From c129767e063c5c9839cc9d94c34fd88dac3fb9a6 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 7 Dec 2006 00:26:16 +0100
Subject: [PATCH] Imported from util-linux-2.12b tarball.

---
 HISTORY                                   |   22 +
 VERSION                                   |    2 +-
 configure                                 |   19 +
 disk-utils/blockdev.c                     |   64 +-
 disk-utils/elvtune.c                      |    4 +-
 disk-utils/fsck.minix.c                   |   50 +-
 disk-utils/mkfs.minix.c                   |   62 +-
 fdisk/cfdisk.c                            |    5 +-
 fdisk/common.h                            |    2 +-
 fdisk/fdisk.c                             |   56 +-
 fdisk/i386_sys_types.c                    |    2 +-
 fdisk/sfdisk.c                            |  181 +-
 login-utils/chsh.c                        |    8 +-
 misc-utils/Makefile                       |    2 +-
 misc-utils/rename.1                       |    1 +
 misc-utils/script.1                       |    2 +-
 misc-utils/script.c                       |   10 +
 misc-utils/{replay.1 => scriptreplay.1}   |    6 +-
 misc-utils/{replay.pl => scriptreplay.pl} |   14 +-
 mount/Makefile                            |   20 +-
 mount/fstab.c                             |   26 +-
 mount/get_label_uuid.c                    |   29 +-
 mount/linux_fs.h                          |   15 +-
 mount/lomount.c                           |   13 +-
 mount/lomount.h                           |    4 +-
 mount/mount.8                             |   41 +-
 mount/mount.c                             |   96 +-
 mount/mount_blkid.c                       |  110 +
 mount/mount_blkid.h                       |   12 +
 mount/mount_by_label.c                    |   10 +-
 mount/mount_by_label.h                    |    4 +-
 mount/mount_guess_fstype.c                |  108 +-
 mount/my_dev_t.h                          |   13 +-
 mount/swapon.c                            |    2 +
 partx/partx.c                             |    2 +-
 po/Makefile                               |    4 +-
 po/ca.po                                  | 3317 ++++---
 po/cat-id-tbl.c                           | 2679 +++---
 po/cs.po                                  | 2447 ++---
 po/da.po                                  | 2452 ++---
 po/de.po                                  | 3122 ++++---
 po/es.po                                  | 2449 +++--
 po/et.po                                  | 2337 +++--
 po/fi.po                                  | 2442 +++--
 po/fr.po                                  | 2466 +++--
 po/it.po                                  | 2437 ++---
 po/ja.po                                  | 2450 ++---
 po/nl.po                                  | 2451 +++--
 po/pt_BR.po                               | 2459 ++---
 po/ru.po                                  | 7568 +++++++++-------
 po/sl.po                                  | 2317 +++--
 po/sv.po                                  | 2475 +++--
 po/tr.po                                  | 2457 +++--
 po/uk.po                                  | 9953 +++++++++++++++++++++
 sys-utils/dmesg.c                         |   57 +-
 sys-utils/readprofile.c                   |   75 +-
 56 files changed, 35114 insertions(+), 24317 deletions(-)
 rename misc-utils/{replay.1 => scriptreplay.1} (97%)
 rename misc-utils/{replay.pl => scriptreplay.pl} (83%)
 create mode 100644 mount/mount_blkid.c
 create mode 100644 mount/mount_blkid.h
 create mode 100644 po/uk.po

diff --git a/HISTORY b/HISTORY
index 50635cda..dc378266 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,25 @@
+util-linux 2.12b
+
+* chsh: improved error message
+* dmesg: ask kernel proper buffer size
+* losetup: handle 64-bit offsets
+* blockdev: also report BLKGETSIZE64 result
+* blockdev, elvtune, fdisk: handle new kernel _IOR,_IOW defines
+* fdisk: remove strange "ends in a digit" heuristic
+* fdisk: also list Solaris as possible type for 0x82
+* mount: added --rbind option
+* mount: use blkid library
+* mount: support reiserfs mount by label
+* mount: attempt to use the right definition of dev_t in struct loopinfo
+* mount.8: jfs mount options added
+* readprofile: new -s option
+* rename.1: added ref to mmv.1
+* replay: renamed to scriptreplay; correct typos
+* script: do not use locale for time delay floating point number format
+* sfdisk: error messages to stderr
+* New Catalan, Dutch, Finnish, French, German, Spanish, Swedish, Turkish,
+  Ukrainian messages
+
 util-linux 2.12a
 
 * chfn, chsh, login, vipw: SElinux support
diff --git a/VERSION b/VERSION
index e36bb395..0841085a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.12a
+2.12b
diff --git a/configure b/configure
index 45ba906a..354a4079 100755
--- a/configure
+++ b/configure
@@ -42,6 +42,7 @@
 # 12. For hwclock.c: does struct tm have a field tm_gmtoff?
 # 13. For nfsmount: does the output of rpcgen compile?
 # 14. For fsck.cramfs, mkfs.cramfs: do we have libz?
+# 15. For mount, do we have blkid?
 
 rm -f make_include defines.h
 
@@ -710,3 +711,21 @@ else
 fi
 rm -f conftest conftest.c
 
+#
+# 15. For mount, do we have blkid?
+# 
+echo '
+#include <blkid/blkid.h>
+int main(){ exit(0); blkid_known_fstype("ext2"); }
+' > conftest.c
+LIBS="-lblkid -luuid"
+eval $compile
+LIBS=
+if test -s conftest; then
+        echo "HAVE_BLKID=yes" >> make_include
+        echo "You have blkid"
+else
+        echo "HAVE_BLKID=no" >> make_include
+        echo "You don't have blkid"
+fi
+rm -f conftest conftest.c
diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index b1422a82..bb11981d 100644
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -24,8 +24,9 @@
 #define BLKRASET   _IO(0x12,98)
 #define BLKRAGET   _IO(0x12,99)
 #define BLKSSZGET  _IO(0x12,104)
-#define BLKBSZGET  _IOR(0x12,112,sizeof(int))
-#define BLKBSZSET  _IOW(0x12,113,sizeof(int))
+#define BLKBSZGET  _IOR(0x12,112,size_t)
+#define BLKBSZSET  _IOW(0x12,113,size_t)
+#define BLKGETSIZE64 _IOR(0x12,114,size_t)
 #endif
 
 /* Maybe <linux/hdreg.h> could be included */
@@ -52,6 +53,7 @@ struct bdc {
 #define	ARGINTP	3
 #define ARGINTG	4
 #define ARGLINTG 5
+#define ARGLLINTG 6
 	long argval;
 	char *argname;
 	char *help;
@@ -73,7 +75,10 @@ struct bdc {
 	{ "--setbsz", "BLKBSZSET", BLKBSZSET, ARGINTAP, 0, "BLOCKSIZE", N_("set blocksize") },
 #endif
 #ifdef BLKGETSIZE
-	{ "--getsize", "BLKGETSIZE", BLKGETSIZE, ARGLINTG, -1, NULL, N_("get size") },
+	{ "--getsize", "BLKGETSIZE", BLKGETSIZE, ARGLINTG, -1, NULL, N_("get 32-bit sector count") },
+#endif
+#ifdef BLKGETSIZE64
+	{ "--getsize64", "BLKGETSIZE64", BLKGETSIZE64, ARGLLINTG, -1, NULL, N_("get size in bytes") },
 #endif
 #ifdef BLKRASET
 	{ "--setra", "BLKRASET", BLKRASET, ARGINTA, 0, "READAHEAD", N_("set readahead") },
@@ -100,6 +105,7 @@ usage(void) {
 	fprintf(stderr, _("  %s --report [devices]\n"), progname);
 	fprintf(stderr, _("  %s [-v|-q] commands devices\n"), progname);
 	fprintf(stderr, _("Available commands:\n"));
+	fprintf(stderr, "\t--getsz\t(%s)\n", "get size in 512-byte sectors");
 	for (i = 0; i < SIZE(bdcms); i++) {
 		fprintf(stderr, "\t%s", bdcms[i].name);
 		if (bdcms[i].argname)
@@ -121,6 +127,23 @@ find_cmd(char *s) {
 	return -1;
 }
 
+static int
+getsize(int fd, long long *sectors) {
+	int err;
+	long sz;
+	long long b;
+
+	err = ioctl (fd, BLKGETSIZE, &sz);
+	if (err)
+		return err;
+	err = ioctl(fd, BLKGETSIZE64, &b);
+	if (err || b == 0 || b == sz)
+		*sectors = sz;
+	else
+		*sectors = (b >> 9);
+	return 0;
+}
+
 void do_commands(int fd, char **argv, int d);
 void report_header(void);
 void report_device(char *device, int quiet);
@@ -174,6 +197,8 @@ main(int argc, char **argv) {
 				d++;
 			continue;
 		}
+		if (!strcmp(argv[d], "--getsz"))
+			continue;
 		if (!strcmp(argv[d], "--")) {
 			d++;
 			break;
@@ -202,6 +227,7 @@ do_commands(int fd, char **argv, int d) {
 	int res, i, j;
 	int iarg;
 	long larg;
+	long long llarg;
 	int verbose = 0;
 
 	for (i = 1; i < d; i++) {
@@ -214,6 +240,15 @@ do_commands(int fd, char **argv, int d) {
 			continue;
 		}
 
+		if (!strcmp(argv[i], "--getsz")) {
+			res = getsize(fd, &llarg);
+			if (res == 0)
+				printf("%lld\n", llarg);
+			else
+				exit(1);
+			continue;
+		}
+
 		j = find_cmd(argv[i]);
 		if (j == -1) {
 			fprintf(stderr, _("%s: Unknown command: %s\n"),
@@ -253,6 +288,10 @@ do_commands(int fd, char **argv, int d) {
 			larg = bdcms[j].argval;
 			res = ioctl(fd, bdcms[j].ioc, &larg);
 			break;
+		case ARGLLINTG:
+			llarg = bdcms[j].argval;
+			res = ioctl(fd, bdcms[j].ioc, &llarg);
+			break;
 		}
 		if (res == -1) {
 			perror(bdcms[j].iocname);
@@ -273,6 +312,12 @@ do_commands(int fd, char **argv, int d) {
 			else
 				printf("%ld\n", larg);
 			break;
+		case ARGLLINTG:
+			if (verbose)
+				printf("%s: %lld\n", _(bdcms[j].help), llarg);
+			else
+				printf("%lld\n", llarg);
+			break;
 		default:
 			if (verbose)
 				printf(_("%s succeeded.\n"), _(bdcms[j].help));
@@ -312,7 +357,8 @@ void
 report_device(char *device, int quiet) {
 	int fd;
 	int ro, ssz, bsz;
-	long ra, sz, ss;
+	long ra, ss;
+	long long bytes;
 	struct hd_geometry g;
 
 	fd = open(device, O_RDONLY | O_NONBLOCK);
@@ -324,15 +370,15 @@ report_device(char *device, int quiet) {
 	}
 
 	ro = ssz = bsz = 0;
-	g.start = ra = sz = ss = 0;
+	g.start = ra = ss = 0;
 	if (ioctl (fd, BLKROGET, &ro) == 0 &&
 	    ioctl (fd, BLKRAGET, &ra) == 0 &&
 	    ioctl (fd, BLKSSZGET, &ssz) == 0 &&
 	    ioctl (fd, BLKBSZGET, &bsz) == 0 &&
-	    ioctl (fd, BLKGETSIZE, &sz) == 0 &&
-	    ioctl (fd, HDIO_GETGEO, &g) == 0) {
-		printf("%s %5ld %5d %5d %10ld %10ld  %s\n",
-		       ro ? "ro" : "rw", ra, ssz, bsz, g.start, sz, device);
+	    ioctl (fd, HDIO_GETGEO, &g) == 0 &&
+	    getsize (fd, &bytes) == 0) {
+		printf("%s %5ld %5d %5d %10ld %10lld  %s\n",
+		       ro ? "ro" : "rw", ra, ssz, bsz, g.start, bytes, device);
 	} else {
 		if (!quiet)
 			fprintf(stderr, _("%s: ioctl error on %s\n"),
diff --git a/disk-utils/elvtune.c b/disk-utils/elvtune.c
index 2c49b444..a727745c 100644
--- a/disk-utils/elvtune.c
+++ b/disk-utils/elvtune.c
@@ -37,8 +37,8 @@ typedef struct blkelv_ioctl_arg_s {
 	int max_bomb_segments;
 } blkelv_ioctl_arg_t;
 
-#define BLKELVGET   _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t))
-#define BLKELVSET   _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t))
+#define BLKELVGET   _IOR(0x12,106,size_t)
+#define BLKELVSET   _IOW(0x12,107,size_t)
 
 static void
 usage(void) {
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 2a109b84..808ae22c 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -99,10 +99,6 @@
 #include "minix.h"
 #include "nls.h"
 
-#ifdef MINIX2_SUPER_MAGIC2
-#define HAVE_MINIX2 1
-#endif
-
 #ifndef __linux__
 #define volatile
 #endif
@@ -111,13 +107,9 @@
 
 #define UPPER(size,n) ((size+((n)-1))/(n))
 #define INODE_SIZE (sizeof(struct minix_inode))
-#ifdef HAVE_MINIX2
 #define INODE_SIZE2 (sizeof(struct minix2_inode))
 #define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
 				    : MINIX_INODES_PER_BLOCK))
-#else
-#define INODE_BLOCKS UPPER(INODES, (MINIX_INODES_PER_BLOCK))
-#endif
 #define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
 
 #define BITS_PER_BLOCK (BLOCK_SIZE<<3)
@@ -152,11 +144,7 @@ static char * inode_buffer = NULL;
 static char super_block_buffer[BLOCK_SIZE];
 #define Super (*(struct minix_super_block *)super_block_buffer)
 #define INODES ((unsigned long)Super.s_ninodes)
-#ifdef HAVE_MINIX2
 #define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
-#else
-#define ZONES ((unsigned long)(Super.s_nzones))
-#endif
 #define IMAPS ((unsigned long)Super.s_imap_blocks)
 #define ZMAPS ((unsigned long)Super.s_zmap_blocks)
 #define FIRSTZONE ((unsigned long)Super.s_firstdatazone)
@@ -172,9 +160,7 @@ static unsigned char * inode_count = NULL;
 static unsigned char * zone_count = NULL;
 
 static void recursive_check(unsigned int ino);
-#ifdef HAVE_MINIX2
 static void recursive_check2(unsigned int ino);
-#endif
 
 #include "bitops.h"
 
@@ -345,7 +331,6 @@ check_zone_nr(unsigned short * nr, int * corrected) {
 	return 0;
 }
 
-#ifdef HAVE_MINIX2
 static int
 check_zone_nr2 (unsigned int *nr, int *corrected) {
 	if (!*nr)
@@ -368,7 +353,6 @@ check_zone_nr2 (unsigned int *nr, int *corrected) {
 	}
 	return 0;
 }
-#endif
 
 /*
  * read-block reads block nr into the buffer at addr.
@@ -456,7 +440,6 @@ map_block(struct minix_inode * inode, unsigned int blknr) {
 	return result;
 }
 
-#ifdef HAVE_MINIX2
 static int
 map_block2 (struct minix2_inode *inode, unsigned int blknr) {
   	unsigned int ind[BLOCK_SIZE >> 2];
@@ -513,7 +496,6 @@ map_block2 (struct minix2_inode *inode, unsigned int blknr) {
 		write_block (block, (char *) ind);
 	return result;
 }
-#endif
 
 static void
 write_super_block(void) {
@@ -554,11 +536,9 @@ get_dirsize (void) {
 	char blk[BLOCK_SIZE];
 	int size;
 
-#if HAVE_MINIX2
 	if (version2)
 		block = Inode2[ROOT_INO].i_zone[0];
 	else
-#endif
 		block = Inode[ROOT_INO].i_zone[0];
 	read_block (block, blk);
 	for (size = 16; size < BLOCK_SIZE; size <<= 1) {
@@ -585,7 +565,6 @@ read_superblock(void) {
 		namelen = 30;
 		dirsize = 32;
 		version2 = 0;
-#ifdef HAVE_MINIX2
 	} else if (MAGIC == MINIX2_SUPER_MAGIC) {
 		namelen = 14;
 		dirsize = 16;
@@ -594,7 +573,6 @@ read_superblock(void) {
 		namelen = 30;
 		dirsize = 32;
 		version2 = 1;
-#endif
 	} else
 		die(_("bad magic number in super-block"));
 	if (ZONESIZE != 0 || BLOCK_SIZE != 1024)
@@ -697,7 +675,6 @@ get_inode(unsigned int nr) {
 	return inode;
 }
 
-#ifdef HAVE_MINIX2
 static struct minix2_inode *
 get_inode2 (unsigned int nr) {
 	struct minix2_inode *inode;
@@ -745,7 +722,6 @@ get_inode2 (unsigned int nr) {
 	}
 	return inode;
 }
-#endif
 
 static void
 check_root(void) {
@@ -755,7 +731,6 @@ check_root(void) {
 		die(_("root inode isn't a directory"));
 }
 
-#ifdef HAVE_MINIX2
 static void
 check_root2 (void) {
 	struct minix2_inode *inode = Inode2 + ROOT_INO;
@@ -763,7 +738,6 @@ check_root2 (void) {
 	if (!inode || !S_ISDIR (inode->i_mode))
 		die ("root inode isn't a directory");
 }
-#endif
 
 static int
 add_zone(unsigned short * znr, int * corrected) {
@@ -798,7 +772,6 @@ add_zone(unsigned short * znr, int * corrected) {
 	return block;
 }
 
-#ifdef HAVE_MINIX2
 static int
 add_zone2 (unsigned int *znr, int *corrected) {
 	int result;
@@ -831,7 +804,6 @@ add_zone2 (unsigned int *znr, int *corrected) {
 		zone_count[block]--;
 	return block;
 }
-#endif
 
 static void
 add_zone_ind(unsigned short * znr, int * corrected) {
@@ -849,7 +821,6 @@ add_zone_ind(unsigned short * znr, int * corrected) {
 		write_block(block, blk);
 }
 
-#ifdef HAVE_MINIX2
 static void
 add_zone_ind2 (unsigned int *znr, int *corrected) {
 	static char blk[BLOCK_SIZE];
@@ -865,7 +836,6 @@ add_zone_ind2 (unsigned int *znr, int *corrected) {
 	if (chg_blk)
 		write_block (block, blk);
 }
-#endif
 
 static void
 add_zone_dind(unsigned short * znr, int * corrected) {
@@ -883,7 +853,6 @@ add_zone_dind(unsigned short * znr, int * corrected) {
 		write_block(block, blk);
 }
 
-#ifdef HAVE_MINIX2
 static void
 add_zone_dind2 (unsigned int *znr, int *corrected) {
 	static char blk[BLOCK_SIZE];
@@ -915,7 +884,6 @@ add_zone_tind2 (unsigned int *znr, int *corrected) {
 	if (blk_chg)
 		write_block (block, blk);
 }
-#endif
 
 static void
 check_zones(unsigned int i) {
@@ -935,7 +903,6 @@ check_zones(unsigned int i) {
 	add_zone_dind(8 + inode->i_zone, &changed);
 }
 
-#ifdef HAVE_MINIX2
 static void
 check_zones2 (unsigned int i) {
 	struct minix2_inode *inode;
@@ -954,7 +921,6 @@ check_zones2 (unsigned int i) {
 	add_zone_dind2 (8 + inode->i_zone, &changed);
 	add_zone_tind2 (9 + inode->i_zone, &changed);
 }
-#endif
 
 static void
 check_file(struct minix_inode * dir, unsigned int offset) {
@@ -1023,7 +989,6 @@ check_file(struct minix_inode * dir, unsigned int offset) {
 	return;
 }
 
-#ifdef HAVE_MINIX2
 static void
 check_file2 (struct minix2_inode *dir, unsigned int offset) {
 	static char blk[BLOCK_SIZE];
@@ -1090,7 +1055,6 @@ check_file2 (struct minix2_inode *dir, unsigned int offset) {
 	name_depth--;
 	return;
 }
-#endif
 
 static void
 recursive_check(unsigned int ino) {
@@ -1110,7 +1074,6 @@ recursive_check(unsigned int ino) {
 		check_file(dir,offset);
 }
 
-#ifdef HAVE_MINIX2
 static void
 recursive_check2 (unsigned int ino) {
 	struct minix2_inode *dir;
@@ -1128,7 +1091,6 @@ recursive_check2 (unsigned int ino) {
 	for (offset = 0; offset < dir->i_size; offset += dirsize)
 		check_file2 (dir, offset);
 }
-#endif
 
 static int
 bad_zone(int i) {
@@ -1194,7 +1156,6 @@ check_counts(void) {
 	}
 }
 
-#ifdef HAVE_MINIX2
 static void
 check_counts2 (void) {
 	int i;
@@ -1249,7 +1210,6 @@ check_counts2 (void) {
 				i, zone_count[i]);
 	}
 }
-#endif
 
 static void
 check(void) {
@@ -1260,7 +1220,6 @@ check(void) {
 	check_counts();
 }
 
-#ifdef HAVE_MINIX2
 static void
 check2 (void) {
 	memset (inode_count, 0, (INODES + 1) * sizeof (*inode_count));
@@ -1269,7 +1228,6 @@ check2 (void) {
 	recursive_check2 (ROOT_INO);
 	check_counts2 ();
 }
-#endif
 
 int
 main(int argc, char ** argv) {
@@ -1294,10 +1252,9 @@ main(int argc, char ** argv) {
 
 	if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
 		die(_("bad inode size"));
-#ifdef HAVE_MINIX2
 	if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
 		die(_("bad v2 inode size"));
-#endif
+
 	while (argc-- > 1) {
 		argv++;
 		if (argv[0][0] != '-') {
@@ -1360,13 +1317,10 @@ main(int argc, char ** argv) {
 		termios_set = 1;
 	}
 
-#if HAVE_MINIX2
 	if (version2) {
 		check_root2 ();
 		check2 ();
-	} else 
-#endif
-	  {
+	} else {
 		check_root();
 		check();
 	}
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index f399684a..14cf6fa6 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -79,10 +79,6 @@
 #define BLKGETSIZE _IO(0x12,96)    /* return device size */
 #endif
 
-#ifdef MINIX2_SUPER_MAGIC2
-#define HAVE_MINIX2 1
-#endif
-
 #ifndef __GNUC__
 #error "needs gcc for the bitop-__asm__'s"
 #endif
@@ -95,13 +91,10 @@
 
 #define UPPER(size,n) ((size+((n)-1))/(n))
 #define INODE_SIZE (sizeof(struct minix_inode))
-#ifdef HAVE_MINIX2
+
 #define INODE_SIZE2 (sizeof(struct minix2_inode))
 #define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
 				    : MINIX_INODES_PER_BLOCK))
-#else
-#define INODE_BLOCKS UPPER(INODES, (MINIX_INODES_PER_BLOCK))
-#endif
 #define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
 
 #define BITS_PER_BLOCK (BLOCK_SIZE<<3)
@@ -122,18 +115,13 @@ static char root_block[BLOCK_SIZE] = "\0";
 
 static char * inode_buffer = NULL;
 #define Inode (((struct minix_inode *) inode_buffer)-1)
-#ifdef HAVE_MINIX2
 #define Inode2 (((struct minix2_inode *) inode_buffer)-1)
-#endif
+
 static char super_block_buffer[BLOCK_SIZE];
 static char boot_block_buffer[512];
 #define Super (*(struct minix_super_block *)super_block_buffer)
 #define INODES ((unsigned long)Super.s_ninodes)
-#ifdef HAVE_MINIX2
 #define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
-#else
-#define ZONES ((unsigned long)(Super.s_nzones))
-#endif
 #define IMAPS ((unsigned long)Super.s_imap_blocks)
 #define ZMAPS ((unsigned long)Super.s_zmap_blocks)
 #define FIRSTZONE ((unsigned long)Super.s_firstdatazone)
@@ -368,7 +356,6 @@ end_bad:
 		write_block(dind, (char *) dind_block);
 }
 
-#ifdef HAVE_MINIX2
 static void
 make_bad_inode2 (void) {
 	struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
@@ -417,7 +404,6 @@ make_bad_inode2 (void) {
 	if (dind)
 		write_block (dind, (char *) dind_block);
 }
-#endif
 
 static void
 make_root_inode(void) {
@@ -441,7 +427,6 @@ make_root_inode(void) {
 	write_block(inode->i_zone[0],root_block);
 }
 
-#ifdef HAVE_MINIX2
 static void
 make_root_inode2 (void) {
 	struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
@@ -463,7 +448,6 @@ make_root_inode2 (void) {
 		inode->i_gid = getgid();
 	write_block (inode->i_zone[0], root_block);
 }
-#endif
 
 static void
 setup_tables(void) {
@@ -472,10 +456,13 @@ setup_tables(void) {
 
 	memset(super_block_buffer,0,BLOCK_SIZE);
 	memset(boot_block_buffer,0,512);
-	MAGIC = magic;
-	ZONESIZE = 0;
-	MAXSIZE = version2 ? 0x7fffffff : (7+512+512*512)*1024;
-	ZONES = BLOCKS;
+	Super.s_magic = magic;
+	Super.s_log_zone_size = 0;
+	Super.s_max_size = version2 ? 0x7fffffff : (7+512+512*512)*1024;
+	if (version2)
+		Super.s_zones = BLOCKS;
+	else
+		Super.s_nzones = BLOCKS;
 
 /* some magic nrs: 1 inode / 3 blocks */
 	if ( req_nr_inodes == 0 ) 
@@ -483,26 +470,27 @@ setup_tables(void) {
 	else
 		inodes = req_nr_inodes;
 	/* Round up inode count to fill block size */
-#ifdef HAVE_MINIX2
 	if (version2)
 		inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) &
 			  ~(MINIX2_INODES_PER_BLOCK - 1));
 	else
-#endif
 		inodes = ((inodes + MINIX_INODES_PER_BLOCK - 1) &
 			  ~(MINIX_INODES_PER_BLOCK - 1));
 	if (inodes > 65535)
 		inodes = 65535;
-	INODES = inodes;
-	IMAPS = UPPER(INODES + 1,BITS_PER_BLOCK);
-	ZMAPS = UPPER(BLOCKS - (1+IMAPS+INODE_BLOCKS), BITS_PER_BLOCK+1);
+	Super.s_ninodes = inodes;
+
 	/* The old code here
 	 * ZMAPS = 0;
 	 * while (ZMAPS != UPPER(BLOCKS - NORM_FIRSTZONE + 1,BITS_PER_BLOCK))
 	 *	  ZMAPS = UPPER(BLOCKS - NORM_FIRSTZONE + 1,BITS_PER_BLOCK);
 	 * was no good, since it may loop. - aeb
 	 */
-	FIRSTZONE = NORM_FIRSTZONE;
+	Super.s_imap_blocks = UPPER(INODES + 1, BITS_PER_BLOCK);
+	Super.s_zmap_blocks = UPPER(BLOCKS - (1+IMAPS+INODE_BLOCKS),
+				    BITS_PER_BLOCK+1);
+	Super.s_firstdatazone = NORM_FIRSTZONE;
+
 	inode_map = malloc(IMAPS * BLOCK_SIZE);
 	zone_map = malloc(ZMAPS * BLOCK_SIZE);
 	if (!inode_map || !zone_map)
@@ -641,10 +629,9 @@ main(int argc, char ** argv) {
 
   if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
     die(_("bad inode size"));
-#ifdef HAVE_MINIX2
   if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
     die(_("bad inode size"));
-#endif
+
   opterr = 0;
   while ((i = getopt(argc, argv, "ci:l:n:v")) != -1)
     switch (i) {
@@ -669,12 +656,6 @@ main(int argc, char ** argv) {
 	dirsize = i+2;
 	break;
       case 'v':
-#ifndef HAVE_MINIX2
-	fprintf(stderr,
-		_("%s: not compiled with minix v2 support\n"),
-		program_name);
-	exit(-1);
-#endif
 	version2 = 1;
 	break;
       default:
@@ -700,14 +681,12 @@ main(int argc, char ** argv) {
   if (!device_name || BLOCKS<10) {
     usage();
   }
-#ifdef HAVE_MINIX2
   if (version2) {
     if (namelen == 14)
       magic = MINIX2_SUPER_MAGIC;
     else
       magic = MINIX2_SUPER_MAGIC2;
   } else
-#endif
     if (BLOCKS > 65535)
       BLOCKS = 65535;
   check_mount();		/* is it already mounted? */
@@ -734,16 +713,13 @@ main(int argc, char ** argv) {
     check_blocks();
   else if (listfile)
     get_list_blocks(listfile);
-#ifdef HAVE_MINIX2
   if (version2) {
     make_root_inode2 ();
     make_bad_inode2 ();
-  } else
-#endif
-    {
+  } else {
       make_root_inode();
       make_bad_inode();
-    }
+  }
   mark_good_blocks();
   write_tables();
   return 0;
diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index 31ddd7e7..9be1c707 100644
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -2574,13 +2574,14 @@ draw_screen(void) {
     mvaddstr(HEADER_START+2, (COLS-strlen(line))/2, line);
     {
 	    long long bytes = actual_size*(long long) SECTOR_SIZE;
-	    long long megabytes = bytes/1000000;
+	    long long megabytes = bytes/(K*K);
+
 	    if (megabytes < 10000)
 		    sprintf(line, _("Size: %lld bytes, %lld MB"),
 			    bytes, megabytes);
 	    else
 		    sprintf(line, _("Size: %lld bytes, %lld.%lld GB"),
-			    bytes, megabytes/1000, (megabytes/100)%10);
+			    bytes, megabytes/K, (10*megabytes/K)%10);
     }
     mvaddstr(HEADER_START+3, (COLS-strlen(line))/2, line);
     sprintf(line, _("Heads: %d   Sectors per Track: %d   Cylinders: %lld"),
diff --git a/fdisk/common.h b/fdisk/common.h
index f3886395..a2b9f1cd 100644
--- a/fdisk/common.h
+++ b/fdisk/common.h
@@ -6,7 +6,7 @@
 #define BLKGETSIZE   _IO(0x12,96)    /* return device size */
 #define BLKFLSBUF    _IO(0x12,97)    /* flush buffer cache */
 #define BLKSSZGET    _IO(0x12,104)   /* get block device sector size */
-#define BLKGETSIZE64 _IOR(0x12,114,8)	/* 8 = sizeof(u64) */
+#define BLKGETSIZE64 _IOR(0x12,114,size_t)	/* size in bytes */
 
 /* including <linux/hdreg.h> also fails */
 struct hd_geometry {
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 9ef071ca..bf2cdded 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -766,6 +766,26 @@ get_kernel_geometry(int fd) {
 #endif
 }
 
+static int
+is_probably_full_disk(char *name) {
+#ifdef HDIO_GETGEO
+	struct hd_geometry geometry;
+	int fd, i = 0;
+
+	fd = open(name, O_RDONLY);
+	if (fd >= 0) {
+		i = ioctl(fd, HDIO_GETGEO, &geometry);
+		close(fd);
+	}
+	return (fd >= 0 && i == 0 && geometry.start == 0);
+#else
+	/* silly heuristic */
+	while (*name)
+		name++;
+	return !isdigit(name[-1]);
+#endif
+}
+
 static void
 get_partition_table_geometry(void) {
 	unsigned char *bufp = MBRbuffer;
@@ -862,6 +882,8 @@ get_boot(enum action what) {
 	int i;
 
 	partitions = 4;
+	ext_index = 0;
+	extended_offset = 0;
 
 	for (i = 0; i < 4; i++) {
 		struct pte *pe = &ptes[i];
@@ -1044,8 +1066,8 @@ read_hex(struct systypes *sys)
 }
 
 /*
- * Print the message MESG, then read an integer between LOW and HIGH (inclusive).
- * If the user hits Enter, DFLT is returned.
+ * Print the message MESG, then read an integer in LOW..HIGH.
+ * If the user hits Enter, DFLT is returned, provided that is in LOW..HIGH.
  * Answers like +10 are interpreted as offsets from BASE.
  *
  * There is no default if DFLT is not between LOW and HIGH.
@@ -2359,23 +2381,17 @@ try(char *device, int user_specified) {
 			return;
 	if ((fd = open(disk_device, type_open)) >= 0) {
 		gb = get_boot(try_only);
-		if (gb > 0) {	/* I/O error */
-			close(fd);
+		if (gb > 0) { /* I/O error */
 		} else if (gb < 0) { /* no DOS signature */
 			list_disk_geometry();
-			if (aix_label)
-				return;
-			if (btrydev(device) < 0)
+			if (!aix_label && btrydev(device) < 0)
 				fprintf(stderr,
 					_("Disk %s doesn't contain a valid "
 					  "partition table\n"), device);
-			close(fd);
 		} else {
-			close(fd);
 			list_table(0);
-			if (!sun_label && partitions > 4)
-				delete_partition(ext_index);
 		}
+		close(fd);
 	} else {
 		/* Ignore other errors, since we try IDE
 		   and SCSI hard disks which may not be
@@ -2387,12 +2403,14 @@ try(char *device, int user_specified) {
 	}
 }
 
-/* for fdisk -l: try all things in /proc/partitions
-   that look like a partition name (do not end in a digit) */
+/*
+ * for fdisk -l:
+ * try all things in /proc/partitions that look like a full disk
+ */
 static void
 tryprocpt(void) {
 	FILE *procpt;
-	char line[100], ptname[100], devname[120], *s;
+	char line[100], ptname[100], devname[120];
 	int ma, mi, sz;
 
 	procpt = fopen(PROC_PARTITIONS, "r");
@@ -2405,11 +2423,9 @@ tryprocpt(void) {
 		if (sscanf (line, " %d %d %d %[^\n ]",
 			    &ma, &mi, &sz, ptname) != 4)
 			continue;
-		for (s = ptname; *s; s++);
-		if (isdigit(s[-1]))
-			continue;
 		snprintf(devname, sizeof(devname), "/dev/%s", ptname);
-		try(devname, 0);
+		if (is_probably_full_disk(devname))
+			try(devname, 0);
 	}
 	fclose(procpt);
 }
@@ -2504,11 +2520,11 @@ main(int argc, char **argv) {
 			   variable `k' might be clobbered by `longjmp' */
 			dummy(&k);
 			listing = 1;
-			for (k=optind; k<argc; k++)
+			for (k = optind; k < argc; k++)
 				try(argv[k], 1);
 		} else {
 			/* we no longer have default device names */
-			/* but, we can use /proc/partitions instead */
+			/* but we can use /proc/partitions instead */
 			tryprocpt();
 		}
 		exit(0);
diff --git a/fdisk/i386_sys_types.c b/fdisk/i386_sys_types.c
index 740d2a73..94e50cc7 100644
--- a/fdisk/i386_sys_types.c
+++ b/fdisk/i386_sys_types.c
@@ -53,7 +53,7 @@ struct systypes i386_sys_types[] = {
 	{0x75, N_("PC/IX")},
 	{0x80, N_("Old Minix")},	/* Minix 1.4a and earlier */
 	{0x81, N_("Minix / old Linux")},/* Minix 1.4b and later */
-	{0x82, N_("Linux swap")},	/* also Solaris */
+	{0x82, N_("Linux swap / Solaris")},
 	{0x83, N_("Linux")},
 	{0x84, N_("OS/2 hidden C: drive")},
 	{0x85, N_("Linux extended")},
diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index 74d145de..f3abe98d 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -28,11 +28,12 @@
  *
  * Changes:
  * 19990319 - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - i18n
+ * 20040824 - David A. Wheeler <dwheeler@dwheeler.com> - warnings to stderr
  */
 
 #define PROGNAME "sfdisk"
-#define VERSION "3.07"
-#define DATE "990908"
+#define VERSION "3.08"
+#define DATE "040824"
 
 #include <stdio.h>
 #include <stdlib.h>		/* atoi, free */
@@ -83,13 +84,23 @@ char *save_sector_file = NULL;
 char *restore_sector_file = NULL;
 
 static void
-warn(char *s, ...) {
+do_warn(char *s, ...) {
     va_list p;
 
     va_start(p, s);
     fflush(stdout);
+    vfprintf(stderr, s, p);
+    fflush(stderr);
+    va_end(p);
+}
+
+static void
+warn(char *s, ...) {
+    va_list p;
+
+    va_start(p, s);
     if (!quiet)
-      vfprintf (stderr, s, p);
+	do_warn(s, p);
     va_end(p);
 }
 
@@ -101,6 +112,7 @@ error(char *s, ...) {
     fflush(stdout);
     fprintf(stderr, "\n" PROGNAME ": ");
     vfprintf(stderr, s, p);
+    fflush(stderr);
     va_end(p);
 }
 
@@ -112,6 +124,7 @@ fatal(char *s, ...) {
     fflush(stdout);
     fprintf(stderr, "\n" PROGNAME ": ");
     vfprintf(stderr, s, p);
+    fflush(stderr);
     va_end(p);
     exit(1);
 }
@@ -192,7 +205,7 @@ get_sector(char *dev, int fd, unsigned long sno) {
     struct sector *s;
 
     for(s = sectorhead; s; s = s->next)
-	if(s->sectornumber == sno)
+	if (s->sectornumber == sno)
 	    return s;
 
     if (!sseek(dev, fd, sno))
@@ -402,12 +415,12 @@ get_geometry(char *dev, int fd, int silent) {
     if (ioctl(fd, BLKGETSIZE, &size)) {
 	size = 0;
 	if (!silent)
-	    printf(_("Disk %s: cannot get size\n"), dev);
+	    do_warn(_("Disk %s: cannot get size\n"), dev);
     }
     if (ioctl(fd, HDIO_GETGEO, &g)) {
 	g.heads = g.sectors = g.cylinders = g.start = 0;
 	if (!silent)
-	    printf(_("Disk %s: cannot get geometry\n"), dev);
+	    do_warn(_("Disk %s: cannot get geometry\n"), dev);
     }
     R.heads = g.heads;
     R.sectors = g.sectors;
@@ -721,7 +734,7 @@ add_sector_and_offset(struct disk_desc *z) {
 /* tell the kernel to reread the partition tables */
 static int
 reread_ioctl(int fd) {
-    if(ioctl(fd, BLKRRPART)) {
+    if (ioctl(fd, BLKRRPART)) {
 	perror("BLKRRPART");
 	return -1;
     }
@@ -743,13 +756,13 @@ reread_disk_partition(char *dev, int fd) {
     sync();
     sleep(3);			/* superfluous since 1.3.20 */
 
-    if(reread_ioctl(fd) && is_blockdev(fd))
-      printf(_("The command to re-read the partition table failed\n"
+    if (reread_ioctl(fd) && is_blockdev(fd))
+      do_warn(_("The command to re-read the partition table failed\n"
 	     "Reboot your system now, before using mkfs\n"));
 
     if (close(fd)) {
 	perror(dev);
-	printf(_("Error closing %s\n"), dev);
+	do_warn(_("Error closing %s\n"), dev);
     }
     printf("\n");
 }
@@ -760,7 +773,7 @@ index_to_linux(int pno, struct disk_desc *z) {
     int i, ct = 1;
     struct part_desc *p = &(z->partitions[0]);
     for (i=0; i<pno; i++,p++)
-	if(i < 4 || (p->size > 0 && !is_extended(p->p.sys_type)))
+	if (i < 4 || (p->size > 0 && !is_extended(p->p.sys_type)))
 	  ct++;
     return ct;
 }
@@ -770,7 +783,7 @@ linux_to_index(int lpno, struct disk_desc *z) {
     int i, ct = 0;
     struct part_desc *p = &(z->partitions[0]);
     for (i=0; i<z->partno && ct < lpno; i++,p++)
-      if((i < 4 || (p->size > 0 && !is_extended(p->p.sys_type)))
+      if ((i < 4 || (p->size > 0 && !is_extended(p->p.sys_type)))
 	 && ++ct == lpno)
 	return i;
     return -1;
@@ -810,7 +823,7 @@ static void
 set_format(char c) {
     switch(c) {
       default:
-	printf(_("unrecognized format - using sectors\n"));
+	do_warn(_("unrecognized format - using sectors\n"));
       case 'S': specified_format = F_SECTOR; break;
       case 'B': specified_format = F_BLOCK; break;
       case 'C': specified_format = F_CYLINDER; break;
@@ -827,7 +840,7 @@ unitsize(int format) {
     switch(format) {
       default:
       case F_CYLINDER:
-	if(B.cylindersize)
+	if (B.cylindersize)
 	  return B.cylindersize;
       case F_SECTOR:
 	return 1;
@@ -860,7 +873,7 @@ out_partition_header(char *dev, int format, struct geometry G) {
 
     switch(format) {
       default:
-	printf(_("unimplemented format - using %s\n"),
+	do_warn(_("unimplemented format - using %s\n"),
 	       G.cylindersize ? _("cylinders") : _("sectors"));
       case F_CYLINDER:
 	if (G.cylindersize) {
@@ -965,9 +978,9 @@ out_partition(char *dev, int format, struct part_desc *p,
 
     pno = p - &(z->partitions[0]); 	/* our index */
     lpno = index_to_linux(pno, z); 	/* name of next one that has a name */
-    if(pno == linux_to_index(lpno, z))  /* was that us? */
+    if (pno == linux_to_index(lpno, z))  /* was that us? */
       printf("%s", partname(dev, lpno, 10));  /* yes */
-    else if(show_extended)
+    else if (show_extended)
       printf("    -     ");
     else
       return;
@@ -989,9 +1002,9 @@ out_partition(char *dev, int format, struct part_desc *p,
 	return;
     }
 
-    if(p->ptype != DOS_TYPE || p->p.bootable == 0)
+    if (p->ptype != DOS_TYPE || p->p.bootable == 0)
       printf("   ");
-    else if(p->p.bootable == 0x80)
+    else if (p->p.bootable == 0x80)
       printf(" * ");
     else
       printf(" ? ");		/* garbage */
@@ -1043,18 +1056,18 @@ out_partition(char *dev, int format, struct part_desc *p,
 	b = p->p.begin_chs;
 	aa = chs_to_longchs(a);
 	bb = chs_to_longchs(b);
-	if(a.s && !is_equal_chs(a, b))
-	  printf(_("\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"),
+	if (a.s && !is_equal_chs(a, b))
+	  do_warn(_("\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"),
 		 aa.c, aa.h, aa.s, bb.c, bb.h, bb.s);
 	a = (size ? ulong_to_chs(end,G) : zero_chs);
 	b = p->p.end_chs;
 	aa = chs_to_longchs(a);
 	bb = chs_to_longchs(b);
-	if(a.s && !is_equal_chs(a, b))
-	  printf(_("\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"),
+	if (a.s && !is_equal_chs(a, b))
+	  do_warn(_("\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"),
 		 aa.c, aa.h, aa.s, bb.c, bb.h, bb.s);
-	if(G.cylinders && G.cylinders < 1024 && bb.c > G.cylinders)
-	  printf(_("partition ends on cylinder %ld, beyond the end of the disk\n"),
+	if (G.cylinders && G.cylinders < 1024 && bb.c > G.cylinders)
+	  do_warn(_("partition ends on cylinder %ld, beyond the end of the disk\n"),
 	       bb.c);
     }
 }
@@ -1064,10 +1077,10 @@ out_partitions(char *dev, struct disk_desc *z) {
     int pno, format = 0;
 
     if (z->partno == 0)
-	printf(_("No partitions found\n"));
+	do_warn(_("No partitions found\n"));
     else {
 	if (get_fdisk_geometry(z) && !dump) {
-	    printf(
+	    do_warn(
 	   _("Warning: The partition table looks like it was made\n"
 	     "  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
 	     "For this listing I'll assume that geometry.\n"),
@@ -1077,7 +1090,7 @@ out_partitions(char *dev, struct disk_desc *z) {
 	out_partition_header(dev, format, F);
 	for(pno=0; pno < z->partno; pno++) {
 	    out_partition(dev, format, &(z->partitions[pno]), z, F);
-	    if(show_extended && pno%4==3)
+	    if (show_extended && pno%4==3)
 	      printf("\n");
 	}
     }
@@ -1127,13 +1140,13 @@ partitions_ok(struct disk_desc *z) {
        And do they have start = 0? And bootable = 0? */
     for (p = partitions; p - partitions < partno; p++)
       if (p->size == 0) {
-	  if(p->p.sys_type != EMPTY_PARTITION)
+	  if (p->p.sys_type != EMPTY_PARTITION)
 	    warn(_("Warning: partition %s has size 0 but is not marked Empty\n"),
 		 PNO(p));
-	  else if(p->p.bootable != 0)
+	  else if (p->p.bootable != 0)
 	    warn(_("Warning: partition %s has size 0 and is bootable\n"),
 		 PNO(p));
-	  else if(p->p.start_sect != 0)
+	  else if (p->p.start_sect != 0)
 	    warn(_("Warning: partition %s has size 0 and nonzero start\n"),
 		 PNO(p));
 	  /* all this is probably harmless, no error return */
@@ -1156,7 +1169,7 @@ partitions_ok(struct disk_desc *z) {
       if (p->size && !is_extended(p->p.sys_type))
 	for (q = p+1; q < partitions+partno; q++)
 	  if (q->size && !is_extended(q->p.sys_type))
-	    if(!((p->start > q-> start) ? disj(q,p) : disj(p,q))) {
+	    if (!((p->start > q-> start) ? disj(q,p) : disj(p,q))) {
 		warn(_("Warning: partitions %s "), PNO(p));
 		warn(_("and %s overlap\n"), PNO(q));
 		return 0;
@@ -1180,7 +1193,7 @@ partitions_ok(struct disk_desc *z) {
     { unsigned long ds = get_disksize(F_SECTOR);
     for (p = partitions; p < partitions+partno; p++)
       if (p->size) {
-	  if(p->start == 0) {
+	  if (p->start == 0) {
 	      warn(_("Warning: partition %s starts at sector 0\n"), PNO(p));
 	      return 0;
 	  }
@@ -1215,7 +1228,7 @@ partitions_ok(struct disk_desc *z) {
     if (B.cylindersize) {
 	for(p = partitions; p < partitions+partno; p++)
 	  if (p->size) {
-	      if(p->start % B.cylindersize != 0
+	      if (p->start % B.cylindersize != 0
 		 && (!p->ep || p->start / B.cylindersize != p->ep->start / B.cylindersize)
 		 && (p->p.start_sect >= B.cylindersize)) {
 		  warn(_("Warning: partition %s does not start "
@@ -1223,7 +1236,7 @@ partitions_ok(struct disk_desc *z) {
 		  if (!Linux)
 		    return 0;
 	      }
-	      if((p->start + p->size) % B.cylindersize) {
+	      if ((p->start + p->size) % B.cylindersize) {
 		  warn(_("Warning: partition %s does not end "
 		       "at a cylinder boundary\n"), PNO(p));
 		  if (!Linux)
@@ -1262,7 +1275,7 @@ partitions_ok(struct disk_desc *z) {
 
     /* Is chs as we expect? */
     for(p = partitions; p < partitions+partno; p++)
-      if(p->ptype == DOS_TYPE) {
+      if (p->ptype == DOS_TYPE) {
 	chs a, b;
 	longchs aa, bb;
 	a = p->size ? ulong_to_chs(p->start,B) : zero_chs;
@@ -1271,7 +1284,7 @@ partitions_ok(struct disk_desc *z) {
 	bb = chs_to_longchs(b);
 	if (!chs_ok(b, PNO(p), _("start")))
 	  return 0;
-	if(a.s && !is_equal_chs(a, b))
+	if (a.s && !is_equal_chs(a, b))
 	  warn(_("partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"),
 	       PNO(p), aa.c, aa.h, aa.s, bb.c, bb.h, bb.s);
 	a = p->size ? ulong_to_chs(p->start + p->size - 1, B) : zero_chs;
@@ -1280,10 +1293,10 @@ partitions_ok(struct disk_desc *z) {
 	bb = chs_to_longchs(b);
 	if (!chs_ok(b, PNO(p), _("end")))
 	  return 0;
-	if(a.s && !is_equal_chs(a, b))
+	if (a.s && !is_equal_chs(a, b))
 	  warn(_("partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"),
 	       PNO(p), aa.c, aa.h, aa.s, bb.c, bb.h, bb.s);
-	if(B.cylinders && B.cylinders < 1024 && bb.c > B.cylinders)
+	if (B.cylinders && B.cylinders < 1024 && bb.c > B.cylinders)
 	  warn(_("partition %s ends on cylinder %ld, beyond the end of the disk\n"),
 	       PNO(p), bb.c);
     }
@@ -1309,13 +1322,13 @@ 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 "
+	    do_warn(_("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);
 	} else {
-	    printf(_("Warning: extended partition does not start at a "
+	    do_warn(_("Warning: extended partition does not start at a "
 		     "cylinder boundary.\n"
 		     "DOS and Linux will interpret the contents differently.\n"));
 	}
@@ -1333,7 +1346,7 @@ extended_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z)
 	cp = s->data + 0x1be;
 
 	if (pno+4 >= SIZE(z->partitions)) {
-	    printf(_("too many partitions - ignoring those past nr (%d)\n"),
+	    do_warn(_("too many partitions - ignoring those past nr (%d)\n"),
 		   pno-1);
 	    break;
 	}
@@ -1348,7 +1361,7 @@ extended_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z)
 	    if (is_extended(p.sys_type)) {
 		partitions[pno].start = start + p.start_sect;
 		if (next)
-		  printf(_("tree of partitions?\n"));
+		  do_warn(_("tree of partitions?\n"));
 		else
 		  next = partitions[pno].start;		/* follow `upper' branch */
 		moretodo = 1;
@@ -1410,7 +1423,7 @@ bsd_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z) {
 	bp = bp0 = &l->d_partitions[0];
 	while (bp - bp0 < BSD_MAXPARTITIONS && bp - bp0 < l->d_npartitions) {
 		if (pno+1 >= SIZE(z->partitions)) {
-			printf(_("too many partitions - ignoring those "
+			do_warn(_("too many partitions - ignoring those "
 			       "past nr (%d)\n"), pno-1);
 			break;
 		}
@@ -1469,14 +1482,14 @@ msdos_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) {
 	|| pt.sys_type == EZD_PARTITION
 	|| pt.sys_type == DM6_AUX1PARTITION
 	|| pt.sys_type == DM6_AUX3PARTITION) {
-	printf(_("detected Disk Manager - unable to handle that\n"));
+	do_warn(_("detected Disk Manager - unable to handle that\n"));
 	return 0;
     }
     { unsigned int sig = *(unsigned short *)(s->data + 2);
       if (sig <= 0x1ae
 	  && *(unsigned short *)(s->data + sig) == 0x55aa
 	  && (1 & *(unsigned char *)(s->data + sig + 2))) {
-	  printf(_("DM6 signature found - giving up\n"));
+	  do_warn(_("DM6 signature found - giving up\n"));
 	  return 0;
       }
     }
@@ -1496,14 +1509,14 @@ msdos_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) {
     for (i=0; i<4; i++) {
 	if (is_extended(partitions[i].p.sys_type)) {
 	    if (!partitions[i].size) {
-		printf(_("strange..., an extended partition of size 0?\n"));
+		do_warn(_("strange..., an extended partition of size 0?\n"));
 		continue;
 	    }
 	    extended_partition(dev, fd, &partitions[i], z);
 	}
 	if (!bsd_later && is_bsd(partitions[i].p.sys_type)) {
 	    if (!partitions[i].size) {
-		printf(_("strange..., a BSD partition of size 0?\n"));
+		do_warn(_("strange..., a BSD partition of size 0?\n"));
 		continue;
 	    }
 	    bsd_partition(dev, fd, &partitions[i], z);
@@ -1514,7 +1527,7 @@ msdos_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) {
 	for (i=0; i<4; i++) {
 	    if (is_bsd(partitions[i].p.sys_type)) {
 		if (!partitions[i].size) {
-		    printf(_("strange..., a BSD partition of size 0?\n"));
+		    do_warn(_("strange..., a BSD partition of size 0?\n"));
 		    continue;
 		}
 		bsd_partition(dev, fd, &partitions[i], z);
@@ -1548,7 +1561,7 @@ get_partitions(char *dev, int fd, struct disk_desc *z) {
 	&& !osf_partition(dev, fd, 0, z)
 	&& !sun_partition(dev, fd, 0, z)
 	&& !amiga_partition(dev, fd, 0, z)) {
-	printf(_(" %s: unrecognized partition\n"), dev);
+	do_warn(_(" %s: unrecognized partition table type\n"), dev);
 	return;
     }
 }
@@ -1560,7 +1573,7 @@ write_partitions(char *dev, int fd, struct disk_desc *z) {
     int pno = z->partno;
 
     if (no_write) {
-	printf(_("-n flag was given: Nothing changed\n"));
+	do_warn(_("-n flag was given: Nothing changed\n"));
 	exit(0);
     }
 
@@ -1682,7 +1695,7 @@ read_stdin(unsigned char **fields, unsigned char *line, int fieldssize, int line
 	    if (*ip == 0)
 	      return fno;
 	    for(d = dumpflds; d-dumpflds < SIZE(dumpflds); d++) {
-		if(!strncmp(ip, d->fldname, strlen(d->fldname))) {
+		if (!strncmp(ip, d->fldname, strlen(d->fldname))) {
 		    ip += strlen(d->fldname);
 		    while(isspace(*ip))
 		      ip++;
@@ -1698,9 +1711,9 @@ read_stdin(unsigned char **fields, unsigned char *line, int fieldssize, int line
 			    d->fldname);
 		    if (fno <= d->fldno)
 		      fno = d->fldno + 1;
-		    if(*ip == 0)
+		    if (*ip == 0)
 		      return fno;
-		    if(*ip != ',' && *ip != ';')
+		    if (*ip != ',' && *ip != ';')
 		      fatal(_("input error: unexpected character %c after %s field\n"),
 			    *ip, d->fldname);
 		    *ip = 0;
@@ -1749,11 +1762,11 @@ get_ul(char *u, unsigned long *up, unsigned long def, int base) {
 	errno = 0;
 	val = strtoul(u, &nu, base);
 	if (errno == ERANGE) {
-	    printf(_("number too big\n"));
+	    do_warn(_("number too big\n"));
 	    return -1;
 	}
 	if (*nu) {
-	    printf(_("trailing junk after number\n"));
+	    do_warn(_("trailing junk after number\n"));
 	    return -1;
 	}
 	if (sign == 1)
@@ -1912,7 +1925,7 @@ build_surrounding_extended(struct part_desc *p, struct part_desc *ep,
 	}
     } else {
 	ep->start = p->start;
-	if(boxes == CHAINED)
+	if (boxes == CHAINED)
 	  ep->size = p->size;
 	else
 	  ep->size = inc;
@@ -1958,7 +1971,7 @@ read_line(int pno, struct part_desc *ep, char *dev, int interactive,
     if (fno == RD_EOF) {
 	return -1;
     } else if (fno > 10 && *(fields[10]) != 0) {
-	printf(_("too many input fields\n"));
+	do_warn(_("too many input fields\n"));
 	return 0;
     }
 
@@ -2000,13 +2013,13 @@ read_line(int pno, struct part_desc *ep, char *dev, int interactive,
       ul = orig ? orig->p.sys_type :
 	   (is_extd || (pno > 3 && pct == 1 && show_extended))
 	     ? EXTENDED_PARTITION : LINUX_NATIVE;
-    else if(!strcmp(fields[2], "L"))
+    else if (!strcmp(fields[2], "L"))
       ul = LINUX_NATIVE;
-    else if(!strcmp(fields[2], "S"))
+    else if (!strcmp(fields[2], "S"))
       ul = LINUX_SWAP;
-    else if(!strcmp(fields[2], "E"))
+    else if (!strcmp(fields[2], "E"))
       ul = EXTENDED_PARTITION;
-    else if(!strcmp(fields[2], "X"))
+    else if (!strcmp(fields[2], "X"))
       ul = LINUX_EXTENDED;
     else if (get_ul(fields[2], &ul, LINUX_NATIVE, 16))
       return 0;
@@ -2056,9 +2069,9 @@ read_line(int pno, struct part_desc *ep, char *dev, int interactive,
     p.p.nr_sects = p.size;
 
     if (p.size == 0 && !orig) {
-	if(fno < 1 || !*(fields[0]))
+	if (fno < 1 || !*(fields[0]))
 	  p.start = 0;
-	if(fno < 3 || !*(fields[2]))
+	if (fno < 3 || !*(fields[2]))
 	  p.p.sys_type = EMPTY_PARTITION;
     }
 
@@ -2082,10 +2095,10 @@ read_line(int pno, struct part_desc *ep, char *dev, int interactive,
     p.p.bootable = ul;
 
     if (ep && ep->p.sys_type == EMPTY_PARTITION) {
-      if(!build_surrounding_extended(&p, ep, z))
+      if (!build_surrounding_extended(&p, ep, z))
 	return 0;
     } else
-      if(!compute_start_sect(&p, ep))
+      if (!compute_start_sect(&p, ep))
 	return 0;
 
     { longchs aa = chs_to_longchs(p.p.begin_chs), bb;
@@ -2095,7 +2108,7 @@ read_line(int pno, struct part_desc *ep, char *dev, int interactive,
       } else if (fno < 7) {
 	  warn(_("partial c,h,s specification?\n"));
 	  return 0;
-      } else if(get_ul(fields[4], &bb.c, aa.c, 0) ||
+      } else if (get_ul(fields[4], &bb.c, aa.c, 0) ||
 		get_ul(fields[5], &bb.h, aa.h, 0) ||
 		get_ul(fields[6], &bb.s, aa.s, 0))
 	return 0;
@@ -2108,7 +2121,7 @@ read_line(int pno, struct part_desc *ep, char *dev, int interactive,
       } else if (fno < 10) {
 	  warn(_("partial c,h,s specification?\n"));
 	  return 0;
-      } else if(get_ul(fields[7], &bb.c, aa.c, 0) ||
+      } else if (get_ul(fields[7], &bb.c, aa.c, 0) ||
 		get_ul(fields[8], &bb.h, aa.h, 0) ||
 		get_ul(fields[9], &bb.s, aa.s, 0))
 	return 0;
@@ -2171,7 +2184,7 @@ read_partition_chain(char *dev, int interactive, struct part_desc *ep,
     while (1) {
 	base = z->partno;
 	if (base+4 > SIZE(z->partitions)) {
-	    printf(_("too many partitions\n"));
+	    do_warn(_("too many partitions\n"));
 	    break;
 	}
 	for (i=0; i<4; i++)
@@ -2670,8 +2683,8 @@ do_size (char *dev, int silent) {
     if (fd < 0)
 	return;
 
-    if(ioctl(fd, BLKGETSIZE, &size)) {
-	if(!silent) {
+    if (ioctl(fd, BLKGETSIZE, &size)) {
+	if (!silent) {
 	    perror(dev);
 	    fatal(_("BLKGETSIZE ioctl failed for %s\n"), dev);
 	}
@@ -2768,7 +2781,7 @@ do_activate (char **av, int ac, char *arg) {
 	  set_active(z, av[i]);
 
 	/* then write to disk */
-	if(write_partitions(dev, fd, z))
+	if (write_partitions(dev, fd, z))
 	  warn(_("Done\n\n"));
 	else
 	  exit_status = 1;
@@ -2821,7 +2834,7 @@ do_unhide (char **av, int ac, char *arg) {
       set_unhidden(z, av[i]);
 
     /* then write to disk */
-    if(write_partitions(dev, fd, z))
+    if (write_partitions(dev, fd, z))
       warn(_("Done\n\n"));
     else
       exit_status = 1;
@@ -2852,7 +2865,7 @@ do_change_id(char *dev, char *pnam, char *id) {
       fatal(_("Bad Id %lx\n"), i);
     z->partitions[pno].p.sys_type = i;
 
-    if(write_partitions(dev, fd, z))
+    if (write_partitions(dev, fd, z))
       warn(_("Done\n\n"));
     else
       exit_status = 1;
@@ -2863,8 +2876,8 @@ do_reread(char *dev) {
     int fd;
 
     fd = my_open(dev, 0, 0);
-    if(reread_ioctl(fd))
-      printf(_("This disk is currently in use.\n"));
+    if (reread_ioctl(fd))
+      do_warn(_("This disk is currently in use.\n"));
 }
 
 /*
@@ -2889,14 +2902,14 @@ do_fdisk(char *dev){
     }
     fd = my_open(dev, !no_write, 0);
 
-    if(!no_write && !no_reread) {
+    if (!no_write && !no_reread) {
 	warn(_("Checking that no-one is using this disk right now ...\n"));
-	if(reread_ioctl(fd)) {
-	    printf(_("\nThis disk is currently in use - repartitioning is probably a bad idea.\n"
+	if (reread_ioctl(fd)) {
+	    do_warn(_("\nThis 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"));
 	    if (!force) {
-		printf(_("Use the --force flag to overrule all checks.\n"));
+		do_warn(_("Use the --force flag to overrule all checks.\n"));
 		exit(1);
 	    }
 	} else
@@ -2925,11 +2938,11 @@ do_fdisk(char *dev){
 	out_partitions(dev, z);
 
 	if (!partitions_ok(z) && !force) {
-	    if(!interactive)
+	    if (!interactive)
 	      fatal(_("I don't like these partitions - nothing changed.\n"
 		      "(If you really want this, use the --force option.)\n"));
 	    else
-	      printf(_("I don't like this - probably you should answer No\n"));
+	      do_warn(_("I don't like this - probably you should answer No\n"));
 	}
       ask:
 	if (interactive) {
@@ -2956,7 +2969,7 @@ do_fdisk(char *dev){
 	  break;
     }
 
-    if(write_partitions(dev, fd, z))
+    if (write_partitions(dev, fd, z))
       printf(_("Successfully wrote the new partition table\n\n"));
     else
       exit_status = 1;
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index 8d8f8862..03c0ec48 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -152,7 +152,13 @@ main (int argc, char *argv[]) {
     if (!oldshell[0]) oldshell = "/bin/sh";
 
     /* reality check */
-    if (uid != 0 && (uid != pw->pw_uid || !get_shell_list(oldshell))) {
+    if (uid != 0 && uid != pw->pw_uid) {
+	errno = EACCES;
+	fprintf(stderr,_("%s: Running UID doesn't match UID of user we're "
+			 "altering, shell change denied\n"), whoami);
+	return (-1);
+    }
+    if (uid != 0 && !get_shell_list(oldshell)) {
 	errno = EACCES;
 	fprintf(stderr,_("%s: Your shell is not in /etc/shells, shell change"
 		" denied\n"),whoami);
diff --git a/misc-utils/Makefile b/misc-utils/Makefile
index 73e03a60..6fb38c72 100644
--- a/misc-utils/Makefile
+++ b/misc-utils/Makefile
@@ -7,7 +7,7 @@
 include ../make_include
 include ../MCONFIG
 
-# replay not added yet
+# scriptreplay not added yet
 
 # Where to put man pages?
 
diff --git a/misc-utils/rename.1 b/misc-utils/rename.1
index 9c1a5d9f..cbd7e974 100644
--- a/misc-utils/rename.1
+++ b/misc-utils/rename.1
@@ -37,4 +37,5 @@ rename .htm .html *.htm
 will fix the extension of your html files.
 
 .SH "SEE ALSO"
+.BR mmv (1),
 .BR mv (1)
diff --git a/misc-utils/script.1 b/misc-utils/script.1
index b8e54377..cdd6af0e 100644
--- a/misc-utils/script.1
+++ b/misc-utils/script.1
@@ -130,7 +130,7 @@ is assumed. (Most shells set this variable automatically).
 (for the
 .Em history
 mechanism),
-.Xr replay 1 .
+.Xr scriptreplay 1 .
 .Sh HISTORY
 The
 .Nm script
diff --git a/misc-utils/script.c b/misc-utils/script.c
index fc913f43..81747a61 100644
--- a/misc-utils/script.c
+++ b/misc-utils/script.c
@@ -113,6 +113,15 @@ die_if_link(char *fn) {
 	}
 }
 
+/*
+ * script -t prints time delays as floating point numbers
+ * The example program (scriptreplay) that we provide to handle this
+ * timing output is a perl script, and does not handle numbers in
+ * locale format (not even when "use locale;" is added).
+ * So, since these numbers are not for human consumption, it seems
+ * easiest to set LC_NUMERIC here.
+ */
+
 int
 main(int argc, char **argv) {
 	extern int optind;
@@ -125,6 +134,7 @@ main(int argc, char **argv) {
 
 
 	setlocale(LC_ALL, "");
+	setlocale(LC_NUMERIC, "C");	/* see comment above */
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 	
diff --git a/misc-utils/replay.1 b/misc-utils/scriptreplay.1
similarity index 97%
rename from misc-utils/replay.1
rename to misc-utils/scriptreplay.1
index 52d82c25..7a495390 100644
--- a/misc-utils/replay.1
+++ b/misc-utils/scriptreplay.1
@@ -141,10 +141,10 @@
 .TH REPLAY 1 "perl v5.6.0" "2001-09-03" "User Contributed Perl Documentation"
 .UC
 .SH "NAME"
-replay \- play back typescripts, using timing information
+scriptreplay \- play back typescripts, using timing information
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-replay timingfile [typescript [divisor]]
+scriptreplay timingfile [typescript [divisor]]
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 This program replays a typescript, using timing information to ensure that
@@ -169,7 +169,7 @@ specifying a divisor of 2 makes the script be replayed twice as fast.
 \& <etc, etc>
 \& % exit
 \& Script done, file is typescript
-\& % replay timingfile
+\& % scriptreplay timingfile
 .Ve
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
diff --git a/misc-utils/replay.pl b/misc-utils/scriptreplay.pl
similarity index 83%
rename from misc-utils/replay.pl
rename to misc-utils/scriptreplay.pl
index 416dc601..ea72b1f3 100755
--- a/misc-utils/replay.pl
+++ b/misc-utils/scriptreplay.pl
@@ -1,16 +1,16 @@
 #!/usr/bin/perl -w
 
 # "script -t" will output a typescript with timings
-# this script "replay" replays it
+# this script "scriptreplay" replays it
 # run pod2man on it to get a man page
 
 =head1 NAME
 
-replay - play back typescripts, using timing information
+scriptreplay - play back typescripts, using timing information
 
 =head1 SYNOPSIS
 
-replay timingfile [typescript [divisor]]
+scriptreplay timingfile [typescript [divisor]]
 
 =head1 DESCRIPTION
 
@@ -36,7 +36,7 @@ specifying a divisor of 2 makes the script be replayed twice as fast.
  <etc, etc>
  % exit
  Script done, file is typescript
- % replay timingfile
+ % scriptreplay timingfile
 
 =cut
 
@@ -45,7 +45,7 @@ $|=1;
 open (TIMING, shift)
         or die "cannot read timing info: $!";
 open (TYPESCRIPT, shift || 'typescript')
-        or die "cannot read typescriot: $!";
+        or die "cannot read typescript: $!";
 my $divisor=shift || 1;
 
 # Read starting timestamp line and ignore.
@@ -55,7 +55,7 @@ my $block;
 my $oldblock='';
 while (<TIMING>) {
         my ($delay, $blocksize)=split ' ', $_, 2;
-        # Sleep, unless the delay is really tiny. Realy tiny delays cannot
+        # Sleep, unless the delay is really tiny. Really tiny delays cannot
         # be accurately done, because the system calls in this loop will
         # have more overhead. The 0.0001 is arbitrary, but works fairly well.
         if ($delay / $divisor > 0.0001) {
@@ -63,7 +63,7 @@ while (<TIMING>) {
         }
 
         read(TYPESCRIPT, $block, $blocksize)
-                or die "read filure on typescript: $!";
+                or die "read failure on typescript: $!";
         print $oldblock;
         $oldblock=$block;
 }
diff --git a/mount/Makefile b/mount/Makefile
index 96434941..9258fbdf 100644
--- a/mount/Makefile
+++ b/mount/Makefile
@@ -1,7 +1,7 @@
 include ../make_include
 include ../MCONFIG
 
-DEFINES = -DHAVE_NFS
+DEFINES = -DHAVE_NFS $(BLKID_DEFINE)
 
 RPCSVCDIR = rpcsvc
 RPC_CFLAGS = -Wno-unused 
@@ -20,6 +20,11 @@ NOSUID_PROGS := $(NOSUID_PROGS) pivot_root
 MAN8 := $(MAN8) pivot_root.8
 endif
 
+ifeq "$(HAVE_BLKID)" "yes"
+BLKID_DEFINE = -DHAVE_BLKID
+BLKID_LIB = -lblkid -luuid
+endif
+
 PROGS = $(SUID_PROGS) $(NOSUID_PROGS)
 
 MAYBE = pivot_root swapoff
@@ -43,13 +48,14 @@ install: $(PROGS)
 	$(COMPILE) $<
 
 mount: mount.o fstab.o sundries.o realpath.o mntent.o version.o \
-       mount_guess_fstype.o get_label_uuid.o mount_by_label.o getusername.o \
-       $(LIB)/setproctitle.o $(LIB)/env.o $(NFS_OBJS) $(LO_OBJS)
-	$(LINK) $^ -o $@
+       get_label_uuid.o mount_by_label.o mount_blkid.o mount_guess_fstype.o \
+       getusername.o $(LIB)/setproctitle.o $(LIB)/env.o $(NFS_OBJS) $(LO_OBJS)
+	$(LINK) $^ -o $@ $(BLKID_LIB)
 
 umount: umount.o fstab.o sundries.o realpath.o mntent.o getusername.o \
-	get_label_uuid.o version.o $(LIB)/env.o $(LO_OBJS)
-	$(LINK) $^ -o $@
+	get_label_uuid.o mount_by_label.o mount_blkid.o version.o \
+	$(LIB)/env.o $(LO_OBJS)
+	$(LINK) $^ -o $@ $(BLKID_LIB)
 
 swapon:	swapon.o version.o
 	$(LINK) $^ -o $@
@@ -80,6 +86,8 @@ sundries.o nfsmount.o nfsmount_xdr.o nfsmount_clnt.o: nfsmount.h
 
 umount.o: mount_constants.h
 
+mount.o mount_blkid.o: mount_blkid.h
+
 mount.o mount_by_label.o mount_guess_fstype.o: linux_fs.h
 
 sundries.o realpath.o: realpath.h
diff --git a/mount/fstab.c b/mount/fstab.c
index 85a5d2df..d31327dc 100644
--- a/mount/fstab.c
+++ b/mount/fstab.c
@@ -12,7 +12,7 @@
 #include "mntent.h"
 #include "fstab.h"
 #include "sundries.h"		/* for xmalloc() etc */
-#include "get_label_uuid.h"
+#include "mount_blkid.h"
 #include "nls.h"
 
 #define streq(s, t)	(strcmp ((s), (t)) == 0)
@@ -260,20 +260,24 @@ getmntoptfile (const char *file) {
 
 static int
 has_label(const char *device, const char *label) {
-	char devuuid[16];
-	char *devlabel;
+	const char *devlabel;
+	int ret;
 
-	return !get_label_uuid(device, &devlabel, devuuid) &&
-		!strcmp(label, devlabel);
+	devlabel = mount_get_volume_label_by_spec(device);
+	ret = !strcmp(label, devlabel);
+	/* free(devlabel); */
+	return ret;
 }
 
 static int
 has_uuid(const char *device, const char *uuid){
-	char devuuid[16];
-	char *devlabel;
+	const char *devuuid;
+	int ret;
 
-	return !get_label_uuid(device, &devlabel, devuuid) &&
-		!memcmp(uuid, devuuid, sizeof(devuuid));
+	devuuid = mount_get_devname_by_uuid(device);
+	ret = !strcmp(uuid, devuuid);
+	/* free(devuuid); */
+	return ret;
 }
 
 /* Find the entry (SPEC,FILE) in fstab */
@@ -455,6 +459,9 @@ lock_mtab (void) {
 
 		(void) unlink(linktargetfile);
 
+		if (j == 0)
+			we_created_lockfile = 1;
+
 		if (j < 0 && errsv != EEXIST) {
 			die (EX_FILEIO, _("can't link lock file %s: %s "
 			     "(use -n flag to override)"),
@@ -488,7 +495,6 @@ lock_mtab (void) {
 				}
 				/* proceed anyway */
 			}
-			we_created_lockfile = 1;
 		} else {
 			static int tries = 0;
 
diff --git a/mount/get_label_uuid.c b/mount/get_label_uuid.c
index 310de6dc..488bd28d 100644
--- a/mount/get_label_uuid.c
+++ b/mount/get_label_uuid.c
@@ -1,3 +1,4 @@
+#ifndef HAVE_BLKID
 /*
  * Get label. Used by both mount and umount.
  */
@@ -43,7 +44,20 @@ is_raid_partition(int fd) {
 #endif
 }
 
-/* for now, only ext2, ext3, xfs, ocfs are supported */
+int
+is_reiserfs_magic_string (const char *magic) {
+	return (!strncmp(magic, REISERFS_SUPER_MAGIC_STRING, 
+			 strlen(REISERFS_SUPER_MAGIC_STRING)) ||
+		!strncmp(magic, REISER2FS_SUPER_MAGIC_STRING, 
+			 strlen(REISER2FS_SUPER_MAGIC_STRING)) ||
+		!strncmp(magic, REISER3FS_SUPER_MAGIC_STRING, 
+			 strlen(REISER3FS_SUPER_MAGIC_STRING)));
+}
+
+/*
+ * Get both label and uuid.
+ * For now, only ext2, ext3, xfs, ocfs, reiserfs are supported
+ */
 int
 get_label_uuid(const char *device, char **label, char *uuid) {
 	int fd;
@@ -54,6 +68,7 @@ get_label_uuid(const char *device, char **label, char *uuid) {
 	struct jfs_super_block jfssb;
 	struct ocfs_volume_header ovh;	/* Oracle */
 	struct ocfs_volume_label olbl;
+	struct reiserfs_super_block reiserfssb;
 
 	fd = open(device, O_RDONLY);
 	if (fd < 0)
@@ -112,7 +127,19 @@ get_label_uuid(const char *device, char **label, char *uuid) {
 		}
 		rv = 0;
 	}
+	else if (lseek(fd, REISERFS_DISK_OFFSET_IN_BYTES, SEEK_SET)
+		 == REISERFS_DISK_OFFSET_IN_BYTES
+	    && read(fd, (char *) &reiserfssb, sizeof(reiserfssb))
+		 == sizeof(reiserfssb)
+	    && is_reiserfs_magic_string(reiserfssb.s_magic)) {
+		namesize = sizeof (reiserfssb.s_label);
+		if ((*label = calloc(namesize + 1, 1)) != NULL)
+			memcpy(*label, reiserfssb.s_label, namesize);
+		memcpy(uuid, reiserfssb.s_uuid, sizeof (reiserfssb.s_uuid));
+		rv = 0;
+	}
 
 	close(fd);
 	return rv;
 }
+#endif
diff --git a/mount/linux_fs.h b/mount/linux_fs.h
index 485dbe84..14d53b55 100644
--- a/mount/linux_fs.h
+++ b/mount/linux_fs.h
@@ -82,14 +82,27 @@ struct reiserfs_super_block
 	u_char		s_oid_maxsize[2];
 	u_char		s_oid_cursize[2];
 	u_char		s_state[2];
-	u_char		s_magic[12];
+	u_char		s_magic[10];
+	u_char		s_fs_state[2];
+	u_char		s_hash_function_code[4];
+	u_char		s_tree_height[2];
+	u_char		s_bmap_nr[2];
+	u_char		s_version[2];
+	u_char		s_reserved_for_journal[2];
+	u_char		s_inode_generation[4];
+	u_char		s_flags[4];
+	u_char		s_uuid[16];
+	u_char		s_label[16];
 };
 #define REISERFS_SUPER_MAGIC_STRING "ReIsErFs"
 #define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
+#define REISER3FS_SUPER_MAGIC_STRING "ReIsEr3Fs"
 #define REISERFS_DISK_OFFSET_IN_BYTES (64 * 1024)
 /* the spot for the super in versions 3.5 - 3.5.10 (inclusive) */
 #define REISERFS_OLD_DISK_OFFSET_IN_BYTES (8 * 1024)
 
+extern int is_reiserfs_magic_string (const char *magic);
+
 #define _XIAFS_SUPER_MAGIC 0x012FD16D
 struct xiafs_super_block {
     u_char     s_boot_segment[512];     /*  1st sector reserved for boot */
diff --git a/mount/lomount.c b/mount/lomount.c
index 0874f3ea..06c45b15 100644
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@ -246,7 +246,7 @@ digits_only(const char *s) {
 }
 
 int
-set_loop(const char *device, const char *file, int offset,
+set_loop(const char *device, const char *file, unsigned long long offset,
 	 const char *encryption, int pfd, int *loopro) {
 	struct loop_info64 loopinfo64;
 	int fd, ffd, mode;
@@ -337,7 +337,7 @@ set_loop(const char *device, const char *file, int offset,
 
 	close (fd);
 	if (verbose > 1)
-		printf(_("set_loop(%s,%s,%d): success\n"),
+		printf(_("set_loop(%s,%s,%llu): success\n"),
 		       device, file, offset);
 	return 0;
 
@@ -376,7 +376,7 @@ mutter(void) {
 }  
 
 int
-set_loop (const char *device, const char *file, int offset,
+set_loop (const char *device, const char *file, unsigned long long offset,
 	  const char *encryption, int *loopro) {
 	mutter();
 	return 1;
@@ -446,10 +446,11 @@ error (const char *fmt, ...) {
 int
 main(int argc, char **argv) {
 	char *offset, *encryption, *passfd;
-	int delete, off, c;
+	int delete, c;
 	int res = 0;
 	int ro = 0;
 	int pfd = -1;
+	unsigned long long off;
 
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
@@ -490,9 +491,9 @@ main(int argc, char **argv) {
 		else
 			res = show_loop(argv[optind]);
 	} else {
-		if (offset && sscanf(offset,"%d",&off) != 1)
+		if (offset && sscanf(offset, "%llu", &off) != 1)
 			usage();
-		if (passfd && sscanf(passfd,"%d",&pfd) != 1)
+		if (passfd && sscanf(passfd, "%d", &pfd) != 1)
 			usage();
 		res = set_loop(argv[optind], argv[optind+1], off,
 			       encryption, pfd, &ro);
diff --git a/mount/lomount.h b/mount/lomount.h
index d81fc3b5..89695cd7 100644
--- a/mount/lomount.h
+++ b/mount/lomount.h
@@ -1,6 +1,6 @@
 extern int verbose;
-extern int set_loop(const char *, const char *, int, const char *,
-		    int, int *);
+extern int set_loop(const char *, const char *, unsigned long long,
+		    const char *, int, int *);
 extern int del_loop(const char *);
 extern int is_loop_device(const char *);
 extern char * find_unused_loop_device(void);
diff --git a/mount/mount.8 b/mount/mount.8
index ba547c66..371f4110 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -1130,9 +1130,6 @@ possibly leading to silent data corruption.)
 If the high byte of the file length contains other garbage,
 set this mount option to ignore the high order bits of the file length.
 This implies that a file cannot be larger than 16MB.
-The `cruft' option is set automatically if the entire CDROM
-has a weird size (negative, or more than 800MB). It is also
-set when volume sequence numbers other than 0 or 1 are seen.
 .TP
 .BI session= x
 Select number of session on multisession CD. (Since 2.3.4.)
@@ -1150,6 +1147,44 @@ to 8 bit characters. The default is iso8859-1.
 .B utf8
 Convert 16 bit Unicode characters on CD to UTF-8.
 
+.SH "Mount options for jfs"
+.TP
+.BI iocharset= name
+Character set to use for converting from Unicode to ASCII.  The default is
+to do no conversion.  Use
+.B iocharset=utf8
+for UTF8 translations.  This requires CONFIG_NLS_UTF8 to be set in
+the kernel
+.I ".config"
+file.
+.TP
+.BI resize= value
+Resize the volume to
+.I value
+blocks. JFS only supports growing a volume, not shrinking it. This option
+is only valid during a remount, when the volume is mounted read-write. The
+.B resize
+keyword with no value will grow the volume to the full size of the partition.
+.TP
+.B nointegrity
+Do not write to the journal.  The primary use of this option is to allow
+for higher performance when restoring a volume from backup media. The
+integrity of the volume is not guaranteed if the system abnormally abends.
+.TP
+.B integrity
+Default.  Commit metadata changes to the journal.  Use this option to remount
+a volume where the
+.B nointegrity
+option was previously specified in order to restore normal behavior.
+.TP
+.BR errors=continue " / " errors=remount-ro " / " errors=panic
+Define the behaviour when an error is encountered.
+(Either ignore errors and just mark the file system erroneous and continue,
+or remount the file system read-only, or panic and halt the system.)
+.TP
+.BR noquota " / " quota " / " usrquota " / " grpquota
+These options are accepted but ignored.
+
 .SH "Mount options for minix"
 None.
 
diff --git a/mount/mount.c b/mount/mount.c
index 227de560..083e747a 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -57,6 +57,7 @@
 #include <sys/wait.h>
 #include <sys/mount.h>
 
+#include "mount_blkid.h"
 #include "mount_constants.h"
 #include "sundries.h"
 #include "mntent.h"
@@ -160,6 +161,7 @@ static const struct opt_map opt_map[] = {
   { "dirsync",	0, 0, MS_DIRSYNC},	/* synchronous directory modifications */
   { "remount",  0, 0, MS_REMOUNT},      /* Alter flags of mounted FS */
   { "bind",	0, 0, MS_BIND   },	/* Remount part of tree elsewhere */
+  { "rbind",	0, 0, MS_BIND|MS_REC }, /* Idem, plus mounted subtrees */
   { "auto",	0, 1, MS_NOAUTO	},	/* Can be mounted using -a */
   { "noauto",	0, 0, MS_NOAUTO	},	/* Can  only be mounted explicitly */
   { "users",	0, 0, MS_USERS	},	/* Allow ordinary user to mount */
@@ -247,9 +249,11 @@ print_one (const struct mntent *me) {
 	  printf (" (%s)", me->mnt_opts);
      if (list_with_volumelabel) {
 	     const char *label;
-	     label = get_volume_label_by_spec(me->mnt_fsname);
-	     if (label)
+	     label = mount_get_volume_label_by_spec(me->mnt_fsname);
+	     if (label) {
 		     printf (" [%s]", label);
+		     /* free(label); */
+	     }
      }
      printf ("\n");
 }
@@ -561,7 +565,8 @@ suid_check(char *spec, char *node, int *flags, char **user) {
 static int
 loop_check(char **spec, char **type, int *flags,
 	   int *loop, char **loopdev, char **loopfile) {
-  int looptype, offset;
+  int looptype;
+  unsigned long long offset;
 
   /*
    * In the case of a loop mount, either type is of the form lo@/dev/loop5
@@ -603,7 +608,7 @@ loop_check(char **spec, char **type, int *flags,
 	return EX_SYSERR;	/* no more loop devices */
       if (verbose)
 	printf(_("mount: going to use the loop device %s\n"), *loopdev);
-      offset = opt_offset ? strtoul(opt_offset, NULL, 0) : 0;
+      offset = opt_offset ? strtoull(opt_offset, NULL, 0) : 0;
       if (set_loop(*loopdev, *loopfile, offset,
 		   opt_encryption, pfd, &loopro)) {
 	if (verbose)
@@ -1097,10 +1102,8 @@ usersubst(const char *opts) {
 static int
 mount_one (const char *spec, const char *node, char *types, const char *opts,
 	   char *cmdlineopts, int freq, int pass) {
-  int status;
-  int status2;
-  int specset = 0;
-  char *nspec;
+  int status, status2;
+  const char *nspec;
 
   /* Substitute values in opts, if required */
   opts = usersubst(opts);
@@ -1111,37 +1114,10 @@ mount_one (const char *spec, const char *node, char *types, const char *opts,
   else if (cmdlineopts != NULL)
        opts = xstrconcat3(opts, ",", cmdlineopts);
 
-  if (!strncmp(spec, "UUID=", 5)) {
-      specset = 1;
-      nspec = get_spec_by_uuid(spec+5);
-  } else if (!strncmp(spec, "LABEL=", 6)) {
-      const char *nspec2 = NULL;
-      specset = 2;
-      nspec = get_spec_by_volume_label(spec+6);
-      if (nspec)
-	      nspec2 = second_occurrence_of_vol_label(spec+6);
-      if (nspec2) {
-	      if (verbose)
-		      printf(_("mount: the label %s occurs on "
-			       "both %s and %s\n"),
-			     spec+6, nspec, nspec2);
-	      die (EX_FAIL,
-		   _("mount: %s duplicate - not mounted"),
-		   spec, _PATH_FSTAB);
-      }
-  } else
-      nspec = 0;		/* just for gcc */
-
-  if (specset) {
-      if (nspec) {
-	  spec = nspec;
-	  if (verbose > 1)
-		  printf(_("mount: going to mount %s by %s\n"), spec,
-			 (specset==1) ? _("UUID") : _("label"));
-      } else if(!mount_all)
-          die (EX_USAGE, _("mount: no such partition found"));
-      /* if -a then we may be rescued by a noauto option */
-  }
+  /* Handle possible LABEL= and UUID= forms of spec */
+  nspec = mount_get_devname_for_mounting(spec);
+  if (nspec)
+       spec = nspec;
 
   if (types == NULL && !mounttype) {
       if (strchr (spec, ':') != NULL) {
@@ -1185,20 +1161,14 @@ mount_one (const char *spec, const char *node, char *types, const char *opts,
 
 /* Check if an fsname/dir pair was already in the old mtab.  */
 static int
-mounted (char *spec, char *node) {
+mounted (const char *spec, char *node) {
      struct mntentchn *mc, *mc0;
-     char *nspec = NULL;
 
-     if (!strncmp(spec, "UUID=", 5))
-	  nspec = get_spec_by_uuid(spec+5);
-     else if (!strncmp(spec, "LABEL=", 6))
-	  nspec = get_spec_by_volume_label(spec+6);
+     /* Handle possible UUID= and LABEL= in spec */
+     spec = mount_get_devname(spec);
 
-     if (nspec)
-	  spec = nspec;
-
-     spec = canonicalize (spec);
-     node = canonicalize (node);
+     spec = canonicalize(spec);
+     node = canonicalize(node);
 
      mc0 = mtab_head();
      for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
@@ -1422,7 +1392,8 @@ usage (FILE *fp, int n) {
 int
 main (int argc, char *argv[]) {
 	int c, result = 0, specseen;
-	char *options = NULL, *test_opts = NULL, *spec, *node;
+	char *options = NULL, *test_opts = NULL, *node;
+	const char *spec;
 	char *volumelabel = NULL;
 	char *uuid = NULL;
 	char *types = NULL;
@@ -1443,6 +1414,8 @@ main (int argc, char *argv[]) {
 	if (fd > 2)
 		close(fd);
 
+	mount_blkid_get_cache();
+
 #ifdef DO_PS_FIDDLING
 	initproctitle(argc, argv);
 #endif
@@ -1580,17 +1553,10 @@ main (int argc, char *argv[]) {
 
 	if (specseen) {
 		if (uuid)
-			spec = get_spec_by_uuid(uuid);
-		else {
-			const char *spec2;
-			spec = get_spec_by_volume_label(volumelabel);
-			spec2 = second_occurrence_of_vol_label(volumelabel);
-			if (spec2)
-				die (EX_FAIL,
-				     _("mount: the label %s occurs on "
-				       "both %s and %s - not mounted\n"),
-				     volumelabel, spec, spec2);
-		}
+			spec = mount_get_devname_by_uuid(uuid);
+		else
+			spec = mount_get_devname_by_label(volumelabel);
+
 		if (!spec)
 			die (EX_USAGE, _("mount: no such partition found"));
 		if (verbose)
@@ -1620,7 +1586,8 @@ main (int argc, char *argv[]) {
 				die (EX_USAGE,
 				     _("mount: cannot find %s in %s"),
 				     spec, _PATH_FSTAB);
-			mc->m.mnt_fsname = spec;
+			/* struct mntent does not have const qualifiers */
+			mc->m.mnt_fsname = (char *) spec;
 		} else {
 			/* Try to find the other pathname in fstab.  */
 			spec = canonicalize (*argv);
@@ -1664,5 +1631,8 @@ main (int argc, char *argv[]) {
 
 	if (result == EX_SOMEOK)
 		result = 0;
+
+	mount_blkid_put_cache();
+
 	exit (result);
 }
diff --git a/mount/mount_blkid.c b/mount/mount_blkid.c
new file mode 100644
index 00000000..7abadec2
--- /dev/null
+++ b/mount/mount_blkid.c
@@ -0,0 +1,110 @@
+#include <stdio.h>
+#include "mount_blkid.h"
+
+#ifdef HAVE_BLKID
+
+blkid_cache blkid;
+
+void
+mount_blkid_get_cache(void) {
+	blkid_get_cache(&blkid, NULL);
+}
+
+void
+mount_blkid_put_cache(void) {
+	blkid_put_cache(blkid);
+}
+
+const char *
+mount_get_volume_label_by_spec(const char *spec) {
+	return blkid_get_tag_value(blkid, "LABEL", spec);
+}
+
+const char *
+mount_get_devname(const char *spec) {
+	return blkid_get_devname(blkid, spec, 0);
+}
+
+const char *
+mount_get_devname_by_uuid(const char *uuid) {
+	return blkid_get_devname(blkid, "UUID", uuid);
+}
+
+const char *
+mount_get_devname_by_label(const char *label) {
+	return blkid_get_devname(blkid, "LABEL", label);
+}
+
+/* Also when no UUID= or LABEL= occur? No verbose? No warnings? */
+const char *
+mount_get_devname_for_mounting(const char *spec) {
+	return blkid_get_devname(blkid, spec, 0);
+}
+
+#else
+#include <string.h>
+#include "sundries.h"
+#include "mount_by_label.h"
+#include "nls.h"
+
+void
+mount_blkid_get_cache(void) {
+}
+
+void
+mount_blkid_put_cache(void) {
+}
+
+const char *
+mount_get_volume_label_by_spec(const char *spec) {
+	return strdup(get_volume_label_by_spec(spec));
+}
+
+const char *
+mount_get_devname(const char *spec) {
+	if (!strncmp(spec, "UUID=", 5))
+		return get_spec_by_uuid(spec+5);
+	if (!strncmp(spec, "LABEL=", 6))
+		return get_spec_by_volume_label(spec+6);
+	return spec;
+}
+
+const char *
+mount_get_devname_by_uuid(const char *uuid) {
+	return get_spec_by_uuid(uuid);
+}
+
+const char *
+mount_get_devname_by_label(const char *volumelabel) {
+	const char *spec, *spec2;
+
+	spec = get_spec_by_volume_label(volumelabel);
+	spec2 = second_occurrence_of_vol_label(volumelabel);
+	if (spec2)
+		die (EX_FAIL,
+		     _("mount: the label %s occurs on "
+		       "both %s and %s - not mounted\n"),
+		     volumelabel, spec, spec2);
+	return spec;
+}
+
+const char *
+mount_get_devname_for_mounting(const char *spec) {
+	const char *nspec;
+
+	if (!strncmp(spec, "UUID=", 5)) {
+		nspec = mount_get_devname_by_uuid(spec+5);
+		if (nspec && verbose > 1)
+			printf(_("mount: going to mount %s by UUID\n"), spec);
+	} else if (!strncmp(spec, "LABEL=", 6)) {
+		nspec = mount_get_devname_by_label(spec+6);
+		if (nspec && verbose > 1)
+			printf(_("mount: going to mount %s by label\n"), spec);
+	} else
+		nspec = spec;
+
+	return nspec;
+}
+
+
+#endif
diff --git a/mount/mount_blkid.h b/mount/mount_blkid.h
new file mode 100644
index 00000000..67c9975b
--- /dev/null
+++ b/mount/mount_blkid.h
@@ -0,0 +1,12 @@
+#ifdef HAVE_BLKID
+#include <blkid/blkid.h>
+extern blkid_cache blkid;
+#endif
+
+extern void mount_blkid_get_cache(void);
+extern void mount_blkid_put_cache(void);
+extern const char *mount_get_devname_by_uuid(const char *uuid);
+extern const char *mount_get_devname_by_label(const char *label);
+extern const char *mount_get_volume_label_by_spec(const char *spec);
+extern const char *mount_get_devname(const char *spec);
+extern const char *mount_get_devname_for_mounting(const char *spec);
diff --git a/mount/mount_by_label.c b/mount/mount_by_label.c
index 54170e56..80d252ca 100644
--- a/mount/mount_by_label.c
+++ b/mount/mount_by_label.c
@@ -1,3 +1,4 @@
+#ifndef HAVE_BLKID
 /*
  * mount_by_label.c - aeb
  *
@@ -255,7 +256,7 @@ uuidcache_init(void) {
 #define UUID   1
 #define VOL    2
 
-static char *
+static const char *
 get_spec_by_x(int n, const char *t) {
 	struct uuidCache_s *uc;
 
@@ -288,7 +289,7 @@ fromhex(char c) {
 		return (c - 'A' + 10);
 }
 
-char *
+const char *
 get_spec_by_uuid(const char *s) {
 	u_char uuid[16];
 	int i;
@@ -310,7 +311,7 @@ get_spec_by_uuid(const char *s) {
 	return NULL;		/* just for gcc */
 }
 
-char *
+const char *
 get_spec_by_volume_label(const char *s) {
 	return get_spec_by_x(VOL, s);
 }
@@ -342,7 +343,7 @@ second_occurrence_of_vol_label (const char *label) {
 
         uuidcache_init();
 
-        for (last = uuidCache; last->next; last = last->next) {
+        for (last = uuidCache; last; last = last->next) {
 		if (!strcmp(last->label, label)) {
 			occurrences++;
 			if (occurrences == 2)
@@ -354,3 +355,4 @@ second_occurrence_of_vol_label (const char *label) {
 }
 
           
+#endif
diff --git a/mount/mount_by_label.h b/mount/mount_by_label.h
index 451d0685..f5c930d7 100644
--- a/mount/mount_by_label.h
+++ b/mount/mount_by_label.h
@@ -1,4 +1,4 @@
-char *get_spec_by_uuid(const char *uuid);
-char *get_spec_by_volume_label(const char *volumelabel);
+const char *get_spec_by_uuid(const char *uuid);
+const char *get_spec_by_volume_label(const char *volumelabel);
 const char *get_volume_label_by_spec(const char *spec);
 const char *second_occurrence_of_vol_label(const char *label);
diff --git a/mount/mount_guess_fstype.c b/mount/mount_guess_fstype.c
index e8829ce0..af7b6780 100644
--- a/mount/mount_guess_fstype.c
+++ b/mount/mount_guess_fstype.c
@@ -38,6 +38,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include "linux_fs.h"
+#include "mount_blkid.h"
 #include "mount_guess_fstype.h"
 #include "sundries.h"		/* for xstrdup */
 #include "nls.h"
@@ -45,6 +46,21 @@
 #define ETC_FILESYSTEMS		"/etc/filesystems"
 #define PROC_FILESYSTEMS	"/proc/filesystems"
 
+#ifdef HAVE_BLKID
+
+char *
+do_guess_fstype(const char *device) 
+{
+	return blkid_get_tag_value(blkid, "TYPE", device);
+}
+
+static int
+known_fstype(const char *fstype) 
+{
+	return blkid_known_fstype(fstype);
+}
+	
+#else
 #define SIZE(a) (sizeof(a)/sizeof(a[0]))
 
 /* Most file system types can be recognized by a `magic' number
@@ -90,49 +106,16 @@ static char
 	"vxfs", "xfs", "xiafs"
 };
 
-static struct tried {
-	struct tried *next;
-	char *type;
-} *tried = NULL;
-
 static int
-was_tested(const char *fstype) {
+known_fstype(const char *fstype) {
 	char **m;
-	struct tried *t;
 
 	for (m = magic_known; m - magic_known < SIZE(magic_known); m++)
 		if (!strcmp(*m, fstype))
 			return 1;
-	for (t = tried; t; t = t->next) {
-		if (!strcmp(t->type, fstype))
-			return 1;
-	}
 	return 0;
 }
 
-static void
-set_tested(const char *fstype) {
-	struct tried *t = xmalloc(sizeof(struct tried));
-
-	t->next = tried;
-	t->type = xstrdup(fstype);
-	tried = t;
-}
-
-static void
-free_tested(void) {
-	struct tried *t, *tt;
-
-	t = tried;
-	while(t) {
-		free(t->type);
-		tt = t->next;
-		free(t);
-		t = tt;
-	}
-	tried = NULL;
-}
-
 /*
  * udf magic - I find that trying to mount garbage as an udf fs
  * causes a very large kernel delay, almost killing the machine.
@@ -210,20 +193,12 @@ may_be_adfs(const u_char *s) {
 
 	p = (u_char *) s + 511;
 	sum = 0;
-	while(--p != s)
+	while (--p != s)
 		sum = (sum >> 8) + (sum & 0xff) + *p;
 
 	return (sum == p[511]);
 }
 
-static int is_reiserfs_magic_string (struct reiserfs_super_block * rs)
-{
-    return (!strncmp (rs->s_magic, REISERFS_SUPER_MAGIC_STRING, 
-		      strlen ( REISERFS_SUPER_MAGIC_STRING)) ||
-	    !strncmp (rs->s_magic, REISER2FS_SUPER_MAGIC_STRING, 
-		      strlen ( REISER2FS_SUPER_MAGIC_STRING)));
-}
-
 char *
 do_guess_fstype(const char *device) {
     int fd;
@@ -409,7 +384,7 @@ do_guess_fstype(const char *device) {
 	    || read(fd, (char *) &reiserfssb, sizeof(reiserfssb)) !=
 		sizeof(reiserfssb))
 	    goto io_error;
-	if (is_reiserfs_magic_string(&reiserfssb))
+	if (is_reiserfs_magic_string(reiserfssb.s_magic))
 	    type = "reiserfs";
     }
 
@@ -459,7 +434,7 @@ do_guess_fstype(const char *device) {
 	    || read(fd, (char *) &reiserfssb, sizeof(reiserfssb)) !=
 		sizeof(reiserfssb))
 	    goto io_error;
-	if (is_reiserfs_magic_string(&reiserfssb))
+	if (is_reiserfs_magic_string(reiserfssb.s_magic))
 	    type = "reiserfs";
     }
 
@@ -495,6 +470,49 @@ io_error:
     return 0;
 }
 
+#endif
+
+static struct tried {
+	struct tried *next;
+	char *type;
+} *tried = NULL;
+
+static int
+was_tested(const char *fstype) {
+	struct tried *t;
+
+	if (known_fstype(fstype))
+		return 1;
+	for (t = tried; t; t = t->next) {
+		if (!strcmp(t->type, fstype))
+			return 1;
+	}
+	return 0;
+}
+
+static void
+set_tested(const char *fstype) {
+	struct tried *t = xmalloc(sizeof(struct tried));
+
+	t->next = tried;
+	t->type = xstrdup(fstype);
+	tried = t;
+}
+
+static void
+free_tested(void) {
+	struct tried *t, *tt;
+
+	t = tried;
+	while(t) {
+		free(t->type);
+		tt = t->next;
+		free(t);
+		t = tt;
+	}
+	tried = NULL;
+}
+
 char *
 guess_fstype(const char *spec) {
 	char *type = do_guess_fstype(spec);
diff --git a/mount/my_dev_t.h b/mount/my_dev_t.h
index 5ef97154..8bb2ea4a 100644
--- a/mount/my_dev_t.h
+++ b/mount/my_dev_t.h
@@ -1,7 +1,16 @@
 /* silliness to get dev_t defined as the kernel defines it */
 /* glibc uses a different dev_t */
-/* maybe we need __kernel_old_dev_t -- later */
-/* for ancient systems use "unsigned short" */
 
 #include <linux/posix_types.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(1,3,78)
+/* for i386 - alpha uses unsigned int */
+#define my_dev_t unsigned short
+#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,68)
 #define my_dev_t __kernel_dev_t
+#else
+#define my_dev_t __kernel_old_dev_t
+#endif
+#endif
diff --git a/mount/swapon.c b/mount/swapon.c
index 443ae3c5..e3dfffac 100644
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -329,6 +329,7 @@ main_swapon(int argc, char *argv[]) {
 				status |= do_swapon(special, priority);
 			}
 		}
+		fclose(fp);
 	}
 
 	while (*argv != NULL)
@@ -407,6 +408,7 @@ main_swapoff(int argc, char *argv[]) {
 			    !is_in_proc_swaps(fstab->mnt_fsname))
 				do_swapoff(fstab->mnt_fsname, QUIET);
 		}
+		fclose(fp);
 	}
 
 	return status;
diff --git a/partx/partx.c b/partx/partx.c
index 26dafa3f..5fb56f33 100644
--- a/partx/partx.c
+++ b/partx/partx.c
@@ -123,7 +123,7 @@ main(int argc, char **argv){
 	case 'd':
 		what = DELETE; break;
 	case 'g':
-		force_gpt=1; break;
+		force_gpt = 1; break;
 	case 'n':
 		p = optarg;
 		lower = atoi(p);
diff --git a/po/Makefile b/po/Makefile
index 3fcf0537..ad1a6a3e 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -43,9 +43,9 @@ INCLUDES = -I.. -I$(INTL)
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
 # Enter here all .po files
-POFILES = ca.po cs.po da.po de.po es.po et.po fi.po fr.po it.po ja.po nl.po pt_BR.po sl.po sv.po tr.po
+POFILES = ca.po cs.po da.po de.po es.po et.po fi.po fr.po it.po ja.po nl.po pt_BR.po sl.po sv.po tr.po uk.po
 # the same but with .gmo
-GMOFILES = ca.gmo cs.gmo da.gmo de.gmo es.gmo et.gmo fi.gmo fr.gmo it.gmo ja.gmo nl.gmo pt_BR.gmo sl.gmo sv.gmo tr.gmo
+GMOFILES = ca.gmo cs.gmo da.gmo de.gmo es.gmo et.gmo fi.gmo fr.gmo it.gmo ja.gmo nl.gmo pt_BR.gmo sl.gmo sv.gmo tr.gmo uk.gmo
 
 CATALOGS = $(GMOFILES)
 CATOBJEXT = .gmo
diff --git a/po/ca.po b/po/ca.po
index 76665ed4..6574ddc1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,114 +9,119 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-2.11z\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
-"PO-Revision-Date: 2003-02-28 09:28+0100\n"
+"Project-Id-Version: util-linux 2.12\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
+"PO-Revision-Date: 2003-08-01 10:59+0200\n"
 "Last-Translator: Antoni Bella Perez <bella5@teleline.es>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0\n"
+"X-Generator: KBabel 1.0.1\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
-msgstr "establir a sols lectura"
+msgstr "estableix a sols lectura"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
-msgstr "establir a lectura/escriptura"
+msgstr "estableix a lectura/escriptura"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "obtindre sols lectura"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "obtindre la mida del sector"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr "obtindre la mida del bloc"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
-msgstr "establir la mida del bloc"
+msgstr "estableix la mida del bloc"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "obtindre la mida"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
-msgstr "establir 'readahead'"
+msgstr "estableix 'readahead'"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "obtindre 'readahead'"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "buida la memòria temporal"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "torna a llegir la taula de particions"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
-msgstr "Usant:\n"
+msgstr "Ús:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr "  %s --report [dispositius]\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "  %s [-v|-q] comandaments dels dispositius\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Comandaments disponibles:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: Comandament desconegut: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s requereix un argument\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr "%s ha tingut èxit.\n"
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
-msgstr "%s: no pot obrir %s\n"
+msgstr "%s: No pot obrir %s\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
-msgstr "%s: error de ioctl en %s\n"
+msgstr "%s: Error de ioctl en %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ  Comença Sec.  Mida    Dispositiu\n"
 
 #: disk-utils/elvtune.c:46 disk-utils/setfdprm.c:100
 msgid "usage:\n"
-msgstr "useu:\n"
+msgstr "ús:\n"
 
 #: disk-utils/fdformat.c:31
 msgid "Formatting ... "
-msgstr "Formatant ... "
+msgstr "S'està formatant... "
 
 #: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
 msgid "done\n"
@@ -124,11 +129,11 @@ msgstr "fet\n"
 
 #: disk-utils/fdformat.c:60
 msgid "Verifying ... "
-msgstr "Verificant ... "
+msgstr "S'està verificant... "
 
 #: disk-utils/fdformat.c:71
 msgid "Read: "
-msgstr "Llegir: "
+msgstr "Llegeix: "
 
 #: disk-utils/fdformat.c:73
 #, c-format
@@ -142,19 +147,19 @@ msgid ""
 "Continuing ... "
 msgstr ""
 "dades incorrectes al cilindre %d\n"
-"Continuant ... "
+"Continuant... "
 
 #: disk-utils/fdformat.c:94
 #, c-format
 msgid "usage: %s [ -n ] device\n"
-msgstr "useu: %s [ -n ] dispositiu\n"
+msgstr "ús: %s [ -n ] dispositiu\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s provinent de %s\n"
@@ -162,7 +167,7 @@ msgstr "%s provinent de %s\n"
 #: disk-utils/fdformat.c:130
 #, c-format
 msgid "%s: not a block device\n"
-msgstr "%s: no és un dispositiu de bloc\n"
+msgstr "%s: No és un dispositiu de bloc\n"
 
 #: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
@@ -190,7 +195,7 @@ msgid ""
 " -v         be more verbose\n"
 " file       file to test\n"
 msgstr ""
-"usar: %s [-hv] [-x dir] fitxer\n"
+"ús: %s [-hv] [-x dir] fitxer\n"
 " -h         mostra aquesta ajuda\n"
 " -x dir     extreu a dins del dir\n"
 " -v         mostra més missatges\n"
@@ -199,12 +204,12 @@ msgstr ""
 #: disk-utils/fsck.cramfs.c:191
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
-msgstr "%s: error %d al descomprimir! %p(%d)\n"
+msgstr "%s: Error %d al descomprimir! %p(%d)\n"
 
 #: disk-utils/fsck.cramfs.c:243
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
-msgstr "%s: error en la mida de l'enllaç simbòlic `%s'\n"
+msgstr "%s: Error en la mida de l'enllaç simbòlic `%s'\n"
 
 #: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
 #, c-format
@@ -214,7 +219,7 @@ msgstr "  descomprimint el bloc en %ld a %ld (%ld)\n"
 #: disk-utils/fsck.cramfs.c:287
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
-msgstr "%s: mode fals en `%s' (%o)\n"
+msgstr "%s: Mode fals en `%s' (%o)\n"
 
 #: disk-utils/fsck.cramfs.c:319
 #, c-format
@@ -234,17 +239,17 @@ msgstr "%s: No mida (%ld vs %ld) octets\n"
 #: disk-utils/fsck.cramfs.c:392
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
-msgstr "%s: cramfs invàlid, longitud de la ruta errònia\n"
+msgstr "%s: cramfs no vàlid, longitud de la ruta errònia\n"
 
 #: disk-utils/fsck.cramfs.c:472
 #, c-format
 msgid "%s: compiled without -x support\n"
-msgstr "%s: compilat sense suport per a -x\n"
+msgstr "%s: Compilat sense suport per a -x\n"
 
 #: disk-utils/fsck.cramfs.c:498
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
-msgstr "%s: atenció, no es pot determinar la mida del sistema de fitxers \n"
+msgstr "%s: Atenció, no es pot determinar la mida del sistema de fitxers \n"
 
 #: disk-utils/fsck.cramfs.c:508
 #, c-format
@@ -254,211 +259,211 @@ msgstr "%s no és un dispositiu de bloc o un fitxer\n"
 #: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
 #, c-format
 msgid "%s: invalid cramfs--file length too short\n"
-msgstr "%s: cramfs invàlid, longitud del fitxer massa curta\n"
+msgstr "%s: cramfs no vàlid, longitud del fitxer massa curta\n"
 
 #: disk-utils/fsck.cramfs.c:541
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
-msgstr "%s: cramfs invàlid, màgia errònia\n"
+msgstr "%s: cramfs no vàlid, màgia errònia\n"
 
 #: disk-utils/fsck.cramfs.c:554
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
-msgstr "%s: atenció; longitud del fitxer massa llarga, imatge desplaçada?\n"
+msgstr "%s: Atenció; longitud del fitxer massa llarga, imatge desplaçada?\n"
 
 #: disk-utils/fsck.cramfs.c:564
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
-msgstr "%s: cramfs invàlid, error del crc\n"
+msgstr "%s: cramfs no vàlid, error del crc\n"
 
 #: disk-utils/fsck.cramfs.c:570
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
-msgstr "%s: atenció; imatge cramfs antiga, no és CRC\n"
+msgstr "%s: Atenció; imatge cramfs antiga, no és CRC\n"
 
 #: disk-utils/fsck.cramfs.c:592
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
-msgstr "%s: cramfs invàlid, superbloc dolent\n"
+msgstr "%s: cramfs no vàlid, superbloc dolent\n"
 
 #: disk-utils/fsck.cramfs.c:608
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
-"%s: cramfs invàlid, el final de les dades als directoris (%ld)\n"
+"%s: cramfs no vàlid, el final de les dades als directoris (%ld)\n"
 "és diferent del començament de les dades dels fitxers (%ld)\n"
 
 #: disk-utils/fsck.cramfs.c:616
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
-msgstr "%s: cramfs invàlid, desplaçament invàlid de les dades dels fitxers\n"
+msgstr "%s: cramfs no vàlid, desplaçament no vàlid de les dades dels fitxers\n"
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr "Useu: %s [-larvsmf] /dev/_nom_\n"
+msgstr "Ús: %s [-larvsmf] /dev/_nom_\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s està muntat.\t "
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "N'esteu segur que desitgeu continuar?"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "comprovació avortada.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Número de zona < FIRSTZONE en el fitxer `%s'."
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Número de zona >= ZONES en el fitxer `%s'."
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
-msgstr "Eliminar bloc"
+msgstr "Elimina bloc"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
-msgstr "Error de lectura: no es pot cercar el bloc en el fitxer '%s'\n"
+msgstr "Error de lectura: No es pot cercar el bloc en el fitxer '%s'\n"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
-msgstr "Error de lectura: bloc incorrecte en el fitxer '%s'\n"
+msgstr "Error de lectura: Bloc incorrecte en el fitxer '%s'\n"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
 msgstr ""
-"Error intern: s'està intentant escriure un bloc incorrecte\n"
+"Error intern: S'està intentant escriure un bloc incorrecte\n"
 "El requeriment d'escriptura serà ignorat\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "error cercant en write_block"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
-msgstr "Error d'escriptura: bloc incorrecte en el fitxer '%s'\n"
+msgstr "Error d'escriptura: Bloc incorrecte en el fitxer '%s'\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "error cercant en write_super_block"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "no es pot escriure el superbloc"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "No es pot escriure el mapa de ínodes"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "No es pot escriure el mapa de zona"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "No es poden escriure els ínodes"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "error cercant"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "no es pot llegir el superbloc"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "número màgic incorrecte en el superbloc"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Sols es suporten blocs o zones de 1k"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "Camp s_imap_blocks incorrecte al superbloc"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "Camp s_zmap_blocks incorrecte en el superbloc"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "No es pot assignar memòria temporal per al mapa de ínodes"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "No es pot assignar memòria temporal per als ínodes"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "No es pot assignar memòria temporal per al nombre de ínodes"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "No es pot assignar memòria temporal per al nombre de zones"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "No es pot llegir el mapa de ínodes"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "No es pot llegir el mapa de zones"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "No es poden llegir els ínodes"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Atenció: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld ínodes\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blocs\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Primerazonadades=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Midadelazona=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Midamàxima=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Estat del sistema de fitxers=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -467,173 +472,173 @@ msgstr ""
 "Longituddelnom=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "L'ínode %d està marcat com a no usat, però és usat pel fitxer '%s'\n"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Marcar en ús"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "El fitxer `%s' té el mode %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
-msgstr "Atenció: nombre d'ínodes massa gran.\n"
+msgstr "Atenció: Nombre d'ínodes massa gran.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
-msgstr "el ínode arrel no és un directori"
+msgstr "l'ínode arrel no és un directori"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "El bloc ja ha estat emprat anteriorment. Ara està en el fitxer `%s'."
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
-msgstr "Esborrar"
+msgstr "Esborra"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "El bloc %d en el fitxer `%s' està marcat com a no usat."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Correcte"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "El directori `%s' conté un nombre d'ínode incorrecte per al fitxer '%.*s'."
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
-msgstr " Eliminar"
+msgstr " Elimina"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
-msgstr "`%s': directori incorrecte: '.' no és el primer\n"
+msgstr "`%s': Directori incorrecte: '.' no és el primer\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
-msgstr "`%s': directori incorrecte: '..' no és el segon\n"
+msgstr "`%s': Directori incorrecte: '..' no és el segon\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
-msgstr "%s: directori incorrecte: '.' no és el primer\n"
+msgstr "%s: Directori incorrecte: '.' no és el primer\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
-msgstr "%s: directori incorrecte: '..' no és el segon\n"
+msgstr "%s: Directori incorrecte: '..' no és el segon\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "error intern"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
-msgstr "%s: directori incorrecte: mida < 32"
+msgstr "%s: Directori incorrecte: Mida < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "error cercant en bad_zone"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
-msgstr "No s'ha esborrat el mode del ínode %d."
+msgstr "No s'ha esborrat el mode de l'ínode %d."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "L'ínode %d no s'usa; marcat com en ús en el mapa de bits."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "S'està usant el ínode %d; marcat com a no en ús en el mapa de bits."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Ínode %d (mode = %07o), i_nlinks=%d, comptats=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
-msgstr "Establir i_nlinks als comptats"
+msgstr "Estableix i_nlinks als comptats"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
-msgstr "Zona %d: marcada com en ús; cap fitxer no l'utilitza."
+msgstr "Zona %d: Marcada com en ús; cap fitxer no l'utilitza."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
-msgstr "Eliminar marca"
+msgstr "Elimina marca"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
-msgstr "Zona %d: en ús, comptada=%d\n"
+msgstr "Zona %d: En ús, comptada=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
-msgstr "Zona %d: no en ús, comptada=%d\n"
+msgstr "Zona %d: No en ús, comptada=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
-msgstr "Establir"
+msgstr "Estableix"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
-msgstr "mida de ínode incorrecte"
+msgstr "mida d'ínode incorrecte"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
-msgstr "mida de ínode v2 incorrecte"
+msgstr "mida d'ínode v2 incorrecte"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "es necessita una terminal per a reparacions interactives"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "No es pot obrir '%s'"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s està net; no es comprova.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Forçant comprovació del sistema de fitxers en %s.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr ""
 "Al sistema de fitxers en %s hi han elements estranys, s'han de comprovar.\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -642,12 +647,12 @@ msgstr ""
 "\n"
 "%6ld ínodes usats (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zones usades (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -670,7 +675,7 @@ msgstr ""
 "------\n"
 "%6d fitxers\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -683,17 +688,17 @@ msgstr ""
 #: disk-utils/isosize.c:129
 #, c-format
 msgid "%s: failed to open: %s\n"
-msgstr "%s: error a l'obrir: %s\n"
+msgstr "%s: Error a l'obrir: %s\n"
 
 #: disk-utils/isosize.c:135
 #, c-format
 msgid "%s: seek error on %s\n"
-msgstr "%s: error cercant en %s\n"
+msgstr "%s: Error cercant en %s\n"
 
 #: disk-utils/isosize.c:141
 #, c-format
 msgid "%s: read error on %s\n"
-msgstr "%s: llegint l'errada en %s\n"
+msgstr "%s: Llegint l'errada en %s\n"
 
 #: disk-utils/isosize.c:150
 #, c-format
@@ -703,12 +708,12 @@ msgstr "sector número: %d, mida del sector: %d\n"
 #: disk-utils/isosize.c:198
 #, c-format
 msgid "%s: option parse error\n"
-msgstr "%s: error a l'analitzar l'opció\n"
+msgstr "%s: Error a l'analitzar l'opció\n"
 
 #: disk-utils/isosize.c:206
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr "Useu: %s [-x] [-d <núm>] imatge-iso9660\n"
+msgstr "Ús: %s [-x] [-d <núm>] imatge-iso9660\n"
 
 #: disk-utils/mkfs.bfs.c:88
 #, c-format
@@ -716,7 +721,7 @@ msgid ""
 "Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
 "       [-F fsname] device [block-count]\n"
 msgstr ""
-"Useu: %s [-v] [-N núm_de_ínodes] [-V nom_volumen]\n"
+"Ús: %s [-v] [-N núm_de_ínodes] [-V nom_volumen]\n"
 "       [-F nom_sis._fitx.] dispositiu [quants_blocs]\n"
 
 #: disk-utils/mkfs.bfs.c:135
@@ -761,7 +766,7 @@ msgstr "masses ínodes; el màxim és de 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "no hi ha prou espai, com a mínim es necessiten %lu blocs"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositiu: %s\n"
@@ -833,10 +838,9 @@ msgstr "error tancant %s"
 #: disk-utils/mkfs.c:76
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
-"Useu: mkfs [-V] [-t tipus_sis._fitx.] [opcions_sis._fitx.]  dispositiu "
-"[mida]\n"
+"Ús: mkfs [-V] [-t tipus_sis._fitx.] [opcions_sis._fitx.]  dispositiu [mida]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -864,7 +868,7 @@ msgid ""
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"useu: %s [-v] [-b blksz] [-e edició] [-i fitxer] [-n nom] nom_dir "
+"ús: %s [-v] [-b blksz] [-e edició] [-i fitxer] [-n nom] nom_dir "
 "fitxer_eixida\n"
 " -h         mostra aquesta ajuda\n"
 " -v         més missatges\n"
@@ -873,7 +877,7 @@ msgstr ""
 " -i fitxer  insereix una imatge de fitxer al sistema de fitxers (requereix\n"
 "            >= 2.4.0)\n"
 " -n nom     estableix el nom del sistema de fitxers cramfs\n"
-" -p         desplaça %d octets pel codi d'arrencada\n"
+" -p         desplaça %d octets per al codi d'arrencada\n"
 " -s         ordena les entrades de directori (opció antiga, ignorar)\n"
 " -z         crear buits explícits (requereix >= 2.3.39)\n"
 " nom_dir    arrel del sistema de fitxers que serà comprimit\n"
@@ -905,7 +909,7 @@ msgstr ""
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
-msgstr "CARAM: bloc \"comprimit\" a > 2*longituddelbloc (%ld)\n"
+msgstr "CARAM: Bloc \"comprimit\" a > 2*longituddelbloc (%ld)\n"
 
 #: disk-utils/mkfs.cramfs.c:641
 #, c-format
@@ -918,7 +922,7 @@ msgid ""
 "warning: guestimate of required size (upper bound) is %LdMB, but maximum "
 "image size is %uMB.  We might die prematurely.\n"
 msgstr ""
-"atenció: s'estima que la mida requerida (cota superior) és %LdMB, però la "
+"atenció: S'estima que la mida requerida (cota superior) és %LdMB, però la "
 "mida màxima de la imatge és %uMB. Podria abortar prematurament.\n"
 
 #: disk-utils/mkfs.cramfs.c:860
@@ -962,23 +966,23 @@ msgstr "ha fallat l'escriptura de l'imatge ROM (%d %d)\n"
 #. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 msgid "warning: filenames truncated to 255 bytes.\n"
-msgstr "atenció: els noms dels fitxers es trunquen a 255 octets.\n"
+msgstr "atenció: Els noms dels fitxers es trunquen a 255 octets.\n"
 
 #: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
-msgstr "atenció: s'han saltat fitxers degut a errors.\n"
+msgstr "atenció: S'han saltat fitxers degut a errors.\n"
 
 #: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
-msgstr "atenció: les mides es trunquen a %luMB (menys 1 octet).\n"
+msgstr "atenció: Les mides es trunquen a %luMB (menys 1 octet).\n"
 
 #: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
-"atenció: els uids es trunquen a %u bits,  (Podria ser un problema de "
+"atenció: Els uids es trunquen a %u bits,  (Podria ser un problema de "
 "seguretat).\n"
 
 #: disk-utils/mkfs.cramfs.c:928
@@ -986,7 +990,7 @@ msgstr ""
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
-"atenció: els gids es trunquen a %u bits.  (Podria ser un problema de "
+"atenció: Els gids es trunquen a %u bits.  (Podria ser un problema de "
 "seguretat).\n"
 
 #: disk-utils/mkfs.cramfs.c:933
@@ -995,67 +999,67 @@ msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
 "that some device files will be wrong.\n"
 msgstr ""
-"ATENCIÓ: els nombres de dispositiu es trunquen a %u bits.  Amb seguretat "
+"ATENCIÓ: Els nombres de dispositiu es trunquen a %u bits.  Amb seguretat "
 "que\n"
 "es deu a fitxers de dispositius erronis.\n"
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
-msgstr "Useu: %s [-c | -l nom_fitxer] [-nXX] [-iXX] /dev/_nom_ [blocs]\n"
+msgstr "Ús: %s [-c | -l nom_fitxer] [-nXX] [-iXX] /dev/_nom_ [blocs]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s està muntat; aquí no es crearà un sistema de fitxers!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "Error cercant el bloc d'arrencada en write_tables"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "No es pot esborrar el sector d'arrencada"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "Error cercant en write_tables"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "No es pot escriure el mapa dels ínodes"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "No es pot escriure el mapa de zones"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "No es poden escriure els ínodes"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "Error escrivint en write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "Hi han masses blocs incorrectes"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "No hi han prous blocs correctes"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "No es pot assignar memòria temporal per als mapes"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "No és possible assignar memòria temporal per als ínodes"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1064,57 +1068,52 @@ msgstr ""
 "Midamàx.=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "Error cercant durant la comprovació de blocs"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
-msgstr "Valors estranys en do_check: probablement hi han errors\n"
+msgstr "Valors estranys en do_check: Probablement hi han errors\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "Error cercant en check_blocks"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
-"Blocs incorrectes abans de l'àrea de dades: no es pot crear el sistema de "
+"Blocs incorrectes abans de l'àrea de dades: No es pot crear el sistema de "
 "fitxers"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d blocs incorrectes\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "un bloc incorrecte\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "no es pot obrir el fitxer de blocs incorrectes"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s: no s'ha compilat amb suport per a minix v2\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
-msgstr "error de strtol: no s'han especificat el nombre de blocs"
+msgstr "error de strtol: No s'han especificat el nombre de blocs"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "no es pot obrir %s"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "no es pot fer stat per a %s"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "no s'intentarà crear el sistema de fitxers en '%s'"
@@ -1139,7 +1138,7 @@ msgstr "Assumint que la mida de les pàgines és de %d (no %d)\n"
 #: disk-utils/mkswap.c:326
 #, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
-msgstr "Useu: %s [-c] [-v0|-v1] [-pMIDA_PÀG] /dev/_nom_ [blocs]\n"
+msgstr "Ús: %s [-c] [-v0|-v1] [-pMIDA_PÀG] /dev/_nom_ [blocs]\n"
 
 #: disk-utils/mkswap.c:349
 msgid "too many bad pages"
@@ -1155,45 +1154,45 @@ msgid "one bad page\n"
 msgstr "una pàgina incorrecta\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d pàgines incorrectes\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
-msgstr "%s: error: no heu especificat a on està l'espai d'intercanvi?\n"
+msgstr "%s: Error: No heu especificat a on està l'espai d'intercanvi?\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
-msgstr "%s: error: la mida %ld es superior a la mida del dispositiu %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
+msgstr "%s: Error: La mida %ld es superior a la mida del dispositiu %d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
-msgstr "%s: error: versió desconeguda %d\n"
+msgstr "%s: Error: Versió desconeguda %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
-msgstr "%s: error: l'espai d'intercanvi ha de tindre com a mínim %ldkB\n"
+msgstr "%s: Error: L'espai d'intercanvi ha de tindre com a mínim %ldkB\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
-msgstr "%s: atenció: l'espai d'intercanvi s'ha truncat en %ldkB\n"
+msgstr "%s: Atenció: L'espai d'intercanvi s'ha truncat en %ldkB\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "No s'intentarà crear el dispositiu d'intercanvi en '%s'"
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
-msgstr "fatal: no es pot llegir la primera pàgina"
+msgstr "fatal: No es pot llegir la primera pàgina"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1201,36 +1200,36 @@ msgid ""
 "No swap created. If you really want to create swap v0 on that device, use\n"
 "the -f option to force it.\n"
 msgstr ""
-"%s: el dispositiu '%s' conté una etiqueta de disc Sun vàlida.\n"
+"%s: El dispositiu '%s' conté una etiqueta de disc Sun vàlida.\n"
 "Això probablement significa que crear un espai d'intercanvi v0 destruirà\n"
 "la taula de particions. No s'ha creat l'espai d'intercanvi. Si de veres\n"
 "desitgeu crear-lo en aquest dispositiu, useu l'opció -f per a forçar-ho.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
-msgstr "No es pot configurar l'espai d'intercanvi: no es pot llegir"
+msgstr "No es pot configurar l'espai d'intercanvi: No es pot llegir"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Configurant l'espai d'intercanvi versió %d, mida = %llu KiB\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "No es pot rebobinar el dispositiu d'intercanvi"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "no es pot escriure la pàgina de la firma"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync ha fallat"
 
 #: disk-utils/setfdprm.c:31
 #, c-format
 msgid "Invalid number: %s\n"
-msgstr "Número invàlid: %s\n"
+msgstr "Número no vàlid: %s\n"
 
 #: disk-utils/setfdprm.c:81
 #, c-format
@@ -1265,58 +1264,57 @@ msgstr "   %s [ -c | -y | -n | -d ] dispositiu\n"
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] dispositiu\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Inutilitzable"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Espai lliure"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "S'ha modificat el disc.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Reinicieu el sistema per a assegurar-vos de que la taula de particions ha "
 "estat actualitzada correctament.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1328,779 +1326,780 @@ msgstr ""
 "particions de DOS 6.x, si us plau consulteu la pàgina\n"
 "del manual de cfdisk per a informació addicional.\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "ERROR FATAL"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Premeu una tecla per a sortir de cfdisk"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "Error accedint a la unitat de disc"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "No es pot llegir la unitat de disc"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "No es pot escriure en la unitat de disc"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Hi han masses particions"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "La partició comença abans del sector 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "La partició acaba abans del sector 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "La partició comença despres de la fí del disc"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "La partició acaba despres de la fí del disc"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr "La partició acaba en l'últim cilindre parcial"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "les particions lògiques no estan en un ordre de disc"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "solapament de particions lògiques"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "solapament de les particions lògiques ampliades"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Error intern al crear una unitat lògica sense partició estesa !!!!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "No es pot crear una unitat lògica aquí; es crearan dos particions esteses"
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Ítem del menú massa llarg; l'aspecte del menú pot ser estrany."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menú sense direcció; l'opció per defecte és horitzontal."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Tecla no permesa"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Premeu una tecla per a continuar"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primària"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Crear una nova partició primària"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Lògica"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Crear una nova partició lògica"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "No crear cap partició"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Error intern !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Mida (en MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Principi"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Afegir partició al principi de l'espai lliure"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Final"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Afegir partició al final de l'espai lliure"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "No hi ha espai per a crear la partició estesa"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr "No hi ha taula de partició o aquesta té una firma desconeguda"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Desitgeu començar amb una taula buida [s/N]?"
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "Heu especificat més cilindres dels que caben al disc"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "No es pot obrir la unitat de disc"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "El disc obert és de sols lectura; no teniu permís per a escriure-hi"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "No es pot obtindre la mida del disc"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Partició primària incorrecta"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Partició lògica incorrecta"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
-msgstr "Atenció: Això pot destruir les dades del vostre disc!"
+msgstr "Atenció!! Això pot destruir les dades del vostre disc!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Esteu segurs de que voleu escriure la taula de particions al disc? (si o "
 "no): "
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "No s'ha escrit la taula de particions al disc"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "si"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Si us plau escriviu `si' o `no'"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Escrivint la taula de particions al disc..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Taula de particions del disc, escrita"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "S'ha escrit la taula de particions, però la nova lectura de la taula ha "
 "fallat.  Reinicieu per a actualitzar-la."
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "No hi han particions primàries marcades com a d'arrencada. Així la MBR del "
 "DOS no podrà arrencar."
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Hi ha més d'una partició primària marcada com d'arrencada. Així la MBR del "
 "DOS no podrà arrencar."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Escriviu el nom del fitxer o premeu Intro per a visualitzar-lo en pantalla: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "No es pot obrir el fitxer '%s'"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unitat de disc: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Cap   "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Lòg"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Primària"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Lògica"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Arren.(%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Arrencada"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
+#: fdisk/cfdisk.c:2007
 #, c-format
-msgid "Unknown (%02X)"
-msgstr "Desconegut (%02X)"
+msgid "(%02X)"
+msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Cap (%02X)"
+#: fdisk/cfdisk.c:2009
+msgid "None"
+msgstr "Cap"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Taula de particions per a %s\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
-msgstr "             Primer   Últim\n"
+#: fdisk/cfdisk.c:2046
+msgid "               First       Last\n"
+msgstr "               Primer      Últim\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
-" # Tipus     Sector   Sector  Despl. Longitud  (ID) Sistema Fitxers   "
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
+" # Tipus      Sector      Sector   Despl.    Long.    (ID) Sist. Fitxers   "
 "Etiqueta\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
-msgstr "         ----Inici-----      -----Final----   Sector Nombre de\n"
+#: fdisk/cfdisk.c:2131
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
+msgstr "         ---Inici---         ----Final----     Inici     Nombre de\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
-msgstr " # Indi. Cap. Sec. Cil.  ID  Capç.Sec. Cil.   Sector   Sectors\n"
+#: fdisk/cfdisk.c:2132
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr " # Indi. Cap. Sec. Cil.  ID  Cap. Sec. Cil.   Sector     Sectors\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "En cru"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
-msgstr "Imprimir la taula utilitzant el format de dades en cru"
+msgstr "Imprimeix la taula utilitzant el format de dades en cru"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Sectors"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
-msgstr "Imprimir la taula ordenada per sectors"
+msgstr "Imprimeix la taula ordenada per sectors"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Taula"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Sols imprimir la taula de particions"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "No imprimir la taula"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Pantalla d'ajuda per a cfdisk"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
-msgstr ""
-"Això és el cfdisk, un programa per al particionament del disc basat en "
-"curses,"
+msgstr "Això és el cfdisk, un programa per al particionament del disc basat en"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
-msgstr ""
-"el qual us permetrà crear, suprimir i modificar particions en el vostre"
+msgstr "curses, el qual us permetrà crear, suprimir i modificar particions en"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
-msgstr "disc dur."
+msgstr "el vostre disc dur."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
-msgstr "Comandament      Significat"
+msgstr "Comandament Significat"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
-msgstr "-------      -------"
+msgstr "----------- ----------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
-msgstr "  b         Fixa l'etiqueta d'arrencada en l'actual partició"
+msgstr "  b         Fixa l'etiqueta d'arrencada en la partició actual"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d         Suprimeix l'actual partició"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g         Canvia paràmetres de cilindres, capçals i sectors per pista"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr "            ATENCIÓ: Aquesta opció sols hauria de ser usada per gent"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "            que conegui el funcionament de la mateixa."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h         Imprimeix aquesta pantalla"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m         Maximitza l'utilització de disc de la partició actual"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "            Nota: Aquesta opció pot fer la partició incompatible"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "            amb DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n         Crea una nova partició des de l'espai lliure"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p         Imprimeix la taula de particions en la pantalla o en un fitxer"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "            Hi han diversos formats diferents per a la partició"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "            entre els que podeu escollir:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr ""
-"                r - Dades en cru (exactament el que s'escriuria al disc)"
+msgstr "               r - Dades en cru (exactament el que s'escriurà al disc)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "               s - Taula ordenada per sectors"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "               t - Taula en format en cru"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
-msgstr "  q         Sortir del programa sense escriure la taula de particions"
+msgstr "  q         Surt del programa sense escriure la taula de particions"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
-msgstr "  t         Canviar el tipus del sistema de fitxers"
+msgstr "  t         Canvia el tipus del sistema de fitxers"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
-msgstr "  u         Canviar les unitats de la mida visualitzava de la partició"
+msgstr "  u         Canvia les unitats de la mida visualitzava de la partició"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "            Alterna entre MB, sectors i cilindres"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W         Escriu la taula de particions al disc (W en majúscula)"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "            Donat que això destruirà les dades del disc, haureu"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
-msgstr "             de confirmar o denegar escrivint `si' o"
+msgstr "            de confirmar o denegar escrivint `si' o"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
-msgstr "             `no'"
+msgstr "            `no'"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
-msgstr "Cursor amunt  Desplaçar el cursor a l'anterior partició"
+msgstr "Fletxa amunt  Desplaça el cursor a l'anterior partició"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
-msgstr "Cursor avall  Desplaçar el cursor a la següent partició"
+msgstr "Fletxa avall  Desplaça el cursor a la següent partició"
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
-msgstr "Ctrl-L        Redibuixar la pantalla"
+msgstr "Ctrl-L        Redibuixa la pantalla"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
-msgstr "  ?           Imprimir aquesta pantalla"
+msgstr "  ?           Imprimeix aquesta pantalla"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Nota: Tots els comandaments es poden escriure en majúscules o"
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "minúscules (excepte W per a escriure)."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cilindres"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Canviar la geometria dels cilindres"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Capçals"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Canviar la geometria dels capçals"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Canviar la geometria dels sectors"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Fet"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "S'ha finalitzat el canvi de geometria"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Escriviu el nombre de cilindres: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Valor dels cilindres no permes"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Escriviu el nombre de capçals: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Valor dels capçals no permes"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Escriviu el nombre de sectors per pista: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Valor dels sectors no permes"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Escriviu el tipus del sistema de fitxers: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "No es pot canviar el tipus del sistema de fitxers a buit"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "No es pot canviar el tipus del sistema de fitxers a estes"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Arrencada"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc.(%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Pri/Lòg"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Desconegut (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unitat de disc: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, c-format
-msgid "Size: %lld bytes, %ld MB"
-msgstr "Mida: %lld octets, %ld MB"
+msgid "Size: %lld bytes, %lld MB"
+msgstr "Mida: %lld octets, %lld MB"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
-msgstr "Mida: %lld octets, %ld.%ld GB"
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "Mida: %lld octets, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2587
 #, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
-msgstr "Capçals: %d   Sectors per pista: %d   Cilindres: %d"
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "Capçals: %d   Sectors per pista: %d   Cilindres: %lld"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Nom"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Etiquetes"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Tipus part."
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "Tipus Sis.Fitx."
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Etiqueta]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
-msgstr "  Sectors"
+#: fdisk/cfdisk.c:2597
+msgid "    Sectors"
+msgstr "    Sectors"
+
+#: fdisk/cfdisk.c:2599
+msgid "  Cylinders"
+msgstr "  Cilindres"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
-msgstr "Mida (MB)"
+#: fdisk/cfdisk.c:2601
+msgid "  Size (MB)"
+msgstr "  Mida (MB)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
-msgstr "Mida (GB)"
+#: fdisk/cfdisk.c:2603
+msgid "  Size (GB)"
+msgstr "  Mida (GB)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Arrencada"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Establir l'etiqueta de la partició actual com d'arrencada"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Suprimir"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Suprimir l'actual partició"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Canviar la geometria del disc (sols usuaris experts)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Ajuda"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Imprimir pantalla d'ajuda"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Maximitzar la utilització del disc en la partició actual (sols usuaris "
 "experts)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Crear una nova partició des de l'espai lliure"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Imprimir"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Imprimir la taula de particions en la pantalla o en un fitxer"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Sortir"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Sortir del programa sense escriure la taula de particions"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Tipus"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Canviar el tipus del sistema de fitxers (DOS, Linux, OS/2, etc.)"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Unitats"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Canviar les unitats de la mida de la partició (MB, sect., cil.)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Escriure"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Escriure la taula de particions al disc (això pot destruir les dades)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "No es pot fer aquesta partició arrencable"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "No es pot suprimir una partició buida"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "No es pot maximitzar aquesta partició"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Aquesta partició és inutilitzable"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Aquesta partició ja està en ús"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "No es pot canviar el tipus d'una partició buida"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "No hi ha més particions"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Comandament no permès"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2120,23 +2119,23 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Usant:\n"
-"Imprimir versió:\n"
+"Usar:\n"
+"Imprimir la versió:\n"
 "        %s -v\n"
-"Imprimir taula de particions:\n"
+"Imprimir la taula de particions:\n"
 "        %s -P {r|s|t} [opcions] dispositiu\n"
 "Ús interactiu:\n"
 "        %s [opcions] dispositiu\n"
 "\n"
 "Opcions:\n"
-"-a:  Emprar fletxa en comptes del ressaltat.\n"
-"-z:  Començar amb una taula de particions a zero en comptes de llegir\n"
+"-a:  Empra la fletxa en comptes del ressaltat.\n"
+"-z:  Comença amb una taula de particions a zero en comptes de llegir\n"
 "     la del disc.\n"
-"-c C -h H -s S: Modificar la idea del nucli sobre el nombre de cilindres,\n"
+"-c C -h H -s S: Modifica la idea del nucli sobre el nombre de cilindres,\n"
 "                el nombre de capçals i el nombre de sectors per pista.\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2147,17 +2146,16 @@ msgid ""
 "-u: give Start and End in sector (instead of cylinder) units\n"
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
-"Useu: fdisk [-b SSZ] [-u] DISK      Canviar la taula de particions\n"
-"      fdisk -l [-b SSZ] [-u] DISK   Llista la(es) taula(es) de partició"
-"(ons)\n"
-"      fdisk -s PARTICIÓ             Augmentar l'espai en blocs\n"
-"      fdisk -v                      Dona la versió del fdisk\n"
+"Ús: fdisk [-b SSZ] [-u] DISK      Canvia la taula de particions\n"
+"    fdisk -l [-b SSZ] [-u] DISK   Llista la(es) taula(es) de partició(ons)\n"
+"    fdisk -s PARTICIÓ             Augmenta l'espai en blocs\n"
+"    fdisk -v                      Dona la versió del fdisk\n"
 "Aquest DISC estarà sota /dev/hdb o /dev/sda i la PARTICIÓ serà quelcom\n"
 "a /dev/hda7\n"
 "-u: Dona el principi i final de la unitat en sectors (no en cilindres)\n"
-"-b 2048: (pels discs MO) usa 2048 octets per sector\n"
+"-b 2048: (per als discs MO) usa 2048 octets per sector\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2166,229 +2164,230 @@ msgid ""
 "  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
 "  ...\n"
 msgstr ""
-"Useu: fdisk [-l] [-b SSZ] [-u] dispositiu\n"
-"P.e.: fdisk /dev/hda  (per al primer disc IDE)\n"
-"   o: fdisk /dev/sdc  (per al tercer disc SCSI)\n"
-"   o: fdisk /dev/eda  (per a la primera unitat PS/2 ESDI)\n"
-"   o: fdisk /dev/rd/c0d0 o: fdisk /dev/ida/c0d0  (pels dispositius RAID)\n"
+"Ús: fdisk [-l] [-b SSZ] [-u] dispositiu\n"
+"P.ex.: fdisk /dev/hda  (per al primer disc IDE)\n"
+"    o: fdisk /dev/sdc  (per al tercer disc SCSI)\n"
+"    o: fdisk /dev/eda  (per a la primera unitat PS/2 ESDI)\n"
+"    o: fdisk /dev/rd/c0d0 o: fdisk /dev/ida/c0d0  (per als dispositius "
+"RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "No es pot obrir %s\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "No es pot llegir %s\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "No es pot cercar en %s\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "No es pot escriure %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "El ioctl BLKGETSIZE ha fallat en %s\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "No es pot assignar més memòria\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Error fatal\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Acció del comandament"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   establir un indicador de sols lectura"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b   editar etiqueta de disc bsd"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   establir indicatiu de muntable"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   suprimir una partició"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   llistar els tipus de particions conegudes"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   imprimir aquest menú"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   afegir una nova partició"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   crear una nova taula de particions DOS buida"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   imprimir la taula de particions"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   sortir sense desar els canvis"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   crear una etiqueta de disc Sun nova"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   canviar l'identificador del sistema d'una partició"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   canviar les unitats de visualització/entrada"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   verificar la taula de particions"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   escriure la taula al disc i sortir"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   funcions addicionals (sols experts)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   seleccionar partició d'arrencada"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b   editar l'entrada del fitxer d'arrencada"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   seleccionar partició d'intercanvi sgi"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a   establir un indicatiu d'arrencada"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   establir l'indicatiu de compatibilitat amb DOS"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   canviar el nombre de cilindres alternatius"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   canviar el nombre de cilindres"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   imprimir les dades en cru en la taula de particions"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   canviar el nombre de sectors addicionals per cilindre"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   canviar el nombre de capçals"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   canviar factor d'inter-fullatge"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   canviar velocitat de rotació (r.p.m.)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   tornar al menú principal"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   canviar el nombre de sectors per pista"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   canviar el nombre de cilindres físics"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   desplaçar al començament les dades d'una partició"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   llistar particions esteses"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   crear una taula de particions IRIX (SGI)"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f   fixar un ordre de particions"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "Heu de definir els"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "capçals"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "sectors"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "cilindres"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2397,11 +2396,11 @@ msgstr ""
 "%s%s.\n"
 "Podeu fer això des del menú de funcions addicionals.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " y "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2421,27 +2420,27 @@ msgstr ""
 "2) Arrencar i particionar des d'un altre SO\n"
 "   (p.e., DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Desplaçament incorrecte en particions primàries esteses\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
-msgstr "Atenció: s'estan suprimint les particions després de %d\n"
+msgstr "Atenció: S'estan suprimint les particions després de %d\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
-msgstr "Atenció: enllaç d'apuntador addicional en la taula de particions %d\n"
+msgstr "Atenció: Enllaç d'apuntador addicional en la taula de particions %d\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
-"Atenció: s'ignoren les dades addicionals en la taula de particions %d\n"
+"Atenció: S'ignoren les dades addicionals en la taula de particions %d\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2453,16 +2452,16 @@ msgstr ""
 "d'aquesta operació, l'anterior contingut no podrà ser recuperat.\n"
 "\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
-msgstr "Nota: la mida del sector és %d (no %d)\n"
+msgstr "Nota: La mida del sector és %d (no %d)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr "No podreu escriure la taula de particions.\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
@@ -2470,7 +2469,7 @@ msgstr ""
 "Aquest disc té tanta màgia DOS com BSD.\n"
 "Empreu el comandament 'b' per anar al mode BSD.\n"
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
@@ -2478,25 +2477,25 @@ msgstr ""
 "El dispositiu no conté una taula de particions DOS vàlida, així com tampoc "
 "una etiqueta de disc Sun, SGI o OSF\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Error intern\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "S'ignorarà la partició estesa addicional %d\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
-"Atenció: etiqueta 0x%04x invàlida de la taula de particions %d serà "
+"Atenció: Etiqueta 0x%04x no vàlida de la taula de particions %d serà "
 "corregida amb w(rite)\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2504,78 +2503,78 @@ msgstr ""
 "\n"
 "s'ha aconseguit un EOF tres vegades - sortint...\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Codi hex. (escriviu L per a veure la llista de codis): "
 
-#: fdisk/fdisk.c:1069
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1094
+#, c-format
 msgid "%s (%u-%u, default %u): "
-msgstr "%s (%d-%d, valor per defecte %d): "
+msgstr "%s (%u-%u, valor per defecte %u): "
 
-#: fdisk/fdisk.c:1136
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1161
+#, c-format
 msgid "Using default value %u\n"
-msgstr "Usant el valor per defecte %d\n"
+msgstr "Usant el valor per defecte %u\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "El valor està fora del rang.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Nombre de partició"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
-msgstr "Atenció: la partició %d és del tipus buit\n"
+msgstr "Atenció: La partició %d és del tipus buit\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "S'ha seleccionat la partició %d\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 msgid "No partition is defined yet!\n"
 msgstr "No hi ha cap partició definida!\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr "Ja s'han definit totes les particions primàries!\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "cilindre"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Canviant les unitats de visualització/entrada a %s\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
-msgstr "ATENCIÓ: la partició %d és una partició estesa\n"
+msgstr "ATENCIÓ: La partició %d és una partició estesa\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "L'etiqueta de compatibilitat amb DOS està establerta\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "L'etiqueta de compatibilitat amb DOS no està establerta\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partició %d encara no existeix!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2587,7 +2586,7 @@ msgstr ""
 "tindre particions del tipus 0. Podeu suprimir-les\n"
 "amb el comandament `d'.\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2595,7 +2594,7 @@ msgstr ""
 "No podeu convertir una partició en estesa ni viceversa primer\n"
 "haureu d'esborrar-la.\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2606,7 +2605,7 @@ msgstr ""
 "Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2617,52 +2616,52 @@ msgstr ""
 "espera.\n"
 "\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "S'ha canviat el tipus del sistema de la partició %d per %x (%s)\n"
 
-#: fdisk/fdisk.c:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "La partició %d té diferents començaments físics/lògics (no Linux?):\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     físic=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lògic=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "La partició %d té diferents finals físics/lògics:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "La partició %i no comença en el límit del cilindre:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "ha de ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "La partició %i no acaba en un límit de cilindre.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "ha de ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -2671,7 +2670,7 @@ msgstr ""
 "\n"
 "Disc %s: %ld MiB, %lld octets\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, c-format
 msgid ""
 "\n"
@@ -2680,17 +2679,17 @@ msgstr ""
 "\n"
 "Disc %s: %ld.%ld GiB, %lld octets\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d capçals, %d sectors/pista, %d cilindres"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
-msgstr ", total %lu sectors"
+msgid ", total %llu sectors"
+msgstr ", total %llu sectors"
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2699,24 +2698,24 @@ msgstr ""
 "Unitats = %s de %d * %d = %d octets\n"
 "\n"
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
-"Res a fer. L'ordre és correcta.\n"
+"Res a fer. L'ordre és correcte.\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
+#: fdisk/fdisk.c:1704
 #, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
-msgstr "%*s Arrenc. Comença  Acaba     Blocs   Id. Sistema\n"
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s Arrenc.   Comença       Acaba    Blocs    Id  Sistema\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Dispositiu"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2724,7 +2723,7 @@ msgstr ""
 "\n"
 "Les entrades en la taula de particions no estan en ordre al disc\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2735,92 +2734,92 @@ msgstr ""
 "Disc %s: %d capçals, %d sectors, %d cilindres\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
-msgstr "Núm IA Cab Sect Cil Cap Sect Cil Comença     Mida ID\n"
+#: fdisk/fdisk.c:1754
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "Núm IA Cab Sect Cil Cap Sect Cil    Comença    Mida ID\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
-msgstr "Atenció: la partició %d conté el sector 0\n"
+msgstr "Atenció: La partició %d conté el sector 0\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
-msgstr "Partició %d: el capçal %d supera el màxim %d\n"
+msgstr "Partició %d: El capçal %d supera el màxim %d\n"
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
-msgstr "Partició %d: el sector %d supera el màxim %d\n"
+msgstr "Partició %d: El sector %d supera el màxim %d\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
-msgstr "Partició %d: el cilindre %d supera el màxim %d\n"
+msgstr "Partició %d: El cilindre %d supera el màxim %d\n"
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
-msgstr "Partició %d: sectors anteriors %d difereixen del total %d\n"
+msgstr "Partició %d: Sectors anteriors %d difereixen del total %d\n"
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
-msgstr "Atenció: inici de dades incorrecte en la partició %d\n"
+msgstr "Atenció: Inici de dades incorrecte en la partició %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
-msgstr "Atenció: la partició %d es solapa amb la partició %d.\n"
+msgstr "Atenció: La partició %d es solapa amb la partició %d.\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
-msgstr "Atenció: la partició %d està buida\n"
+msgstr "Atenció: La partició %d està buida\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partició lògica %d no està integrada en la partició %d\n"
 
-#: fdisk/fdisk.c:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "El total de sectors assignats %d supera el màxim de %d\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d sectors no assignats\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "La partició %d ja està definida. Esborreu-la abans de tornar-la a afegir.\n"
 
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Primer %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ja està assignat\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "No hi ha cap sector lliure disponible\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Últim %s o +mida o +midaM o +midaK"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2832,15 +2831,25 @@ msgstr ""
 "\t particions DOS (Useu o).\n"
 "\tATENCIÓ: Això destruirà l'actual contingut del disc.\n"
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "S'ha creat el màxim nombre de particions\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Primer heu de suprimir alguna partició i afegir-ne una d'estesa\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "les particions lògiques no estan en un ordre de disc"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Partició primària incorrecta"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2851,20 +2860,20 @@ msgstr ""
 "%s\n"
 "   p   Partició primària (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l   lògica (5 o superior)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e   estesa"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Nombre de partició no vàlid per al tipus `%c'\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2872,11 +2881,11 @@ msgstr ""
 "Ja s'ha modificat la taula de particions!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Cridant a ioctl() per a rellegir la taula de particions.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2889,7 +2898,7 @@ msgstr ""
 "El nucli encara usa l'antiga taula.\n"
 "La taula nova s'usarà després de reiniciar.\n"
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2901,87 +2910,87 @@ msgstr ""
 "particions DOS 6.x, mireu la pàgina del manual del fdisk\n"
 "per a informació addicional.\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Sincronitzant els discs.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partició %d no té cap àrea amb dades\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Nou començament de dades"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Comandament expert (m per a l'ajuda): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Nombre de cilindres"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Nombre de capçals"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Nombre de sectors"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
-"Atenció: establint desplaçament del sector per a la compatibilitat amb DOS\n"
+"Atenció: Establint desplaçament del sector per a la compatibilitat amb DOS\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "El disc %s no conté una taula de particions vàlida\n"
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No es pot obrir %s\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "no es pot obrir %s\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
-msgstr "%c: comandament desconegut\n"
+msgstr "%c: Comandament desconegut\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Aquest nucli cerca la mida del sector por si mateix; l'opció -b serà "
 "ignorada\n"
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
-"Atenció: l'opció -b (estableix la mida del sector) ha de ser usada amb un "
+"Atenció: L'opció -b (estableix la mida del sector) ha de ser usada amb un "
 "dispositiu específic\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "A l'entrar el mode d'etiqueta, s'ha detectat una etiqueta de disc OSF/1 en %"
 "s.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Comandament (m per a l'ajuda): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2990,15 +2999,15 @@ msgstr ""
 "\n"
 "L'actual fitxer d'arrencada és: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Si us plau entreu el nom del nou fitxer d'arrencada: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "No s'ha modificat el fitxer d'arrencada\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3009,7 +3018,7 @@ msgstr ""
 "SGI.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3302,7 +3311,7 @@ msgstr "Aquesta partició ja existeix.\n"
 #: fdisk/fdiskbsdlabel.c:756
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr "Atenció: masses particions (%d, el màxim són %d).\n"
+msgstr "Atenció: Masses particions (%d, el màxim són %d).\n"
 
 #: fdisk/fdiskbsdlabel.c:804
 msgid ""
@@ -3368,8 +3377,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Intercanvi Linux"
 
@@ -3464,7 +3472,7 @@ msgid ""
 "\te.g. \"/unix\" or \"/unix.save\".\n"
 msgstr ""
 "\n"
-"Fitxer d'arrencada invàlid!\n"
+"Fitxer d'arrencada no vàlid!\n"
 "\tEl fitxer d'arrencada ha de ser un nom de ruta absolut\n"
 "\tdiferent de zero, p.e. \"/unix\" o \"/unix.save\".\n"
 
@@ -3474,7 +3482,7 @@ msgid ""
 "\tName of Bootfile too long:  16 bytes maximum.\n"
 msgstr ""
 "\n"
-"\tNom del fitxer d'arrencada massa llarg: màxim de 16 octets.\n"
+"\tNom del fitxer d'arrencada massa llarg: Màxim de 16 octets.\n"
 
 #: fdisk/fdisksgilabel.c:313
 msgid ""
@@ -3555,9 +3563,9 @@ msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Les particions %d i %d es solapen en %d sectors.\n"
 
 #: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Espai no usat de %8d sectors - sectors %8d-%d\n"
+msgstr "Espai no usat de %8u sectors - sectors %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:523
 msgid ""
@@ -3606,7 +3614,7 @@ msgstr ""
 "Sols la secció de disc sencer \"Volúmen SGI\" pot infringir això.\n"
 "Escriviu SI si esteu segur sobre tornar a etiquetar aquesta partició.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "SI\n"
 
@@ -3665,6 +3673,10 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
+"ATENCIÓ:  BLKGETSIZE el ioctl ha fallat sobre %s.  S'esta usant el valor %d "
+"per a\n"
+"la geometria del cilindre. Aquest valor es podria tuncar per a dispositius > "
+"33,8 GB.\n"
 
 #: fdisk/fdisksgilabel.c:738
 #, c-format
@@ -3772,15 +3784,15 @@ msgstr "Cilindres alternatius"
 msgid "Physical cylinders"
 msgstr "Cilindres físics"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Velocitat de rotació (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Factor d'inter-fullatge"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Sectors addicionals per cilindre"
 
@@ -3835,7 +3847,7 @@ msgstr ""
 "valor %d %s es solapa amb d'altres particions. La vostra entrada\n"
 "s'ha canviat per %d %s\n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3845,7 +3857,7 @@ msgstr ""
 "deixar\n"
 "aquesta partició com a Disc sencer (5), començant en 0, amb %u sectors\n"
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3859,7 +3871,7 @@ msgstr ""
 "Escriviu SI si n'esteu segur de que desitgeu que la partició sigui\n"
 "etiquetada amb 82 (Linux d'intercanvi): "
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3878,7 +3890,7 @@ msgstr ""
 "Unitats = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3891,16 +3903,16 @@ msgstr ""
 "Unitats = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Etiqu.  Comença   Acaba    Blocs  Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Nombre de cilindres alternatius"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Nombre de cilindres físics"
 
@@ -3951,21 +3963,21 @@ msgstr "Gestor d'arrencada OS/2"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
-msgstr "Win95 FAT32"
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA)"
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA)"
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
-msgstr "Win95 Estesa (LBA)"
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 estesa (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -3996,16 +4008,16 @@ msgid "AST SmartSleep"
 msgstr "SmartSleep de AST"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
-msgstr "Win95 FAT32 oculta"
+msgid "Hidden W95 FAT32"
+msgstr "W95 FAT32 oculta"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA) oculta"
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA) oculta"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA) oculta"
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA) oculta"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4113,6 +4125,12 @@ msgstr "Minix antic"
 msgid "Minix / old Linux"
 msgstr "Minix / antic Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Intercanvi Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "Unitat C: oculta de OS/2"
@@ -4267,126 +4285,126 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "error cercant en %s - no es pot cercar a %lu\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
-msgstr "error cercant: s'esperava 0x%08x%08x, s'ha obtingut 0x%08x%08x\n"
+msgstr "error cercant: S'esperava 0x%08x%08x, s'ha obtingut 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "memòria esgotada - abandonant\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "error de lectura en %s - no es pot llegir el sector %lu\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
-msgstr "ERROR: el sector %lu no té una signatura msdos\n"
+msgstr "ERROR: El sector %lu no té una signatura msdos\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "error d'escriptura en %s - no es pot escriure el sector %lu\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "no es pot obrir el sector de la partició desat al fitxer (%s)\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "error d'escriptura en %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "no es pot fer stat al fitxer de restaurar la partició (%s)\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "mida incorrecte del fitxer de restitució de la partició - no es restituirà\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "memòria esgotada?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "no es pot obrir el fitxer de restituir la partició (%s)\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "error llegint %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "no es pot obrir per a escriptura el dispositiu %s\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "error escrivint el sector %lu en %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
-msgstr "Disc %s : no es pot obtrindre'n la mida.\n"
+msgstr "Disc %s : No es pot obtrindre'n la mida.\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
-msgstr "Disc %s: no es pot obtindre la geometria\n"
+msgstr "Disc %s: No es pot obtindre la geometria\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
 "the entire disk. Using fdisk on it is probably meaningless.\n"
 "[Use the --force option if you really want this]\n"
 msgstr ""
-"Atenció: començament=%lu - això sembla ser una partició\n"
+"Atenció: Començament=%lu - això sembla ser una partició\n"
 "en comptes del disc sencer. Usar el fdisk amb aquesta\n"
 "probablement no tingui cap sentit.\n"
 "[Useu l'opció --force si de veres ho desitgeu.]\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Atenció: HDIO_GETGEO indica que hi han %lu capçals\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Atenció: HDIO_GETGEO indica que hi han %lu sectors\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Atenció: HDIO_GETGEO indica que hi han %lu cilindres\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
-"Atenció: improbable nombre de sectors (%lu); normalment com a molt 63\n"
+"Atenció: Improbable nombre de sectors (%lu); normalment com a molt 63\n"
 "Això donarà problemes amb el programari que usi adreces Cil./Capç./Sector\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4395,7 +4413,7 @@ msgstr ""
 "\n"
 "Disc %s: %lu cilindres, %lu capçals, %lu sectors/pista\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4403,7 +4421,7 @@ msgstr ""
 "%s de partició %s té un valor imposible per al capçal: %lu (hauria d'estar "
 "entre 0 i %lu)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4412,16 +4430,16 @@ msgstr ""
 "%s de partició %s té un valor imposible per al sector: %lu (hauria d'estar "
 "entre 1 i %lu)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
-"%s de partició %s té un valor imposible pels cilindres: %lu (hauria d'estar "
-"entre 0 i %lu)\n"
+"%s de partició %s té un valor imposible per als cilindres: %lu (hauria "
+"d'estar entre 0 i %lu)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4429,11 +4447,11 @@ msgstr ""
 "Id  Nom\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Rellegint la taula de particions...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4441,31 +4459,31 @@ msgstr ""
 "El comandament per a rellegir la taula de particions ha fallat\n"
 "Reinicieu el sistema ara, avans d'usar mkfs\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Error tancant %s\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
-msgstr "%s: aquesta partició no existeix\n"
+msgstr "%s: Aquesta partició no existeix\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "Format no reconegut; usant els sectors\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# taula de particions de %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "format no implementat; usant %s\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4474,11 +4492,11 @@ msgstr ""
 "Unitats = cilindres de %lu octets, blocs de 1024 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Disp. Arr.  Comença   Acaba #cil.    #blocs    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4487,11 +4505,11 @@ msgstr ""
 "Unitats = sectors de 512 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Disp. Arr      Comença     Acaba #sectors  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4500,11 +4518,11 @@ msgstr ""
 "Unitats = blocs de 1024 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Disp. Arr.    Comença    Acaba   #blocs   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4513,33 +4531,33 @@ msgstr ""
 "Unitats = MiB de 1048576 octets, blocs de 1024 octets, comptant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Disp. Arr.  Comen.  Acaba  MB     #blocs    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tcomença: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tacaba: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "la partició cava en el cilindre %ld, més enllà de l'acabament del disc\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "No s'han trobat particions\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4550,71 +4568,71 @@ msgstr ""
 "  per a Cil./Capç./Sect.=*/%ld/%ld (en comptes de %ld/%ld/%ld).\n"
 "Per a aquest llistat s'assumirà aquesta geometria.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "no hi ha cap taula de particions.\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "estranyament, sols hi han definides %d particions.\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
-"Atenció: la partició %s té una mida 0 però no està marcada com a buida\n"
+"Atenció: La partició %s té una mida 0 però no està marcada com a buida\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr "Atenció: la partició %s té una mida 0 i és d'arrencada\n"
+msgstr "Atenció: La partició %s té una mida 0 i és d'arrencada\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
-msgstr "Atenció: la partició %s té una mida 0 i no comença en el zero\n"
+msgstr "Atenció: La partició %s té una mida 0 i no comença en el zero\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
-msgstr "Atenció: la partició %s "
+msgstr "Atenció: La partició %s "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "no està contingut a dins de la partició %s\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
-msgstr "Atenció: les particions %s "
+msgstr "Atenció: Les particions %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "i %s es solapen\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
-"Atenció: la partició %s conté part de la taula de particions\n"
+"Atenció: La partició %s conté part de la taula de particions\n"
 "(sector %lu) i la destruirà en quant s'ompli\n"
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
-msgstr "Atenció: la partició %s comença en el sector 0\n"
+msgstr "Atenció: La partició %s comença en el sector 0\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
-msgstr "Atenció: la partició %s acaba més enllà de l'acabament del disc\n"
+msgstr "Atenció: La partició %s acaba més enllà de l'acabament del disc\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4622,216 +4640,216 @@ msgstr ""
 "Entre les particions primàries, almenys una pot ser estesa\n"
 " (encara que això no és un problema sota Linux)\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
-msgstr "Atenció: la partició %s no comença en al límit d'un cilindre\n"
+msgstr "Atenció: La partició %s no comença en al límit d'un cilindre\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
-msgstr "Atenció: la partició %s no acaba al límit d'un cilindre\n"
+msgstr "Atenció: La partició %s no acaba al límit d'un cilindre\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Atenció: hi ha més d'una partició primària marcada com d'arrencada (activa)\n"
+"Atenció: Hi ha més d'una partició primària marcada com d'arrencada (activa)\n"
 "Això no és problema per al LILO, però el MBR del DOS no arrencarà aquest "
 "disc.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
-"Atenció: usualment sols es pot arrencar des de particions primàries.\n"
+"Atenció: Usualment sols es pot arrencar des de particions primàries.\n"
 "El LILO no tindrà en compte l'etiqueta `d'arrencada'.\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Atenció: no hi ha cap partició primària marcada com d'arrencada (activa).\n"
+"Atenció: No hi ha cap partició primària marcada com d'arrencada (activa).\n"
 "Això no és problema per al LILO, però el MBR de DOS no arrencarà aquest "
 "disc.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 msgid "start"
 msgstr "començament"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
-"partició %s: començament: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha "
+"partició %s: Començament: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha "
 "trobat (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 msgid "end"
 msgstr "acaba"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
-"partició %s: acaba: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trovat "
+"partició %s: Acaba: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trovat "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partició %s acaba en el cilindre %ld, més enllà de l'acabament del disc\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
-"Atenció: es desplaça el començament de la partició estesa de %ld a %ld\n"
+"Atenció: Es desplaça el començament de la partició estesa de %ld a %ld\n"
 "(Sols amb el propòsit de llistar-la. No es canviarà el seu contingut).\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
-"Atenció: la partició estesa no comença al límit d'un cilindre.\n"
+"Atenció: La partició estesa no comença al límit d'un cilindre.\n"
 "El DOS i Linux interpretaran el contingut d'un mode diferent.\n"
 "\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "masses particions - s'ignoran les anteriors al núm: (%d)\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "l'arbre de particions?\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "detectat Gestor de Disc - no es pot tractar això\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "signatura DM6 trobada - abandonant\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "estrany..., una partició estesa de mida 0?\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "estrany..., una partició BSD de mida 0?\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
-msgstr " %s: partició no reconeguda\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
+msgstr " %s: Partició no reconeguda\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr "s'ha especificat l'etiqueta -n: No s'ha canviat res\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Falla al desar els antics sectors - avortant\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Falla a l'escriure la partició en %s\n"
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "línia d'entrada llarga o incompleta - abandonant\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
-msgstr "error d'entrada: s'esperava `=' després del camp %s\n"
+msgstr "error d'entrada: S'esperava `=' després del camp %s\n"
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
-msgstr "error d'entrada: caràcter inesperat %c després del camp %s\n"
+msgstr "error d'entrada: Caràcter inesperat %c després del camp %s\n"
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entrada desconeguda: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "número massa gran\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "dades estranyes després del número\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "no hi ha espai per al descriptor de partició\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "no es pot crear una partició estesa adjunta\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr "masses camps a l'entrada\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "No queda més espai\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "Tipus no permés\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
-"Atenció: la mida aconseguida (%lu) excedeix la màxima acceptable de (%lu)\n"
+"Atenció: La mida aconseguida (%lu) excedeix la màxima acceptable de (%lu)\n"
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
-msgstr "Atenció: partició buida\n"
+msgstr "Atenció: Partició buida\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
-msgstr "Atenció: començament de la partició incorrecte (abans %lu)\n"
+msgstr "Atenció: Començament de la partició incorrecte (abans %lu)\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "Etiqueta d'arrencada desconeguda - escolliu - o *\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "especificació parcial de cil,capç,sect?\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "Partició estesa a on no s'esperava\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "entrada dolenta\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "masses particions\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 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"
@@ -4843,48 +4861,48 @@ msgstr ""
 "Normalment sols necessitarieu especificar <començament> i <mida> (i potser "
 "<tipus>).\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "versió"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
-msgstr "Useu: %s [opcions] dispositiu ...\n"
+msgstr "Ús: %s [opcions] dispositiu ...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
-msgstr "dispositiu: semblant a /dev/hda o /dev/sda"
+msgstr "dispositiu: Semblant a /dev/hda o /dev/sda"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "opcions útils:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]:  Mostra la mida d'una partició"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [o --id]:         Imprimeix o canvia l'identificador de la partició"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:       Mostra les particions de cada dispositiu"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [o --dump]:       Igual, però amb un format adequat per l'entrada "
 "posterior"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [o --increment]:  Nombre de cilindres, etc. des de 1 en comptes de 0"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4892,56 +4910,56 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  Accepta/reporta en unitats de sectors/blocs/"
 "cilindres/MB"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]: Llista els tipus de particions conegudes"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
-"    -D [o --DOS]:        Per compatibilitat amb DOS: es perd una mica d'espai"
+"    -D [o --DOS]:        Per compatibilitat amb DOS: Es perd una mica d'espai"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [o --re-read]:    Fa que el nucli rellegeixi la taula de particions"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                Sols canvia la partició amb el número #"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 No escriu realment al disc"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fitxer :          Desa els sectors que es sobreescriuran en un fitxer"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fitxer:           Restaura aquests sectors altra vegada"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:    Imprimeix la versió"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:       Imprimeix aquest missatge"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "opcions perilloses:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [o --show-geometry]:  Imprimeix la idea del nucli de la geometria"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4950,119 +4968,119 @@ msgstr ""
 "esteses\n"
 "                             o espera els seus descriptors en l'entrada"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [o --Linux]:       No mostra avisos sobre aspectes irrellevants per "
 "a Linux"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:       Suprimeix els missatges d'advertència"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "    Podeu modificar la geometria detectada usant:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C# [o --cylinders #]: Estableix el nombre de cilindres que s'usaran"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [o --heads #]:     Estableix el nombre de capçals que s'usaran"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [o --sectors #]:   Estableix el nombre de sectors que s'usaran"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "Podeu desactivar tota comprovació de consistència amb:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [o --force]:       Farà el que li digueu, encara que sigui estúpid"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
-msgstr "Useu:"
+msgstr "Ús:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositiu\t\t enumera les particions actives del dispositiu\n"
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s dispositiu n1 n2 ... activar particions n1 ..., desactivar la resta\n"
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -Un perifèric\t activa la partició n, desactiva la resta\n"
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "cap comandament?\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "total: %d blocs\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
-msgstr "useu: sfdisk --print-id dispositiu partició_número\n"
+msgstr "ús: sfdisk --print-id dispositiu partició_número\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
-msgstr "useu: sfdisk --change-id dispositiu número_partició Id\n"
+msgstr "ús: sfdisk --change-id dispositiu número_partició Id\n"
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
-msgstr "useu: sfdisk --id dispositiu partició_número [Id]\n"
+msgstr "ús: sfdisk --id dispositiu partició_número [Id]\n"
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "sols podeu especificar un dispositiu (excepte amb -l o -s)\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "no es pot obrir %s per a lectura-escriptura\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "no es pot obrir %s per a lectura\n"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcte\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s : %ld cilindres, %ld capçals, %ld sectors/pista\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "Falla del ioctl BLKGETSIZE per a %s\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "octet actiu incorrecte: 0x%x en comptes de 0x80\n"
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -5070,7 +5088,7 @@ msgstr ""
 "Fet\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5079,35 +5097,35 @@ msgstr ""
 "Teniu %d particions primàries actives. Això no és important per al LILO,\n"
 "però el MBR del DOS sols pot arrencar discs amb una partició activa.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "la partició %s té l'identificador %x i no està oculta\n"
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificador dolent %lx\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Aquest disc està actualment en ús.\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
-msgstr "Error fatal: no es pot trobar %s\n"
+msgstr "Error fatal: No es pot trobar %s\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Atenció: %s no és un dispositiu de blocs\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Comprovant que en aquest moment ningú estigui usant aquest disc...\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5120,28 +5138,28 @@ msgstr ""
 "swapoff en totes les particions d'intercanvi del disc.\n"
 "Useu l'etiqueta --no-reread per a suprimir aquesta comprovació.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Useu l'etiqueta --force per a obviar totes les comprovacions.\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "Correcte\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Antiga situació:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partició %d no existeix; no es pot canviar\n"
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Nova situació:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5149,35 +5167,35 @@ msgstr ""
 "No veig aquestes particions adequades - no he canviat res.\n"
 "(Si realment desitgeu fer això, useu l'opció --force).\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr "No veig això adequat - probablement hagueu de respondre No\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Esteu satisfet amb això? [ynq] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Desitgeu escriure això al disc? [ynq] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 "\n"
-"sfdisk: final prematur de l'entrada\n"
+"sfdisk: Final prematur de l'entrada\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "Sortint - no s'ha canviat res\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
-msgstr "Si us plau respongueu amb una: y,n,q\n"
+msgstr "Si us plau responeu amb una: y,n,q\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5185,7 +5203,7 @@ msgstr ""
 "S'ha escrit correctament la nova taula de particions\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5206,11 +5224,12 @@ msgstr "opció llarga buida després de l'argument -l o --long"
 
 #: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
-msgstr "intèrpret d'ordres desconegut després de l'argument -s o --shell"
+msgstr ""
+"intèrpret de comandaments desconegut després de l'argument -s o --shell"
 
 #: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
-msgstr "Useu: getopt cadena_d'opcions paràmetres\n"
+msgstr "ús: getopt cadena_d'opcions paràmetres\n"
 
 #: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
@@ -5264,7 +5283,7 @@ msgstr "  -Q, --quiet-output           No hi ha eixida normal\n"
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
 "  -s, --shell=shell            Estableix les convencions amb que es crida a\n"
-"                               l'interpret d'ordres\n"
+"                               l'interpret de comandaments\n"
 
 #: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
@@ -5310,7 +5329,7 @@ msgstr "funky TOY!\n"
 #: hwclock/cmos.c:263
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr "%s: comprovació de %s atòmic ha fallat per 1000 iteracions!"
+msgstr "%s: Comprovació de %s atòmic ha fallat per 1000 iteracions!"
 
 #: hwclock/cmos.c:587
 #, c-format
@@ -5325,7 +5344,7 @@ msgstr "Ha fallat l'obtenció del permís perque no s'ha intentat.\n"
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
-"%s no pot aconseguir l'accés al port de E/S: la crida iopl(3) ha fallat.\n"
+"%s no pot aconseguir l'accés al port de E/S: La crida iopl(3) ha fallat.\n"
 
 #: hwclock/cmos.c:600
 msgid "Probably you need root privileges.\n"
@@ -5347,7 +5366,7 @@ msgstr "local"
 #: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
-msgstr "%s: Atenció: tercera línia desconeguda al fitxer adjtime\n"
+msgstr "%s: Atenció: Tercera línia desconeguda al fitxer adjtime\n"
 
 #: hwclock/hwclock.c:305
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
@@ -5423,7 +5442,7 @@ msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
 msgstr ""
-"Els registres del rellotge del maquinari conté valores invàlids (p.e. dia 50 "
+"Els registres del rellotge del maquinari conté valors no vàlids (p.e. dia 50 "
 "del mes) o excedeixen el rang que poden usar (p.e. l'any 2095).\n"
 
 #: hwclock/hwclock.c:555
@@ -5698,7 +5717,7 @@ msgid ""
 msgstr ""
 "hwclock - Consulta i configura el rellotge de maquinari (RTC)\n"
 "\n"
-"Useu: hwclock [funció] [opcions...]\n"
+"Ús: hwclock [funció] [opcions...]\n"
 "\n"
 "Funcions:\n"
 "  --help        Mostra aquesta ajuda\n"
@@ -5810,7 +5829,7 @@ msgstr "Esperant en bucle a que canviï l'hora de KDGHWCLK\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "Falla de ioctl KDGHWCLK al llegir l'hora"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "Temps excedit durant l'espera del canvi d'hora.\n"
 
@@ -5835,62 +5854,74 @@ msgstr "No es pot obrir /dev/tty1 o /dev/vc/1"
 msgid "KDGHWCLK ioctl failed"
 msgstr "Falla de ioctl KDGHWCLK"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "Falla de open() de %s"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "La comprovació de ioctl() en %s ha fallat al llegir l'hora.\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "Esperant en bucle per a canviar l'hora des de %s\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s no té funcions d'interrupció.  "
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr ""
 "La comprovació de read() en %s ha fallat a l'esperar la senyal del rellotge"
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr ""
+"La comprovació de read() en %s ha fallat a l'esperar la senyal del rellotge"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr ""
+"La comprovació de read() en %s ha fallat a l'esperar la senyal del rellotge"
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
 "La comprovació de ioctl() en %s ha fallat al desactivar les interrupcions "
 "d'actualització"
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 "La comprovació de ioctl() en %s ha fallat inesperadament a l'activar les "
 "interrupcions d'actualització"
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "La comprovació de ioctl() en %s ha fallat a l'establir l'hora.\n"
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "La comprovació de ioctl(%s) ha finalitzat correctament.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "Error obrint %s"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5901,17 +5932,17 @@ msgstr ""
 "del dispositiu 'rtc' de Linux mitjançant el fitxer especial de dispositiu %"
 "s. Aquest fitxer no existeix en aquest sistema.\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "No es pot obrir %s"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "La comprovació de ioctl(RTC_EPOCH_READ) en %s ha fallat"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
@@ -5920,17 +5951,17 @@ msgstr ""
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "El valor de època no pot ser inferior a 1900. Heu requerit %ld\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr "establint la època a %ld amb ioctl RTC_EPOCH_SET en %s.\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
@@ -5938,7 +5969,7 @@ msgstr ""
 "El controlador de dispositiu del nucli per a %s no té el ioctl "
 "RTC_EPOCH_SET.\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "La comprovació de ioctl(RTC_EPOCH_SET) de %s ha fallat"
@@ -5978,7 +6009,7 @@ msgstr "llegint el nom d'accés\n"
 #: login-utils/agetty.c:386
 #, c-format
 msgid "%s: can't exec %s: %m"
-msgstr "%s: no pot executar %s: %m"
+msgstr "%s: No pot executar %s: %m"
 
 #: login-utils/agetty.c:406
 msgid "can't malloc initstring"
@@ -6022,7 +6053,7 @@ msgstr "/dev: chdir() ha fallat: %m"
 #: login-utils/agetty.c:653
 #, c-format
 msgid "/dev/%s: not a character device"
-msgstr "/dev/%s: no és un dispositiu de caràcter"
+msgstr "/dev/%s: No és un dispositiu de caràcter"
 
 #. ignore close(2) errors
 #: login-utils/agetty.c:660
@@ -6032,12 +6063,12 @@ msgstr "open(2)\n"
 #: login-utils/agetty.c:662
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
-msgstr "/dev/%s: no es pot obrir-lo com a entrada estàndard: %m"
+msgstr "/dev/%s: No es pot obrir-lo com a entrada estàndard: %m"
 
 #: login-utils/agetty.c:672
 #, c-format
 msgid "%s: not open for read/write"
-msgstr "%s: no obert per a lectura/escriptura"
+msgstr "%s: No obert per a lectura/escriptura"
 
 #. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
@@ -6048,7 +6079,7 @@ msgstr "dup() en curs\n"
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
-msgstr "%s: problema de dup: %m"
+msgstr "%s: Problema de dup: %m"
 
 #: login-utils/agetty.c:752
 msgid "term_io 2\n"
@@ -6065,12 +6096,12 @@ msgstr "usuaris"
 #: login-utils/agetty.c:1025
 #, c-format
 msgid "%s: read: %m"
-msgstr "%s: lectura: %m"
+msgstr "%s: Lectura: %m"
 
 #: login-utils/agetty.c:1071
 #, c-format
 msgid "%s: input overrun"
-msgstr "%s: desbordament de l'entrada"
+msgstr "%s: Desbordament de l'entrada"
 
 #: login-utils/agetty.c:1195
 #, c-format
@@ -6080,17 +6111,17 @@ msgid ""
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
-"Useu: %s [-hiLmw] [-l programa_d'accés] [-t temps_espera] [-I "
-"cadena_inicialització] [-H host_d'accés] velocitat_baudis,... línia "
+"Ús: %s [-hiLmw] [-l programa_d'accés] [-t temps_espera] [-I "
+"cadena_inicialització] [-H màquina_d'accés] velocitat_baudis,... línia "
 "[tipus_terminal]\n"
-"o be\n"
-"\t    [-hiLmw] [-l programa_d'accés] [-t temps_espera] [-I "
-"cadena_inicialització] [-H host_d'accés] línia velocitat_baudis,... "
+"o bé\n"
+"\t  [-hiLmw] [-l programa_d'accés] [-t temps_espera] [-I "
+"cadena_inicialització] [-H màquina_d'accés] línia velocitat_baudis,... "
 "[tipus_terminal]\n"
 
 #: login-utils/checktty.c:104 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
-msgstr "login: poca memòria; l'accés podria fallar\n"
+msgstr "login: Poca memòria; l'accés podria fallar\n"
 
 #: login-utils/checktty.c:105
 msgid "can't malloc for ttyclass"
@@ -6115,51 +6146,67 @@ msgstr "Accés a %s des de %s denegat per defecte.\n"
 msgid "Login on %s from %s denied.\n"
 msgstr "Accés a %s des de %s denegat.\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
-msgstr "%s: el vostre (usuari %d) no existeix.\n"
+msgstr "%s: El vostre (usuari %d) no existeix.\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr "%s: l'usuari \"%s\" no existeix.\n"
+msgstr "%s: L'usuari \"%s\" no existeix.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
-msgstr "%s: sols put modificar entrades locals; useu yp%s.\n"
+msgstr "%s: Sols put modificar entrades locals; useu yp%s.\n"
+
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+#, fuzzy
+msgid "Unknown user context"
+msgstr "error desconegut en la clau"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Canviant informació del finger per a %s.\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Error de contrasenya."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Contrasenya: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Contrasenya incorrecta."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "No s'ha canviat la informació del finger.\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr "Useu: %s [ -f nom_complet ] [ -o oficina ] "
+msgstr "Ús: %s [ -f nom_complet ] [ -o oficina ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6167,11 +6214,11 @@ msgstr ""
 "[ -p telèfon_oficina ]\n"
 "\t[ -h telèfon_particular ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6179,123 +6226,135 @@ msgstr ""
 "\n"
 "Abortada.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "el camp és massa llarg.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' no està permes.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Els caràcters de control no estan permesos.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 "*NO* s'ha canviat la informació del finger. Probeu-ho altra vegada després.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "Informació del finger modificada.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "l'assignació de memòria (malloc) ha fallat"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" no està llistat en /etc/shells.\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
-"%s: El vostre intèrpret d'ordres no està en /etc/shells; canvi de "
-"l'intèrpret d'ordres denegat\n"
+"%s: El vostre intèrpret de comandaments no està en /etc/shells; canvi de "
+"l'intèrpret de comandaments denegat\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
-msgstr "Canviant l'intèrpret d'ordres per a %s.\n"
+msgstr "Canviant l'intèrpret de comandaments per a %s.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
-msgstr "Nou intèrpret d'ordres"
+msgstr "Nou intèrpret de comandaments"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
-msgstr "L'intèrpret d'ordres no ha canviat.\n"
+msgstr "L'intèrpret de comandaments no ha canviat.\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr "L'intèrpret d'ordres *NO* ha canviat. Proveu-ho més endavant.\n"
+msgstr "L'intèrpret de comandaments *NO* ha canviat. Proveu-ho més endavant.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
-msgstr "S'ha canviat l'intèrpret d'ordres.\n"
+msgstr "S'ha canviat l'intèrpret de comandaments.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr ""
-"Useu: %s [ -s intèrpret_d'ordres ] [ --list-shells ] [ --help ] [ --"
+"Ús: %s [ -s intèrpret_de_comandaments ] [ --list-shells ] [ --help ] [ --"
 "version ]\n"
 "     [ nom_d'usuari ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
-msgstr "%s: l'intèrpret d'ordres ha de ser un nom de ruta complet.\n"
+msgstr "%s: L'intèrpret de comandaments ha de ser un nom de ruta complet.\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" no existeix.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" no és executable.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' no està permes.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Els caràcters de control no estan permesos.\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Atenció: \"%s\" no està llistat en /etc/shells\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" no està llistat en /etc/shells.\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: useu l'opció -l per a veuren la llista\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Atenció: \"%s\" no està llistat en /etc/shells.\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Useu %s -l per a veuren la llista.\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
-msgstr "No conec intèrprets d'ordres.\n"
+msgstr "No conec intèrprets de comandaments.\n"
 
 #: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
@@ -6332,7 +6391,7 @@ msgstr "no es pot llegir %s; sortint."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr "useu: last [-#] [-f fitxer] [-t tty] [-h nom_del_host] [usuari ...]\n"
+msgstr "ús: last [-#] [-f fitxer] [-t tty] [-h nom_màquina] [usuari ...]\n"
 
 #: login-utils/last.c:312
 msgid "  still logged in"
@@ -6349,11 +6408,11 @@ msgstr ""
 
 #: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
 msgid "last: malloc failure.\n"
-msgstr "last: falla del malloc.\n"
+msgstr "last: Falla del malloc.\n"
 
 #: login-utils/last.c:441
 msgid "last: gethostname"
-msgstr "last: obtindre el nom del host"
+msgstr "last: Obtindre el nom de la màquina"
 
 #: login-utils/last.c:490
 #, c-format
@@ -6367,11 +6426,11 @@ msgstr ""
 #: login-utils/login.c:254
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
-msgstr "Error FATAL: no es pot reobrir tty: %s"
+msgstr "Error FATAL: No es pot reobrir tty: %s"
 
 #: login-utils/login.c:285
 msgid "FATAL: bad tty"
-msgstr "ERROR FATAL: terminal errònia"
+msgstr "ERROR FATAL: Terminal errònia"
 
 #: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
@@ -6379,7 +6438,7 @@ msgstr "login: -h sols per al superusuari.\n"
 
 #: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
-msgstr "useu: login [-fp] [nom_usuari]\n"
+msgstr "ús: login [-fp] [nom_usuari]\n"
 
 #: login-utils/login.c:538
 #, c-format
@@ -6448,7 +6507,7 @@ msgstr "Nom d'usuari NUL en %s:%d. Avortat."
 #: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr "Nom d'usuari invàlid \"%s\" en %s:%d. Avortat."
+msgstr "Nom d'usuari no vàlid \"%s\" en %s:%d. Avortat."
 
 #: login-utils/login.c:667
 msgid "login: Out of memory\n"
@@ -6489,78 +6548,80 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Teniu masses processos en execució.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP EN %s PER %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ACCÉS DE ROOT EN %s DES DE %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ACCÉS DE ROOT EN %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "ACCCÉS EN %s PER %s DES DE %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "ACCÉS EN %s PER %s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "Teniu correu nou.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "Teniu correu.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
-msgstr "login: falla l'establiment del canvi: %s"
+msgstr "login: Falla l'establiment del canvi: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ha fallat: %m"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() ha fallat"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "No hi ha cap directori %s\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Accedint amb el directori inicial = \"/\".\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
-msgstr "login: memòria esgotada per a l'script de l'ntèrpret d'ordres.\n"
+msgstr ""
+"login: Memòria esgotada per a l'script de l'intèrpret de comandaments.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
-msgstr "login: no s'ha pogut executar l'script de l'ntèrpret d'ordres: %s.\n"
+msgstr ""
+"login: No s'ha pogut executar l'script de l'intèrpret de comandaments: %s.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
-msgstr "login: no hi ha intèrpret d'ordres: %s.\n"
+msgstr "login: No hi ha intèrpret de comandaments: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6569,62 +6630,62 @@ msgstr ""
 "\n"
 "Accés de %s: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "nom d'accés massa llarg.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "NOM massa llarg"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "els noms d'accés no poden començar per '-'.\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "masses salts de pàgina solitaris.\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "MASSES salts de pàgina"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "L'intent d'accés ha esgotat el temps d'espera després de %d segons\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Últim accés: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "des de %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "en %.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ACCÉS FALLIT DES DE %s, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ACCÉS FALLIT EN %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d FALLES EN L'ACCÉS DES DE %s, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d FALLES EN L'ACCÉS EN %s, %s"
@@ -6639,7 +6700,7 @@ msgstr "és n\n"
 
 #: login-utils/mesg.c:112
 msgid "usage: mesg [y | n]\n"
-msgstr "useu: mesg [y | n]\n"
+msgstr "ús: mesg [y | n]\n"
 
 #: login-utils/newgrp.c:68
 msgid "newgrp: Who are you?"
@@ -6663,7 +6724,7 @@ msgstr "newgrp: setuid"
 
 #: login-utils/newgrp.c:103
 msgid "No shell"
-msgstr "No hi ha intèrpret d'ordres"
+msgstr "No hi ha intèrpret de comandaments"
 
 #: login-utils/passwd.c:161
 msgid "The password must have at least 6 characters, try again.\n"
@@ -6696,7 +6757,7 @@ msgstr "Si us plau, no useu tal com el vostre nom real com a contrasenya.\n"
 
 #: login-utils/passwd.c:224
 msgid "Usage: passwd [username [password]]\n"
-msgstr "Useu: passwd [nom_usuari [contrasenya]]\n"
+msgstr "Ús: passwd [nom_usuari [contrasenya]]\n"
 
 #: login-utils/passwd.c:225
 msgid "Only root may use the one and two argument forms.\n"
@@ -6704,7 +6765,7 @@ msgstr "Sols l'usuari root pot usar les formes d'un i dos arguments.\n"
 
 #: login-utils/passwd.c:280
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Useu: passwd [-foqsvV] [usuari [contrasenya]]\n"
+msgstr "Ús: passwd [-foqsvV] [usuari [contrasenya]]\n"
 
 #: login-utils/passwd.c:301
 #, c-format
@@ -6794,7 +6855,7 @@ msgstr "Contrasenya canviada.\n"
 
 #: login-utils/shutdown.c:113
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr "Useu: shutdown [-h|-r] [-fqs] [now|hh:ss|+minuts]\n"
+msgstr "Ús: shutdown [-h|-r] [-fqs] [now|hh:ss|+minuts]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
@@ -6807,7 +6868,7 @@ msgstr "%s: Sols l'usuari root pot aturar un sistema.\n"
 
 #: login-utils/shutdown.c:256
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr "Això serà demà: Podeu esperara fins llavors?\n"
+msgstr "Això serà demà: Podeu esperar fins llavors?\n"
 
 #: login-utils/shutdown.c:307
 msgid "for maintenance; bounce, bounce"
@@ -6876,7 +6937,7 @@ msgstr "Error executant \t%s\n"
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr "URGENT: missatge de difusió des de %s:"
+msgstr "URGENT: Missatge de difusió des de %s:"
 
 #: login-utils/shutdown.c:494
 #, c-format
@@ -6942,12 +7003,14 @@ msgstr "Arrencant en mode d'un sol usuari.\n"
 
 #: login-utils/simpleinit.c:134
 msgid "exec of single user shell failed\n"
-msgstr "l'execució de l'intèrpret d'ordres en mode d'usuari únic ha fallat\n"
+msgstr ""
+"l'execució de l'intèrpret de comandaments en mode d'usuari únic ha fallat\n"
 
 #: login-utils/simpleinit.c:138
 msgid "fork of single user shell failed\n"
 msgstr ""
-"l'establiment del canvi a un sol usuari a l'intèrpret d'ordres ha fallat\n"
+"l'establiment del canvi a un sol usuari a l'intèrpret de comandaments ha "
+"fallat\n"
 
 #: login-utils/simpleinit.c:206
 msgid "error opening fifo\n"
@@ -7029,56 +7092,66 @@ msgstr "canvi (fork): %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: ERROR DOLENT"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
-msgstr "%s: el fitxer password està ocupat.\n"
+msgstr "%s: El fitxer password està ocupat.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
-msgstr "%s: el fitxer group està ocupat.\n"
+msgstr "%s: El fitxer group està ocupat.\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
-msgstr "%s: el fitxer %s està ocupat (presenta %s).\n"
+msgstr "%s: El fitxer %s està ocupat (presenta %s).\n"
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr "%s: no es pot enllaçar %s: %s\n"
+msgstr "%s: No es pot enllaçar %s: %s\n"
+
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "No es pot obtindre el temps d'espera per a %s: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "No es pot obtindre el temps d'espera per a %s: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
-"%s: no es pot desbloquejar %s: %s (els vostres canvis encara estan en %s)\n"
+"%s: No es pot desbloquejar %s: %s (els vostres canvis encara estan en %s)\n"
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: No es pot establir el canvi\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s no s'ha modificat\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
-msgstr "%s: no s'ha fet cap canvi\n"
+msgstr "%s: No s'ha fet cap canvi\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr "Esteu usant grups shadow en aquest sistema.\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr "Esteu usant contrasenyes shadow en aquest sistema.\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "Desitgeu editar %s ara? [s/n] "
@@ -7086,12 +7159,12 @@ msgstr "Desitgeu editar %s ara? [s/n] "
 #: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr "useu: %s [fitxer]\n"
+msgstr "ús: %s [fitxer]\n"
 
 #: login-utils/wall.c:159
 #, c-format
 msgid "%s: can't open temporary file.\n"
-msgstr "%s: no es pot obrir el fitxer temporal.\n"
+msgstr "%s: No es pot obrir el fitxer temporal.\n"
 
 #: login-utils/wall.c:186
 #, c-format
@@ -7101,30 +7174,30 @@ msgstr "Missatge de difusió general des de %s@%s"
 #: login-utils/wall.c:204
 #, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr "%s: no es pot llegir %s; usant l'entrada estàndard.\n"
+msgstr "%s: No es pot llegir %s; usant l'entrada estàndard.\n"
 
 #: login-utils/wall.c:209
 #, c-format
 msgid "%s: can't read %s.\n"
-msgstr "%s: no es pot llegir %s.\n"
+msgstr "%s: No es pot llegir %s.\n"
 
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr "%s: no es pot executar stat al fitxer temporal.\n"
+msgstr "%s: No es pot executar stat al fitxer temporal.\n"
 
 #: login-utils/wall.c:241
 #, c-format
 msgid "%s: can't read temporary file.\n"
-msgstr "%s: no es pot llegir el fitxer temporal.\n"
+msgstr "%s: No es pot llegir el fitxer temporal.\n"
 
 #: misc-utils/cal.c:262
 msgid "illegal month value: use 1-12"
-msgstr "valor de més no permes: usar 1-12"
+msgstr "valor de més no permes: Usar 1-12"
 
 #: misc-utils/cal.c:266
 msgid "illegal year value: use 1-9999"
-msgstr "valor de més no permes: usar 1-9999"
+msgstr "valor de més no permes: Usar 1-9999"
 
 #. %s is the month name, %d the year number.
 #. * you can change the order and/or add something here; eg for
@@ -7138,12 +7211,12 @@ msgstr "%s de %d"
 
 #: misc-utils/cal.c:676
 msgid "usage: cal [-13smjyV] [[month] year]\n"
-msgstr "useu: cal [-13smjyV] [[mes] any]\n"
+msgstr "ús: cal [-13smjyV] [[mes] any]\n"
 
 #: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr "useu: %s [+format] [dia mes any]\n"
+msgstr "ús: %s [+format] [dia mes any]\n"
 
 #. handle St. Tib's Day
 #: misc-utils/ddate.c:252
@@ -7153,22 +7226,22 @@ msgstr "Dia de Sant Tibb"
 #: misc-utils/kill.c:206
 #, c-format
 msgid "%s: unknown signal %s\n"
-msgstr "%s: senyal desconeguda %s\n"
+msgstr "%s: Senyal desconeguda %s\n"
 
 #: misc-utils/kill.c:269
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr "%s: no es pot trobar el proces \"%s\"\n"
+msgstr "%s: No es pot trobar el proces \"%s\"\n"
 
 #: misc-utils/kill.c:313
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
-msgstr "%s: senyal desconeguda %s; senyals vàlides:\n"
+msgstr "%s: Senyal desconeguda %s; senyals vàlides:\n"
 
 #: misc-utils/kill.c:353
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr "useu: %s [ -s senyal | -p ] [ -a ] pid ...\n"
+msgstr "ús: %s [ -s senyal | -p ] [ -a ] pid ...\n"
 
 #: misc-utils/kill.c:354
 #, c-format
@@ -7183,23 +7256,23 @@ msgstr "logger: %s: %s.\n"
 #: misc-utils/logger.c:247
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
-msgstr "logger: nom facilitat desconegut: %s.\n"
+msgstr "logger: Nom facilitat desconegut: %s.\n"
 
 #: misc-utils/logger.c:259
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
-msgstr "logger: nom amb prioritat desconeguda: %s.\n"
+msgstr "logger: Nom amb prioritat desconeguda: %s.\n"
 
 #: misc-utils/logger.c:286
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
-"useu: logger [-is] [-f fitxer] [-p pri] [-t etiqueta] [-u connector] "
+"ús: logger [-is] [-f fitxer] [-p pri] [-t etiqueta] [-u connector] "
 "[ missatge ... ]\n"
 
 #: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr "useu: look [-dfa] [-t caràcter] cadena [fitxer]\n"
+msgstr "ús: look [-dfa] [-t caràcter] cadena [fitxer]\n"
 
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
@@ -7214,28 +7287,28 @@ msgstr "S'han obtingut %d octets des de %s\n"
 #: misc-utils/namei.c:102
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
-msgstr "namei: no es pot obtindre l'actual directori - %s\n"
+msgstr "namei: No es pot obtindre l'actual directori - %s\n"
 
 #: misc-utils/namei.c:115
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
-msgstr "namei: no es pot executar chdir per a %s - %s (%d)\n"
+msgstr "namei: No es pot executar chdir per a %s - %s (%d)\n"
 
 #: misc-utils/namei.c:125
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr "useu: namei [-mx] nom_ruta [nom_ruta ...]\n"
+msgstr "ús: namei [-mx] nom_ruta [nom_ruta ...]\n"
 
 #: misc-utils/namei.c:150
 msgid "namei: could not chdir to root!\n"
-msgstr "namei: no es pot executar chdir al directori arrel\n"
+msgstr "namei: No es pot executar chdir al directori arrel\n"
 
 #: misc-utils/namei.c:157
 msgid "namei: could not stat root!\n"
-msgstr "namei: no es pot executar stat al directori arrel\n"
+msgstr "namei: No es pot executar stat al directori arrel\n"
 
 #: misc-utils/namei.c:171
 msgid "namei: buf overflow\n"
-msgstr "namei: desbordament de la memòria intermèdia\n"
+msgstr "namei: Desbordament de la memòria intermèdia\n"
 
 #: misc-utils/namei.c:217
 #, c-format
@@ -7254,24 +7327,24 @@ msgstr "  *** EXCEDIT EL LÍMIT D'ENLLAÇOS SIMBÒLICS DE UNIX ***\n"
 #: misc-utils/namei.c:293
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
-msgstr "namei: tipus de fitxer desconegut 0%06o en el fitxer %s\n"
+msgstr "namei: Tipus de fitxer desconegut 0%06o en el fitxer %s\n"
 
 #: misc-utils/rename.c:38
 #, c-format
 msgid "%s: out of memory\n"
-msgstr "%s: memòria esgotada\n"
+msgstr "%s: Memòria esgotada\n"
 
 #: misc-utils/rename.c:56
 #, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr "%s: falla al reanomenar de %s a %s: %s\n"
+msgstr "%s: Falla al reanomenar de %s a %s: %s\n"
 
 #: misc-utils/rename.c:86
 #, c-format
 msgid "call: %s from to files...\n"
 msgstr "crida: %s des dels fitxers...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7282,21 +7355,21 @@ msgstr ""
 "Useu `%s [opcions] %s' si realment desitgeu usar-lo.\n"
 "Script no executat.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr "useu: script [-a] [-f] [-q] [-t] [fitxer]\n"
+msgstr "ús: script [-a] [-f] [-q] [-t] [fitxer]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script executat, el fitxer és %s\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "Script executat sobre (%s)"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7305,16 +7378,16 @@ msgstr ""
 "\n"
 "Script finalitzat (%s)"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script finalitzat, el fitxer és %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "openpty ha fallat\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "No queden pty\n"
 
@@ -7519,11 +7592,11 @@ msgstr "whereis [ -sbmu ] [ -SBM directori ... -f ] nom...\n"
 
 #: misc-utils/write.c:99
 msgid "write: can't find your tty's name\n"
-msgstr "write: no es pot trobar el nom de la vostra tty\n"
+msgstr "write: No es pot trobar el nom de la vostra tty\n"
 
 #: misc-utils/write.c:110
 msgid "write: you have write permission turned off.\n"
-msgstr "write: teniu el permís d'escriptura desactivat.\n"
+msgstr "write: Teniu el permís d'escriptura desactivat.\n"
 
 #: misc-utils/write.c:131
 #, c-format
@@ -7537,7 +7610,7 @@ msgstr "write: %s té els missatges deshabilitats en %s\n"
 
 #: misc-utils/write.c:146
 msgid "usage: write user [tty]\n"
-msgstr "useu: write usuari [tty]\n"
+msgstr "ús: write usuari [tty]\n"
 
 #: misc-utils/write.c:234
 #, c-format
@@ -7567,58 +7640,58 @@ msgstr "Missatge des de %s@%s el %s a les %s ..."
 #: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
-msgstr "advertència: error al llegir %s: %s"
+msgstr "advertència: Error al llegir %s: %s"
 
 #: mount/fstab.c:142 mount/fstab.c:167
 #, c-format
 msgid "warning: can't open %s: %s"
-msgstr "advertència: no es pot obrir %s: %s"
+msgstr "advertència: No es pot obrir %s: %s"
 
 #: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
-msgstr "mount: no es pot obrir %s; en el seu lloc s'usarà %s\n"
+msgstr "mount: No es pot obrir %s; en el seu lloc s'usarà %s\n"
 
 #. linktargetfile does not exist (as a file)
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "no es pot crear el fitxer de blocat %s: %s (useu l'etiqueta -n per a "
 "modificar aquest valor)"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "no es pot enllaçar el fitxer de blocat %s: %s (useu l'etiqueta -n per a "
 "modificar aquest valor)"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "no es pot obrir el fitxer de blocat %s: %s (useu l'etiqueta -n per a "
 "modificar aquest valor)"
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "No es pot blocar al fitxer de blocat %s: %s\n"
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "no es pot blocar al fitxer de blocat %s: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "temps d'espera excedit"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7627,413 +7700,350 @@ msgstr ""
 "No es pot crear l'enllaç %s\n"
 "Potser hi hagi un fitxer de blocat obsolet?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "no es pot obrir %s (%s) - mtab no actualitzat"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "error escrivint %s: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "error al canviar el mode de %s: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "no es pot reanomenar %s per %s: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
-msgstr "loop: no es pot obrir el dispositiu %s: %s\n"
+msgstr "loop: No es pot obrir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: no es pot obtindre informació sobre el dispositiu %s: %s\n"
-
-#: mount/lomount.c:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) desplaçament %d, %s encriptació\n"
+msgid ", offset %lld"
+msgstr ", desplaçament %lld"
 
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: no es pot trobar cap dispositiu /dev/loop#"
-
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
-msgstr ""
-"mount: No es pot trobar cap dispositiu loop.\n"
-"       Podria ser que /dev/loop# tingui un número major incorrecte?"
-
-#: mount/lomount.c:253
+#: mount/lomount.c:104
 #, 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: No es pot trobar cap dispositiu loop, i, segons %s,\n"
-"       aquest nucli no el reconeix.\n"
-"       (Si es això, recompileu o feu `insmod loop.o')."
+msgid ", sizelimit %lld"
+msgstr ", mida límit %lld"
 
-#: mount/lomount.c:259
-msgid ""
-"mount: Could not find any loop device. Maybe this kernel does not know\n"
-"       about the loop device (then recompile or `insmod loop.o'), or\n"
-"       maybe /dev/loop# has the wrong major number?"
-msgstr ""
-"mount: No es pot trobar cap dispositiu loop. Potser aquest nucli no\n"
-"       el reconegui (si es això, recompileu o feu `insmod loop.o')\n"
-"       o també podria ser que /dev/loop# tingui un número major incorrecte."
-
-#: mount/lomount.c:263
-msgid "mount: could not find any free loop device"
-msgstr "mount: no es pot trobar cap dispositiu loop lliure"
-
-#: mount/lomount.c:359
-#, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "no es pot obrir %s per a lectura\n"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Reescriviu la nova contrasenya: "
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", xifrat %s (tipus %d)"
 
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "l'obertura del directori ha fallat.\n"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ", desplaçament %d"
 
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr ""
-"La contrasenya ha de tindre com a mínim 6 caràcters, probeu-ho altra "
-"vegada.\n"
+#: mount/lomount.c:129
+#, c-format
+msgid ", encryption type %d\n"
+msgstr ", tipus de xifrat %d\n"
 
-#: mount/lomount.c:472
-#, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "No es pot assignar més memòria\n"
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: No es pot obtindre informació sobre el dispositiu %s: %s\n"
 
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: No es pot trobar cap dispositiu /dev/loop#"
 
-#: mount/lomount.c:490
-#, c-format
+#: mount/lomount.c:192
 msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
+"mount: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
+"mount: No es pot trobar cap dispositiu loop. Podria ser que el nucli no el\n"
+"       reconeguès?. (Si es això, recompileu o feu `modprobe loop')."
 
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
+#: mount/lomount.c:197
+msgid "mount: could not find any free loop device"
+msgstr "mount: No es pot trobar cap dispositiu loop lliure"
 
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "No es pot blocar en memòria, sortint.\n"
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Inicialització (fins a 16 dígits hexadecimals): "
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): Correcte\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "Dígit no hexadecimal '%c'.\n"
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: No es pot suprimir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:764
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
-msgstr "No conec com obtindre la clau per al sistema d'encriptació %d\n"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): Correcte\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): correcte\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr ""
+"Aquest mount s'ha compilat sense suport loop. Si us plau, recompileu-lo.\n"
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "no hi ha prou memòria"
-
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "no es pot obrir %s per a lectura\n"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"ús:\n"
+"  %s dispositiu_loop                                 # dona informació\n"
+"  %s -d dispositiu_loop                              # elimina\n"
+"  %s [ -e xifrat ] [ -o desplaça. ] disp_loop fitxer # configura\n"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "no hi ha prou memòria"
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
+"Quan es va compilar el suport loop no estava disponible. Si us plau, "
+"recompileu.\n"
 
 #: mount/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
-msgstr "[mntent]: advertència: no hi ha cap nova línia al final de %s\n"
+msgstr "[mntent]: Atenció: No hi ha cap nova línia al final de %s\n"
 
 #: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
-msgstr "[mntent]: la línia %d de %s és incorrecta%s\n"
+msgstr "[mntent]: La línia %d de %s és incorrecta%s\n"
 
 #: mount/mntent.c:222
 msgid "; rest of file ignored"
 msgstr "; la resta del fitxer s'ignorarà"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr "mount: segons mtab, %s ja està muntat en %s"
+msgstr "mount: Segons mtab, %s ja està muntat en %s"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
-msgstr "mount: segons mtab, %s està muntat en %s"
+msgstr "mount: Segons mtab, %s està muntat en %s"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
-msgstr "mount: no es pot obrir %s per a escriptura: %s"
+msgstr "mount: No es pot obrir %s per a escriptura: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
-msgstr "mount: error escrivint %s: %s"
+msgstr "mount: Error escrivint %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
-msgstr "mount: error al canviar el mode de %s: %s"
+msgstr "mount: Error al canviar el mode de %s: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s sembla espai d'intercanvi - no muntat"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "el muntatge ha fallat"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr "mount: sols l'usuari root pot muntar %s en %s"
+msgstr "mount: Sols l'usuari root pot muntar %s en %s"
 
 #: mount/mount.c:584
 msgid "mount: loop device specified twice"
-msgstr "mount: el dispositiu loop està especificat dues vegades"
+msgstr "mount: El dispositiu loop està especificat dues vegades"
 
 #: mount/mount.c:589
 msgid "mount: type specified twice"
-msgstr "mount: el tipus està especificat dues vegades"
+msgstr "mount: El tipus està especificat dues vegades"
 
 #: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
-msgstr "mount: saltant-se la configuració d'un dispositiu loop\n"
+msgstr "mount: Saltant-se la configuració d'un dispositiu loop\n"
 
 #: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
-msgstr "mount: s'usarà el dispositiu loop %s\n"
+msgstr "mount: S'usarà el dispositiu loop %s\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
-msgstr "mount: falla al configurar el dispositiu loop\n"
+msgstr "mount: Falla al configurar el dispositiu loop\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
-msgstr "mount: configuració correcta del dispositiu loop\n"
+msgstr "mount: Configuració correcta del dispositiu loop\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
-msgstr "mount: no es pot obrir %s: %s"
+msgstr "mount: No es pot obrir %s: %s"
+
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: L'argument per a -p o --pass-fd hauria de ser un número"
 
-#: mount/mount.c:678
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
-msgstr "mount: no es pot obrir %s per a establir-ne la velocitat"
+msgstr "mount: No es pot obrir %s per a establir-ne la velocitat"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
-msgstr "mount : no es pot establir la velocitat de: %s"
+msgstr "mount: No es pot establir la velocitat de: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
-msgstr "mount: no es pot establir el canvi: %s"
+msgstr "mount: No es pot establir el canvi: %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr ""
-"mount: aquesta versió ha estat compilada sense suport per al tipus `nfs'"
+"mount: Aquesta versió ha estat compilada sense suport per al tipus `nfs'"
 
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
-msgstr "mount : falla al muntar la versió 4 de nfs, escolliu la 3...\n"
+msgstr "mount : Falla al muntar la versió 4 de nfs, escolliu la 3...\n"
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
-"mount: no es pot determinar el tipus del sistema de fitxers i no n'heu "
+"mount: No es pot determinar el tipus del sistema de fitxers i no n'heu "
 "especificat cap"
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
-msgstr "mount: haureu d'especificar el tipus del sistema de fitxers"
+msgstr "mount: Haureu d'especificar el tipus del sistema de fitxers"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
-msgstr "mount: el muntatge ha fallat"
+msgstr "mount: El muntatge ha fallat"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
-msgstr "mount: el punt de muntatge %s no és un directori"
+msgstr "mount: El punt de muntatge %s no és un directori"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
-msgstr "mount: permís denegat"
+msgstr "mount: Permís denegat"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
-msgstr "mount: haureu de ser un superusuari per a usar mount"
+msgstr "mount: Haureu de ser un superusuari per a usar mount"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s està ocupat"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc ja està muntat"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ja està muntat o %s està ocupat"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
-msgstr "mount: el punt de muntatge %s no existeix"
+msgstr "mount: El punt de muntatge %s no existeix"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr "mount: el punt de muntatge %s és un enllaç simbòlic sense destí"
+msgstr "mount: El punt de muntatge %s és un enllaç simbòlic sense destí"
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
-msgstr "mount: el dispositiu especial %s no existeix"
+msgstr "mount: El dispositiu especial %s no existeix"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
-"mount: el dispositiu especial %s no existeix\n"
+"mount: El dispositiu especial %s no existeix\n"
 "       (una ruta prefixada no és un directori)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s encara no està muntat o una opció és incorrecta"
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
-"mount: tipus del sistema de fitxers incorrecte, opció incorrecta,\n"
+"mount: Tipus del sistema de fitxers incorrecte, opció incorrecta,\n"
 "       superbloc incorrecte en %s o masses sistemes de fitxers muntats"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "taula de dispositius muntats completa"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
-msgstr "mount: %s: no es pot llegir el superbloc"
+msgstr "mount: %s: No es pot llegir el superbloc"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
-msgstr "umount: %s: dispositiu desconegut"
+msgstr "umount: %s: Dispositiu desconegut"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
-msgstr "mount: el tipus del sistema de fitxers %s no està suportat pel nucli"
+msgstr "mount: El tipus del sistema de fitxers %s no està suportat pel nucli"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
-msgstr "mount: probablement volíeu referir-vos a %s"
+msgstr "mount: Probablement volíeu referir-vos a %s"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
-msgstr "mount: potser volíeu referir-vos a iso9660 ?"
+msgstr "mount: Potser volíeu referir-vos a iso9660 ?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -8041,116 +8051,88 @@ msgstr ""
 "fitxers %s no està suportat"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s no és un dispositiu de blocs, i stat falla?"
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
-"mount: el nucli no reconeix %s com a un dispositiu de blocs\n"
+"mount: El nucli no reconeix %s com a un dispositiu de blocs\n"
 "       (potser fent `insmod controlador'?)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s no és un dispositiu de blocs (proveu amb `-o loop')"
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s no és un dispositiu de blocs"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s no és un dispositiu de blocs vàlid"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "dispositiu de blocs "
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr "mount : no es pot muntar %s%s com a sols lectura"
+msgstr "mount : No es pot muntar %s%s com a sols lectura"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount : %s%s està protegit contra escriptura però se li ha donat l'etiqueta "
 "explicita `-w'"
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 "mount: %s%s està protegit contra escriptura; es muntarà en sols lectura"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr "mount: l'etiqueta %s apareix en %s i %s\n"
-
-#: mount/mount.c:1124
-#, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "mount: %s duplicada; no es muntarà"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: muntant %s per %s\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "etiqueta"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: no troba aquesta partició"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
-"mount: no s'ha especificat cap tipus; s'assumeix nfs per als dos punts\n"
+"mount: No s'ha especificat cap tipus; s'assumeix nfs per als dos punts\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
-"mount: no s'ha especificat cap tipus; s'assumeix smbfs per al prefix //\n"
+"mount: No s'ha especificat cap tipus - s'assumeix smbfs per al prefix //\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
-msgstr "mount: executant en segon plà \"%s\"\n"
+msgstr "mount: Executant en segon plà \"%s\"\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
-msgstr "mount: abandonant \"%s\"\n"
+msgstr "mount: Abandonant \"%s\"\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ja està muntat en %s\n"
 
-#: mount/mount.c:1386
-#, fuzzy
+#: mount/mount.c:1362
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8171,128 +8153,127 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
-"Useu: mount -V                 : mostra la versió\n"
-"      mount -h                 : mostra aquesta ajuda\n"
-"      mount                    : llista els sistemes de fitxers muntats\n"
-"      mount -l                 : ídem, incloguen les etiquetes de volumen\n"
+"Ús: mount -V                 : mostra la versió\n"
+"    mount -h                 : mostra aquesta ajuda\n"
+"    mount                    : llista els sistemes de fitxers muntats\n"
+"    mount -l                 : ídem, incloguen les etiquetes de volumen\n"
 "Fins aquí la part informativa. Seguim amb el muntatge.\n"
 "El comandament és `mount [-t tipus_sis._fitx.] alguna_cosa lloc'.\n"
 "Els detalls en /etc/fstab es poden ometre.\n"
-"      mount -a [-t|-O]         : munta tot l'indicat en /etc/fstab\n"
-"      mount dispositiu         : munta el dispositiu en el lloc conegut\n"
-"      mount directori          : munta el dispositiu conegut aquí\n"
-"      mount -t tipus disp dir  : comandament mount ordinari\n"
+"    mount -a [-t|-O]         : munta tot l'indicat en /etc/fstab\n"
+"    mount dispositiu         : munta el dispositiu en el lloc conegut\n"
+"    mount directori          : munta el dispositiu conegut aquí\n"
+"    mount -t tipus disp dir  : comandament mount ordinari\n"
 "Tingueu en compte que no muntareu realment un dispositiu, sinó més\n"
 "aviat el seu sistema de fitxers (el tipus donat). També es pot muntar\n"
 "un arbre de directoris ja visible en un altre lloc\n"
-"      mount --bind dir_antic dir_nou\n"
+"    mount --bind dir_antic dir_nou\n"
 "o moure un subarbre:\n"
-"      mount --move dir_antic dir_nou\n"
+"    mount --move dir_antic dir_nou\n"
 "Es pot donar un dispositiu mitjançant el nom, posem-hi /dev/hda1 o\n"
 "/dev/cdrom o mitjançant l'etiqueta, usant -L etiqueta o mitjançant uuid,\n"
 "usant -U uuid. D'altres opcions: [-nfFrsvw] [-o opcions].\n"
 "Per a més detalls, escriviu man 8 mount.\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
-msgstr "mount: sols l'usuari root pot fer això"
+msgstr "mount: Sols l'usuari root pot fer això"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr "mount: no s'ha trobat %s; s'està creant...\n"
+msgstr "mount: No s'ha trobat %s; s'està creant...\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr "mount: l'etiqueta %s apareix en %s i %s; no s'ha muntat\n"
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: No troba aquesta partició"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
-msgstr "mount: muntant %s\n"
+msgstr "mount: Muntant %s\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr "no s'ha muntat res"
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
-msgstr "mount: no es pot trobar %s en %s"
+msgstr "mount: No es pot trobar %s en %s"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
-msgstr "mount: no es pot trobar %s en %s o %s"
+msgstr "mount: No es pot trobar %s en %s o %s"
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
-"mount : impossible obrir %s, donat que la conversió UUID i LABEL no s'ha "
+"mount : No es pot obrir %s, donat que la conversió UUID i LABEL no s'ha "
 "fet.\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: UUID incorrecte"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
-msgstr "mount: error a l'intentar endevinar el tipus del sistema de fitxers\n"
+msgstr "mount: Error a l'intentar endevinar el tipus del sistema de fitxers\n"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr "mount: no heu especificat un tipus de sistema de fitxers per a %s\n"
+msgstr "mount: No heu especificat un tipus de sistema de fitxers per a %s\n"
 
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Es provarà amb tots els tipus indicats en %s o %s\n"
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr "       i sembla que això és espai d'intercanvi\n"
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Provaré amb el tipus %s\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "Provant amb %s\n"
 
 #: mount/nfsmount.c:237
 msgid "mount: excessively long host:dir argument\n"
-msgstr "mount: argument excessivament llarg host:dir\n"
+msgstr "mount: Argument excessivament llarg màquina:dir\n"
 
 #: mount/nfsmount.c:251
 msgid "mount: warning: multiple hostnames not supported\n"
-msgstr "mount: advertència: múltiples noms de host no suportats\n"
+msgstr "mount: Atenció: Múltiples noms de màquina no suportats\n"
 
 #: mount/nfsmount.c:256
 msgid "mount: directory to mount not in host:dir format\n"
-msgstr "mount: el directori a muntar no té el format host:dir\n"
+msgstr "mount: El directori a muntar no té el format màquina:dir\n"
 
 #: mount/nfsmount.c:267 mount/nfsmount.c:522
 #, c-format
 msgid "mount: can't get address for %s\n"
-msgstr "mount: no es pot obtindre l'adreça per a %s\n"
+msgstr "mount: No es pot obtindre l'adreça per a %s\n"
 
 #: mount/nfsmount.c:273
 msgid "mount: got bad hp->h_length\n"
-msgstr "mount: valor incorrecte per a hp->h_length\n"
+msgstr "mount: Valor incorrecte per a hp->h_length\n"
 
 #: mount/nfsmount.c:290
 msgid "mount: excessively long option argument\n"
-msgstr "mount: argument d'opció excessivament llarg\n"
+msgstr "mount: Argument d'opció excessivament llarg\n"
 
 #: mount/nfsmount.c:382
 msgid "Warning: Unrecognized proto= option.\n"
@@ -8309,7 +8290,7 @@ msgstr "paràmetre de muntatge de nfs desconegut: %s=%d\n"
 
 #: mount/nfsmount.c:427
 msgid "Warning: option nolock is not supported.\n"
-msgstr "Atenció: l'opció nolock no està suportada.\n"
+msgstr "Atenció: L'opció nolock no està suportada.\n"
 
 #: mount/nfsmount.c:432
 #, c-format
@@ -8318,7 +8299,7 @@ msgstr "Opció de muntatge de nfs desconeguda: %s%s\n"
 
 #: mount/nfsmount.c:528
 msgid "mount: got bad hp->h_length?\n"
-msgstr "mount: valor incorrecte per a hp->h_length?\n"
+msgstr "mount: Valor incorrecte per a hp->h_length?\n"
 
 #: mount/nfsmount.c:716
 msgid "NFS over TCP is not supported.\n"
@@ -8358,7 +8339,7 @@ msgstr "valor de retorn de nfs status desconegut: %d"
 msgid "bug in xstrndup call"
 msgstr "error en la crida xstrndup"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8366,258 +8347,191 @@ msgid ""
 "       %s [-v] [-p priority] special ...\n"
 "       %s [-s]\n"
 msgstr ""
-"useu:   %s [-hV]\n"
-"        %s -a [-e] [-v]\n"
-"        %s [-v] [-p prioritat] especial ...\n"
-"        %s [-s]\n"
+"ús:   %s [-hV]\n"
+"      %s -a [-e] [-v]\n"
+"      %s [-v] [-p prioritat] especial ...\n"
+"      %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-v]\n"
 "       %s [-v] special ...\n"
 msgstr ""
-"useu:  %s [-hV]\n"
-"       %s -a [-v]\n"
-"       %s [-v] especial ...\n"
+"ús:  %s [-hV]\n"
+"     %s -a [-v]\n"
+"     %s [-v] especial ...\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "memòria esgotada"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s en %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
-msgstr "swapon: no es pot executar stat per a %s: %s\n"
+msgstr "swapon: No es pot executar stat per a %s: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
-"swapon: atenció: %s teniu els permisos %04o que no son segurs, es "
+"swapon: Atenció: %s teniu els permisos %04o que no son segurs, es "
 "suggereixen %04o\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: Saltant-se el fitxer %s - sembla que està a troços.\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr "No és el superusuari.\n"
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s: dispositiu de blocs no vàlid"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "Tipus d'encriptació no suportada %s\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: s'usarà el dispositiu loop %s\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Aquesta partició ja està en ús"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "No es pot rebobinar el dispositiu d'intercanvi"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "no es pot obrir /dev/urandom"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "No es poden escriure els ínodes"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "l'establiment del canvi ha fallat\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Canviant la contrasenya per a %s\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
-msgstr "%s: no es pot obrir %s: %s\n"
+msgstr "%s: No es pot obrir %s: %s\n"
 
 #: mount/umount.c:77
 msgid "umount: compiled without support for -f\n"
-msgstr "umount: està compilat sense suporte per a -f\n"
+msgstr "umount: Està compilat sense suporte per a -f\n"
 
 #: mount/umount.c:150
 #, c-format
 msgid "host: %s, directory: %s\n"
-msgstr "host: %s, directori: %s\n"
+msgstr "màquina: %s, directori: %s\n"
 
 #: mount/umount.c:170
 #, c-format
 msgid "umount: can't get address for %s\n"
-msgstr "umount: no es pot obtindre l'adreça per a %s\n"
+msgstr "umount: No es pot obtindre l'adreça per a %s\n"
 
 #: mount/umount.c:175
 msgid "umount: got bad hostp->h_length\n"
-msgstr "umount: valor incorrecte per a hostp->h_length\n"
+msgstr "umount: Valor incorrecte per a hostp->h_length\n"
 
 #: mount/umount.c:223
 #, c-format
 msgid "umount: %s: invalid block device"
-msgstr "umount: %s: dispositiu de blocs no vàlid"
+msgstr "umount: %s: Dispositiu de blocs no vàlid"
 
 #: mount/umount.c:225
 #, c-format
 msgid "umount: %s: not mounted"
-msgstr "umount: %s: no està muntat"
+msgstr "umount: %s: No està muntat"
 
 #: mount/umount.c:227
 #, c-format
 msgid "umount: %s: can't write superblock"
-msgstr "umount: %s: no es pot escriure el superbloc"
+msgstr "umount: %s: No es pot escriure el superbloc"
 
 #. Let us hope fstab has a line "proc /proc ..."
 #. and not "none /proc ..."
 #: mount/umount.c:231
 #, c-format
 msgid "umount: %s: device is busy"
-msgstr "umount: %s: dispositiu ocupat"
+msgstr "umount: %s: Dispositiu ocupat"
 
 #: mount/umount.c:233
 #, c-format
 msgid "umount: %s: not found"
-msgstr "umount: %s: no s'ha trobat"
+msgstr "umount: %s: No s'ha trobat"
 
 #: mount/umount.c:235
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr "umount: %s: haureu de ser superusuari per a usar umount"
+msgstr "umount: %s: Haureu de ser superusuari per a usar umount"
 
 #: mount/umount.c:237
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
-msgstr "umount: %s: dispositius de blocs no permesos en el sistema de fitxers"
+msgstr "umount: %s: Dispositius de blocs no permesos en el sistema de fitxers"
 
 #: mount/umount.c:239
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existeix, s'està provant amb umount...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "no es pot executar umount en %s - es provarà amb %s\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ocupat - tornat a muntar en sols lectura\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
-msgstr "umount: no es pot tornar a muntar %s en sols lectura\n"
+msgstr "umount: No es pot tornar a muntar %s en sols lectura\n"
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmuntat\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
-"umount: no es pot trobar la llista dels sistemes de fitxers per a desmuntar"
+"umount: No es pot trobar la llista dels sistemes de fitxers per a desmuntar"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
-"Useu:   umount [-hV]\n"
-"        umount -a [-f] [-r] [-n] [-v] [-t  tipus_sist._fitx._virtuals] [-O "
+"Ús: umount [-hV]\n"
+"    umount -a [-f] [-r] [-n] [-v] [-t  tipus_sist._fitx._virtuals] [-O "
 "opcions]\n"
-"        umount [-f] [-r] [-n] [-v] especial | node...\n"
+"    umount [-f] [-r] [-n] [-v] especial | node...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "S'intenta desmuntar %s\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "No es pot trobar a %s en mtab\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no està muntat (segons mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr "umount: sembla que %s ha estat muntat diverses vegades"
+msgstr "umount: Sembla que %s ha estat muntat diverses vegades"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s no està en el fstab (i no sou el root)"
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
-msgstr "umount: el muntatge de %s no concorda amb el fstab"
+msgstr "umount: El muntatge de %s no concorda amb el fstab"
 
-#: mount/umount.c:602
-#, c-format
-msgid "umount: only root can unmount %s from %s"
-msgstr "umount: sols el root pot desmuntar %s des de %s"
+#: mount/umount.c:616
+#, fuzzy, c-format
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: Sols el root pot desmuntar %s des de %s"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
-msgstr "umount: sols el root pot fer això"
+msgstr "umount: Sols el root pot fer això"
 
 #: sys-utils/ctrlaltdel.c:27
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -8626,7 +8540,7 @@ msgstr ""
 
 #: sys-utils/ctrlaltdel.c:42
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr "Useu: ctrlaltdel maquin.|progr.\n"
+msgstr "Ús: ctrlaltdel maquin.|progr.\n"
 
 #: sys-utils/cytune.c:120
 #, c-format
@@ -8652,27 +8566,27 @@ msgstr ""
 #: sys-utils/cytune.c:195
 #, c-format
 msgid "Invalid interval value: %s\n"
-msgstr "Valor d'interval invàlid: %s\n"
+msgstr "Valor d'interval no vàlid: %s\n"
 
 #: sys-utils/cytune.c:203
 #, c-format
 msgid "Invalid set value: %s\n"
-msgstr "Valor establert invàlid: %s\n"
+msgstr "Valor establert no vàlid: %s\n"
 
 #: sys-utils/cytune.c:211
 #, c-format
 msgid "Invalid default value: %s\n"
-msgstr "Valor per defecte invàlid: %s\n"
+msgstr "Valor per defecte no vàlid: %s\n"
 
 #: sys-utils/cytune.c:219
 #, c-format
 msgid "Invalid set time value: %s\n"
-msgstr "Valor de l'hora establerta invàlid: %s\n"
+msgstr "Valor de l'hora establerta no vàlid: %s\n"
 
 #: sys-utils/cytune.c:227
 #, c-format
 msgid "Invalid default time value: %s\n"
-msgstr "Valor de l'hora per defecte invàlid: %s\n"
+msgstr "Valor de l'hora per defecte no vàlid: %s\n"
 
 #: sys-utils/cytune.c:244
 #, c-format
@@ -8680,8 +8594,8 @@ msgid ""
 "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
 "[-g|-G] file [file...]\n"
 msgstr ""
-"Useu: %s [-q [-i interval]] ([-s valor]|[-S valor]) ([-t valor]|[-T valor]) "
-"[-g|-G] fitxer [fitxer...]\n"
+"Ús: %s [-q [-i interval]] ([-s valor]|[-S valor]) ([-t valor]|[-T valor]) [-"
+"g|-G] fitxer [fitxer...]\n"
 
 #: sys-utils/cytune.c:256 sys-utils/cytune.c:275 sys-utils/cytune.c:295
 #: sys-utils/cytune.c:345
@@ -8758,15 +8672,15 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f enters/seg.; %f rebut (caràcters/seg.)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr "Useu: %s [-c] [-n nivell] [-s mida_memòria_temporal]\n"
+msgstr "Ús: %s [-c] [-n nivell] [-s mida_memòria_temporal]\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
 msgid "invalid id: %s\n"
-msgstr "id invàlid : %s\n"
+msgstr "id no vàlid : %s\n"
 
 #: sys-utils/ipcrm.c:84
 #, c-format
@@ -8793,8 +8707,8 @@ msgid ""
 "usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
-"useu: %s [ [-q msqid] [-m shmid] [-s semid]\n"
-"      [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
+"ús: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"    [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
 #: sys-utils/ipcrm.c:181
 #, c-format
@@ -8816,7 +8730,7 @@ msgstr "la clau ja ha estat treta"
 
 #: sys-utils/ipcrm.c:214 sys-utils/ipcrm.c:245
 msgid "invalid key"
-msgstr "clau invàlida"
+msgstr "clau no vàlida"
 
 #: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
 msgid "unknown error in key"
@@ -8828,7 +8742,7 @@ msgstr "permisos denegats per l'identificador"
 
 #: sys-utils/ipcrm.c:246
 msgid "invalid id"
-msgstr "identificador invàlid"
+msgstr "identificador no vàlid"
 
 #: sys-utils/ipcrm.c:251
 msgid "already removed id"
@@ -8851,7 +8765,7 @@ msgstr "%s: argument desconegut: %s\n"
 #: sys-utils/ipcs.c:121
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
-msgstr "useu: %s -asmq -tclup \n"
+msgstr "ús: %s -asmq -tclup \n"
 
 #: sys-utils/ipcs.c:122
 #, c-format
@@ -8878,16 +8792,16 @@ msgid ""
 "\t-q : messages\n"
 msgstr ""
 "Especificació dels recursos:\n"
-"\t-m : memòria compartida\n"
-"\t-q : missatges\n"
+"\t-m : Memòria compartida\n"
+"\t-q : Missatges\n"
 
 #: sys-utils/ipcs.c:132
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
 msgstr ""
-"\t-s : semàfors\n"
-"\t-a : tot (per defecte)\n"
+"\t-s : Semàfors\n"
+"\t-a : Tot (per defecte)\n"
 
 #: sys-utils/ipcs.c:133
 msgid ""
@@ -8897,22 +8811,22 @@ msgid ""
 "\t-c : creator\n"
 msgstr ""
 "Format de l'eixida:\n"
-"\t-t : temps\n"
-"\t-p : pid\n"
-"\t-c : creador\n"
+"\t-t : Temps\n"
+"\t-p : Pid\n"
+"\t-c : Creador\n"
 
 #: sys-utils/ipcs.c:134
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
 msgstr ""
-"\t-l : límits\n"
-"\t-u : resumen\n"
+"\t-l : Límits\n"
+"\t-u : Resumen\n"
 
 #: sys-utils/ipcs.c:135
 msgid "-i id [-s -q -m] : details on resource identified by id\n"
 msgstr ""
-"-i id [-s -q -m] : detalls sobre els recursos identificats  per "
+"-i id [-s -q -m] : Detalls sobre els recursos identificats per "
 "l'identificador\n"
 
 #: sys-utils/ipcs.c:267
@@ -8926,23 +8840,23 @@ msgstr "------ Límits de la memòria compartida --------\n"
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
-msgstr "nombre màx. de segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
+msgstr "màx. nombre de segments = %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "mida màx. del segment (koctets) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "total màx. memòria compartida (koctets) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "mida mín. segment (octets) = %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9185,7 +9099,7 @@ msgstr "el nucli no està configurat per a cues de missatges\n"
 
 #: sys-utils/ipcs.c:504
 msgid "------ Messages: Limits --------\n"
-msgstr "------ Missatges: límits -------\n"
+msgstr "------ Missatges: Límits -------\n"
 
 #: sys-utils/ipcs.c:505
 #, c-format
@@ -9204,7 +9118,7 @@ msgstr "mida màx. per defecte de la cua (octets) = %d\n"
 
 #: sys-utils/ipcs.c:511
 msgid "------ Messages: Status --------\n"
-msgstr "------ Missatges: estat --------\n"
+msgstr "------ Missatges: Estat --------\n"
 
 #: sys-utils/ipcs.c:512
 #, c-format
@@ -9223,7 +9137,7 @@ msgstr "espai emprat = %d octets\n"
 
 #: sys-utils/ipcs.c:518
 msgid "------ Message Queues: Creators/Owners --------\n"
-msgstr "--- Cues de missatges: creadors/propietaris ---\n"
+msgstr "--- Cues de missatges: Creadors/propietaris ---\n"
 
 #: sys-utils/ipcs.c:520 sys-utils/ipcs.c:526 sys-utils/ipcs.c:532
 #: sys-utils/ipcs.c:538
@@ -9405,7 +9319,7 @@ msgstr "pid"
 #: sys-utils/rdev.c:69
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr ""
-"useu: rdev [ -rv ] [ -o DESPLAÇAMENT ] [ IMATGE [ VALOR [ DESPLAÇAMENT ] ] ]"
+"ús: rdev [ -rv ] [ -o DESPLAÇAMENT ] [ IMATGE [ VALOR [ DESPLAÇAMENT ] ] ]"
 
 #: sys-utils/rdev.c:70
 msgid ""
@@ -9452,7 +9366,7 @@ msgstr "  vidmode ...                     el mateix que rdev -v"
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
-"Nota: els modes de vídeo són: -3=Ask, -2=Extended, -1=NormalVga,\n"
+"Nota: Els modes de vídeo són: -3=Ask, -2=Extended, -1=NormalVga,\n"
 "                              1=tecla1, 2=tecla2, ... "
 
 #: sys-utils/rdev.c:80
@@ -9465,8 +9379,12 @@ msgstr ""
 msgid "missing comma"
 msgstr "falta una coma"
 
-#: sys-utils/readprofile.c:115
-#, c-format
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "memòria esgotada"
+
+#: sys-utils/readprofile.c:118
+#, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9477,11 +9395,12 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
-"%s: Useu: \"%s [opcions]\n"
+"%s: Ús: \"%s [opcions]\n"
 "\t -m <fitxer_mapa> (Valor predeterminat = \"%s\" i \t\t\t\t  \"%s\")\n"
 "\t -p <fitxer>  (Valor predeterminat = \"%s\")\n"
 "\t -M <mult>    Estableix el multiplicador del perfil en <mult>\n"
@@ -9493,32 +9412,32 @@ msgstr ""
 "\t -n           Desactiva la detecció auto. de l'ordre dels octets\n"
 "\t -V           Mostra la versió i surt\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s versió %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Passa de probes: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
-msgstr "%s: %s(%i): línia del mapa incorrecta\n"
+msgstr "%s: %s(%i): Línia del mapa incorrecta\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
-msgstr "%s: no es pot trobar \"_stext\" en %s\n"
+msgstr "%s: No es pot trobar \"_stext\" en %s\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s adreça del perfil fora del rang. Fitxer `map' incorrecte?\n"
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "total"
 
@@ -9526,17 +9445,17 @@ msgstr "total"
 msgid ""
 "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 msgstr ""
-"useu: renice prioritat [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] usuaris ]\n"
+"ús: renice prioritat [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] usuaris ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
 msgid "renice: %s: unknown user\n"
-msgstr "renice: %s: usuari desconegut\n"
+msgstr "renice: %s: Usuari desconegut\n"
 
 #: sys-utils/renice.c:105
 #, c-format
 msgid "renice: %s: bad value\n"
-msgstr "renice: %s: valor incorrecte\n"
+msgstr "renice: %s: Valor incorrecte\n"
 
 #: sys-utils/renice.c:123 sys-utils/renice.c:135
 msgid "getpriority"
@@ -9549,12 +9468,12 @@ msgstr "setpriority"
 #: sys-utils/renice.c:139
 #, c-format
 msgid "%d: old priority %d, new priority %d\n"
-msgstr "%d: prioritat antiga %d, nova prioritat %d\n"
+msgstr "%d: Prioritat antiga %d, nova prioritat %d\n"
 
 #: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr "useu: %s programa [arg ...]\n"
+msgstr "ús: %s programa [arg ...]\n"
 
 #: sys-utils/tunelp.c:75
 #, c-format
@@ -9563,8 +9482,7 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"Useu: %s <dispositiu> [ -i <IRQ> | -t <TEMPS> | -c <CARÀCT.> | -w <ESPERA> "
-"|\n"
+"ús: %s <dispositiu> [ -i <IRQ> | -t <TEMPS> | -c <CARÀCT.> | -w <ESPERA> |\n"
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
@@ -9575,7 +9493,7 @@ msgstr "error en l'assignació de memòria"
 #: sys-utils/tunelp.c:103
 #, c-format
 msgid "%s: bad value\n"
-msgstr "%s: valor incorrecte\n"
+msgstr "%s: Valor incorrecte\n"
 
 #: sys-utils/tunelp.c:242
 #, c-format
@@ -9624,20 +9542,20 @@ msgstr "%s usant l'escrutini\n"
 #: text-utils/col.c:153
 #, c-format
 msgid "col: bad -l argument %s.\n"
-msgstr "col: argument -l incorrecte %s.\n"
+msgstr "col: Argument -l incorrecte %s.\n"
 
 #: text-utils/col.c:535
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr "useu : col [-bfpx] [-l nline]\n"
+msgstr "ús : col [-bfpx] [-l nline]\n"
 
 #: text-utils/col.c:541
 msgid "col: write error.\n"
-msgstr "col: error d'escriptura.\n"
+msgstr "col: Error d'escriptura.\n"
 
 #: text-utils/col.c:548
 #, c-format
 msgid "col: warning: can't back up %s.\n"
-msgstr "col: advertència: no es pot fer la còpia de seguretat de %s.\n"
+msgstr "col: Atenció: No es pot fer la còpia de seguretat de %s.\n"
 
 #: text-utils/col.c:549
 msgid "past first line"
@@ -9650,7 +9568,7 @@ msgstr "-- línia ja està buida"
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr "useu: %s [ - ] [ -2 ] [ fitxer ... ]\n"
+msgstr "ús: %s [ - ] [ -2 ] [ fitxer ... ]\n"
 
 #: text-utils/column.c:297
 msgid "line too long"
@@ -9658,7 +9576,7 @@ msgstr "línia massa llarga"
 
 #: text-utils/column.c:374
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr "useu: column [-tx] [-c columnes] [fitxer ...]\n"
+msgstr "ús: column [-tx] [-c columnes] [fitxer ...]\n"
 
 #: text-utils/hexsyntax.c:82
 msgid "hexdump: bad length value.\n"
@@ -9678,7 +9596,7 @@ msgstr ""
 #: text-utils/more.c:263
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr "useu: %s [-dflpcsu] [+núm_línies | +/patró] nom1 nom2 ...\n"
+msgstr "ús: %s [-dflpcsu] [+núm_línies | +/patró] nom1 nom2 ...\n"
 
 #: text-utils/more.c:521
 #, c-format
@@ -9879,7 +9797,7 @@ msgstr "od: od(1) ha quedat obsolet per a hexdump(1).\n"
 #: text-utils/odsyntax.c:133
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr "od: la compatibilitat amb hexdump(1) no permet l'opció -%c %s\n"
+msgstr "od: La compatibilitat amb hexdump(1) no permet l'opció -%c %s\n"
 
 #: text-utils/odsyntax.c:134
 msgid "; see strings(1)."
@@ -9888,21 +9806,21 @@ msgstr "; veure strings(1)."
 #: text-utils/parse.c:63
 #, c-format
 msgid "hexdump: can't read %s.\n"
-msgstr "hexdump: no es pot llegir %s.\n"
+msgstr "hexdump: No es pot llegir %s.\n"
 
 #: text-utils/parse.c:68
 msgid "hexdump: line too long.\n"
-msgstr "hexdump: línia massa llarga.\n"
+msgstr "hexdump: Línia massa llarga.\n"
 
 #: text-utils/parse.c:401
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr "hexdump: nombre total d'octets amb diversos caràcters de conversió.\n"
+msgstr "hexdump: Nombre total d'octets amb diversos caràcters de conversió.\n"
 
 #: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
 msgstr ""
-"hexdump: nombre total d'octets incorrecte per al caràcter de conversió %s.\n"
+"hexdump: Nombre total d'octets incorrecte per al caràcter de conversió %s.\n"
 
 #: text-utils/parse.c:490
 #, c-format
@@ -9913,29 +9831,29 @@ msgstr ""
 #: text-utils/parse.c:496
 #, c-format
 msgid "hexdump: bad format {%s}\n"
-msgstr "hexdump: format incorrecte {%s}\n"
+msgstr "hexdump: Format incorrecte {%s}\n"
 
 #: text-utils/parse.c:502
 #, c-format
 msgid "hexdump: bad conversion character %%%s.\n"
-msgstr "hexdump: caràcter de conversió %%%s incorrecte.\n"
+msgstr "hexdump: Caràcter de conversió %%%s incorrecte.\n"
 
 #: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
-"%s: Useu: %s [-número] [-p cadena] [-cefnrs] [+línia] [+/patró/] [fitxers]\n"
+"%s: Ús: %s [-número] [-p cadena] [-cefnrs] [+línia] [+/patró/] [fitxers]\n"
 
 #: text-utils/pg.c:266
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
-msgstr "%s: l'opció requereix un argument -- %s\n"
+msgstr "%s: L'opció requereix un argument -- %s\n"
 
 #: text-utils/pg.c:274
 #, c-format
 msgid "%s: illegal option -- %s\n"
-msgstr "%s: opció ilegal -- %s\n"
+msgstr "%s: Opció ilegal -- %s\n"
 
 #: text-utils/pg.c:391
 msgid "...skipping forward\n"
@@ -9998,7 +9916,7 @@ msgstr "desat"
 
 #: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
-msgstr ": no es permet !comandament en el mode rflag.\n"
+msgstr ": No es permet !comandament en el mode rflag.\n"
 
 #: text-utils/pg.c:1515
 msgid "fork() failed, try again later\n"
@@ -10010,16 +9928,16 @@ msgstr "(Següent fitxer: "
 
 #: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
-msgstr "No es pot assignar espai de memòria intermèdia\n"
+msgstr "No es pot assignar espai de memòria temporal\n"
 
 #: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
-msgstr "useu: rev [fitxer ...]\n"
+msgstr "ús: rev [fitxer ...]\n"
 
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr "useu: %s [ -i ] [ -tTerminal ] fitxer...\n"
+msgstr "ús: %s [ -i ] [ -tTerminal ] fitxer...\n"
 
 #: text-utils/ul.c:152
 msgid "trouble reading terminfo"
@@ -10042,28 +9960,23 @@ msgstr "Línia d'entrada massa llarga.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Memòria esgotada a l'augmentar la mida de la memòria temporal.\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: no es pot suprimir el dispositiu %s: %s\n"
-
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): correcte\n"
-
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
-#~ msgstr ""
-#~ "Aquest mount s'ha compilat sense suport loop. Si us plau, recompileu-lo.\n"
-
-#~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
-#~ msgstr ""
-#~ "useu:\n"
-#~ "  %s dispositiu_loop                                  # dona informació\n"
-#~ "  %s -d dispositiu_loop                               # elimina\n"
-#~ "  %s [ -e encrip. ] [ -o desplaça. ] disp_loop fitxer # configura\n"
-
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
-#~ msgstr ""
-#~ "Quan es va compilar el suport loop no estava disponible. Si us plau, "
-#~ "recompileu.\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: No s'ha compilat amb suport per a minix v2\n"
+
+#~ msgid "mount: the label %s occurs on both %s and %s\n"
+#~ msgstr "mount: L'etiqueta %s apareix en %s i %s\n"
+
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "mount: %s duplicada; no es muntarà"
+
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: Muntant %s per %s\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "etiqueta"
+
+#~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
+#~ msgstr "mount: L'etiqueta %s apareix en %s i %s; no s'ha muntat\n"
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 25a86215..763638a1 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -14,143 +14,144 @@ const struct _msg_ent _msg_tbl[] = {
   {"get sectorsize", 5},
   {"get blocksize", 6},
   {"set blocksize", 7},
-  {"get size", 8},
-  {"set readahead", 9},
-  {"get readahead", 10},
-  {"flush buffers", 11},
-  {"reread partition table", 12},
-  {"Usage:\n", 13},
-  {"  %s --report [devices]\n", 14},
-  {"  %s [-v|-q] commands devices\n", 15},
-  {"Available commands:\n", 16},
-  {"%s: Unknown command: %s\n", 17},
-  {"%s requires an argument\n", 18},
-  {"%s succeeded.\n", 19},
-  {"%s: cannot open %s\n", 20},
-  {"%s: ioctl error on %s\n", 21},
-  {"RO    RA   SSZ   BSZ   StartSec     Size    Device\n", 22},
-  {"usage:\n", 23},
-  {"Formatting ... ", 24},
-  {"done\n", 25},
-  {"Verifying ... ", 26},
-  {"Read: ", 27},
-  {"Problem reading cylinder %d, expected %d, read %d\n", 28},
+  {"get 32-bit sector count", 8},
+  {"get size in bytes", 9},
+  {"set readahead", 10},
+  {"get readahead", 11},
+  {"flush buffers", 12},
+  {"reread partition table", 13},
+  {"Usage:\n", 14},
+  {"  %s --report [devices]\n", 15},
+  {"  %s [-v|-q] commands devices\n", 16},
+  {"Available commands:\n", 17},
+  {"%s: Unknown command: %s\n", 18},
+  {"%s requires an argument\n", 19},
+  {"%s succeeded.\n", 20},
+  {"%s: cannot open %s\n", 21},
+  {"%s: ioctl error on %s\n", 22},
+  {"RO    RA   SSZ   BSZ   StartSec     Size    Device\n", 23},
+  {"usage:\n", 24},
+  {"Formatting ... ", 25},
+  {"done\n", 26},
+  {"Verifying ... ", 27},
+  {"Read: ", 28},
+  {"Problem reading cylinder %d, expected %d, read %d\n", 29},
   {"\
 bad data in cyl %d\n\
-Continuing ... ", 29},
-  {"usage: %s [ -n ] device\n", 30},
-  {"%s from %s\n", 31},
-  {"%s: not a block device\n", 32},
-  {"Could not determine current format type", 33},
-  {"%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n", 34},
-  {"Double", 35},
-  {"Single", 36},
+Continuing ... ", 30},
+  {"usage: %s [ -n ] device\n", 31},
+  {"%s from %s\n", 32},
+  {"%s: not a block device\n", 33},
+  {"Could not determine current format type", 34},
+  {"%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n", 35},
+  {"Double", 36},
+  {"Single", 37},
   {"\
 usage: %s [-hv] [-x dir] file\n\
  -h         print this help\n\
  -x dir     extract into dir\n\
  -v         be more verbose\n\
- file       file to test\n", 37},
-  {"%s: error %d while decompressing! %p(%d)\n", 38},
-  {"%s: size error in symlink `%s'\n", 39},
-  {"  uncompressing block at %ld to %ld (%ld)\n", 40},
-  {"%s: bogus mode on `%s' (%o)\n", 41},
-  {"  hole at %ld (%d)\n", 42},
-  {"%s: Non-block (%ld) bytes\n", 43},
-  {"%s: Non-size (%ld vs %ld) bytes\n", 44},
-  {"%s: invalid cramfs--bad path length\n", 45},
-  {"%s: compiled without -x support\n", 46},
-  {"%s: warning--unable to determine filesystem size \n", 47},
-  {"%s is not a block device or file\n", 48},
-  {"%s: invalid cramfs--file length too short\n", 49},
-  {"%s: invalid cramfs--wrong magic\n", 50},
-  {"%s: warning--file length too long, padded image?\n", 51},
-  {"%s: invalid cramfs--crc error\n", 52},
-  {"%s: warning--old cramfs image, no CRC\n", 53},
-  {"%s: invalid cramfs--bad superblock\n", 54},
-  {"%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n", 55},
-  {"%s: invalid cramfs--invalid file data offset\n", 56},
-  {"Usage: %s [-larvsmf] /dev/name\n", 57},
-  {"%s is mounted.\t ", 58},
-  {"Do you really want to continue", 59},
-  {"check aborted.\n", 60},
-  {"Zone nr < FIRSTZONE in file `%s'.", 61},
-  {"Zone nr >= ZONES in file `%s'.", 62},
-  {"Remove block", 63},
-  {"Read error: unable to seek to block in file '%s'\n", 64},
-  {"Read error: bad block in file '%s'\n", 65},
+ file       file to test\n", 38},
+  {"%s: error %d while decompressing! %p(%d)\n", 39},
+  {"%s: size error in symlink `%s'\n", 40},
+  {"  uncompressing block at %ld to %ld (%ld)\n", 41},
+  {"%s: bogus mode on `%s' (%o)\n", 42},
+  {"  hole at %ld (%d)\n", 43},
+  {"%s: Non-block (%ld) bytes\n", 44},
+  {"%s: Non-size (%ld vs %ld) bytes\n", 45},
+  {"%s: invalid cramfs--bad path length\n", 46},
+  {"%s: compiled without -x support\n", 47},
+  {"%s: warning--unable to determine filesystem size \n", 48},
+  {"%s is not a block device or file\n", 49},
+  {"%s: invalid cramfs--file length too short\n", 50},
+  {"%s: invalid cramfs--wrong magic\n", 51},
+  {"%s: warning--file length too long, padded image?\n", 52},
+  {"%s: invalid cramfs--crc error\n", 53},
+  {"%s: warning--old cramfs image, no CRC\n", 54},
+  {"%s: invalid cramfs--bad superblock\n", 55},
+  {"%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n", 56},
+  {"%s: invalid cramfs--invalid file data offset\n", 57},
+  {"Usage: %s [-larvsmf] /dev/name\n", 58},
+  {"%s is mounted.\t ", 59},
+  {"Do you really want to continue", 60},
+  {"check aborted.\n", 61},
+  {"Zone nr < FIRSTZONE in file `%s'.", 62},
+  {"Zone nr >= ZONES in file `%s'.", 63},
+  {"Remove block", 64},
+  {"Read error: unable to seek to block in file '%s'\n", 65},
+  {"Read error: bad block in file '%s'\n", 66},
   {"\
 Internal error: trying to write bad block\n\
-Write request ignored\n", 66},
-  {"seek failed in write_block", 67},
-  {"Write error: bad block in file '%s'\n", 68},
-  {"seek failed in write_super_block", 69},
-  {"unable to write super-block", 70},
-  {"Unable to write inode map", 71},
-  {"Unable to write zone map", 72},
-  {"Unable to write inodes", 73},
-  {"seek failed", 74},
-  {"unable to read super block", 75},
-  {"bad magic number in super-block", 76},
-  {"Only 1k blocks/zones supported", 77},
-  {"bad s_imap_blocks field in super-block", 78},
-  {"bad s_zmap_blocks field in super-block", 79},
-  {"Unable to allocate buffer for inode map", 80},
-  {"Unable to allocate buffer for inodes", 81},
-  {"Unable to allocate buffer for inode count", 82},
-  {"Unable to allocate buffer for zone count", 83},
-  {"Unable to read inode map", 84},
-  {"Unable to read zone map", 85},
-  {"Unable to read inodes", 86},
-  {"Warning: Firstzone != Norm_firstzone\n", 87},
-  {"%ld inodes\n", 88},
-  {"%ld blocks\n", 89},
-  {"Firstdatazone=%ld (%ld)\n", 90},
-  {"Zonesize=%d\n", 91},
-  {"Maxsize=%ld\n", 92},
-  {"Filesystem state=%d\n", 93},
+Write request ignored\n", 67},
+  {"seek failed in write_block", 68},
+  {"Write error: bad block in file '%s'\n", 69},
+  {"seek failed in write_super_block", 70},
+  {"unable to write super-block", 71},
+  {"Unable to write inode map", 72},
+  {"Unable to write zone map", 73},
+  {"Unable to write inodes", 74},
+  {"seek failed", 75},
+  {"unable to read super block", 76},
+  {"bad magic number in super-block", 77},
+  {"Only 1k blocks/zones supported", 78},
+  {"bad s_imap_blocks field in super-block", 79},
+  {"bad s_zmap_blocks field in super-block", 80},
+  {"Unable to allocate buffer for inode map", 81},
+  {"Unable to allocate buffer for inodes", 82},
+  {"Unable to allocate buffer for inode count", 83},
+  {"Unable to allocate buffer for zone count", 84},
+  {"Unable to read inode map", 85},
+  {"Unable to read zone map", 86},
+  {"Unable to read inodes", 87},
+  {"Warning: Firstzone != Norm_firstzone\n", 88},
+  {"%ld inodes\n", 89},
+  {"%ld blocks\n", 90},
+  {"Firstdatazone=%ld (%ld)\n", 91},
+  {"Zonesize=%d\n", 92},
+  {"Maxsize=%ld\n", 93},
+  {"Filesystem state=%d\n", 94},
   {"\
 namelen=%d\n\
-\n", 94},
-  {"Inode %d marked unused, but used for file '%s'\n", 95},
-  {"Mark in use", 96},
-  {"The file `%s' has mode %05o\n", 97},
-  {"Warning: inode count too big.\n", 98},
-  {"root inode isn't a directory", 99},
-  {"Block has been used before. Now in file `%s'.", 100},
-  {"Clear", 101},
-  {"Block %d in file `%s' is marked not in use.", 102},
-  {"Correct", 103},
-  {"The directory '%s' contains a bad inode number for file '%.*s'.", 104},
-  {" Remove", 105},
-  {"`%s': bad directory: '.' isn't first\n", 106},
-  {"`%s': bad directory: '..' isn't second\n", 107},
-  {"%s: bad directory: '.' isn't first\n", 108},
-  {"%s: bad directory: '..' isn't second\n", 109},
-  {"internal error", 110},
-  {"%s: bad directory: size < 32", 111},
-  {"seek failed in bad_zone", 112},
-  {"Inode %d mode not cleared.", 113},
-  {"Inode %d not used, marked used in the bitmap.", 114},
-  {"Inode %d used, marked unused in the bitmap.", 115},
-  {"Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", 116},
-  {"Set i_nlinks to count", 117},
-  {"Zone %d: marked in use, no file uses it.", 118},
-  {"Unmark", 119},
-  {"Zone %d: in use, counted=%d\n", 120},
-  {"Zone %d: not in use, counted=%d\n", 121},
-  {"Set", 122},
-  {"bad inode size", 123},
-  {"bad v2 inode size", 124},
-  {"need terminal for interactive repairs", 125},
-  {"unable to open '%s'", 126},
-  {"%s is clean, no check.\n", 127},
-  {"Forcing filesystem check on %s.\n", 128},
-  {"Filesystem on %s is dirty, needs checking.\n", 129},
+\n", 95},
+  {"Inode %d marked unused, but used for file '%s'\n", 96},
+  {"Mark in use", 97},
+  {"The file `%s' has mode %05o\n", 98},
+  {"Warning: inode count too big.\n", 99},
+  {"root inode isn't a directory", 100},
+  {"Block has been used before. Now in file `%s'.", 101},
+  {"Clear", 102},
+  {"Block %d in file `%s' is marked not in use.", 103},
+  {"Correct", 104},
+  {"The directory '%s' contains a bad inode number for file '%.*s'.", 105},
+  {" Remove", 106},
+  {"`%s': bad directory: '.' isn't first\n", 107},
+  {"`%s': bad directory: '..' isn't second\n", 108},
+  {"%s: bad directory: '.' isn't first\n", 109},
+  {"%s: bad directory: '..' isn't second\n", 110},
+  {"internal error", 111},
+  {"%s: bad directory: size < 32", 112},
+  {"seek failed in bad_zone", 113},
+  {"Inode %d mode not cleared.", 114},
+  {"Inode %d not used, marked used in the bitmap.", 115},
+  {"Inode %d used, marked unused in the bitmap.", 116},
+  {"Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", 117},
+  {"Set i_nlinks to count", 118},
+  {"Zone %d: marked in use, no file uses it.", 119},
+  {"Unmark", 120},
+  {"Zone %d: in use, counted=%d\n", 121},
+  {"Zone %d: not in use, counted=%d\n", 122},
+  {"Set", 123},
+  {"bad inode size", 124},
+  {"bad v2 inode size", 125},
+  {"need terminal for interactive repairs", 126},
+  {"unable to open '%s'", 127},
+  {"%s is clean, no check.\n", 128},
+  {"Forcing filesystem check on %s.\n", 129},
+  {"Filesystem on %s is dirty, needs checking.\n", 130},
   {"\
 \n\
-%6ld inodes used (%ld%%)\n", 130},
-  {"%6ld zones used (%ld%%)\n", 131},
+%6ld inodes used (%ld%%)\n", 131},
+  {"%6ld zones used (%ld%%)\n", 132},
   {"\
 \n\
 %6d regular files\n\
@@ -160,47 +161,47 @@ namelen=%d\n\
 %6d links\n\
 %6d symbolic links\n\
 ------\n\
-%6d files\n", 132},
+%6d files\n", 133},
   {"\
 ----------------------------\n\
 FILE SYSTEM HAS BEEN CHANGED\n\
-----------------------------\n", 133},
-  {"%s: failed to open: %s\n", 134},
-  {"%s: seek error on %s\n", 135},
-  {"%s: read error on %s\n", 136},
-  {"sector count: %d, sector size: %d\n", 137},
-  {"%s: option parse error\n", 138},
-  {"Usage: %s [-x] [-d <num>] iso9660-image\n", 139},
+----------------------------\n", 134},
+  {"%s: failed to open: %s\n", 135},
+  {"%s: seek error on %s\n", 136},
+  {"%s: read error on %s\n", 137},
+  {"sector count: %d, sector size: %d\n", 138},
+  {"%s: option parse error\n", 139},
+  {"Usage: %s [-x] [-d <num>] iso9660-image\n", 140},
   {"\
 Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n\
-       [-F fsname] device [block-count]\n", 140},
-  {"volume name too long", 141},
-  {"fsname name too long", 142},
-  {"cannot stat device %s", 143},
-  {"%s is not a block special device", 144},
-  {"cannot open %s", 145},
-  {"cannot get size of %s", 146},
-  {"blocks argument too large, max is %lu", 147},
-  {"too many inodes - max is 512", 148},
-  {"not enough space, need at least %lu blocks", 149},
-  {"Device: %s\n", 150},
-  {"Volume: <%-6s>\n", 151},
-  {"FSname: <%-6s>\n", 152},
-  {"BlockSize: %d\n", 153},
-  {"Inodes: %d (in 1 block)\n", 154},
-  {"Inodes: %d (in %ld blocks)\n", 155},
-  {"Blocks: %ld\n", 156},
-  {"Inode end: %d, Data end: %d\n", 157},
-  {"error writing superblock", 158},
-  {"error writing root inode", 159},
-  {"error writing inode", 160},
-  {"seek error", 161},
-  {"error writing . entry", 162},
-  {"error writing .. entry", 163},
-  {"error closing %s", 164},
-  {"Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n", 165},
-  {"%s: Out of memory!\n", 166},
-  {"mkfs version %s (%s)\n", 167},
+       [-F fsname] device [block-count]\n", 141},
+  {"volume name too long", 142},
+  {"fsname name too long", 143},
+  {"cannot stat device %s", 144},
+  {"%s is not a block special device", 145},
+  {"cannot open %s", 146},
+  {"cannot get size of %s", 147},
+  {"blocks argument too large, max is %lu", 148},
+  {"too many inodes - max is 512", 149},
+  {"not enough space, need at least %lu blocks", 150},
+  {"Device: %s\n", 151},
+  {"Volume: <%-6s>\n", 152},
+  {"FSname: <%-6s>\n", 153},
+  {"BlockSize: %d\n", 154},
+  {"Inodes: %d (in 1 block)\n", 155},
+  {"Inodes: %d (in %ld blocks)\n", 156},
+  {"Blocks: %ld\n", 157},
+  {"Inode end: %d, Data end: %d\n", 158},
+  {"error writing superblock", 159},
+  {"error writing root inode", 160},
+  {"error writing inode", 161},
+  {"seek error", 162},
+  {"error writing . entry", 163},
+  {"error writing .. entry", 164},
+  {"error closing %s", 165},
+  {"Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n", 166},
+  {"%s: Out of memory!\n", 167},
+  {"mkfs version %s (%s)\n", 168},
   {"\
 usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n\
  -h         print this help\n\
@@ -214,60 +215,59 @@ usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n\
  -s         sort directory entries (old option, ignored)\n\
  -z         make explicit holes (requires >= 2.3.39)\n\
  dirname    root of the filesystem to be compressed\n\
- outfile    output file\n", 168},
+ outfile    output file\n", 169},
   {"\
 Very long (%u bytes) filename `%s' found.\n\
- Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n", 169},
-  {"filesystem too big.  Exiting.\n", 170},
+ Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n", 170},
+  {"filesystem too big.  Exiting.\n", 171},
   {"\
 Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  \
-Exiting.\n", 171},
-  {"AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n", 172},
-  {"%6.2f%% (%+d bytes)\t%s\n", 173},
+Exiting.\n", 172},
+  {"AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n", 173},
+  {"%6.2f%% (%+d bytes)\t%s\n", 174},
   {"\
 warning: guestimate of required size (upper bound) is %LdMB, but maximum \
-image size is %uMB.  We might die prematurely.\n", 174},
-  {"Including: %s\n", 175},
-  {"Directory data: %d bytes\n", 176},
-  {"Everything: %d kilobytes\n", 177},
-  {"Super block: %d bytes\n", 178},
-  {"CRC: %x\n", 179},
-  {"not enough space allocated for ROM image (%Ld allocated, %d used)\n", 180},
-  {"ROM image write failed (%d %d)\n", 181},
-  {"warning: filenames truncated to 255 bytes.\n", 182},
-  {"warning: files were skipped due to errors.\n", 183},
-  {"warning: file sizes truncated to %luMB (minus 1 byte).\n", 184},
-  {"\
-warning: uids truncated to %u bits.  (This may be a security concern.)\n", 185},
-  {"\
-warning: gids truncated to %u bits.  (This may be a security concern.)\n", 186},
+image size is %uMB.  We might die prematurely.\n", 175},
+  {"Including: %s\n", 176},
+  {"Directory data: %d bytes\n", 177},
+  {"Everything: %d kilobytes\n", 178},
+  {"Super block: %d bytes\n", 179},
+  {"CRC: %x\n", 180},
+  {"not enough space allocated for ROM image (%Ld allocated, %d used)\n", 181},
+  {"ROM image write failed (%d %d)\n", 182},
+  {"warning: filenames truncated to 255 bytes.\n", 183},
+  {"warning: files were skipped due to errors.\n", 184},
+  {"warning: file sizes truncated to %luMB (minus 1 byte).\n", 185},
+  {"\
+warning: uids truncated to %u bits.  (This may be a security concern.)\n", 186},
+  {"\
+warning: gids truncated to %u bits.  (This may be a security concern.)\n", 187},
   {"\
 WARNING: device numbers truncated to %u bits.  This almost certainly means\n\
-that some device files will be wrong.\n", 187},
-  {"Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", 188},
-  {"%s is mounted; will not make a filesystem here!", 189},
-  {"seek to boot block failed in write_tables", 190},
-  {"unable to clear boot sector", 191},
-  {"seek failed in write_tables", 192},
-  {"unable to write inode map", 193},
-  {"unable to write zone map", 194},
-  {"unable to write inodes", 195},
-  {"write failed in write_block", 196},
-  {"too many bad blocks", 197},
-  {"not enough good blocks", 198},
-  {"unable to allocate buffers for maps", 199},
-  {"unable to allocate buffer for inodes", 200},
+that some device files will be wrong.\n", 188},
+  {"Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", 189},
+  {"%s is mounted; will not make a filesystem here!", 190},
+  {"seek to boot block failed in write_tables", 191},
+  {"unable to clear boot sector", 192},
+  {"seek failed in write_tables", 193},
+  {"unable to write inode map", 194},
+  {"unable to write zone map", 195},
+  {"unable to write inodes", 196},
+  {"write failed in write_block", 197},
+  {"too many bad blocks", 198},
+  {"not enough good blocks", 199},
+  {"unable to allocate buffers for maps", 200},
+  {"unable to allocate buffer for inodes", 201},
   {"\
 Maxsize=%ld\n\
-\n", 201},
-  {"seek failed during testing of blocks", 202},
-  {"Weird values in do_check: probably bugs\n", 203},
-  {"seek failed in check_blocks", 204},
-  {"bad blocks before data-area: cannot make fs", 205},
-  {"%d bad blocks\n", 206},
-  {"one bad block\n", 207},
-  {"can't open file of bad blocks", 208},
-  {"%s: not compiled with minix v2 support\n", 209},
+\n", 202},
+  {"seek failed during testing of blocks", 203},
+  {"Weird values in do_check: probably bugs\n", 204},
+  {"seek failed in check_blocks", 205},
+  {"bad blocks before data-area: cannot make fs", 206},
+  {"%d bad blocks\n", 207},
+  {"one bad block\n", 208},
+  {"can't open file of bad blocks", 209},
   {"strtol error: number of blocks not specified", 210},
   {"unable to open %s", 211},
   {"unable to stat %s", 212},
@@ -1076,403 +1076,404 @@ Units = %s of %d * 512 bytes\n\
   {"PC/IX", 792},
   {"Old Minix", 793},
   {"Minix / old Linux", 794},
-  {"OS/2 hidden C: drive", 795},
-  {"Linux extended", 796},
-  {"NTFS volume set", 797},
-  {"Amoeba", 798},
-  {"Amoeba BBT", 799},
-  {"BSD/OS", 800},
-  {"IBM Thinkpad hibernation", 801},
-  {"FreeBSD", 802},
-  {"OpenBSD", 803},
-  {"NeXTSTEP", 804},
-  {"Darwin UFS", 805},
-  {"NetBSD", 806},
-  {"Darwin boot", 807},
-  {"BSDI fs", 808},
-  {"BSDI swap", 809},
-  {"Boot Wizard hidden", 810},
-  {"Solaris boot", 811},
-  {"DRDOS/sec (FAT-12)", 812},
-  {"DRDOS/sec (FAT-16 < 32M)", 813},
-  {"DRDOS/sec (FAT-16)", 814},
-  {"Syrinx", 815},
-  {"Non-FS data", 816},
-  {"CP/M / CTOS / ...", 817},
-  {"Dell Utility", 818},
-  {"BootIt", 819},
-  {"DOS access", 820},
-  {"DOS R/O", 821},
-  {"BeOS fs", 822},
-  {"EFI GPT", 823},
-  {"EFI (FAT-12/16/32)", 824},
-  {"Linux/PA-RISC boot", 825},
-  {"DOS secondary", 826},
-  {"LANstep", 827},
-  {"BBT", 828},
-  {"seek error on %s - cannot seek to %lu\n", 829},
-  {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 830},
-  {"out of memory - giving up\n", 831},
-  {"read error on %s - cannot read sector %lu\n", 832},
-  {"ERROR: sector %lu does not have an msdos signature\n", 833},
-  {"write error on %s - cannot write sector %lu\n", 834},
-  {"cannot open partition sector save file (%s)\n", 835},
-  {"write error on %s\n", 836},
-  {"cannot stat partition restore file (%s)\n", 837},
-  {"partition restore file has wrong size - not restoring\n", 838},
-  {"out of memory?\n", 839},
-  {"cannot open partition restore file (%s)\n", 840},
-  {"error reading %s\n", 841},
-  {"cannot open device %s for writing\n", 842},
-  {"error writing sector %lu on %s\n", 843},
-  {"Disk %s: cannot get size\n", 844},
-  {"Disk %s: cannot get geometry\n", 845},
+  {"Linux swap / Solaris", 795},
+  {"OS/2 hidden C: drive", 796},
+  {"Linux extended", 797},
+  {"NTFS volume set", 798},
+  {"Amoeba", 799},
+  {"Amoeba BBT", 800},
+  {"BSD/OS", 801},
+  {"IBM Thinkpad hibernation", 802},
+  {"FreeBSD", 803},
+  {"OpenBSD", 804},
+  {"NeXTSTEP", 805},
+  {"Darwin UFS", 806},
+  {"NetBSD", 807},
+  {"Darwin boot", 808},
+  {"BSDI fs", 809},
+  {"BSDI swap", 810},
+  {"Boot Wizard hidden", 811},
+  {"Solaris boot", 812},
+  {"DRDOS/sec (FAT-12)", 813},
+  {"DRDOS/sec (FAT-16 < 32M)", 814},
+  {"DRDOS/sec (FAT-16)", 815},
+  {"Syrinx", 816},
+  {"Non-FS data", 817},
+  {"CP/M / CTOS / ...", 818},
+  {"Dell Utility", 819},
+  {"BootIt", 820},
+  {"DOS access", 821},
+  {"DOS R/O", 822},
+  {"BeOS fs", 823},
+  {"EFI GPT", 824},
+  {"EFI (FAT-12/16/32)", 825},
+  {"Linux/PA-RISC boot", 826},
+  {"DOS secondary", 827},
+  {"LANstep", 828},
+  {"BBT", 829},
+  {"seek error on %s - cannot seek to %lu\n", 830},
+  {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 831},
+  {"out of memory - giving up\n", 832},
+  {"read error on %s - cannot read sector %lu\n", 833},
+  {"ERROR: sector %lu does not have an msdos signature\n", 834},
+  {"write error on %s - cannot write sector %lu\n", 835},
+  {"cannot open partition sector save file (%s)\n", 836},
+  {"write error on %s\n", 837},
+  {"cannot stat partition restore file (%s)\n", 838},
+  {"partition restore file has wrong size - not restoring\n", 839},
+  {"out of memory?\n", 840},
+  {"cannot open partition restore file (%s)\n", 841},
+  {"error reading %s\n", 842},
+  {"cannot open device %s for writing\n", 843},
+  {"error writing sector %lu on %s\n", 844},
+  {"Disk %s: cannot get size\n", 845},
+  {"Disk %s: cannot get geometry\n", 846},
   {"\
 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", 846},
-  {"Warning: HDIO_GETGEO says that there are %lu heads\n", 847},
-  {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 848},
-  {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 849},
+[Use the --force option if you really want this]\n", 847},
+  {"Warning: HDIO_GETGEO says that there are %lu heads\n", 848},
+  {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 849},
+  {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 850},
   {"\
 Warning: unlikely number of sectors (%lu) - usually at most 63\n\
-This will give problems with all software that uses C/H/S addressing.\n", 850},
+This will give problems with all software that uses C/H/S addressing.\n", 851},
   {"\
 \n\
-Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 851},
+Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 852},
   {"\
-%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 852},
+%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 853},
   {"\
 %s of partition %s has impossible value for sector: %lu (should be in 1-%\
-lu)\n", 853},
+lu)\n", 854},
   {"\
 %s of partition %s has impossible value for cylinders: %lu (should be in 0-%\
-lu)\n", 854},
+lu)\n", 855},
   {"\
 Id  Name\n\
-\n", 855},
-  {"Re-reading the partition table ...\n", 856},
+\n", 856},
+  {"Re-reading the partition table ...\n", 857},
   {"\
 The command to re-read the partition table failed\n\
-Reboot your system now, before using mkfs\n", 857},
-  {"Error closing %s\n", 858},
-  {"%s: no such partition\n", 859},
-  {"unrecognized format - using sectors\n", 860},
-  {"# partition table of %s\n", 861},
-  {"unimplemented format - using %s\n", 862},
+Reboot your system now, before using mkfs\n", 858},
+  {"Error closing %s\n", 859},
+  {"%s: no such partition\n", 860},
+  {"unrecognized format - using sectors\n", 861},
+  {"# partition table of %s\n", 862},
+  {"unimplemented format - using %s\n", 863},
   {"\
 Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n\
-\n", 863},
-  {"   Device Boot Start     End   #cyls    #blocks   Id  System\n", 864},
+\n", 864},
+  {"   Device Boot Start     End   #cyls    #blocks   Id  System\n", 865},
   {"\
 Units = sectors of 512 bytes, counting from %d\n\
-\n", 865},
-  {"   Device Boot    Start       End   #sectors  Id  System\n", 866},
+\n", 866},
+  {"   Device Boot    Start       End   #sectors  Id  System\n", 867},
   {"\
 Units = blocks of 1024 bytes, counting from %d\n\
-\n", 867},
-  {"   Device Boot   Start       End    #blocks   Id  System\n", 868},
+\n", 868},
+  {"   Device Boot   Start       End    #blocks   Id  System\n", 869},
   {"\
 Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n\
-\n", 869},
-  {"   Device Boot Start   End    MiB    #blocks   Id  System\n", 870},
-  {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 871},
-  {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 872},
-  {"partition ends on cylinder %ld, beyond the end of the disk\n", 873},
-  {"No partitions found\n", 874},
+\n", 870},
+  {"   Device Boot Start   End    MiB    #blocks   Id  System\n", 871},
+  {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 872},
+  {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 873},
+  {"partition ends on cylinder %ld, beyond the end of the disk\n", 874},
+  {"No partitions found\n", 875},
   {"\
 Warning: The partition table looks like it was made\n\
   for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n\
-For this listing I'll assume that geometry.\n", 875},
-  {"no partition table present.\n", 876},
-  {"strange, only %d partitions defined.\n", 877},
-  {"Warning: partition %s has size 0 but is not marked Empty\n", 878},
-  {"Warning: partition %s has size 0 and is bootable\n", 879},
-  {"Warning: partition %s has size 0 and nonzero start\n", 880},
-  {"Warning: partition %s ", 881},
-  {"is not contained in partition %s\n", 882},
-  {"Warning: partitions %s ", 883},
-  {"and %s overlap\n", 884},
+For this listing I'll assume that geometry.\n", 876},
+  {"no partition table present.\n", 877},
+  {"strange, only %d partitions defined.\n", 878},
+  {"Warning: partition %s has size 0 but is not marked Empty\n", 879},
+  {"Warning: partition %s has size 0 and is bootable\n", 880},
+  {"Warning: partition %s has size 0 and nonzero start\n", 881},
+  {"Warning: partition %s ", 882},
+  {"is not contained in partition %s\n", 883},
+  {"Warning: partitions %s ", 884},
+  {"and %s overlap\n", 885},
   {"\
 Warning: partition %s contains part of the partition table (sector %lu),\n\
-and will destroy it when filled\n", 885},
-  {"Warning: partition %s starts at sector 0\n", 886},
-  {"Warning: partition %s extends past end of disk\n", 887},
+and will destroy it when filled\n", 886},
+  {"Warning: partition %s starts at sector 0\n", 887},
+  {"Warning: partition %s extends past end of disk\n", 888},
   {"\
 Among the primary partitions, at most one can be extended\n\
- (although this is not a problem under Linux)\n", 888},
-  {"Warning: partition %s does not start at a cylinder boundary\n", 889},
-  {"Warning: partition %s does not end at a cylinder boundary\n", 890},
+ (although this is not a problem under Linux)\n", 889},
+  {"Warning: partition %s does not start at a cylinder boundary\n", 890},
+  {"Warning: partition %s does not end at a cylinder boundary\n", 891},
   {"\
 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", 891},
+This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 892},
   {"\
 Warning: usually one can boot from primary partitions only\n\
-LILO disregards the `bootable' flag.\n", 892},
+LILO disregards the `bootable' flag.\n", 893},
   {"\
 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", 893},
-  {"start", 894},
+This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 894},
+  {"start", 895},
   {"\
-partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 895},
-  {"end", 896},
-  {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 897},
-  {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 898},
+partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 896},
+  {"end", 897},
+  {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 898},
+  {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 899},
   {"\
 Warning: shifted start of the extd partition from %ld to %ld\n\
-(For listing purposes only. Do not change its contents.)\n", 899},
+(For listing purposes only. Do not change its contents.)\n", 900},
   {"\
 Warning: extended partition does not start at a cylinder boundary.\n\
-DOS and Linux will interpret the contents differently.\n", 900},
-  {"too many partitions - ignoring those past nr (%d)\n", 901},
-  {"tree of partitions?\n", 902},
-  {"detected Disk Manager - unable to handle that\n", 903},
-  {"DM6 signature found - giving up\n", 904},
-  {"strange..., an extended partition of size 0?\n", 905},
-  {"strange..., a BSD partition of size 0?\n", 906},
-  {" %s: unrecognized partition\n", 907},
-  {"-n flag was given: Nothing changed\n", 908},
-  {"Failed saving the old sectors - aborting\n", 909},
-  {"Failed writing the partition on %s\n", 910},
-  {"long or incomplete input line - quitting\n", 911},
-  {"input error: `=' expected after %s field\n", 912},
-  {"input error: unexpected character %c after %s field\n", 913},
-  {"unrecognized input: %s\n", 914},
-  {"number too big\n", 915},
-  {"trailing junk after number\n", 916},
-  {"no room for partition descriptor\n", 917},
-  {"cannot build surrounding extended partition\n", 918},
-  {"too many input fields\n", 919},
-  {"No room for more\n", 920},
-  {"Illegal type\n", 921},
-  {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 922},
-  {"Warning: empty partition\n", 923},
-  {"Warning: bad partition start (earliest %lu)\n", 924},
-  {"unrecognized bootable flag - choose - or *\n", 925},
-  {"partial c,h,s specification?\n", 926},
-  {"Extended partition not where expected\n", 927},
-  {"bad input\n", 928},
-  {"too many partitions\n", 929},
+DOS and Linux will interpret the contents differently.\n", 901},
+  {"too many partitions - ignoring those past nr (%d)\n", 902},
+  {"tree of partitions?\n", 903},
+  {"detected Disk Manager - unable to handle that\n", 904},
+  {"DM6 signature found - giving up\n", 905},
+  {"strange..., an extended partition of size 0?\n", 906},
+  {"strange..., a BSD partition of size 0?\n", 907},
+  {" %s: unrecognized partition table type\n", 908},
+  {"-n flag was given: Nothing changed\n", 909},
+  {"Failed saving the old sectors - aborting\n", 910},
+  {"Failed writing the partition on %s\n", 911},
+  {"long or incomplete input line - quitting\n", 912},
+  {"input error: `=' expected after %s field\n", 913},
+  {"input error: unexpected character %c after %s field\n", 914},
+  {"unrecognized input: %s\n", 915},
+  {"number too big\n", 916},
+  {"trailing junk after number\n", 917},
+  {"no room for partition descriptor\n", 918},
+  {"cannot build surrounding extended partition\n", 919},
+  {"too many input fields\n", 920},
+  {"No room for more\n", 921},
+  {"Illegal type\n", 922},
+  {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 923},
+  {"Warning: empty partition\n", 924},
+  {"Warning: bad partition start (earliest %lu)\n", 925},
+  {"unrecognized bootable flag - choose - or *\n", 926},
+  {"partial c,h,s specification?\n", 927},
+  {"Extended partition not where expected\n", 928},
+  {"bad input\n", 929},
+  {"too many partitions\n", 930},
   {"\
 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", 930},
-  {"version", 931},
-  {"Usage: %s [options] device ...\n", 932},
-  {"device: something like /dev/hda or /dev/sda", 933},
-  {"useful options:", 934},
-  {"    -s [or --show-size]: list size of a partition", 935},
-  {"    -c [or --id]:        print or change partition Id", 936},
-  {"    -l [or --list]:      list partitions of each device", 937},
-  {"    -d [or --dump]:      idem, but in a format suitable for later input", 938},
-  {"    -i [or --increment]: number cylinders etc. from 1 instead of from 0", 939},
+Usually you only need to specify <start> and <size> (and perhaps <type>).\n", 931},
+  {"version", 932},
+  {"Usage: %s [options] device ...\n", 933},
+  {"device: something like /dev/hda or /dev/sda", 934},
+  {"useful options:", 935},
+  {"    -s [or --show-size]: list size of a partition", 936},
+  {"    -c [or --id]:        print or change partition Id", 937},
+  {"    -l [or --list]:      list partitions of each device", 938},
+  {"    -d [or --dump]:      idem, but in a format suitable for later input", 939},
+  {"    -i [or --increment]: number cylinders etc. from 1 instead of from 0", 940},
   {"\
     -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/\
-MB", 940},
-  {"    -T [or --list-types]:list the known partition types", 941},
-  {"    -D [or --DOS]:       for DOS-compatibility: waste a little space", 942},
-  {"    -R [or --re-read]:   make kernel reread partition table", 943},
-  {"    -N# :                change only the partition with number #", 944},
-  {"    -n :                 do not actually write to disk", 945},
-  {"\
-    -O file :            save the sectors that will be overwritten to file", 946},
-  {"    -I file :            restore these sectors again", 947},
-  {"    -v [or --version]:   print version", 948},
-  {"    -? [or --help]:      print this message", 949},
-  {"dangerous options:", 950},
-  {"    -g [or --show-geometry]: print the kernel's idea of the geometry", 951},
+MB", 941},
+  {"    -T [or --list-types]:list the known partition types", 942},
+  {"    -D [or --DOS]:       for DOS-compatibility: waste a little space", 943},
+  {"    -R [or --re-read]:   make kernel reread partition table", 944},
+  {"    -N# :                change only the partition with number #", 945},
+  {"    -n :                 do not actually write to disk", 946},
+  {"\
+    -O file :            save the sectors that will be overwritten to file", 947},
+  {"    -I file :            restore these sectors again", 948},
+  {"    -v [or --version]:   print version", 949},
+  {"    -? [or --help]:      print this message", 950},
+  {"dangerous options:", 951},
+  {"    -g [or --show-geometry]: print the kernel's idea of the geometry", 952},
   {"\
     -x [or --show-extended]: also list extended partitions on output\n\
-                             or expect descriptors for them on input", 952},
-  {"\
-    -L  [or --Linux]:      do not complain about things irrelevant for Linux", 953},
-  {"    -q  [or --quiet]:      suppress warning messages", 954},
-  {"    You can override the detected geometry using:", 955},
-  {"    -C# [or --cylinders #]:set the number of cylinders to use", 956},
-  {"    -H# [or --heads #]:    set the number of heads to use", 957},
-  {"    -S# [or --sectors #]:  set the number of sectors to use", 958},
-  {"You can disable all consistency checking with:", 959},
-  {"    -f  [or --force]:      do what I say, even if it is stupid", 960},
-  {"Usage:", 961},
-  {"%s device\t\t list active partitions on device\n", 962},
-  {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 963},
-  {"%s -An device\t activate partition n, inactivate the other ones\n", 964},
-  {"no command?\n", 965},
-  {"total: %lu blocks\n", 966},
-  {"usage: sfdisk --print-id device partition-number\n", 967},
-  {"usage: sfdisk --change-id device partition-number Id\n", 968},
-  {"usage: sfdisk --id device partition-number [Id]\n", 969},
-  {"can specify only one device (except with -l or -s)\n", 970},
-  {"cannot open %s read-write\n", 971},
-  {"cannot open %s for reading\n", 972},
-  {"%s: OK\n", 973},
-  {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 974},
-  {"BLKGETSIZE ioctl failed for %s\n", 975},
-  {"bad active byte: 0x%x instead of 0x80\n", 976},
+                             or expect descriptors for them on input", 953},
+  {"\
+    -L  [or --Linux]:      do not complain about things irrelevant for Linux", 954},
+  {"    -q  [or --quiet]:      suppress warning messages", 955},
+  {"    You can override the detected geometry using:", 956},
+  {"    -C# [or --cylinders #]:set the number of cylinders to use", 957},
+  {"    -H# [or --heads #]:    set the number of heads to use", 958},
+  {"    -S# [or --sectors #]:  set the number of sectors to use", 959},
+  {"You can disable all consistency checking with:", 960},
+  {"    -f  [or --force]:      do what I say, even if it is stupid", 961},
+  {"Usage:", 962},
+  {"%s device\t\t list active partitions on device\n", 963},
+  {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 964},
+  {"%s -An device\t activate partition n, inactivate the other ones\n", 965},
+  {"no command?\n", 966},
+  {"total: %lu blocks\n", 967},
+  {"usage: sfdisk --print-id device partition-number\n", 968},
+  {"usage: sfdisk --change-id device partition-number Id\n", 969},
+  {"usage: sfdisk --id device partition-number [Id]\n", 970},
+  {"can specify only one device (except with -l or -s)\n", 971},
+  {"cannot open %s read-write\n", 972},
+  {"cannot open %s for reading\n", 973},
+  {"%s: OK\n", 974},
+  {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 975},
+  {"BLKGETSIZE ioctl failed for %s\n", 976},
+  {"bad active byte: 0x%x instead of 0x80\n", 977},
   {"\
 Done\n\
-\n", 977},
+\n", 978},
   {"\
 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", 978},
-  {"partition %s has id %x and is not hidden\n", 979},
-  {"Bad Id %lx\n", 980},
-  {"This disk is currently in use.\n", 981},
-  {"Fatal error: cannot find %s\n", 982},
-  {"Warning: %s is not a block device\n", 983},
-  {"Checking that no-one is using this disk right now ...\n", 984},
+but the DOS MBR will only boot a disk with 1 active partition.\n", 979},
+  {"partition %s has id %x and is not hidden\n", 980},
+  {"Bad Id %lx\n", 981},
+  {"This disk is currently in use.\n", 982},
+  {"Fatal error: cannot find %s\n", 983},
+  {"Warning: %s is not a block device\n", 984},
+  {"Checking that no-one is using this disk right now ...\n", 985},
   {"\
 \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", 985},
-  {"Use the --force flag to overrule all checks.\n", 986},
-  {"OK\n", 987},
-  {"Old situation:\n", 988},
-  {"Partition %d does not exist, cannot change it\n", 989},
-  {"New situation:\n", 990},
+Use the --no-reread flag to suppress this check.\n", 986},
+  {"Use the --force flag to overrule all checks.\n", 987},
+  {"OK\n", 988},
+  {"Old situation:\n", 989},
+  {"Partition %d does not exist, cannot change it\n", 990},
+  {"New situation:\n", 991},
   {"\
 I don't like these partitions - nothing changed.\n\
-(If you really want this, use the --force option.)\n", 991},
-  {"I don't like this - probably you should answer No\n", 992},
-  {"Are you satisfied with this? [ynq] ", 993},
-  {"Do you want to write this to disk? [ynq] ", 994},
+(If you really want this, use the --force option.)\n", 992},
+  {"I don't like this - probably you should answer No\n", 993},
+  {"Are you satisfied with this? [ynq] ", 994},
+  {"Do you want to write this to disk? [ynq] ", 995},
   {"\
 \n\
-sfdisk: premature end of input\n", 995},
-  {"Quitting - nothing changed\n", 996},
-  {"Please answer one of y,n,q\n", 997},
+sfdisk: premature end of input\n", 996},
+  {"Quitting - nothing changed\n", 997},
+  {"Please answer one of y,n,q\n", 998},
   {"\
 Successfully wrote the new partition table\n\
-\n", 998},
+\n", 999},
   {"\
 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", 999},
-  {"Try `getopt --help' for more information.\n", 1000},
-  {"empty long option after -l or --long argument", 1001},
-  {"unknown shell after -s or --shell argument", 1002},
-  {"Usage: getopt optstring parameters\n", 1003},
-  {"       getopt [options] [--] optstring parameters\n", 1004},
-  {"       getopt [options] -o|--options optstring [options] [--]\n", 1005},
-  {"              parameters\n", 1006},
-  {"\
-  -a, --alternative            Allow long options starting with single -\n", 1007},
-  {"  -h, --help                   This small usage guide\n", 1008},
-  {"  -l, --longoptions=longopts   Long options to be recognized\n", 1009},
-  {"\
-  -n, --name=progname          The name under which errors are reported\n", 1010},
-  {"  -o, --options=optstring      Short options to be recognized\n", 1011},
-  {"  -q, --quiet                  Disable error reporting by getopt(3)\n", 1012},
-  {"  -Q, --quiet-output           No normal output\n", 1013},
-  {"  -s, --shell=shell            Set shell quoting conventions\n", 1014},
-  {"  -T, --test                   Test for getopt(1) version\n", 1015},
-  {"  -u, --unqote                 Do not quote the output\n", 1016},
-  {"  -V, --version                Output version information\n", 1017},
-  {"missing optstring argument", 1018},
-  {"getopt (enhanced) 1.1.3\n", 1019},
-  {"internal error, contact the author.", 1020},
-  {"booted from MILO\n", 1021},
-  {"Ruffian BCD clock\n", 1022},
-  {"clockport adjusted to 0x%x\n", 1023},
-  {"funky TOY!\n", 1024},
-  {"%s: atomic %s failed for 1000 iterations!", 1025},
-  {"Cannot open /dev/port: %s", 1026},
-  {"I failed to get permission because I didn't try.\n", 1027},
-  {"%s is unable to get I/O port access:  the iopl(3) call failed.\n", 1028},
-  {"Probably you need root privileges.\n", 1029},
-  {"Assuming hardware clock is kept in %s time.\n", 1030},
-  {"UTC", 1031},
-  {"local", 1032},
-  {"%s: Warning: unrecognized third line in adjtime file\n", 1033},
-  {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 1034},
-  {"Last drift adjustment done at %ld seconds after 1969\n", 1035},
-  {"Last calibration done at %ld seconds after 1969\n", 1036},
-  {"Hardware clock is on %s time\n", 1037},
-  {"unknown", 1038},
-  {"Waiting for clock tick...\n", 1039},
-  {"...got clock tick\n", 1040},
-  {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 1041},
-  {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1042},
-  {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 1043},
-  {"Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1044},
-  {"Clock not changed - testing only.\n", 1045},
+(See fdisk(8).)\n", 1000},
+  {"Try `getopt --help' for more information.\n", 1001},
+  {"empty long option after -l or --long argument", 1002},
+  {"unknown shell after -s or --shell argument", 1003},
+  {"Usage: getopt optstring parameters\n", 1004},
+  {"       getopt [options] [--] optstring parameters\n", 1005},
+  {"       getopt [options] -o|--options optstring [options] [--]\n", 1006},
+  {"              parameters\n", 1007},
+  {"\
+  -a, --alternative            Allow long options starting with single -\n", 1008},
+  {"  -h, --help                   This small usage guide\n", 1009},
+  {"  -l, --longoptions=longopts   Long options to be recognized\n", 1010},
+  {"\
+  -n, --name=progname          The name under which errors are reported\n", 1011},
+  {"  -o, --options=optstring      Short options to be recognized\n", 1012},
+  {"  -q, --quiet                  Disable error reporting by getopt(3)\n", 1013},
+  {"  -Q, --quiet-output           No normal output\n", 1014},
+  {"  -s, --shell=shell            Set shell quoting conventions\n", 1015},
+  {"  -T, --test                   Test for getopt(1) version\n", 1016},
+  {"  -u, --unqote                 Do not quote the output\n", 1017},
+  {"  -V, --version                Output version information\n", 1018},
+  {"missing optstring argument", 1019},
+  {"getopt (enhanced) 1.1.3\n", 1020},
+  {"internal error, contact the author.", 1021},
+  {"booted from MILO\n", 1022},
+  {"Ruffian BCD clock\n", 1023},
+  {"clockport adjusted to 0x%x\n", 1024},
+  {"funky TOY!\n", 1025},
+  {"%s: atomic %s failed for 1000 iterations!", 1026},
+  {"Cannot open /dev/port: %s", 1027},
+  {"I failed to get permission because I didn't try.\n", 1028},
+  {"%s is unable to get I/O port access:  the iopl(3) call failed.\n", 1029},
+  {"Probably you need root privileges.\n", 1030},
+  {"Assuming hardware clock is kept in %s time.\n", 1031},
+  {"UTC", 1032},
+  {"local", 1033},
+  {"%s: Warning: unrecognized third line in adjtime file\n", 1034},
+  {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 1035},
+  {"Last drift adjustment done at %ld seconds after 1969\n", 1036},
+  {"Last calibration done at %ld seconds after 1969\n", 1037},
+  {"Hardware clock is on %s time\n", 1038},
+  {"unknown", 1039},
+  {"Waiting for clock tick...\n", 1040},
+  {"...got clock tick\n", 1041},
+  {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 1042},
+  {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1043},
+  {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 1044},
+  {"Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1045},
+  {"Clock not changed - testing only.\n", 1046},
   {"\
 Time elapsed since reference time has been %.6f seconds.\n\
-Delaying further to reach the next full second.\n", 1046},
+Delaying further to reach the next full second.\n", 1047},
   {"\
 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", 1047},
-  {"%s  %.6f seconds\n", 1048},
-  {"No --date option specified.\n", 1049},
-  {"--date argument too long\n", 1050},
+50th day of month) or beyond the range we can handle (e.g. Year 2095).\n", 1048},
+  {"%s  %.6f seconds\n", 1049},
+  {"No --date option specified.\n", 1050},
+  {"--date argument too long\n", 1051},
   {"\
 The value of the --date option is not a valid date.\n\
-In particular, it contains quotation marks.\n", 1051},
-  {"Issuing date command: %s\n", 1052},
-  {"Unable to run 'date' program in /bin/sh shell. popen() failed", 1053},
-  {"response from date command = %s\n", 1054},
+In particular, it contains quotation marks.\n", 1052},
+  {"Issuing date command: %s\n", 1053},
+  {"Unable to run 'date' program in /bin/sh shell. popen() failed", 1054},
+  {"response from date command = %s\n", 1055},
   {"\
 The date command issued by %s returned unexpected results.\n\
 The command was:\n\
   %s\n\
 The response was:\n\
-  %s\n", 1055},
+  %s\n", 1056},
   {"\
 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", 1056},
-  {"date string %s equates to %ld seconds since 1969.\n", 1057},
+ %s\n", 1057},
+  {"date string %s equates to %ld seconds since 1969.\n", 1058},
   {"\
 The Hardware Clock does not contain a valid time, so we cannot set the \
-System Time from it.\n", 1058},
-  {"Calling settimeofday:\n", 1059},
-  {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 1060},
-  {"\ttz.tz_minuteswest = %d\n", 1061},
-  {"Not setting system clock because running in test mode.\n", 1062},
-  {"Must be superuser to set system clock.\n", 1063},
-  {"settimeofday() failed", 1064},
+System Time from it.\n", 1059},
+  {"Calling settimeofday:\n", 1060},
+  {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 1061},
+  {"\ttz.tz_minuteswest = %d\n", 1062},
+  {"Not setting system clock because running in test mode.\n", 1063},
+  {"Must be superuser to set system clock.\n", 1064},
+  {"settimeofday() failed", 1065},
   {"\
 Not adjusting drift factor because the Hardware Clock previously contained \
-garbage.\n", 1065},
+garbage.\n", 1066},
   {"\
 Not adjusting drift factor because last calibration time is zero,\n\
-so history is bad and calibration startover is necessary.\n", 1066},
+so history is bad and calibration startover is necessary.\n", 1067},
   {"\
 Not adjusting drift factor because it has been less than a day since the \
-last calibration.\n", 1067},
+last calibration.\n", 1068},
   {"\
 Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor \
 of %f seconds/day.\n\
-Adjusting drift factor by %f seconds/day\n", 1068},
-  {"Time since last adjustment is %d seconds\n", 1069},
-  {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1070},
-  {"Not updating adjtime file because of testing mode.\n", 1071},
+Adjusting drift factor by %f seconds/day\n", 1069},
+  {"Time since last adjustment is %d seconds\n", 1070},
+  {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1071},
+  {"Not updating adjtime file because of testing mode.\n", 1072},
   {"\
 Would have written the following to %s:\n\
-%s", 1072},
-  {"Drift adjustment parameters not updated.\n", 1073},
+%s", 1073},
+  {"Drift adjustment parameters not updated.\n", 1074},
   {"\
-The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1074},
-  {"Needed adjustment is less than one second, so not setting clock.\n", 1075},
-  {"Using %s.\n", 1076},
-  {"No usable clock interface found.\n", 1077},
-  {"Unable to set system clock.\n", 1078},
+The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1075},
+  {"Needed adjustment is less than one second, so not setting clock.\n", 1076},
+  {"Using %s.\n", 1077},
+  {"No usable clock interface found.\n", 1078},
+  {"Unable to set system clock.\n", 1079},
   {"\
 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", 1079},
-  {"Unable to get the epoch value from the kernel.\n", 1080},
-  {"Kernel is assuming an epoch value of %lu\n", 1081},
+(and thus is presumably not running on an Alpha now).  No action taken.\n", 1080},
+  {"Unable to get the epoch value from the kernel.\n", 1081},
+  {"Kernel is assuming an epoch value of %lu\n", 1082},
   {"\
 To set the epoch value, you must use the 'epoch' option to tell to what \
-value to set it.\n", 1082},
-  {"Not setting the epoch to %d - testing only.\n", 1083},
-  {"Unable to set the epoch value in the kernel.\n", 1084},
+value to set it.\n", 1083},
+  {"Not setting the epoch to %d - testing only.\n", 1084},
+  {"Unable to set the epoch value in the kernel.\n", 1085},
   {"\
 hwclock - query and set the hardware clock (RTC)\n\
 \n\
@@ -1500,559 +1501,556 @@ Options: \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", 1085},
+                either --utc or --localtime\n", 1086},
   {"\
   --jensen, --arc, --srm, --funky-toy\n\
-                tell hwclock the type of alpha you have (see hwclock(8))\n", 1086},
-  {"%s takes no non-option arguments.  You supplied %d.\n", 1087},
+                tell hwclock the type of alpha you have (see hwclock(8))\n", 1087},
+  {"%s takes no non-option arguments.  You supplied %d.\n", 1088},
   {"\
 You have specified multiple functions.\n\
-You can only perform one function at a time.\n", 1088},
+You can only perform one function at a time.\n", 1089},
   {"\
 %s: The --utc and --localtime options are mutually exclusive.  You specified \
-both.\n", 1089},
+both.\n", 1090},
   {"\
 %s: The --adjust and --noadjfile options are mutually exclusive.  You \
-specified both.\n", 1090},
-  {"%s: With --noadjfile, you must specify either --utc or --localtime\n", 1091},
-  {"No usable set-to time.  Cannot set clock.\n", 1092},
-  {"Sorry, only the superuser can change the Hardware Clock.\n", 1093},
-  {"Sorry, only the superuser can change the System Clock.\n", 1094},
+specified both.\n", 1091},
+  {"%s: With --noadjfile, you must specify either --utc or --localtime\n", 1092},
+  {"No usable set-to time.  Cannot set clock.\n", 1093},
+  {"Sorry, only the superuser can change the Hardware Clock.\n", 1094},
+  {"Sorry, only the superuser can change the System Clock.\n", 1095},
   {"\
 Sorry, only the superuser can change the Hardware Clock epoch in the \
-kernel.\n", 1095},
-  {"Cannot access the Hardware Clock via any known method.\n", 1096},
+kernel.\n", 1096},
+  {"Cannot access the Hardware Clock via any known method.\n", 1097},
   {"\
 Use the --debug option to see the details of our search for an access \
-method.\n", 1097},
-  {"Waiting in loop for time from KDGHWCLK to change\n", 1098},
-  {"KDGHWCLK ioctl to read time failed", 1099},
-  {"Timed out waiting for time change.\n", 1100},
-  {"KDGHWCLK ioctl to read time failed in loop", 1101},
-  {"ioctl() failed to read time from %s", 1102},
-  {"ioctl KDSHWCLK failed", 1103},
-  {"Can't open /dev/tty1 or /dev/vc/1", 1104},
-  {"KDGHWCLK ioctl failed", 1105},
-  {"open() of %s failed", 1106},
-  {"ioctl() to %s to read the time failed.\n", 1107},
-  {"Waiting in loop for time from %s to change\n", 1108},
-  {"%s does not have interrupt functions. ", 1109},
-  {"read() to %s to wait for clock tick failed", 1110},
-  {"select() to %s to wait for clock tick failed", 1111},
-  {"select() to %s to wait for clock tick timed out\n", 1112},
-  {"ioctl() to %s to turn off update interrupts failed", 1113},
-  {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1114},
-  {"ioctl() to %s to set the time failed.\n", 1115},
-  {"ioctl(%s) was successful.\n", 1116},
-  {"Open of %s failed", 1117},
+method.\n", 1098},
+  {"Waiting in loop for time from KDGHWCLK to change\n", 1099},
+  {"KDGHWCLK ioctl to read time failed", 1100},
+  {"Timed out waiting for time change.\n", 1101},
+  {"KDGHWCLK ioctl to read time failed in loop", 1102},
+  {"ioctl() failed to read time from %s", 1103},
+  {"ioctl KDSHWCLK failed", 1104},
+  {"Can't open /dev/tty1 or /dev/vc/1", 1105},
+  {"KDGHWCLK ioctl failed", 1106},
+  {"open() of %s failed", 1107},
+  {"ioctl() to %s to read the time failed.\n", 1108},
+  {"Waiting in loop for time from %s to change\n", 1109},
+  {"%s does not have interrupt functions. ", 1110},
+  {"read() to %s to wait for clock tick failed", 1111},
+  {"select() to %s to wait for clock tick failed", 1112},
+  {"select() to %s to wait for clock tick timed out\n", 1113},
+  {"ioctl() to %s to turn off update interrupts failed", 1114},
+  {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1115},
+  {"ioctl() to %s to set the time failed.\n", 1116},
+  {"ioctl(%s) was successful.\n", 1117},
+  {"Open of %s failed", 1118},
   {"\
 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", 1118},
-  {"Unable to open %s", 1119},
-  {"ioctl(RTC_EPOCH_READ) to %s failed", 1120},
-  {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1121},
-  {"The epoch value may not be less than 1900.  You requested %ld\n", 1122},
-  {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1123},
-  {"\
-The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1124},
-  {"ioctl(RTC_EPOCH_SET) to %s failed", 1125},
-  {"calling open_tty\n", 1126},
-  {"calling termio_init\n", 1127},
-  {"writing init string\n", 1128},
-  {"before autobaud\n", 1129},
-  {"waiting for cr-lf\n", 1130},
-  {"read %c\n", 1131},
-  {"reading login name\n", 1132},
-  {"%s: can't exec %s: %m", 1133},
-  {"can't malloc initstring", 1134},
-  {"bad timeout value: %s", 1135},
-  {"after getopt loop\n", 1136},
-  {"exiting parseargs\n", 1137},
-  {"entered parse_speeds\n", 1138},
-  {"bad speed: %s", 1139},
-  {"too many alternate speeds", 1140},
-  {"exiting parsespeeds\n", 1141},
-  {"/dev: chdir() failed: %m", 1142},
-  {"/dev/%s: not a character device", 1143},
-  {"open(2)\n", 1144},
-  {"/dev/%s: cannot open as standard input: %m", 1145},
-  {"%s: not open for read/write", 1146},
-  {"duping\n", 1147},
-  {"%s: dup problem: %m", 1148},
-  {"term_io 2\n", 1149},
-  {"user", 1150},
-  {"users", 1151},
-  {"%s: read: %m", 1152},
-  {"%s: input overrun", 1153},
+this system.\n", 1119},
+  {"Unable to open %s", 1120},
+  {"ioctl(RTC_EPOCH_READ) to %s failed", 1121},
+  {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1122},
+  {"The epoch value may not be less than 1900.  You requested %ld\n", 1123},
+  {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1124},
+  {"\
+The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1125},
+  {"ioctl(RTC_EPOCH_SET) to %s failed", 1126},
+  {"calling open_tty\n", 1127},
+  {"calling termio_init\n", 1128},
+  {"writing init string\n", 1129},
+  {"before autobaud\n", 1130},
+  {"waiting for cr-lf\n", 1131},
+  {"read %c\n", 1132},
+  {"reading login name\n", 1133},
+  {"%s: can't exec %s: %m", 1134},
+  {"can't malloc initstring", 1135},
+  {"bad timeout value: %s", 1136},
+  {"after getopt loop\n", 1137},
+  {"exiting parseargs\n", 1138},
+  {"entered parse_speeds\n", 1139},
+  {"bad speed: %s", 1140},
+  {"too many alternate speeds", 1141},
+  {"exiting parsespeeds\n", 1142},
+  {"/dev: chdir() failed: %m", 1143},
+  {"/dev/%s: not a character device", 1144},
+  {"open(2)\n", 1145},
+  {"/dev/%s: cannot open as standard input: %m", 1146},
+  {"%s: not open for read/write", 1147},
+  {"duping\n", 1148},
+  {"%s: dup problem: %m", 1149},
+  {"term_io 2\n", 1150},
+  {"user", 1151},
+  {"users", 1152},
+  {"%s: read: %m", 1153},
+  {"%s: input overrun", 1154},
   {"\
 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", 1154},
-  {"login: memory low, login may fail\n", 1155},
-  {"can't malloc for ttyclass", 1156},
-  {"can't malloc for grplist", 1157},
-  {"Login on %s from %s denied by default.\n", 1158},
-  {"Login on %s from %s denied.\n", 1159},
-  {"%s: you (user %d) don't exist.\n", 1160},
-  {"%s: user \"%s\" does not exist.\n", 1161},
-  {"%s: can only change local entries; use yp%s instead.\n", 1162},
-  {"Unknown user context", 1163},
-  {"%s: %s is not authorized to change the finger info of %s\n", 1164},
-  {"%s: Can't set default context for /etc/passwd", 1165},
-  {"Changing finger information for %s.\n", 1166},
-  {"Password error.", 1167},
-  {"Password: ", 1168},
-  {"Incorrect password.", 1169},
-  {"Finger information not changed.\n", 1170},
-  {"Usage: %s [ -f full-name ] [ -o office ] ", 1171},
+line baud_rate,... [termtype]\n", 1155},
+  {"login: memory low, login may fail\n", 1156},
+  {"can't malloc for ttyclass", 1157},
+  {"can't malloc for grplist", 1158},
+  {"Login on %s from %s denied by default.\n", 1159},
+  {"Login on %s from %s denied.\n", 1160},
+  {"%s: you (user %d) don't exist.\n", 1161},
+  {"%s: user \"%s\" does not exist.\n", 1162},
+  {"%s: can only change local entries; use yp%s instead.\n", 1163},
+  {"Unknown user context", 1164},
+  {"%s: %s is not authorized to change the finger info of %s\n", 1165},
+  {"%s: Can't set default context for /etc/passwd", 1166},
+  {"Changing finger information for %s.\n", 1167},
+  {"Password error.", 1168},
+  {"Password: ", 1169},
+  {"Incorrect password.", 1170},
+  {"Finger information not changed.\n", 1171},
+  {"Usage: %s [ -f full-name ] [ -o office ] ", 1172},
   {"\
 [ -p office-phone ]\n\
-\t[ -h home-phone ] ", 1172},
-  {"[ --help ] [ --version ]\n", 1173},
+\t[ -h home-phone ] ", 1173},
+  {"[ --help ] [ --version ]\n", 1174},
   {"\
 \n\
-Aborted.\n", 1174},
-  {"field is too long.\n", 1175},
-  {"'%c' is not allowed.\n", 1176},
-  {"Control characters are not allowed.\n", 1177},
-  {"Finger information *NOT* changed.  Try again later.\n", 1178},
-  {"Finger information changed.\n", 1179},
-  {"malloc failed", 1180},
-  {"%s: %s is not authorized to change the shell of %s\n", 1181},
-  {"%s: Your shell is not in /etc/shells, shell change denied\n", 1182},
-  {"Changing shell for %s.\n", 1183},
-  {"New shell", 1184},
-  {"Shell not changed.\n", 1185},
-  {"Shell *NOT* changed.  Try again later.\n", 1186},
-  {"Shell changed.\n", 1187},
+Aborted.\n", 1175},
+  {"field is too long.\n", 1176},
+  {"'%c' is not allowed.\n", 1177},
+  {"Control characters are not allowed.\n", 1178},
+  {"Finger information *NOT* changed.  Try again later.\n", 1179},
+  {"Finger information changed.\n", 1180},
+  {"malloc failed", 1181},
+  {"%s: %s is not authorized to change the shell of %s\n", 1182},
+  {"\
+%s: Running UID doesn't match UID of user we're altering, shell change \
+denied\n", 1183},
+  {"%s: Your shell is not in /etc/shells, shell change denied\n", 1184},
+  {"Changing shell for %s.\n", 1185},
+  {"New shell", 1186},
+  {"Shell not changed.\n", 1187},
+  {"Shell *NOT* changed.  Try again later.\n", 1188},
+  {"Shell changed.\n", 1189},
   {"\
 Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n\
-       [ username ]\n", 1188},
-  {"%s: shell must be a full path name.\n", 1189},
-  {"%s: \"%s\" does not exist.\n", 1190},
-  {"%s: \"%s\" is not executable.\n", 1191},
-  {"%s: '%c' is not allowed.\n", 1192},
-  {"%s: Control characters are not allowed.\n", 1193},
-  {"Warning: \"%s\" is not listed in /etc/shells\n", 1194},
-  {"%s: \"%s\" is not listed in /etc/shells.\n", 1195},
-  {"%s: use -l option to see list\n", 1196},
-  {"Warning: \"%s\" is not listed in /etc/shells.\n", 1197},
-  {"Use %s -l to see list.\n", 1198},
-  {"No known shells.\n", 1199},
-  {"couldn't open /dev/urandom", 1200},
-  {"couldn't read random data from /dev/urandom", 1201},
-  {"can't open %s for reading", 1202},
-  {"can't stat(%s)", 1203},
-  {"%s doesn't have the correct filemodes", 1204},
-  {"can't read data from %s", 1205},
-  {"Can't read %s, exiting.", 1206},
-  {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1207},
-  {"  still logged in", 1208},
+       [ username ]\n", 1190},
+  {"%s: shell must be a full path name.\n", 1191},
+  {"%s: \"%s\" does not exist.\n", 1192},
+  {"%s: \"%s\" is not executable.\n", 1193},
+  {"%s: '%c' is not allowed.\n", 1194},
+  {"%s: Control characters are not allowed.\n", 1195},
+  {"Warning: \"%s\" is not listed in /etc/shells\n", 1196},
+  {"%s: \"%s\" is not listed in /etc/shells.\n", 1197},
+  {"%s: use -l option to see list\n", 1198},
+  {"Warning: \"%s\" is not listed in /etc/shells.\n", 1199},
+  {"Use %s -l to see list.\n", 1200},
+  {"No known shells.\n", 1201},
+  {"couldn't open /dev/urandom", 1202},
+  {"couldn't read random data from /dev/urandom", 1203},
+  {"can't open %s for reading", 1204},
+  {"can't stat(%s)", 1205},
+  {"%s doesn't have the correct filemodes", 1206},
+  {"can't read data from %s", 1207},
+  {"Can't read %s, exiting.", 1208},
+  {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1209},
+  {"  still logged in", 1210},
   {"\
 \n\
-wtmp begins %s", 1209},
-  {"last: malloc failure.\n", 1210},
-  {"last: gethostname", 1211},
+wtmp begins %s", 1211},
+  {"last: malloc failure.\n", 1212},
+  {"last: gethostname", 1213},
   {"\
 \n\
-interrupted %10.10s %5.5s \n", 1212},
-  {"FATAL: can't reopen tty: %s", 1213},
-  {"FATAL: bad tty", 1214},
-  {"login: -h for super-user only.\n", 1215},
-  {"usage: login [-fp] [username]\n", 1216},
-  {"login: PAM Failure, aborting: %s\n", 1217},
-  {"Couldn't initialize PAM: %s", 1218},
-  {"login: ", 1219},
-  {"FAILED LOGIN %d FROM %s FOR %s, %s", 1220},
+interrupted %10.10s %5.5s \n", 1214},
+  {"FATAL: can't reopen tty: %s", 1215},
+  {"FATAL: bad tty", 1216},
+  {"login: -h for super-user only.\n", 1217},
+  {"usage: login [-fp] [username]\n", 1218},
+  {"login: PAM Failure, aborting: %s\n", 1219},
+  {"Couldn't initialize PAM: %s", 1220},
+  {"login: ", 1221},
+  {"FAILED LOGIN %d FROM %s FOR %s, %s", 1222},
   {"\
 Login incorrect\n\
-\n", 1221},
-  {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1222},
-  {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1223},
+\n", 1223},
+  {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1224},
+  {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1225},
   {"\
 \n\
-Login incorrect\n", 1224},
+Login incorrect\n", 1226},
   {"\
 \n\
-Session setup problem, abort.\n", 1225},
-  {"NULL user name in %s:%d. Abort.", 1226},
-  {"Invalid user name \"%s\" in %s:%d. Abort.", 1227},
-  {"login: Out of memory\n", 1228},
-  {"Illegal username", 1229},
-  {"%s login refused on this terminal.\n", 1230},
-  {"LOGIN %s REFUSED FROM %s ON TTY %s", 1231},
-  {"LOGIN %s REFUSED ON TTY %s", 1232},
-  {"Login incorrect\n", 1233},
+Session setup problem, abort.\n", 1227},
+  {"NULL user name in %s:%d. Abort.", 1228},
+  {"Invalid user name \"%s\" in %s:%d. Abort.", 1229},
+  {"login: Out of memory\n", 1230},
+  {"Illegal username", 1231},
+  {"%s login refused on this terminal.\n", 1232},
+  {"LOGIN %s REFUSED FROM %s ON TTY %s", 1233},
+  {"LOGIN %s REFUSED ON TTY %s", 1234},
+  {"Login incorrect\n", 1235},
   {"\
 Too many users logged on already.\n\
-Try again later.\n", 1234},
-  {"You have too many processes running.\n", 1235},
-  {"DIALUP AT %s BY %s", 1236},
-  {"ROOT LOGIN ON %s FROM %s", 1237},
-  {"ROOT LOGIN ON %s", 1238},
-  {"LOGIN ON %s BY %s FROM %s", 1239},
-  {"LOGIN ON %s BY %s", 1240},
-  {"You have new mail.\n", 1241},
-  {"You have mail.\n", 1242},
-  {"login: failure forking: %s", 1243},
-  {"TIOCSCTTY failed: %m", 1244},
-  {"setuid() failed", 1245},
-  {"No directory %s!\n", 1246},
-  {"Logging in with home = \"/\".\n", 1247},
-  {"login: no memory for shell script.\n", 1248},
-  {"login: couldn't exec shell script: %s.\n", 1249},
-  {"login: no shell: %s.\n", 1250},
+Try again later.\n", 1236},
+  {"You have too many processes running.\n", 1237},
+  {"DIALUP AT %s BY %s", 1238},
+  {"ROOT LOGIN ON %s FROM %s", 1239},
+  {"ROOT LOGIN ON %s", 1240},
+  {"LOGIN ON %s BY %s FROM %s", 1241},
+  {"LOGIN ON %s BY %s", 1242},
+  {"You have new mail.\n", 1243},
+  {"You have mail.\n", 1244},
+  {"login: failure forking: %s", 1245},
+  {"TIOCSCTTY failed: %m", 1246},
+  {"setuid() failed", 1247},
+  {"No directory %s!\n", 1248},
+  {"Logging in with home = \"/\".\n", 1249},
+  {"login: no memory for shell script.\n", 1250},
+  {"login: couldn't exec shell script: %s.\n", 1251},
+  {"login: no shell: %s.\n", 1252},
   {"\
 \n\
-%s login: ", 1251},
-  {"login name much too long.\n", 1252},
-  {"NAME too long", 1253},
-  {"login names may not start with '-'.\n", 1254},
-  {"too many bare linefeeds.\n", 1255},
-  {"EXCESSIVE linefeeds", 1256},
-  {"Login timed out after %d seconds\n", 1257},
-  {"Last login: %.*s ", 1258},
-  {"from %.*s\n", 1259},
-  {"on %.*s\n", 1260},
-  {"LOGIN FAILURE FROM %s, %s", 1261},
-  {"LOGIN FAILURE ON %s, %s", 1262},
-  {"%d LOGIN FAILURES FROM %s, %s", 1263},
-  {"%d LOGIN FAILURES ON %s, %s", 1264},
-  {"is y\n", 1265},
-  {"is n\n", 1266},
-  {"usage: mesg [y | n]\n", 1267},
-  {"newgrp: Who are you?", 1268},
-  {"newgrp: setgid", 1269},
-  {"newgrp: No such group.", 1270},
-  {"newgrp: Permission denied", 1271},
-  {"newgrp: setuid", 1272},
-  {"No shell", 1273},
-  {"The password must have at least 6 characters, try again.\n", 1274},
+%s login: ", 1253},
+  {"login name much too long.\n", 1254},
+  {"NAME too long", 1255},
+  {"login names may not start with '-'.\n", 1256},
+  {"too many bare linefeeds.\n", 1257},
+  {"EXCESSIVE linefeeds", 1258},
+  {"Login timed out after %d seconds\n", 1259},
+  {"Last login: %.*s ", 1260},
+  {"from %.*s\n", 1261},
+  {"on %.*s\n", 1262},
+  {"LOGIN FAILURE FROM %s, %s", 1263},
+  {"LOGIN FAILURE ON %s, %s", 1264},
+  {"%d LOGIN FAILURES FROM %s, %s", 1265},
+  {"%d LOGIN FAILURES ON %s, %s", 1266},
+  {"is y\n", 1267},
+  {"is n\n", 1268},
+  {"usage: mesg [y | n]\n", 1269},
+  {"newgrp: Who are you?", 1270},
+  {"newgrp: setgid", 1271},
+  {"newgrp: No such group.", 1272},
+  {"newgrp: Permission denied", 1273},
+  {"newgrp: setuid", 1274},
+  {"No shell", 1275},
+  {"The password must have at least 6 characters, try again.\n", 1276},
   {"\
 The password must contain characters out of two of the following\n\
 classes:  upper and lower case letters, digits and non alphanumeric\n\
-characters. See passwd(1) for more information.\n", 1275},
-  {"You cannot reuse the old password.\n", 1276},
-  {"Please don't use something like your username as password!\n", 1277},
-  {"Please don't use something like your realname as password!\n", 1278},
-  {"Usage: passwd [username [password]]\n", 1279},
-  {"Only root may use the one and two argument forms.\n", 1280},
-  {"Usage: passwd [-foqsvV] [user [password]]\n", 1281},
-  {"Can't exec %s: %s\n", 1282},
-  {"Cannot find login name", 1283},
-  {"Only root can change the password for others.\n", 1284},
-  {"Too many arguments.\n", 1285},
-  {"Can't find username anywhere. Is `%s' really a user?", 1286},
-  {"Sorry, I can only change local passwords. Use yppasswd instead.", 1287},
-  {"UID and username does not match, imposter!", 1288},
-  {"Changing password for %s\n", 1289},
-  {"Enter old password: ", 1290},
-  {"Illegal password, imposter.", 1291},
-  {"Enter new password: ", 1292},
-  {"Password not changed.", 1293},
-  {"Re-type new password: ", 1294},
-  {"You misspelled it. Password not changed.", 1295},
-  {"password changed, user %s", 1296},
-  {"ROOT PASSWORD CHANGED", 1297},
-  {"password changed by root, user %s", 1298},
-  {"calling setpwnam to set password.\n", 1299},
-  {"Password *NOT* changed.  Try again later.\n", 1300},
-  {"Password changed.\n", 1301},
-  {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1302},
-  {"Shutdown process aborted", 1303},
-  {"%s: Only root can shut a system down.\n", 1304},
-  {"That must be tomorrow, can't you wait till then?\n", 1305},
-  {"for maintenance; bounce, bounce", 1306},
-  {"timeout = %d, quiet = %d, reboot = %d\n", 1307},
-  {"The system is being shut down within 5 minutes", 1308},
-  {"Login is therefore prohibited.", 1309},
-  {"rebooted by %s: %s", 1310},
-  {"halted by %s: %s", 1311},
+characters. See passwd(1) for more information.\n", 1277},
+  {"You cannot reuse the old password.\n", 1278},
+  {"Please don't use something like your username as password!\n", 1279},
+  {"Please don't use something like your realname as password!\n", 1280},
+  {"Usage: passwd [username [password]]\n", 1281},
+  {"Only root may use the one and two argument forms.\n", 1282},
+  {"Usage: passwd [-foqsvV] [user [password]]\n", 1283},
+  {"Can't exec %s: %s\n", 1284},
+  {"Cannot find login name", 1285},
+  {"Only root can change the password for others.\n", 1286},
+  {"Too many arguments.\n", 1287},
+  {"Can't find username anywhere. Is `%s' really a user?", 1288},
+  {"Sorry, I can only change local passwords. Use yppasswd instead.", 1289},
+  {"UID and username does not match, imposter!", 1290},
+  {"Changing password for %s\n", 1291},
+  {"Enter old password: ", 1292},
+  {"Illegal password, imposter.", 1293},
+  {"Enter new password: ", 1294},
+  {"Password not changed.", 1295},
+  {"Re-type new password: ", 1296},
+  {"You misspelled it. Password not changed.", 1297},
+  {"password changed, user %s", 1298},
+  {"ROOT PASSWORD CHANGED", 1299},
+  {"password changed by root, user %s", 1300},
+  {"calling setpwnam to set password.\n", 1301},
+  {"Password *NOT* changed.  Try again later.\n", 1302},
+  {"Password changed.\n", 1303},
+  {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1304},
+  {"Shutdown process aborted", 1305},
+  {"%s: Only root can shut a system down.\n", 1306},
+  {"That must be tomorrow, can't you wait till then?\n", 1307},
+  {"for maintenance; bounce, bounce", 1308},
+  {"timeout = %d, quiet = %d, reboot = %d\n", 1309},
+  {"The system is being shut down within 5 minutes", 1310},
+  {"Login is therefore prohibited.", 1311},
+  {"rebooted by %s: %s", 1312},
+  {"halted by %s: %s", 1313},
   {"\
 \n\
-Why am I still alive after reboot?", 1312},
+Why am I still alive after reboot?", 1314},
   {"\
 \n\
-Now you can turn off the power...", 1313},
-  {"Calling kernel power-off facility...\n", 1314},
-  {"Error powering off\t%s\n", 1315},
-  {"Executing the program \"%s\" ...\n", 1316},
-  {"Error executing\t%s\n", 1317},
-  {"URGENT: broadcast message from %s:", 1318},
-  {"System going down in %d hours %d minutes", 1319},
-  {"System going down in 1 hour %d minutes", 1320},
-  {"System going down in %d minutes\n", 1321},
-  {"System going down in 1 minute\n", 1322},
-  {"System going down IMMEDIATELY!\n", 1323},
-  {"\t... %s ...\n", 1324},
-  {"Cannot fork for swapoff. Shrug!", 1325},
-  {"Cannot exec swapoff, hoping umount will do the trick.", 1326},
-  {"Cannot fork for umount, trying manually.", 1327},
-  {"Cannot exec %s, trying umount.\n", 1328},
-  {"Cannot exec umount, giving up on umount.", 1329},
-  {"Unmounting any remaining filesystems...", 1330},
-  {"shutdown: Couldn't umount %s: %s\n", 1331},
-  {"Booting to single user mode.\n", 1332},
-  {"exec of single user shell failed\n", 1333},
-  {"fork of single user shell failed\n", 1334},
-  {"error opening fifo\n", 1335},
-  {"error setting close-on-exec on /dev/initctl", 1336},
-  {"error running finalprog\n", 1337},
-  {"error forking finalprog\n", 1338},
+Now you can turn off the power...", 1315},
+  {"Calling kernel power-off facility...\n", 1316},
+  {"Error powering off\t%s\n", 1317},
+  {"Executing the program \"%s\" ...\n", 1318},
+  {"Error executing\t%s\n", 1319},
+  {"URGENT: broadcast message from %s:", 1320},
+  {"System going down in %d hours %d minutes", 1321},
+  {"System going down in 1 hour %d minutes", 1322},
+  {"System going down in %d minutes\n", 1323},
+  {"System going down in 1 minute\n", 1324},
+  {"System going down IMMEDIATELY!\n", 1325},
+  {"\t... %s ...\n", 1326},
+  {"Cannot fork for swapoff. Shrug!", 1327},
+  {"Cannot exec swapoff, hoping umount will do the trick.", 1328},
+  {"Cannot fork for umount, trying manually.", 1329},
+  {"Cannot exec %s, trying umount.\n", 1330},
+  {"Cannot exec umount, giving up on umount.", 1331},
+  {"Unmounting any remaining filesystems...", 1332},
+  {"shutdown: Couldn't umount %s: %s\n", 1333},
+  {"Booting to single user mode.\n", 1334},
+  {"exec of single user shell failed\n", 1335},
+  {"fork of single user shell failed\n", 1336},
+  {"error opening fifo\n", 1337},
+  {"error setting close-on-exec on /dev/initctl", 1338},
+  {"error running finalprog\n", 1339},
+  {"error forking finalprog\n", 1340},
   {"\
 \n\
-Wrong password.\n", 1339},
-  {"lstat of path failed\n", 1340},
-  {"stat of path failed\n", 1341},
-  {"open of directory failed\n", 1342},
-  {"fork failed\n", 1343},
-  {"exec failed\n", 1344},
-  {"cannot open inittab\n", 1345},
-  {"no TERM or cannot stat tty\n", 1346},
-  {"error stopping service: \"%s\"", 1347},
-  {"too many iov's (change code in wall/ttymsg.c)", 1348},
-  {"excessively long line arg", 1349},
-  {"cannot fork", 1350},
-  {"fork: %s", 1351},
-  {"%s: BAD ERROR", 1352},
-  {"%s: the password file is busy.\n", 1353},
-  {"%s: the group file is busy.\n", 1354},
-  {"%s: the %s file is busy (%s present)\n", 1355},
-  {"%s: can't link %s: %s\n", 1356},
-  {"%s: Can't get context for %s", 1357},
-  {"%s: Can't set context for %s", 1358},
-  {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1359},
-  {"%s: Cannot fork\n", 1360},
-  {"%s: %s unchanged\n", 1361},
-  {"%s: no changes made\n", 1362},
-  {"You are using shadow groups on this system.\n", 1363},
-  {"You are using shadow passwords on this system.\n", 1364},
-  {"Would you like to edit %s now [y/n]? ", 1365},
-  {"usage: %s [file]\n", 1366},
-  {"%s: can't open temporary file.\n", 1367},
-  {"Broadcast Message from %s@%s", 1368},
-  {"%s: will not read %s - use stdin.\n", 1369},
-  {"%s: can't read %s.\n", 1370},
-  {"%s: can't stat temporary file.\n", 1371},
-  {"%s: can't read temporary file.\n", 1372},
-  {"illegal month value: use 1-12", 1373},
-  {"illegal year value: use 1-9999", 1374},
-  {"%s %d", 1375},
-  {"usage: cal [-13smjyV] [[month] year]\n", 1376},
-  {"usage: %s [+format] [day month year]\n", 1377},
-  {"St. Tib's Day", 1378},
-  {"%s: unknown signal %s\n", 1379},
-  {"%s: can't find process \"%s\"\n", 1380},
-  {"%s: unknown signal %s; valid signals:\n", 1381},
-  {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1382},
-  {"       %s -l [ signal ]\n", 1383},
-  {"logger: %s: %s.\n", 1384},
-  {"logger: unknown facility name: %s.\n", 1385},
-  {"logger: unknown priority name: %s.\n", 1386},
-  {"\
-usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1387},
-  {"usage: look [-dfa] [-t char] string [file]\n", 1388},
-  {"Could not open %s\n", 1389},
-  {"Got %d bytes from %s\n", 1390},
-  {"namei: unable to get current directory - %s\n", 1391},
-  {"namei: unable to chdir to %s - %s (%d)\n", 1392},
-  {"usage: namei [-mx] pathname [pathname ...]\n", 1393},
-  {"namei: could not chdir to root!\n", 1394},
-  {"namei: could not stat root!\n", 1395},
-  {"namei: buf overflow\n", 1396},
-  {" ? could not chdir into %s - %s (%d)\n", 1397},
-  {" ? problems reading symlink %s - %s (%d)\n", 1398},
-  {"  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1399},
-  {"namei: unknown file type 0%06o on file %s\n", 1400},
-  {"%s: out of memory\n", 1401},
-  {"%s: renaming %s to %s failed: %s\n", 1402},
-  {"call: %s from to files...\n", 1403},
+Wrong password.\n", 1341},
+  {"lstat of path failed\n", 1342},
+  {"stat of path failed\n", 1343},
+  {"open of directory failed\n", 1344},
+  {"fork failed\n", 1345},
+  {"exec failed\n", 1346},
+  {"cannot open inittab\n", 1347},
+  {"no TERM or cannot stat tty\n", 1348},
+  {"error stopping service: \"%s\"", 1349},
+  {"too many iov's (change code in wall/ttymsg.c)", 1350},
+  {"excessively long line arg", 1351},
+  {"cannot fork", 1352},
+  {"fork: %s", 1353},
+  {"%s: BAD ERROR", 1354},
+  {"%s: the password file is busy.\n", 1355},
+  {"%s: the group file is busy.\n", 1356},
+  {"%s: the %s file is busy (%s present)\n", 1357},
+  {"%s: can't link %s: %s\n", 1358},
+  {"%s: Can't get context for %s", 1359},
+  {"%s: Can't set context for %s", 1360},
+  {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1361},
+  {"%s: Cannot fork\n", 1362},
+  {"%s: %s unchanged\n", 1363},
+  {"%s: no changes made\n", 1364},
+  {"You are using shadow groups on this system.\n", 1365},
+  {"You are using shadow passwords on this system.\n", 1366},
+  {"Would you like to edit %s now [y/n]? ", 1367},
+  {"usage: %s [file]\n", 1368},
+  {"%s: can't open temporary file.\n", 1369},
+  {"Broadcast Message from %s@%s", 1370},
+  {"%s: will not read %s - use stdin.\n", 1371},
+  {"%s: can't read %s.\n", 1372},
+  {"%s: can't stat temporary file.\n", 1373},
+  {"%s: can't read temporary file.\n", 1374},
+  {"illegal month value: use 1-12", 1375},
+  {"illegal year value: use 1-9999", 1376},
+  {"%s %d", 1377},
+  {"usage: cal [-13smjyV] [[month] year]\n", 1378},
+  {"usage: %s [+format] [day month year]\n", 1379},
+  {"St. Tib's Day", 1380},
+  {"%s: unknown signal %s\n", 1381},
+  {"%s: can't find process \"%s\"\n", 1382},
+  {"%s: unknown signal %s; valid signals:\n", 1383},
+  {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1384},
+  {"       %s -l [ signal ]\n", 1385},
+  {"logger: %s: %s.\n", 1386},
+  {"logger: unknown facility name: %s.\n", 1387},
+  {"logger: unknown priority name: %s.\n", 1388},
+  {"\
+usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1389},
+  {"usage: look [-dfa] [-t char] string [file]\n", 1390},
+  {"Could not open %s\n", 1391},
+  {"Got %d bytes from %s\n", 1392},
+  {"namei: unable to get current directory - %s\n", 1393},
+  {"namei: unable to chdir to %s - %s (%d)\n", 1394},
+  {"usage: namei [-mx] pathname [pathname ...]\n", 1395},
+  {"namei: could not chdir to root!\n", 1396},
+  {"namei: could not stat root!\n", 1397},
+  {"namei: buf overflow\n", 1398},
+  {" ? could not chdir into %s - %s (%d)\n", 1399},
+  {" ? problems reading symlink %s - %s (%d)\n", 1400},
+  {"  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1401},
+  {"namei: unknown file type 0%06o on file %s\n", 1402},
+  {"%s: out of memory\n", 1403},
+  {"%s: renaming %s to %s failed: %s\n", 1404},
+  {"call: %s from to files...\n", 1405},
   {"\
 Warning: `%s' is a link.\n\
 Use `%s [options] %s' if you really want to use it.\n\
-Script not started.\n", 1404},
-  {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1405},
-  {"Script started, file is %s\n", 1406},
-  {"Script started on %s", 1407},
+Script not started.\n", 1406},
+  {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1407},
+  {"Script started, file is %s\n", 1408},
+  {"Script started on %s", 1409},
   {"\
 \n\
-Script done on %s", 1408},
-  {"Script done, file is %s\n", 1409},
-  {"openpty failed\n", 1410},
-  {"Out of pty's\n", 1411},
-  {"%s: Argument error, usage\n", 1412},
-  {"  [ -term terminal_name ]\n", 1413},
-  {"  [ -reset ]\n", 1414},
-  {"  [ -initialize ]\n", 1415},
-  {"  [ -cursor [on|off] ]\n", 1416},
-  {"  [ -snow [on|off] ]\n", 1417},
-  {"  [ -softscroll [on|off] ]\n", 1418},
-  {"  [ -repeat [on|off] ]\n", 1419},
-  {"  [ -appcursorkeys [on|off] ]\n", 1420},
-  {"  [ -linewrap [on|off] ]\n", 1421},
-  {"  [ -default ]\n", 1422},
-  {"  [ -foreground black|blue|green|cyan", 1423},
-  {"|red|magenta|yellow|white|default ]\n", 1424},
-  {"  [ -background black|blue|green|cyan", 1425},
-  {"  [ -ulcolor black|grey|blue|green|cyan", 1426},
-  {"|red|magenta|yellow|white ]\n", 1427},
-  {"  [ -ulcolor bright blue|green|cyan", 1428},
-  {"  [ -hbcolor black|grey|blue|green|cyan", 1429},
-  {"  [ -hbcolor bright blue|green|cyan", 1430},
-  {"  [ -standout [ attr ] ]\n", 1431},
-  {"  [ -inversescreen [on|off] ]\n", 1432},
-  {"  [ -bold [on|off] ]\n", 1433},
-  {"  [ -half-bright [on|off] ]\n", 1434},
-  {"  [ -blink [on|off] ]\n", 1435},
-  {"  [ -reverse [on|off] ]\n", 1436},
-  {"  [ -underline [on|off] ]\n", 1437},
-  {"  [ -store ]\n", 1438},
-  {"  [ -clear [all|rest] ]\n", 1439},
-  {"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n", 1440},
-  {"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n", 1441},
-  {"  [ -regtabs [1-160] ]\n", 1442},
-  {"  [ -blank [0-60] ]\n", 1443},
-  {"  [ -dump   [1-NR_CONSOLES] ]\n", 1444},
-  {"  [ -append [1-NR_CONSOLES] ]\n", 1445},
-  {"  [ -file dumpfilename ]\n", 1446},
-  {"  [ -msg [on|off] ]\n", 1447},
-  {"  [ -msglevel [0-8] ]\n", 1448},
-  {"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1449},
-  {"  [ -powerdown [0-60] ]\n", 1450},
-  {"  [ -blength [0-2000] ]\n", 1451},
-  {"  [ -bfreq freqnumber ]\n", 1452},
-  {"cannot (un)set powersave mode\n", 1453},
-  {"klogctl error: %s\n", 1454},
-  {"Error reading %s\n", 1455},
-  {"Error writing screendump\n", 1456},
-  {"couldn't read %s, and cannot ioctl dump\n", 1457},
-  {"%s: $TERM is not defined.\n", 1458},
-  {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1459},
-  {"write: can't find your tty's name\n", 1460},
-  {"write: you have write permission turned off.\n", 1461},
-  {"write: %s is not logged in on %s.\n", 1462},
-  {"write: %s has messages disabled on %s\n", 1463},
-  {"usage: write user [tty]\n", 1464},
-  {"write: %s is not logged in\n", 1465},
-  {"write: %s has messages disabled\n", 1466},
-  {"write: %s is logged in more than once; writing to %s\n", 1467},
-  {"Message from %s@%s (as %s) on %s at %s ...", 1468},
-  {"Message from %s@%s on %s at %s ...", 1469},
-  {"warning: error reading %s: %s", 1470},
-  {"warning: can't open %s: %s", 1471},
-  {"mount: could not open %s - using %s instead\n", 1472},
-  {"can't create lock file %s: %s (use -n flag to override)", 1473},
-  {"can't link lock file %s: %s (use -n flag to override)", 1474},
-  {"can't open lock file %s: %s (use -n flag to override)", 1475},
-  {"Can't lock lock file %s: %s\n", 1476},
-  {"can't lock lock file %s: %s", 1477},
-  {"timed out", 1478},
+Script done on %s", 1410},
+  {"Script done, file is %s\n", 1411},
+  {"openpty failed\n", 1412},
+  {"Out of pty's\n", 1413},
+  {"%s: Argument error, usage\n", 1414},
+  {"  [ -term terminal_name ]\n", 1415},
+  {"  [ -reset ]\n", 1416},
+  {"  [ -initialize ]\n", 1417},
+  {"  [ -cursor [on|off] ]\n", 1418},
+  {"  [ -snow [on|off] ]\n", 1419},
+  {"  [ -softscroll [on|off] ]\n", 1420},
+  {"  [ -repeat [on|off] ]\n", 1421},
+  {"  [ -appcursorkeys [on|off] ]\n", 1422},
+  {"  [ -linewrap [on|off] ]\n", 1423},
+  {"  [ -default ]\n", 1424},
+  {"  [ -foreground black|blue|green|cyan", 1425},
+  {"|red|magenta|yellow|white|default ]\n", 1426},
+  {"  [ -background black|blue|green|cyan", 1427},
+  {"  [ -ulcolor black|grey|blue|green|cyan", 1428},
+  {"|red|magenta|yellow|white ]\n", 1429},
+  {"  [ -ulcolor bright blue|green|cyan", 1430},
+  {"  [ -hbcolor black|grey|blue|green|cyan", 1431},
+  {"  [ -hbcolor bright blue|green|cyan", 1432},
+  {"  [ -standout [ attr ] ]\n", 1433},
+  {"  [ -inversescreen [on|off] ]\n", 1434},
+  {"  [ -bold [on|off] ]\n", 1435},
+  {"  [ -half-bright [on|off] ]\n", 1436},
+  {"  [ -blink [on|off] ]\n", 1437},
+  {"  [ -reverse [on|off] ]\n", 1438},
+  {"  [ -underline [on|off] ]\n", 1439},
+  {"  [ -store ]\n", 1440},
+  {"  [ -clear [all|rest] ]\n", 1441},
+  {"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n", 1442},
+  {"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n", 1443},
+  {"  [ -regtabs [1-160] ]\n", 1444},
+  {"  [ -blank [0-60] ]\n", 1445},
+  {"  [ -dump   [1-NR_CONSOLES] ]\n", 1446},
+  {"  [ -append [1-NR_CONSOLES] ]\n", 1447},
+  {"  [ -file dumpfilename ]\n", 1448},
+  {"  [ -msg [on|off] ]\n", 1449},
+  {"  [ -msglevel [0-8] ]\n", 1450},
+  {"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1451},
+  {"  [ -powerdown [0-60] ]\n", 1452},
+  {"  [ -blength [0-2000] ]\n", 1453},
+  {"  [ -bfreq freqnumber ]\n", 1454},
+  {"cannot (un)set powersave mode\n", 1455},
+  {"klogctl error: %s\n", 1456},
+  {"Error reading %s\n", 1457},
+  {"Error writing screendump\n", 1458},
+  {"couldn't read %s, and cannot ioctl dump\n", 1459},
+  {"%s: $TERM is not defined.\n", 1460},
+  {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1461},
+  {"write: can't find your tty's name\n", 1462},
+  {"write: you have write permission turned off.\n", 1463},
+  {"write: %s is not logged in on %s.\n", 1464},
+  {"write: %s has messages disabled on %s\n", 1465},
+  {"usage: write user [tty]\n", 1466},
+  {"write: %s is not logged in\n", 1467},
+  {"write: %s has messages disabled\n", 1468},
+  {"write: %s is logged in more than once; writing to %s\n", 1469},
+  {"Message from %s@%s (as %s) on %s at %s ...", 1470},
+  {"Message from %s@%s on %s at %s ...", 1471},
+  {"warning: error reading %s: %s", 1472},
+  {"warning: can't open %s: %s", 1473},
+  {"mount: could not open %s - using %s instead\n", 1474},
+  {"can't create lock file %s: %s (use -n flag to override)", 1475},
+  {"can't link lock file %s: %s (use -n flag to override)", 1476},
+  {"can't open lock file %s: %s (use -n flag to override)", 1477},
+  {"Can't lock lock file %s: %s\n", 1478},
+  {"can't lock lock file %s: %s", 1479},
+  {"timed out", 1480},
   {"\
 Cannot create link %s\n\
-Perhaps there is a stale lock file?\n", 1479},
-  {"cannot open %s (%s) - mtab not updated", 1480},
-  {"error writing %s: %s", 1481},
-  {"error changing mode of %s: %s\n", 1482},
-  {"can't rename %s to %s: %s\n", 1483},
-  {"loop: can't open device %s: %s\n", 1484},
-  {", offset %lld", 1485},
-  {", sizelimit %lld", 1486},
-  {", encryption %s (type %d)", 1487},
-  {", offset %d", 1488},
-  {", encryption type %d\n", 1489},
-  {"loop: can't get info on device %s: %s\n", 1490},
-  {"mount: could not find any device /dev/loop#", 1491},
+Perhaps there is a stale lock file?\n", 1481},
+  {"cannot open %s (%s) - mtab not updated", 1482},
+  {"error writing %s: %s", 1483},
+  {"error changing mode of %s: %s\n", 1484},
+  {"can't rename %s to %s: %s\n", 1485},
+  {"loop: can't open device %s: %s\n", 1486},
+  {", offset %lld", 1487},
+  {", sizelimit %lld", 1488},
+  {", encryption %s (type %d)", 1489},
+  {", offset %d", 1490},
+  {", encryption type %d\n", 1491},
+  {"loop: can't get info on device %s: %s\n", 1492},
+  {"mount: could not find any device /dev/loop#", 1493},
   {"\
 mount: Could not find any loop device. Maybe this kernel does not know\n\
-       about the loop device? (If so, recompile or `modprobe loop'.)", 1492},
-  {"mount: could not find any free loop device", 1493},
-  {"Couldn't lock into memory, exiting.\n", 1494},
-  {"set_loop(%s,%s,%d): success\n", 1495},
-  {"loop: can't delete device %s: %s\n", 1496},
-  {"del_loop(%s): success\n", 1497},
-  {"This mount was compiled without loop support. Please recompile.\n", 1498},
+       about the loop device? (If so, recompile or `modprobe loop'.)", 1494},
+  {"mount: could not find any free loop device", 1495},
+  {"Couldn't lock into memory, exiting.\n", 1496},
+  {"set_loop(%s,%s,%llu): success\n", 1497},
+  {"loop: can't delete device %s: %s\n", 1498},
+  {"del_loop(%s): success\n", 1499},
+  {"This mount was compiled without loop support. Please recompile.\n", 1500},
   {"\
 usage:\n\
   %s loop_device                                      # give info\n\
   %s -d loop_device                                   # delete\n\
-  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1499},
-  {"not enough memory", 1500},
-  {"No loop support was available at compile time. Please recompile.\n", 1501},
-  {"[mntent]: warning: no final newline at the end of %s\n", 1502},
-  {"[mntent]: line %d in %s is bad%s\n", 1503},
-  {"; rest of file ignored", 1504},
-  {"mount: according to mtab, %s is already mounted on %s", 1505},
-  {"mount: according to mtab, %s is mounted on %s", 1506},
-  {"mount: can't open %s for writing: %s", 1507},
-  {"mount: error writing %s: %s", 1508},
-  {"mount: error changing mode of %s: %s", 1509},
-  {"%s looks like swapspace - not mounted", 1510},
-  {"mount failed", 1511},
-  {"mount: only root can mount %s on %s", 1512},
-  {"mount: loop device specified twice", 1513},
-  {"mount: type specified twice", 1514},
-  {"mount: skipping the setup of a loop device\n", 1515},
-  {"mount: going to use the loop device %s\n", 1516},
-  {"mount: failed setting up loop device\n", 1517},
-  {"mount: setup loop device successfully\n", 1518},
-  {"mount: can't open %s: %s", 1519},
-  {"mount: argument to -p or --pass-fd must be a number", 1520},
-  {"mount: cannot open %s for setting speed", 1521},
-  {"mount: cannot set speed: %s", 1522},
-  {"mount: cannot fork: %s", 1523},
-  {"mount: this version was compiled without support for the type `nfs'", 1524},
-  {"mount: failed with nfs mount version 4, trying 3..\n", 1525},
-  {"\
-mount: I could not determine the filesystem type, and none was specified", 1526},
-  {"mount: you must specify the filesystem type", 1527},
-  {"mount: mount failed", 1528},
-  {"mount: mount point %s is not a directory", 1529},
-  {"mount: permission denied", 1530},
-  {"mount: must be superuser to use mount", 1531},
-  {"mount: %s is busy", 1532},
-  {"mount: proc already mounted", 1533},
-  {"mount: %s already mounted or %s busy", 1534},
-  {"mount: mount point %s does not exist", 1535},
-  {"mount: mount point %s is a symbolic link to nowhere", 1536},
-  {"mount: special device %s does not exist", 1537},
+  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1501},
+  {"not enough memory", 1502},
+  {"No loop support was available at compile time. Please recompile.\n", 1503},
+  {"[mntent]: warning: no final newline at the end of %s\n", 1504},
+  {"[mntent]: line %d in %s is bad%s\n", 1505},
+  {"; rest of file ignored", 1506},
+  {"mount: according to mtab, %s is already mounted on %s", 1507},
+  {"mount: according to mtab, %s is mounted on %s", 1508},
+  {"mount: can't open %s for writing: %s", 1509},
+  {"mount: error writing %s: %s", 1510},
+  {"mount: error changing mode of %s: %s", 1511},
+  {"%s looks like swapspace - not mounted", 1512},
+  {"mount failed", 1513},
+  {"mount: only root can mount %s on %s", 1514},
+  {"mount: loop device specified twice", 1515},
+  {"mount: type specified twice", 1516},
+  {"mount: skipping the setup of a loop device\n", 1517},
+  {"mount: going to use the loop device %s\n", 1518},
+  {"mount: failed setting up loop device\n", 1519},
+  {"mount: setup loop device successfully\n", 1520},
+  {"mount: can't open %s: %s", 1521},
+  {"mount: argument to -p or --pass-fd must be a number", 1522},
+  {"mount: cannot open %s for setting speed", 1523},
+  {"mount: cannot set speed: %s", 1524},
+  {"mount: cannot fork: %s", 1525},
+  {"mount: this version was compiled without support for the type `nfs'", 1526},
+  {"mount: failed with nfs mount version 4, trying 3..\n", 1527},
+  {"\
+mount: I could not determine the filesystem type, and none was specified", 1528},
+  {"mount: you must specify the filesystem type", 1529},
+  {"mount: mount failed", 1530},
+  {"mount: mount point %s is not a directory", 1531},
+  {"mount: permission denied", 1532},
+  {"mount: must be superuser to use mount", 1533},
+  {"mount: %s is busy", 1534},
+  {"mount: proc already mounted", 1535},
+  {"mount: %s already mounted or %s busy", 1536},
+  {"mount: mount point %s does not exist", 1537},
+  {"mount: mount point %s is a symbolic link to nowhere", 1538},
+  {"mount: special device %s does not exist", 1539},
   {"\
 mount: special device %s does not exist\n\
-       (a path prefix is not a directory)\n", 1538},
-  {"mount: %s not mounted already, or bad option", 1539},
+       (a path prefix is not a directory)\n", 1540},
+  {"mount: %s not mounted already, or bad option", 1541},
   {"\
 mount: wrong fs type, bad option, bad superblock on %s,\n\
-       or too many mounted file systems", 1540},
-  {"mount table full", 1541},
-  {"mount: %s: can't read superblock", 1542},
-  {"mount: %s: unknown device", 1543},
-  {"mount: fs type %s not supported by kernel", 1544},
-  {"mount: probably you meant %s", 1545},
-  {"mount: maybe you meant iso9660 ?", 1546},
-  {"mount: %s has wrong device number or fs type %s not supported", 1547},
-  {"mount: %s is not a block device, and stat fails?", 1548},
+       or too many mounted file systems", 1542},
+  {"mount table full", 1543},
+  {"mount: %s: can't read superblock", 1544},
+  {"mount: %s: unknown device", 1545},
+  {"mount: fs type %s not supported by kernel", 1546},
+  {"mount: probably you meant %s", 1547},
+  {"mount: maybe you meant iso9660 ?", 1548},
+  {"mount: %s has wrong device number or fs type %s not supported", 1549},
+  {"mount: %s is not a block device, and stat fails?", 1550},
   {"\
 mount: the kernel does not recognize %s as a block device\n\
-       (maybe `insmod driver'?)", 1549},
-  {"mount: %s is not a block device (maybe try `-o loop'?)", 1550},
-  {"mount: %s is not a block device", 1551},
-  {"mount: %s is not a valid block device", 1552},
-  {"block device ", 1553},
-  {"mount: cannot mount %s%s read-only", 1554},
-  {"mount: %s%s is write-protected but explicit `-w' flag given", 1555},
-  {"mount: %s%s is write-protected, mounting read-only", 1556},
-  {"mount: the label %s occurs on both %s and %s\n", 1557},
-  {"mount: %s duplicate - not mounted", 1558},
-  {"mount: going to mount %s by %s\n", 1559},
-  {"UUID", 1560},
-  {"label", 1561},
-  {"mount: no such partition found", 1562},
-  {"mount: no type was given - I'll assume nfs because of the colon\n", 1563},
-  {"mount: no type was given - I'll assume smbfs because of the // prefix\n", 1564},
-  {"mount: backgrounding \"%s\"\n", 1565},
-  {"mount: giving up \"%s\"\n", 1566},
-  {"mount: %s already mounted on %s\n", 1567},
+       (maybe `insmod driver'?)", 1551},
+  {"mount: %s is not a block device (maybe try `-o loop'?)", 1552},
+  {"mount: %s is not a block device", 1553},
+  {"mount: %s is not a valid block device", 1554},
+  {"block device ", 1555},
+  {"mount: cannot mount %s%s read-only", 1556},
+  {"mount: %s%s is write-protected but explicit `-w' flag given", 1557},
+  {"mount: %s%s is write-protected, mounting read-only", 1558},
+  {"mount: no type was given - I'll assume nfs because of the colon\n", 1559},
+  {"mount: no type was given - I'll assume smbfs because of the // prefix\n", 1560},
+  {"mount: backgrounding \"%s\"\n", 1561},
+  {"mount: giving up \"%s\"\n", 1562},
+  {"mount: %s already mounted on %s\n", 1563},
   {"\
 Usage: mount -V                 : print version\n\
        mount -h                 : print this help\n\
@@ -2074,290 +2072,290 @@ or move a subtree:\n\
 A device can be given by name, say /dev/hda1 or /dev/cdrom,\n\
 or by label, using  -L label  or by uuid, using  -U uuid .\n\
 Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n\
-For many more details, say  man 8 mount .\n", 1568},
-  {"mount: only root can do that", 1569},
-  {"mount: no %s found - creating it..\n", 1570},
-  {"mount: the label %s occurs on both %s and %s - not mounted\n", 1571},
-  {"mount: mounting %s\n", 1572},
-  {"nothing was mounted", 1573},
-  {"mount: cannot find %s in %s", 1574},
-  {"mount: can't find %s in %s or %s", 1575},
-  {"\
-mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1576},
-  {"mount: bad UUID", 1577},
-  {"mount: error while guessing filesystem type\n", 1578},
-  {"mount: you didn't specify a filesystem type for %s\n", 1579},
-  {"       I will try all types mentioned in %s or %s\n", 1580},
-  {"       and it looks like this is swapspace\n", 1581},
-  {"       I will try type %s\n", 1582},
-  {"Trying %s\n", 1583},
-  {"mount: excessively long host:dir argument\n", 1584},
-  {"mount: warning: multiple hostnames not supported\n", 1585},
-  {"mount: directory to mount not in host:dir format\n", 1586},
-  {"mount: can't get address for %s\n", 1587},
-  {"mount: got bad hp->h_length\n", 1588},
-  {"mount: excessively long option argument\n", 1589},
-  {"Warning: Unrecognized proto= option.\n", 1590},
-  {"Warning: Option namlen is not supported.\n", 1591},
-  {"unknown nfs mount parameter: %s=%d\n", 1592},
-  {"Warning: option nolock is not supported.\n", 1593},
-  {"unknown nfs mount option: %s%s\n", 1594},
-  {"mount: got bad hp->h_length?\n", 1595},
-  {"NFS over TCP is not supported.\n", 1596},
-  {"nfs socket", 1597},
-  {"nfs bindresvport", 1598},
-  {"nfs server reported service unavailable", 1599},
-  {"used portmapper to find NFS port\n", 1600},
-  {"using port %d for nfs deamon\n", 1601},
-  {"nfs connect", 1602},
-  {"unknown nfs status return value: %d", 1603},
-  {"bug in xstrndup call", 1604},
+For many more details, say  man 8 mount .\n", 1564},
+  {"mount: only root can do that", 1565},
+  {"mount: no %s found - creating it..\n", 1566},
+  {"mount: no such partition found", 1567},
+  {"mount: mounting %s\n", 1568},
+  {"nothing was mounted", 1569},
+  {"mount: cannot find %s in %s", 1570},
+  {"mount: can't find %s in %s or %s", 1571},
+  {"\
+mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1572},
+  {"mount: bad UUID", 1573},
+  {"mount: error while guessing filesystem type\n", 1574},
+  {"mount: you didn't specify a filesystem type for %s\n", 1575},
+  {"       I will try all types mentioned in %s or %s\n", 1576},
+  {"       and it looks like this is swapspace\n", 1577},
+  {"       I will try type %s\n", 1578},
+  {"Trying %s\n", 1579},
+  {"mount: excessively long host:dir argument\n", 1580},
+  {"mount: warning: multiple hostnames not supported\n", 1581},
+  {"mount: directory to mount not in host:dir format\n", 1582},
+  {"mount: can't get address for %s\n", 1583},
+  {"mount: got bad hp->h_length\n", 1584},
+  {"mount: excessively long option argument\n", 1585},
+  {"Warning: Unrecognized proto= option.\n", 1586},
+  {"Warning: Option namlen is not supported.\n", 1587},
+  {"unknown nfs mount parameter: %s=%d\n", 1588},
+  {"Warning: option nolock is not supported.\n", 1589},
+  {"unknown nfs mount option: %s%s\n", 1590},
+  {"mount: got bad hp->h_length?\n", 1591},
+  {"NFS over TCP is not supported.\n", 1592},
+  {"nfs socket", 1593},
+  {"nfs bindresvport", 1594},
+  {"nfs server reported service unavailable", 1595},
+  {"used portmapper to find NFS port\n", 1596},
+  {"using port %d for nfs deamon\n", 1597},
+  {"nfs connect", 1598},
+  {"unknown nfs status return value: %d", 1599},
+  {"bug in xstrndup call", 1600},
   {"\
 usage: %s [-hV]\n\
        %s -a [-e] [-v]\n\
        %s [-v] [-p priority] special ...\n\
-       %s [-s]\n", 1605},
+       %s [-s]\n", 1601},
   {"\
 usage: %s [-hV]\n\
        %s -a [-v]\n\
-       %s [-v] special ...\n", 1606},
-  {"%s on %s\n", 1607},
-  {"swapon: cannot stat %s: %s\n", 1608},
-  {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1609},
-  {"swapon: Skipping file %s - it appears to have holes.\n", 1610},
-  {"Not superuser.\n", 1611},
-  {"%s: cannot open %s: %s\n", 1612},
-  {"umount: compiled without support for -f\n", 1613},
-  {"host: %s, directory: %s\n", 1614},
-  {"umount: can't get address for %s\n", 1615},
-  {"umount: got bad hostp->h_length\n", 1616},
-  {"umount: %s: invalid block device", 1617},
-  {"umount: %s: not mounted", 1618},
-  {"umount: %s: can't write superblock", 1619},
-  {"umount: %s: device is busy", 1620},
-  {"umount: %s: not found", 1621},
-  {"umount: %s: must be superuser to umount", 1622},
-  {"umount: %s: block devices not permitted on fs", 1623},
-  {"umount: %s: %s", 1624},
-  {"no umount2, trying umount...\n", 1625},
-  {"could not umount %s - trying %s instead\n", 1626},
-  {"umount: %s busy - remounted read-only\n", 1627},
-  {"umount: could not remount %s read-only\n", 1628},
-  {"%s umounted\n", 1629},
-  {"umount: cannot find list of filesystems to unmount", 1630},
+       %s [-v] special ...\n", 1602},
+  {"%s on %s\n", 1603},
+  {"swapon: cannot stat %s: %s\n", 1604},
+  {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1605},
+  {"swapon: Skipping file %s - it appears to have holes.\n", 1606},
+  {"Not superuser.\n", 1607},
+  {"%s: cannot open %s: %s\n", 1608},
+  {"umount: compiled without support for -f\n", 1609},
+  {"host: %s, directory: %s\n", 1610},
+  {"umount: can't get address for %s\n", 1611},
+  {"umount: got bad hostp->h_length\n", 1612},
+  {"umount: %s: invalid block device", 1613},
+  {"umount: %s: not mounted", 1614},
+  {"umount: %s: can't write superblock", 1615},
+  {"umount: %s: device is busy", 1616},
+  {"umount: %s: not found", 1617},
+  {"umount: %s: must be superuser to umount", 1618},
+  {"umount: %s: block devices not permitted on fs", 1619},
+  {"umount: %s: %s", 1620},
+  {"no umount2, trying umount...\n", 1621},
+  {"could not umount %s - trying %s instead\n", 1622},
+  {"umount: %s busy - remounted read-only\n", 1623},
+  {"umount: could not remount %s read-only\n", 1624},
+  {"%s umounted\n", 1625},
+  {"umount: cannot find list of filesystems to unmount", 1626},
   {"\
 Usage: umount [-hV]\n\
        umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n\
-       umount [-f] [-r] [-n] [-v] special | node...\n", 1631},
-  {"Trying to umount %s\n", 1632},
-  {"Could not find %s in mtab\n", 1633},
-  {"umount: %s is not mounted (according to mtab)", 1634},
-  {"umount: it seems %s is mounted multiple times", 1635},
-  {"umount: %s is not in the fstab (and you are not root)", 1636},
-  {"umount: %s mount disagrees with the fstab", 1637},
-  {"umount: only %s can unmount %s from %s", 1638},
-  {"umount: only root can do that", 1639},
-  {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1640},
-  {"Usage: ctrlaltdel hard|soft\n", 1641},
+       umount [-f] [-r] [-n] [-v] special | node...\n", 1627},
+  {"Trying to umount %s\n", 1628},
+  {"Could not find %s in mtab\n", 1629},
+  {"umount: %s is not mounted (according to mtab)", 1630},
+  {"umount: it seems %s is mounted multiple times", 1631},
+  {"umount: %s is not in the fstab (and you are not root)", 1632},
+  {"umount: %s mount disagrees with the fstab", 1633},
+  {"umount: only %s can unmount %s from %s", 1634},
+  {"umount: only root can do that", 1635},
+  {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1636},
+  {"Usage: ctrlaltdel hard|soft\n", 1637},
   {"\
 File %s, For threshold value %lu, Maximum characters in fifo were %d,\n\
-and the maximum transfer rate in characters/second was %f\n", 1642},
+and the maximum transfer rate in characters/second was %f\n", 1638},
   {"\
 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", 1643},
-  {"Invalid interval value: %s\n", 1644},
-  {"Invalid set value: %s\n", 1645},
-  {"Invalid default value: %s\n", 1646},
-  {"Invalid set time value: %s\n", 1647},
-  {"Invalid default time value: %s\n", 1648},
+and the maximum transfer rate in characters/second was %f\n", 1639},
+  {"Invalid interval value: %s\n", 1640},
+  {"Invalid set value: %s\n", 1641},
+  {"Invalid default value: %s\n", 1642},
+  {"Invalid set time value: %s\n", 1643},
+  {"Invalid default time value: %s\n", 1644},
   {"\
 Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) \
-[-g|-G] file [file...]\n", 1649},
-  {"Can't open %s: %s\n", 1650},
-  {"Can't set %s to threshold %d: %s\n", 1651},
-  {"Can't set %s to time threshold %d: %s\n", 1652},
-  {"Can't get threshold for %s: %s\n", 1653},
-  {"Can't get timeout for %s: %s\n", 1654},
-  {"%s: %ld current threshold and %ld current timeout\n", 1655},
-  {"%s: %ld default threshold and %ld default timeout\n", 1656},
-  {"Can't set signal handler", 1657},
-  {"gettimeofday failed", 1658},
-  {"Can't issue CYGETMON on %s: %s\n", 1659},
-  {"\
-%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1660},
-  {"   %f int/sec; %f rec, %f send (char/sec)\n", 1661},
-  {"\
-%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1662},
-  {"   %f int/sec; %f rec (char/sec)\n", 1663},
-  {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1664},
-  {"invalid id: %s\n", 1665},
-  {"cannot remove id %s (%s)\n", 1666},
-  {"deprecated usage: %s {shm | msg | sem} id ...\n", 1667},
-  {"unknown resource type: %s\n", 1668},
-  {"resource(s) deleted\n", 1669},
+[-g|-G] file [file...]\n", 1645},
+  {"Can't open %s: %s\n", 1646},
+  {"Can't set %s to threshold %d: %s\n", 1647},
+  {"Can't set %s to time threshold %d: %s\n", 1648},
+  {"Can't get threshold for %s: %s\n", 1649},
+  {"Can't get timeout for %s: %s\n", 1650},
+  {"%s: %ld current threshold and %ld current timeout\n", 1651},
+  {"%s: %ld default threshold and %ld default timeout\n", 1652},
+  {"Can't set signal handler", 1653},
+  {"gettimeofday failed", 1654},
+  {"Can't issue CYGETMON on %s: %s\n", 1655},
+  {"\
+%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1656},
+  {"   %f int/sec; %f rec, %f send (char/sec)\n", 1657},
+  {"\
+%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1658},
+  {"   %f int/sec; %f rec (char/sec)\n", 1659},
+  {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1660},
+  {"invalid id: %s\n", 1661},
+  {"cannot remove id %s (%s)\n", 1662},
+  {"deprecated usage: %s {shm | msg | sem} id ...\n", 1663},
+  {"unknown resource type: %s\n", 1664},
+  {"resource(s) deleted\n", 1665},
   {"\
 usage: %s [ [-q msqid] [-m shmid] [-s semid]\n\
-          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1670},
-  {"%s: illegal option -- %c\n", 1671},
-  {"%s: illegal key (%s)\n", 1672},
-  {"permission denied for key", 1673},
-  {"already removed key", 1674},
-  {"invalid key", 1675},
-  {"unknown error in key", 1676},
-  {"permission denied for id", 1677},
-  {"invalid id", 1678},
-  {"already removed id", 1679},
-  {"unknown error in id", 1680},
-  {"%s: %s (%s)\n", 1681},
-  {"%s: unknown argument: %s\n", 1682},
-  {"usage : %s -asmq -tclup \n", 1683},
-  {"\t%s [-s -m -q] -i id\n", 1684},
-  {"\t%s -h for help.\n", 1685},
-  {"\
-%s provides information on ipc facilities for which you have read access.\n", 1686},
+          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1666},
+  {"%s: illegal option -- %c\n", 1667},
+  {"%s: illegal key (%s)\n", 1668},
+  {"permission denied for key", 1669},
+  {"already removed key", 1670},
+  {"invalid key", 1671},
+  {"unknown error in key", 1672},
+  {"permission denied for id", 1673},
+  {"invalid id", 1674},
+  {"already removed id", 1675},
+  {"unknown error in id", 1676},
+  {"%s: %s (%s)\n", 1677},
+  {"%s: unknown argument: %s\n", 1678},
+  {"usage : %s -asmq -tclup \n", 1679},
+  {"\t%s [-s -m -q] -i id\n", 1680},
+  {"\t%s -h for help.\n", 1681},
+  {"\
+%s provides information on ipc facilities for which you have read access.\n", 1682},
   {"\
 Resource Specification:\n\
 \t-m : shared_mem\n\
-\t-q : messages\n", 1687},
+\t-q : messages\n", 1683},
   {"\
 \t-s : semaphores\n\
-\t-a : all (default)\n", 1688},
+\t-a : all (default)\n", 1684},
   {"\
 Output Format:\n\
 \t-t : time\n\
 \t-p : pid\n\
-\t-c : creator\n", 1689},
+\t-c : creator\n", 1685},
   {"\
 \t-l : limits\n\
-\t-u : summary\n", 1690},
-  {"-i id [-s -q -m] : details on resource identified by id\n", 1691},
-  {"kernel not configured for shared memory\n", 1692},
-  {"------ Shared Memory Limits --------\n", 1693},
-  {"max number of segments = %lu\n", 1694},
-  {"max seg size (kbytes) = %lu\n", 1695},
-  {"max total shared memory (pages) = %lu\n", 1696},
-  {"min seg size (bytes) = %lu\n", 1697},
-  {"------ Shared Memory Status --------\n", 1698},
-  {"segments allocated %d\n", 1699},
-  {"pages allocated %ld\n", 1700},
-  {"pages resident  %ld\n", 1701},
-  {"pages swapped   %ld\n", 1702},
-  {"Swap performance: %ld attempts\t %ld successes\n", 1703},
-  {"------ Shared Memory Segment Creators/Owners --------\n", 1704},
-  {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1705},
-  {"shmid", 1706},
-  {"perms", 1707},
-  {"cuid", 1708},
-  {"cgid", 1709},
-  {"uid", 1710},
-  {"gid", 1711},
-  {"------ Shared Memory Attach/Detach/Change Times --------\n", 1712},
-  {"%-10s %-10s %-20s %-20s %-20s\n", 1713},
-  {"owner", 1714},
-  {"attached", 1715},
-  {"detached", 1716},
-  {"changed", 1717},
-  {"------ Shared Memory Creator/Last-op --------\n", 1718},
-  {"%-10s %-10s %-10s %-10s\n", 1719},
-  {"cpid", 1720},
-  {"lpid", 1721},
-  {"------ Shared Memory Segments --------\n", 1722},
-  {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1723},
-  {"key", 1724},
-  {"bytes", 1725},
-  {"nattch", 1726},
-  {"status", 1727},
-  {"Not set", 1728},
-  {"dest", 1729},
-  {"locked", 1730},
-  {"kernel not configured for semaphores\n", 1731},
-  {"------ Semaphore Limits --------\n", 1732},
-  {"max number of arrays = %d\n", 1733},
-  {"max semaphores per array = %d\n", 1734},
-  {"max semaphores system wide = %d\n", 1735},
-  {"max ops per semop call = %d\n", 1736},
-  {"semaphore max value = %d\n", 1737},
-  {"------ Semaphore Status --------\n", 1738},
-  {"used arrays = %d\n", 1739},
-  {"allocated semaphores = %d\n", 1740},
-  {"------ Semaphore Arrays Creators/Owners --------\n", 1741},
-  {"semid", 1742},
-  {"------ Shared Memory Operation/Change Times --------\n", 1743},
-  {"%-8s %-10s %-26.24s %-26.24s\n", 1744},
-  {"last-op", 1745},
-  {"last-changed", 1746},
-  {"------ Semaphore Arrays --------\n", 1747},
-  {"%-10s %-10s %-10s %-10s %-10s\n", 1748},
-  {"nsems", 1749},
-  {"kernel not configured for message queues\n", 1750},
-  {"------ Messages: Limits --------\n", 1751},
-  {"max queues system wide = %d\n", 1752},
-  {"max size of message (bytes) = %d\n", 1753},
-  {"default max size of queue (bytes) = %d\n", 1754},
-  {"------ Messages: Status --------\n", 1755},
-  {"allocated queues = %d\n", 1756},
-  {"used headers = %d\n", 1757},
-  {"used space = %d bytes\n", 1758},
-  {"------ Message Queues: Creators/Owners --------\n", 1759},
-  {"msqid", 1760},
-  {"------ Message Queues Send/Recv/Change Times --------\n", 1761},
-  {"%-8s %-10s %-20s %-20s %-20s\n", 1762},
-  {"send", 1763},
-  {"recv", 1764},
-  {"change", 1765},
-  {"------ Message Queues PIDs --------\n", 1766},
-  {"lspid", 1767},
-  {"lrpid", 1768},
-  {"------ Message Queues --------\n", 1769},
-  {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1770},
-  {"used-bytes", 1771},
-  {"messages", 1772},
+\t-u : summary\n", 1686},
+  {"-i id [-s -q -m] : details on resource identified by id\n", 1687},
+  {"kernel not configured for shared memory\n", 1688},
+  {"------ Shared Memory Limits --------\n", 1689},
+  {"max number of segments = %lu\n", 1690},
+  {"max seg size (kbytes) = %lu\n", 1691},
+  {"max total shared memory (pages) = %lu\n", 1692},
+  {"min seg size (bytes) = %lu\n", 1693},
+  {"------ Shared Memory Status --------\n", 1694},
+  {"segments allocated %d\n", 1695},
+  {"pages allocated %ld\n", 1696},
+  {"pages resident  %ld\n", 1697},
+  {"pages swapped   %ld\n", 1698},
+  {"Swap performance: %ld attempts\t %ld successes\n", 1699},
+  {"------ Shared Memory Segment Creators/Owners --------\n", 1700},
+  {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1701},
+  {"shmid", 1702},
+  {"perms", 1703},
+  {"cuid", 1704},
+  {"cgid", 1705},
+  {"uid", 1706},
+  {"gid", 1707},
+  {"------ Shared Memory Attach/Detach/Change Times --------\n", 1708},
+  {"%-10s %-10s %-20s %-20s %-20s\n", 1709},
+  {"owner", 1710},
+  {"attached", 1711},
+  {"detached", 1712},
+  {"changed", 1713},
+  {"------ Shared Memory Creator/Last-op --------\n", 1714},
+  {"%-10s %-10s %-10s %-10s\n", 1715},
+  {"cpid", 1716},
+  {"lpid", 1717},
+  {"------ Shared Memory Segments --------\n", 1718},
+  {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1719},
+  {"key", 1720},
+  {"bytes", 1721},
+  {"nattch", 1722},
+  {"status", 1723},
+  {"Not set", 1724},
+  {"dest", 1725},
+  {"locked", 1726},
+  {"kernel not configured for semaphores\n", 1727},
+  {"------ Semaphore Limits --------\n", 1728},
+  {"max number of arrays = %d\n", 1729},
+  {"max semaphores per array = %d\n", 1730},
+  {"max semaphores system wide = %d\n", 1731},
+  {"max ops per semop call = %d\n", 1732},
+  {"semaphore max value = %d\n", 1733},
+  {"------ Semaphore Status --------\n", 1734},
+  {"used arrays = %d\n", 1735},
+  {"allocated semaphores = %d\n", 1736},
+  {"------ Semaphore Arrays Creators/Owners --------\n", 1737},
+  {"semid", 1738},
+  {"------ Shared Memory Operation/Change Times --------\n", 1739},
+  {"%-8s %-10s %-26.24s %-26.24s\n", 1740},
+  {"last-op", 1741},
+  {"last-changed", 1742},
+  {"------ Semaphore Arrays --------\n", 1743},
+  {"%-10s %-10s %-10s %-10s %-10s\n", 1744},
+  {"nsems", 1745},
+  {"kernel not configured for message queues\n", 1746},
+  {"------ Messages: Limits --------\n", 1747},
+  {"max queues system wide = %d\n", 1748},
+  {"max size of message (bytes) = %d\n", 1749},
+  {"default max size of queue (bytes) = %d\n", 1750},
+  {"------ Messages: Status --------\n", 1751},
+  {"allocated queues = %d\n", 1752},
+  {"used headers = %d\n", 1753},
+  {"used space = %d bytes\n", 1754},
+  {"------ Message Queues: Creators/Owners --------\n", 1755},
+  {"msqid", 1756},
+  {"------ Message Queues Send/Recv/Change Times --------\n", 1757},
+  {"%-8s %-10s %-20s %-20s %-20s\n", 1758},
+  {"send", 1759},
+  {"recv", 1760},
+  {"change", 1761},
+  {"------ Message Queues PIDs --------\n", 1762},
+  {"lspid", 1763},
+  {"lrpid", 1764},
+  {"------ Message Queues --------\n", 1765},
+  {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1766},
+  {"used-bytes", 1767},
+  {"messages", 1768},
   {"\
 \n\
-Shared memory Segment shmid=%d\n", 1773},
-  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1774},
-  {"mode=%#o\taccess_perms=%#o\n", 1775},
-  {"bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1776},
-  {"att_time=%-26.24s\n", 1777},
-  {"det_time=%-26.24s\n", 1778},
-  {"change_time=%-26.24s\n", 1779},
+Shared memory Segment shmid=%d\n", 1769},
+  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1770},
+  {"mode=%#o\taccess_perms=%#o\n", 1771},
+  {"bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1772},
+  {"att_time=%-26.24s\n", 1773},
+  {"det_time=%-26.24s\n", 1774},
+  {"change_time=%-26.24s\n", 1775},
   {"\
 \n\
-Message Queue msqid=%d\n", 1780},
-  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1781},
-  {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1782},
-  {"send_time=%-26.24s\n", 1783},
-  {"rcv_time=%-26.24s\n", 1784},
+Message Queue msqid=%d\n", 1776},
+  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1777},
+  {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1778},
+  {"send_time=%-26.24s\n", 1779},
+  {"rcv_time=%-26.24s\n", 1780},
   {"\
 \n\
-Semaphore Array semid=%d\n", 1785},
-  {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1786},
-  {"mode=%#o, access_perms=%#o\n", 1787},
-  {"nsems = %ld\n", 1788},
-  {"otime = %-26.24s\n", 1789},
-  {"ctime = %-26.24s\n", 1790},
-  {"semnum", 1791},
-  {"value", 1792},
-  {"ncount", 1793},
-  {"zcount", 1794},
-  {"pid", 1795},
-  {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1796},
-  {"\
-  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device", 1797},
-  {"  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2", 1798},
-  {"  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)", 1799},
-  {"  rdev -r /dev/fd0 627            set the RAMDISK size", 1800},
-  {"  rdev -v /dev/fd0 1              set the bootup VIDEOMODE", 1801},
-  {"  rdev -o N ...                   use the byte offset N", 1802},
-  {"  rootflags ...                   same as rdev -R", 1803},
-  {"  ramsize ...                     same as rdev -r", 1804},
-  {"  vidmode ...                     same as rdev -v", 1805},
-  {"\
-Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1806},
-  {"      use -R 1 to mount root readonly, -R 0 for read/write.", 1807},
-  {"missing comma", 1808},
-  {"out of memory", 1809},
+Semaphore Array semid=%d\n", 1781},
+  {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1782},
+  {"mode=%#o, access_perms=%#o\n", 1783},
+  {"nsems = %ld\n", 1784},
+  {"otime = %-26.24s\n", 1785},
+  {"ctime = %-26.24s\n", 1786},
+  {"semnum", 1787},
+  {"value", 1788},
+  {"ncount", 1789},
+  {"zcount", 1790},
+  {"pid", 1791},
+  {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1792},
+  {"\
+  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device", 1793},
+  {"  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2", 1794},
+  {"  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)", 1795},
+  {"  rdev -r /dev/fd0 627            set the RAMDISK size", 1796},
+  {"  rdev -v /dev/fd0 1              set the bootup VIDEOMODE", 1797},
+  {"  rdev -o N ...                   use the byte offset N", 1798},
+  {"  rootflags ...                   same as rdev -R", 1799},
+  {"  ramsize ...                     same as rdev -r", 1800},
+  {"  vidmode ...                     same as rdev -v", 1801},
+  {"\
+Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1802},
+  {"      use -R 1 to mount root readonly, -R 0 for read/write.", 1803},
+  {"missing comma", 1804},
+  {"out of memory", 1805},
   {"\
 %s: Usage: \"%s [options]\n\
 \t -m <mapfile>  (defaults: \"%s\" and\n\
@@ -2368,78 +2366,79 @@ Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1
 \t -v            print verbose data\n\
 \t -a            print all symbols, even if count is 0\n\
 \t -b            print individual histogram-bin counts\n\
+\t -s            print individual counters within functions\n\
 \t -r            reset all the counters (root only)\n\
 \t -n            disable byte order auto-detection\n\
-\t -V            print version and exit\n", 1810},
-  {"%s version %s\n", 1811},
-  {"Sampling_step: %i\n", 1812},
-  {"%s: %s(%i): wrong map line\n", 1813},
-  {"%s: can't find \"_stext\" in %s\n", 1814},
-  {"%s: profile address out of range. Wrong map file?\n", 1815},
-  {"total", 1816},
-  {"\
-usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1817},
-  {"renice: %s: unknown user\n", 1818},
-  {"renice: %s: bad value\n", 1819},
-  {"getpriority", 1820},
-  {"setpriority", 1821},
-  {"%d: old priority %d, new priority %d\n", 1822},
-  {"usage: %s program [arg ...]\n", 1823},
+\t -V            print version and exit\n", 1806},
+  {"%s version %s\n", 1807},
+  {"Sampling_step: %i\n", 1808},
+  {"%s: %s(%i): wrong map line\n", 1809},
+  {"%s: can't find \"_stext\" in %s\n", 1810},
+  {"%s: profile address out of range. Wrong map file?\n", 1811},
+  {"total", 1812},
+  {"\
+usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1813},
+  {"renice: %s: unknown user\n", 1814},
+  {"renice: %s: bad value\n", 1815},
+  {"getpriority", 1816},
+  {"setpriority", 1817},
+  {"%d: old priority %d, new priority %d\n", 1818},
+  {"usage: %s program [arg ...]\n", 1819},
   {"\
 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", 1824},
-  {"malloc error", 1825},
-  {"%s: bad value\n", 1826},
-  {"%s: %s not an lp device.\n", 1827},
-  {"%s status is %d", 1828},
-  {", busy", 1829},
-  {", ready", 1830},
-  {", out of paper", 1831},
-  {", on-line", 1832},
-  {", error", 1833},
-  {"LPGETIRQ error", 1834},
-  {"%s using IRQ %d\n", 1835},
-  {"%s using polling\n", 1836},
-  {"col: bad -l argument %s.\n", 1837},
-  {"usage: col [-bfpx] [-l nline]\n", 1838},
-  {"col: write error.\n", 1839},
-  {"col: warning: can't back up %s.\n", 1840},
-  {"past first line", 1841},
-  {"-- line already flushed", 1842},
-  {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1843},
-  {"line too long", 1844},
-  {"usage: column [-tx] [-c columns] [file ...]\n", 1845},
-  {"hexdump: bad length value.\n", 1846},
-  {"hexdump: bad skip value.\n", 1847},
-  {"\
-hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1848},
-  {"usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n", 1849},
+          -T [on|off] ]\n", 1820},
+  {"malloc error", 1821},
+  {"%s: bad value\n", 1822},
+  {"%s: %s not an lp device.\n", 1823},
+  {"%s status is %d", 1824},
+  {", busy", 1825},
+  {", ready", 1826},
+  {", out of paper", 1827},
+  {", on-line", 1828},
+  {", error", 1829},
+  {"LPGETIRQ error", 1830},
+  {"%s using IRQ %d\n", 1831},
+  {"%s using polling\n", 1832},
+  {"col: bad -l argument %s.\n", 1833},
+  {"usage: col [-bfpx] [-l nline]\n", 1834},
+  {"col: write error.\n", 1835},
+  {"col: warning: can't back up %s.\n", 1836},
+  {"past first line", 1837},
+  {"-- line already flushed", 1838},
+  {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1839},
+  {"line too long", 1840},
+  {"usage: column [-tx] [-c columns] [file ...]\n", 1841},
+  {"hexdump: bad length value.\n", 1842},
+  {"hexdump: bad skip value.\n", 1843},
+  {"\
+hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1844},
+  {"usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n", 1845},
   {"\
 \n\
 *** %s: directory ***\n\
-\n", 1850},
+\n", 1846},
   {"\
 \n\
 ******** %s: Not a text file ********\n\
-\n", 1851},
-  {"[Use q or Q to quit]", 1852},
-  {"--More--", 1853},
-  {"(Next file: %s)", 1854},
-  {"[Press space to continue, 'q' to quit.]", 1855},
-  {"...back %d pages", 1856},
-  {"...back 1 page", 1857},
-  {"...skipping one line", 1858},
-  {"...skipping %d lines", 1859},
+\n", 1847},
+  {"[Use q or Q to quit]", 1848},
+  {"--More--", 1849},
+  {"(Next file: %s)", 1850},
+  {"[Press space to continue, 'q' to quit.]", 1851},
+  {"...back %d pages", 1852},
+  {"...back 1 page", 1853},
+  {"...skipping one line", 1854},
+  {"...skipping %d lines", 1855},
   {"\
 \n\
 ***Back***\n\
-\n", 1860},
+\n", 1856},
   {"\
 \n\
 Most commands optionally preceded by integer argument k.  Defaults in \
 brackets.\n\
-Star (*) indicates argument becomes new default.\n", 1861},
+Star (*) indicates argument becomes new default.\n", 1857},
   {"\
 <space>                 Display next k lines of text [current screen size]\n\
 z                       Display next k lines of text [current screen size]*\n\
@@ -2459,63 +2458,63 @@ ctrl-L                  Redraw screen\n\
 :n                      Go to kth next file [1]\n\
 :p                      Go to kth previous file [1]\n\
 :f                      Display current file name and line number\n\
-.                       Repeat previous command\n", 1862},
-  {"[Press 'h' for instructions.]", 1863},
-  {"\"%s\" line %d", 1864},
-  {"[Not a file] line %d", 1865},
-  {"  Overflow\n", 1866},
-  {"...skipping\n", 1867},
-  {"Regular expression botch", 1868},
+.                       Repeat previous command\n", 1858},
+  {"[Press 'h' for instructions.]", 1859},
+  {"\"%s\" line %d", 1860},
+  {"[Not a file] line %d", 1861},
+  {"  Overflow\n", 1862},
+  {"...skipping\n", 1863},
+  {"Regular expression botch", 1864},
   {"\
 \n\
-Pattern not found\n", 1869},
-  {"Pattern not found", 1870},
-  {"can't fork\n", 1871},
+Pattern not found\n", 1865},
+  {"Pattern not found", 1866},
+  {"can't fork\n", 1867},
   {"\
 \n\
-...Skipping ", 1872},
-  {"...Skipping to file ", 1873},
-  {"...Skipping back to file ", 1874},
-  {"Line too long", 1875},
-  {"No previous command to substitute for", 1876},
-  {"od: od(1) has been deprecated for hexdump(1).\n", 1877},
-  {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1878},
-  {"; see strings(1).", 1879},
-  {"hexdump: can't read %s.\n", 1880},
-  {"hexdump: line too long.\n", 1881},
-  {"hexdump: byte count with multiple conversion characters.\n", 1882},
-  {"hexdump: bad byte count for conversion character %s.\n", 1883},
-  {"hexdump: %%s requires a precision or a byte count.\n", 1884},
-  {"hexdump: bad format {%s}\n", 1885},
-  {"hexdump: bad conversion character %%%s.\n", 1886},
-  {"\
-%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n", 1887},
-  {"%s: option requires an argument -- %s\n", 1888},
-  {"%s: illegal option -- %s\n", 1889},
-  {"...skipping forward\n", 1890},
-  {"...skipping backward\n", 1891},
-  {"No next file", 1892},
-  {"No previous file", 1893},
-  {"%s: Read error from %s file\n", 1894},
-  {"%s: Unexpected EOF in %s file\n", 1895},
-  {"%s: Unknown error in %s file\n", 1896},
-  {"%s: Cannot create tempfile\n", 1897},
-  {"RE error: ", 1898},
-  {"(EOF)", 1899},
-  {"No remembered search string", 1900},
-  {"Cannot open ", 1901},
-  {"saved", 1902},
-  {": !command not allowed in rflag mode.\n", 1903},
-  {"fork() failed, try again later\n", 1904},
-  {"(Next file: ", 1905},
-  {"Unable to allocate bufferspace\n", 1906},
-  {"usage: rev [file ...]\n", 1907},
-  {"usage: %s [ -i ] [ -tTerm ] file...\n", 1908},
-  {"trouble reading terminfo", 1909},
-  {"Unknown escape sequence in input: %o, %o\n", 1910},
-  {"Unable to allocate buffer.\n", 1911},
-  {"Input line too long.\n", 1912},
-  {"Out of memory when growing buffer.\n", 1913},
+...Skipping ", 1868},
+  {"...Skipping to file ", 1869},
+  {"...Skipping back to file ", 1870},
+  {"Line too long", 1871},
+  {"No previous command to substitute for", 1872},
+  {"od: od(1) has been deprecated for hexdump(1).\n", 1873},
+  {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1874},
+  {"; see strings(1).", 1875},
+  {"hexdump: can't read %s.\n", 1876},
+  {"hexdump: line too long.\n", 1877},
+  {"hexdump: byte count with multiple conversion characters.\n", 1878},
+  {"hexdump: bad byte count for conversion character %s.\n", 1879},
+  {"hexdump: %%s requires a precision or a byte count.\n", 1880},
+  {"hexdump: bad format {%s}\n", 1881},
+  {"hexdump: bad conversion character %%%s.\n", 1882},
+  {"\
+%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n", 1883},
+  {"%s: option requires an argument -- %s\n", 1884},
+  {"%s: illegal option -- %s\n", 1885},
+  {"...skipping forward\n", 1886},
+  {"...skipping backward\n", 1887},
+  {"No next file", 1888},
+  {"No previous file", 1889},
+  {"%s: Read error from %s file\n", 1890},
+  {"%s: Unexpected EOF in %s file\n", 1891},
+  {"%s: Unknown error in %s file\n", 1892},
+  {"%s: Cannot create tempfile\n", 1893},
+  {"RE error: ", 1894},
+  {"(EOF)", 1895},
+  {"No remembered search string", 1896},
+  {"Cannot open ", 1897},
+  {"saved", 1898},
+  {": !command not allowed in rflag mode.\n", 1899},
+  {"fork() failed, try again later\n", 1900},
+  {"(Next file: ", 1901},
+  {"Unable to allocate bufferspace\n", 1902},
+  {"usage: rev [file ...]\n", 1903},
+  {"usage: %s [ -i ] [ -tTerm ] file...\n", 1904},
+  {"trouble reading terminfo", 1905},
+  {"Unknown escape sequence in input: %o, %o\n", 1906},
+  {"Unable to allocate buffer.\n", 1907},
+  {"Input line too long.\n", 1908},
+  {"Out of memory when growing buffer.\n", 1909},
 };
 
-int _msg_tbl_length = 1913;
+int _msg_tbl_length = 1909;
diff --git a/po/cs.po b/po/cs.po
index 327a5a09..5438de9f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-2.11d\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
+"POT-Creation-Date: 2004-08-25 01:58+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"
@@ -12,97 +12,102 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "nastaví pouze pro ètení"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "nastaví pro ètení/zápis"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "zjistí zda je zakázán zápis"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "zjistí velikost sektoru"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 #, fuzzy
 msgid "get blocksize"
 msgstr "zjistí velikost"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 #, fuzzy
 msgid "set blocksize"
 msgstr "zjistí velikost"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "zjistí velikost"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "nastaví dopøedné ètení sektorù"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "zjistí nastavení dopøedného ètení sektorù"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "vyprázdnit buffery"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "naète znovu tabulku rozdìlení disku"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 #, fuzzy
 msgid "Usage:\n"
 msgstr "Pou¾ití:"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, fuzzy, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "Pou¾ití: %s [-V] [-v|-q] pøepínaèe zaøízení\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Dostupné pøíkazy:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: neznámý pøíkaz %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "pøepínaè %s vy¾aduje argument\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, fuzzy, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: %s nelze otevøít: %s\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, fuzzy, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: chyba zápisu na %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
@@ -145,12 +150,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Pou¾ití: %s [ -n ] zaøízení\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s na %s\n"
@@ -282,49 +287,49 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Pou¾ití: %s [ -larvsmf ] název zaøízení\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s je ji¾ pøipojeno.\t"
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Chcete opravdu pokraèovat"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "prohlídka ukonèena.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, fuzzy, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "èíslo Zóny < FIRSTZONE v souboru `%s'."
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, fuzzy, 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:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Odstranit blok"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, fuzzy, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Chyba pøi ètení: nelze posunout ukazovátko na blok v souboru '"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, fuzzy, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Chyba pøi ètení: chybný blok v souboru '"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -332,293 +337,293 @@ msgstr ""
 "Vnitøní chyba: pokus o zápis chybného bloku.\n"
 "®ádost o zápis ignorována.\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "chyba pøi posunu ukazovátka ve write_block"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, fuzzy, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Chyba pøi zápisu: chybný blok v souboru '"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "chyba pøi posunu ukazovátka ve write_super_block"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "superblok nelze zapsat"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "mapu i-uzlù nelze zapsat"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "mapu zón nelze zapsat"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "i-uzly nelze zapsat"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "chyba pøi posunu ukazovátka"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "superblok nelze èíst"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "superblok obsahuje chybné magické èíslo"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "podporovány jsou pouze 1kilobajtové bloky/zóny"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "superblok obsahuje chybnou polo¾ku s_imap_blocks"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "superblok obsahuje chybnou polo¾ku s_zmap_blocks"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "buffer pro mapu i-uzlù nelze alokovat"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "buffer pro i-uzly nelze alokovat"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "buffer pro poèítadlo i-uzlù nelze alokovat"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "buffer pro poèítadlo zón nelze alokovat"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "mapu i-uzlù nelze èíst"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "mapu zón nelze èíst"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "i-uzly nelze èíst"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Varování: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "i-uzlù: %ld\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "blokù: %ld\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Velikost zóny=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxvelikost=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Stav systému souborù=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
 "\n"
 msgstr "namelen=%d\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, fuzzy, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "I-uzel %d je oznaèen jako nepou¾ívaný, ale je pou¾it pro soubor '"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Oznaèen jako pou¾ívaný"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, fuzzy, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr " mód je %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "Varování: poèet i-uzlù je pøíli¹ veliký.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "root i-uzel není adresáøem"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, fuzzy, 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:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Smazat"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, fuzzy, c-format
 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:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Opravit"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, fuzzy, 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:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " Odstranit"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, fuzzy, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr ": chybný adresáø: '.' není první\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, fuzzy, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr ": chybný adresáø: '..' není druhý\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, fuzzy, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr ": chybný adresáø: '.' není první\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, fuzzy, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr ": chybný adresáø: '..' není druhý\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "vnitøní chyba"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, fuzzy, c-format
 msgid "%s: bad directory: size < 32"
 msgstr ": chybný adresáø: velikost < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "chyba pøi posunu ukazovátka v bad_zone"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Mód I-uzlu %d není smazán."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "I-uzel %d není pou¾íván a v bitmapì oznaèen jako pou¾ívaný."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "I-uzel %d je pou¾íván a v bitmapì oznaèen jako nepou¾ívaný."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "I-uzel %d (mode = %07o), i_nlinks=%d, napoèítáno=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "Nastavit i_nlinks na poèet"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zóna %d je oznaèena jako pou¾ívaná a ¾ádné soubory ji nepou¾ívají."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Odznaèit"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, fuzzy, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Zóna %d: %spou¾ívaná, napoèítáno=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, fuzzy, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Zóna %d: %spou¾ívaná, napoèítáno=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Nastavit"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "chybná velikost i-uzlu"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "chybná velikost v2 i-uzlu"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "opravy s úèastí u¾ivatele vy¾adují terminál"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "'%s' nelze otevøít"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s je 'èisté', ovìøování vynecháno.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Kontrola systému souborù na %s vynucena.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Systém souborù na %s je '¹pinavý', je tøeba jej zkontrolovat.\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -627,12 +632,12 @@ msgstr ""
 "\n"
 "pou¾ívaných i-uzlù: %6ld (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "pou¾ívaných zón: %6ld (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -655,7 +660,7 @@ msgstr ""
 "------\n"
 "souborù:              %6d\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -746,7 +751,7 @@ msgstr "p
 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:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Zaøízení: %s\n"
@@ -819,7 +824,7 @@ msgstr "Chyba p
 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:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -955,63 +960,63 @@ msgid ""
 "that some device files will be wrong.\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, 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/název [bloky]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s je pøipojeno; systém souborù zde vytváøet nebudu!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "chyba pøi posunu ukazovátka na startovací blok ve write_tables"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "startovací blok nelze smazat"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "chyba pøi posunu ukazovátka ve write_tables"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "mapu i-uzlù nelze zapsat"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "mapu zón nelze zapsat"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "i-uzly nelze zapsat"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "chyba pøi zápisu ve write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "pøíli¹ mnoho chybných blokù"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "nedostatek korektních blokù"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "buffery pro mapy nelze alokovat"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "buffery pro i-uzly nelze alokovat"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1020,55 +1025,50 @@ msgstr ""
 "Maxvelikost=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "chyba pøi posunu ukazovátka v prùbìhu kontroly blokù"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 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:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "chyba pøi posunu ukazovátka v check_blocks"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "chybné bloky pøed datovou oblastí: systém souborù nelze vytvoøit"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "chybných blokù: %d\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "chybných blokù: 1\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "soubor chybných blokù nelze otevøít"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "pøi pøekladu %s nebyla zvolena podpora minix v2\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "chyba strtol: poèet blokù nebyl zadán"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "%s nelze otevøít"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "o %s nelze získat informace"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "nebudu se pokou¹et vytvoøit systém souborù na '%s'"
@@ -1108,45 +1108,45 @@ msgid "one bad page\n"
 msgstr "chybných stránek: 1\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "chybných stránek: %d\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, 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:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: chyba: zadaná velikost (%ld) je vìt¹í ne¾ velikost zaøízení (%d)\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: chyba: neznámá verze %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, 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:562
+#: disk-utils/mkswap.c:563
 #, 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:576
+#: disk-utils/mkswap.c:577
 #, 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:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "osudová chyba: první stránka je neèitelná"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1160,24 +1160,24 @@ msgstr ""
 "opravdu\n"
 "chcete vytvoøit odkládací prostor v0, pou¾ijte pøepínaè -f pro vynucení.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Odkládací prostor nelze nastavit: neèitelné"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Vytváøím odkládací prostor verze %d, velikost (v bajtech) = %ld\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "odkládací prostor nelze pøevinout"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "stránku signatur nelze zapsat"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "volání fsync selhalo"
 
@@ -1219,61 +1219,60 @@ msgstr "         %s [ -c | -y | -n | -d ] za
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "         %s [ -c | -y | -n ] zaøízení\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Nepou¾itelné"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Volný prostor"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 #, fuzzy
 msgid "Linux ext3"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 #, fuzzy
 msgid "Linux XFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux ReiserFS"
 msgstr "Linux"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "Na disku byly provedeny zmìny.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 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:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1285,770 +1284,784 @@ 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:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "OSUDOVÁ CHYBA"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Stisknìte jakoukoliv klávesu pro ukonèení programu cfdisk"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "Nelze posunout ukazovátko na disku"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Z disku nelze èíst"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Nelze zapisovat na disk"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "pøíli¹ mnoho diskových oddílù"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "Diskový oddíl zaèíná pøed sektorem 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "Diskový oddíl konèí pøed sektorem 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "Diskový oddíl zaèíná za koncem disku"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "Diskový oddíl konèí za koncem disku"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "logické diskový oddíl jsou chybnì seøazeny"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "logické diskové oddíly se vzájemnì pøekrývají"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "zvìt¹ené logické diskové oddíly se vzájemnì pøekrývají"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 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:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 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:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Polo¾ka nabídky je pøíli¹ dlouhá. Nabídka mù¾e vypadat podivnì."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Nabídka nemá zadaný smìr. Pou¾ívám horizontální."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Chybná klávesa"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Stisknìte klávesu pro pokraèování"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primární"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Vytvoøit nový primární diskový oddíl"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Logický"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Vytvoøit nový logický diskový oddíl"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Zru¹it"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Nevytváøet diskový oddíl"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Vnitøní chyba !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Velikost (v MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Zaèátek"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Vytvoøit diskový oddíl na zaèátku volného prostoru"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Vytvoøit diskový oddíl na konci volného prostoru"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Pro roz¹íøený diskový oddíl není dostatek místa"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 #, fuzzy
 msgid "No partition table or unknown signature on partition table"
 msgstr "Chybný podpis na tabulce rozdìlení disku"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "Zadal jste vìt¹í poèet cylindrù, ne¾ se vejde na disk."
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "Disk nelze otevøít"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disk byl otevøen pouze pro ètení - nemáte práva pro zápis"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Velikost disku nelze zjistit"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Chybný primární diskový oddíl"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Chybný logický diskový oddíl"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 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:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Jste si jist, ¾e chcete ulo¾it tabulku rozdìlení disku na disk? (ano èi ne):"
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "ne"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Tabulka rozdìlení disku nebyla ulo¾ena"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "ano"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Zadejte `ano' èi `ne'"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Ukládám tabulku rozdìlení disku na disk"
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Tabulka rozdìlení disku byla ulo¾ena na disk"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 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:1861
+#: fdisk/cfdisk.c:1846
 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:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Více ne¾ 1 primární diskový oddíl je startovací. DOS MBR takto nenastartuje."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Zadejte název souboru èi stisknìte RETURN pro zobrazení: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Soubor '%s' nelze otevøít"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disk: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "  ®ádný  "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "  Pri/Log"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "  Primární"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "  Logický"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Startovací (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Startovací"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
-#, c-format
-msgid "Unknown (%02X)"
-msgstr "Neznámý (%02X)"
+#: fdisk/cfdisk.c:2007
+#, fuzzy, c-format
+msgid "(%02X)"
+msgstr "Nez(%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "®ádný (%02X)"
+#: fdisk/cfdisk.c:2009
+#, fuzzy
+msgid "None"
+msgstr "Hotovo"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabulka rozdìlení disku pro %s\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
+#: fdisk/cfdisk.c:2046
+#, fuzzy
+msgid "               First       Last\n"
 msgstr "            První    Poslední\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
+#, fuzzy
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
 " # Typ      Sektor   Sektor   Posun   Délka    ID systému souborù     "
 "Pøíznaky\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
+#, fuzzy
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
+#: fdisk/cfdisk.c:2131
+#, fuzzy
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "        ---Poèátek---       ----Konec----   Poèáteèní\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
+#: fdisk/cfdisk.c:2132
+#, fuzzy
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Pøíz Hlav Sekt Cyl    ID  Hlav Sekt Cyl  sektor    Sektorù\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+#, fuzzy
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Pøímý"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Vytisknout tabulku v pøímém datovém formátu"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Sektory"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Vytisknout tabulku seøazenou dle sektorù"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabulka"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Vytisknout pouze tabulku rozdìlení disku"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Netisknout tabulku"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Nápovìda pro cfdisk"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 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:2215
+#: fdisk/cfdisk.c:2200
 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:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "diskových oddílù na Va¹em pevném disku."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Pøíkaz      Význam"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Pøepne aktuálnímu oddílu pøíznak startovatelnosti"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          Sma¾e aktuální oddíl"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Zmìní geometrii"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 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:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             kteøí vìdí, co èiní."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          Vypí¹e tuto nápovìdu"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximálnì zvìt¹í aktuální diskový oddíl "
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Poznámka: Toto mù¾e uèinit oddíl nekompatibilní s"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2 ..."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          Vytvoøit na volném místì nový oddíl"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 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:2233
+#: fdisk/cfdisk.c:2218
 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:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             z nìkolika formátù:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 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:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabulka seøazená dle sektorù"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - Tabulka v pøímém formátu"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Ukonèí program bez ulo¾ení tabulky rozdìlení disku"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          Zmìní typ systému souborù"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Zmìní jednotky pro zobrazení velikosti oddílu"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Cykluje mezi MB, sektory a cylindry"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 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:2243
+#: fdisk/cfdisk.c:2228
 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:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             nebo odmítnout napsáním `yes' nebo"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             `no'"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nahoru       Pøesune kurzor na pøedcházející oddíl."
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Dolù         Pøesune kurzor na dal¹í oddíl."
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Pøekreslí obrazovku"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Vypí¹e tuto nápovìdu"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 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:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "(s vyjímkou zápisu - W)."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cylindry"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Zmìní geometrii cylindrù"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Hlavy"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Zmìní geometrii hlav"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Zmìní geometrii sektorù"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Hotovo"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "Geometrie zmìnìna"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Zadejte poèet cylindrù: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Chybný poèet cylindrù"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Zadejte poèet hlav: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Chybný poèet hlav"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Zadejte poèet sektorù na stopu: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Chybný poèet sektorù"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Zadejte typ systému souborù: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "Nelze nastavit typ SS na prázdný"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "Nelze nastavit typ SS na roz¹íøený"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Startovací"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Nez(%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Neznámý (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disk: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, fuzzy, c-format
-msgid "Size: %lld bytes, %ld MB"
+msgid "Size: %lld bytes, %lld MB"
 msgstr "Velikost v bajtech: %lld"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, fuzzy, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
+msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Velikost v bajtech: %lld"
 
-#: fdisk/cfdisk.c:2600
-#, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
+#: fdisk/cfdisk.c:2587
+#, fuzzy, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Hlav: %d   Sektorù na stopu: %d   Cylindrù: %d"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Název"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Pøíznaky"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Typ oddílu"
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "Typ SS"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Popis]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
+#: fdisk/cfdisk.c:2597
+#, fuzzy
+msgid "    Sectors"
 msgstr " Sektory"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
+#: fdisk/cfdisk.c:2599
+#, fuzzy
+msgid "  Cylinders"
+msgstr "Cylindry"
+
+#: fdisk/cfdisk.c:2601
+#, fuzzy
+msgid "  Size (MB)"
 msgstr "Velikost (MB)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
+#: fdisk/cfdisk.c:2603
+#, fuzzy
+msgid "  Size (GB)"
 msgstr "Velikost (GB)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Start"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Pøepne pøíznak startovatelnosti aktuálnímu diskovému oddílu"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Smazat"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Sma¾e aktuální diskový oddíl"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Zmìní geometrii disku (pouze pro odborníky)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Nápovìda"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Vypí¹e nápovìdu"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Zvìt¹ení"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 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:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Nový"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Vytvoøí nový diskový oddíl ve volném prostoru"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Tisk"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 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:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Ukonèí program bez ulo¾ení tabulky rozdìlení disku"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Druh"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 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:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Jednotky"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 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:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Ulo¾it"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 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:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "Tento oddíl nelze nastavit jako startovací."
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "Prázdný diskový oddíl nelze smazat."
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "Tento diskový oddíl nelze zvìt¹it."
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Tento diskový oddíl je nepou¾itelný."
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Tento diskový oddíl je ji¾ pou¾íván."
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "Typ prázdného diskového oddílu nelze zmìnit."
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "®ádné dal¹í diskové oddíly"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Chybný pøíkaz"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 #, fuzzy
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2084,7 +2097,7 @@ msgstr ""
 "                jádro.\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 #, fuzzy
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
@@ -2105,7 +2118,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:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2121,223 +2134,223 @@ msgstr ""
 "  èi: fdisk /dev/rd/c0d0  èi: fdisk /dev/ida/c0d0  (pro RAID zaøízení)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s nelze otevøít\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s nelze èíst\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ukazovátko nelze posunout na %s.\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s nelze ulo¾it\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "volání BLKGETSIZE ioctl pro %s selhalo\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Nelze alokovat více pamìti\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Fatální chyba\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Pøíkazy"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   pøepne pøíznak \"pouze pro ètení\""
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b   úprava bsd popisu disku"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   pøepne pøíznak \"pøipojitelný\""
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   sma¾e diskový oddíl"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   vypí¹e známé typy diskových oddílù"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   vypí¹e tuto nabídku"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   vytvoøí nový diskový oddíl"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   vytvoøí prázdný DOSOVÝ diskový oddíl"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   vypí¹e tabulku rozdìlení disku"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   ukonèí program bez ulo¾ení zmìn"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   vytvoøí prázdný Sun popis disku"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   zmìní id diskového oddílu"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   zmìní jednotky v nich¾ jsou vypisovány informace"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   ovìøí tabulku rozdìlení disku"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   ulo¾í tabulku rozdìlení disku a ukonèí program"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   roz¹iøující funkce (pouze pro odborníky)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   nastaví startovací diskový oddíl"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b   úprava polo¾ky startovacího souboru"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   nastaví sgi odkládací diskový oddíl"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a   pøepne pøíznak \"startovací\""
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   pøepne pøíznak \"DOS kompatibilní\""
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   zmìní mno¾ství alternativních cylindrù"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   zmìní mno¾ství cylindrù"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 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:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   zmìní mno¾ství extra sektorù na stopu"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   zmìní mno¾ství hlav"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   zmìní prokládací faktor"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   zmìní rychlost otáèení"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   návrat do hlavní nabídky"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   zmìní poèet sektorù/stopu"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   zmìní poèet fyzických cylindrù"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   posune poèátek dat v diskovém oddílu"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   vypí¹e roz¹íøené diskové oddíly"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 #, fuzzy
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   vytvoøí IRIX tabulku rozdìlení disku"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f   opraví øazení diskových oddílù"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "Musíte nastavit"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "hlavy"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "sektory"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "cylindry"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2346,11 +2359,11 @@ msgstr ""
 "%s%s.\n"
 "Mù¾ete tak uèinit z nabídky roz¹iøujících funkcí.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " a "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2369,26 +2382,26 @@ msgstr ""
 "2) s programy pro správu diskových oddílù z jiných OS\n"
 "   (napø. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Chybný posun v primárním diskovém oddílu\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Varování: ma¾u diskový oddíl za %d\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, 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:666
+#: fdisk/fdisk.c:658
 #, 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:711
+#: fdisk/fdisk.c:703
 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"
@@ -2401,22 +2414,22 @@ msgstr ""
 "data\n"
 "pochopitelnì dostupná.\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Pozor: velikost sektoru je %d (nikoliv %d)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 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:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
@@ -2425,16 +2438,16 @@ msgstr ""
 "popis\n"
 "disku\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Vnitøní chyba\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Nadbyteèný roz¹íøený diskový oddíl %d ignorován.\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2443,7 +2456,7 @@ msgstr ""
 "Varování: chybný pøíznak 0x%04x tabulky rozdìlení disku %d bude opraven "
 "zápisem(w)\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2451,79 +2464,79 @@ msgstr ""
 "\n"
 "tøikrát jsem nalezl EOF - konèím..\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "©estnáctkovì (L vypí¹e kódy):"
 
-#: fdisk/fdisk.c:1069
+#: fdisk/fdisk.c:1094
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, implicitnì %d): "
 
-#: fdisk/fdisk.c:1136
+#: fdisk/fdisk.c:1161
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Pou¾ívám implicitní hodnotu %d\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "Hodnota je mimo meze.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Èíslo diskového oddílu"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, 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:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Nadbyteèný roz¹íøený diskový oddíl %d ignorován.\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 #, fuzzy
 msgid "No partition is defined yet!\n"
 msgstr "Nejsou definovány ¾ádné diskové oddíly\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "cylindr"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, 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:1242
+#: fdisk/fdisk.c:1267
 #, 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:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "Pøíznak DOSOVÉ kompatibility je nastaven.\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Pøíznak DOSOVÉ kompatibility není nastaven.\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Diskový oddíl %d zatím neexistuje!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2534,7 +2547,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:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2542,7 +2555,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:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2552,7 +2565,7 @@ msgstr ""
 "nebo» SunOS/Solaris to oèekává a i Linux tomu dává pøednost.\n"
 "\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2563,60 +2576,60 @@ msgstr ""
 "a diskový oddíl 11 jako celý svazek (6), nebo» IRIX to oèekává.\n"
 "\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, 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:1453
+#: fdisk/fdisk.c:1479
 #, 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:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyz=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logický=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, 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:1470
+#: fdisk/fdisk.c:1496
 #, 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:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "mìlo by být (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Diskový oddíl %d nekonèí na hranici cylindru.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "mìlo by být (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2626,7 +2639,7 @@ msgstr ""
 "Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -2634,19 +2647,19 @@ msgstr ""
 "Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
+msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2654,16 +2667,16 @@ msgstr ""
 "Diskové oddíly jsou ji¾ seøazeny.\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
-#, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
+#: fdisk/fdisk.c:1704
+#, fuzzy, c-format
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot    Zaèátek     Konec  Bloky    Id  Systém\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Zaøízení"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2671,7 +2684,7 @@ msgstr ""
 "\n"
 "Diskové oddíly jsou chybnì seøazeny\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2682,93 +2695,94 @@ msgstr ""
 "Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
+#: fdisk/fdisk.c:1754
+#, fuzzy
+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:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varování: diskový oddíl %d obsahuje sektor 0\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, 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:1778
+#: fdisk/fdisk.c:1805
 #, 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:1781
+#: fdisk/fdisk.c:1808
 #, 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:1785
+#: fdisk/fdisk.c:1812
 #, 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:1817
+#: fdisk/fdisk.c:1844
 #, 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:1825
+#: fdisk/fdisk.c:1852
 #, 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:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varování: diskový oddíl %d je prázdný.\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, 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:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Celkový poèet alokovaných sektorù (%d) je vìt¹í ne¾ maximum (%d).\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "nealokovaných sektorù: %d\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, 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:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "První %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d je ji¾ alokován\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "Nejsou ¾ádné volné sektory.\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Poslední %s èi +velikost èi +velikostM èi velikostK"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2776,15 +2790,25 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 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:2041
+#: fdisk/fdisk.c:2073
 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:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "logické diskový oddíl jsou chybnì seøazeny"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Chybný primární diskový oddíl"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2795,30 +2819,30 @@ msgstr ""
 "   %s\n"
 "   p   primární diskový oddíl (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l   logický diskový oddíl (5 nebo více)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e   roz¹íøený diskový oddíl"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Chybné èíslo diskového oddílu pro typ `%c'.\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr "Tabulka rozdìlení disku byla zmìnìna!\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Volám ioctl() pro znovunaètení tabulky rozdìlení disku.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2827,7 +2851,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2839,65 +2863,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:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Synchronizují se disky.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Diskový oddíl %d neobsahuje datovou oblast.\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Nový zaèátek dat"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Pøíkaz pro odborníky (m pro nápovìdu): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Poèet cylindrù"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Poèet hlav"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Poèet sektorù"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varování: nastaven posun sektoru kvùli kompatibilitì s DOSEM\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, 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:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s nelze otevøít.\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s nelze otevøít.\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "pøíkaz %c není znám\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 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:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2907,18 +2931,18 @@ msgstr ""
 "          zadaným zaøízením.\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Na %s nalezen OSF/1 popis disku. Spou¹tím re¾im popisu disku.\n"
 "Pro návrat do re¾imu DOS tabulky rozdìlení disku pou¾ijte pøíkaz 'r'.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Pøíkaz (m pro nápovìdu): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2927,15 +2951,15 @@ msgstr ""
 "\n"
 "Aktuální startovací soubor: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Zadejte název nového startovacího souboru: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "Startovací soubor nebyl zmìnìn.\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2945,7 +2969,7 @@ msgstr ""
 "\tPro SGI diskové oddíly nejsou k dispozici ¾ádné roz¹iøující funkce.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3307,8 +3331,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux swap"
 
@@ -3541,7 +3564,7 @@ msgstr ""
 "Zadejte YES, pokud jste si jist, ¾e chcete oznaèit tento diskový oddíl "
 "jinak.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr ""
 
@@ -3705,15 +3728,15 @@ msgstr "Alternativn
 msgid "Physical cylinders"
 msgstr "Fyzické cylindry"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Rychlost otáèení (otm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Interleave faktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektory na cylindr"
 
@@ -3767,7 +3790,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:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3777,7 +3800,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:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3791,7 +3814,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:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3810,7 +3833,7 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3823,16 +3846,16 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, 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:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Poèet alternativních cylindrù"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Poèet fyzických cylindrù"
 
@@ -3883,20 +3906,24 @@ msgstr "OS/2 Boot Manager"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
+#, fuzzy
+msgid "W95 FAT32"
 msgstr "Win95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "W95 FAT16 (LBA)"
 msgstr "Win95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
+#, fuzzy
+msgid "W95 Ext'd (LBA)"
 msgstr "Win95 Ext'd (LBA)"
 
 #: fdisk/i386_sys_types.c:21
@@ -3928,15 +3955,18 @@ msgid "AST SmartSleep"
 msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
+#, fuzzy
+msgid "Hidden W95 FAT32"
 msgstr "Skrytá Win95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT32 (LBA)"
 msgstr "Skrytá Win95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT16 (LBA)"
 msgstr "Skrytá Win95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
@@ -4045,6 +4075,12 @@ msgstr "Star
 msgid "Minix / old Linux"
 msgstr "Minix / starý Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux swap"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 skrytý C: disk"
@@ -4200,90 +4236,90 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "chyba posunu ukazovátka na %s - ukazovátko nelze posunout na %lu\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr ""
 "chyba pøi posunu ukazovátka: po¾adavek 0x%08x%08x, výsledek 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "nedostatek pamìti - konèím\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "chyba ètení na %s - sektor %lu nelze èíst\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "CHYBA: sektor %lu nemá msdos podpis\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "chyba zápisu na %s - sektor %lu nelze zapsat\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "soubor pro ulo¾ení sektorù (%s) nelze otevøít\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "chyba zápisu na %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "volání stat pro soubor s ulo¾enými sektory (%s) selhalo\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "soubor s ulo¾enými sektory má chybnou velikost - nebude obnoven\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "nedostatek pamìti?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "soubor s ulo¾enými sektory (%s) nelze otevøít\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "chyba pøi ètení %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "zaøízení %s nelze otevøít pro zápis\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "chyba pøi zápisu sektoru %lu na %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: velikost nelze zjistit\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: geometrii nelze zjistit\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4294,22 +4330,22 @@ msgstr ""
 "celý disk. Pou¾ití fdisku je v tom pøípadì pravdìpodobnì zbyteèné\n"
 "[Pou¾ijte pøepínaè --force pokud to opravdu chcete.]\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Varování: dle HDIO_GETGEO je poèet hlav %lu\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Varování: dle HDIO_GETGEO je poèet sektorù %lu\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Varování: dle BLKGETSIZE/HDIO_GETGEO je poèet cylindrù %lu\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4318,7 +4354,7 @@ msgstr ""
 "Varování: podivný poèet sektorù (%lu) - obvykle nebývá více ne¾ 63\n"
 "To zpùsobí problémy v¹em programùm, které pou¾ívají CHS adresování.\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4327,13 +4363,13 @@ msgstr ""
 "\n"
 "Disk %s: cylindrù: %lu, hlav: %lu, sektorù/stopu: %lu\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr "%s diskového oddílu %s má chybný poèet hlav: %lu (mìlo by být 0-%lu)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4341,7 +4377,7 @@ msgid ""
 msgstr ""
 "%s diskového oddílu %s má chybný poèet sektorù: %lu (mìlo by být 1-%lu)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4349,17 +4385,17 @@ msgid ""
 msgstr ""
 "%s diskového oddílu %s má chybný poèet cylindrù: %lu (mìlo by být 0-%lu)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr "Id  Název\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Naèítám znovu tabulku rozdìlení disku ...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4367,31 +4403,31 @@ msgstr ""
 "Nepodaøilo se znovu naèíst tabulku rozdìlení disku.\n"
 "Restartujte nyní, pøed pou¾itím mkfs, systém.\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Chyba pøi zavírání %s\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "diskový oddíl %s neexistuje\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "Neznámý formát - pou¾ívám sektory\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabulka rozdìlení disku pro %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "nepou¾ívaný formát - pou¾ívám %s\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4400,12 +4436,12 @@ msgstr ""
 "Jednotky = cylindry po %lu bajtech, bloky po 1024 bajtech, poèítáno od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 #, fuzzy
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Zaøíz  Boot Zaèátek   Konec #cylind #bloky    Id  Systém\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4414,12 +4450,12 @@ msgstr ""
 "Jednotky = sektory po 512 bajtech, poèítáno od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 #, fuzzy
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Zaøíz  Boot    Zaèátek     Konec #sektory Id  Systém\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4428,12 +4464,12 @@ msgstr ""
 "Jednotky = bloky po 1024 bajtech, poèítáno od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 #, fuzzy
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Zaøíz  Boot   Zaèátek     Konec #bloky   Id  Systém\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4443,31 +4479,31 @@ msgstr ""
 "d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 #, fuzzy
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Zaøíz  Boot Zaèátek Konec   MB   #bloky    Id  Systém\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tzaèátek: (c,h,s) pøedpoklad (%ld,%ld,%ld) nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tkonec: (c,h,s) pøedpoklad (%ld,%ld,%ld) nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "diskový oddíl konèí na cylindru %ld, t.j. za koncem disku\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "Nebyly nalezeny ¾ádné diskové oddíly\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, fuzzy, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4478,52 +4514,52 @@ msgstr ""
 "pro C/H/S=*/%ld/%ld (místo %ld/%ld/%ld).\n"
 "Zobrazuji za pou¾ití této geometrie.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "Nebyla nalezena ¾ádná tabulka rozdìlení disku.\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Zvlá¹tní - poèet definovaných diskových oddílù je pouze %d.\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Varování: diskový oddíl %s má velikost 0 a není oznaèen jako prázdný.\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Varování: diskový oddíl %s má velikost 0 a je startovací.\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varování: diskový oddíl %s má velikost 0 a nenulový zaèátek.\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Varování: diskový oddíl %s "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "není obsa¾en v diskovém oddílu %s.\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Varování: diskové oddíly %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "a %s se navzájem pøekrývají.\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4533,17 +4569,17 @@ msgstr ""
 "lu)\n"
 "a v pøípadì zaplnìní ji znièí\n"
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, 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:1188
+#: fdisk/sfdisk.c:1201
 #, 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:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4551,17 +4587,17 @@ msgstr ""
 "Pouze jeden z primárních diskových oddílù mù¾e být roz¹íøeným.\n"
 " (aèkoliv v Linux to není problém)\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, 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:1227
+#: fdisk/sfdisk.c:1240
 #, 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:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4569,7 +4605,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:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4577,7 +4613,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:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4585,12 +4621,12 @@ msgstr ""
 "Varování: ¾ádný primární diskový oddíl není oznaèen jako startovací.\n"
 "LILU to neèiní problémy, ale DOS z tohoto disku nenastartuje.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 #, fuzzy
 msgid "start"
 msgstr "stav"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4598,24 +4634,24 @@ msgstr ""
 "diskový oddíl %s: zaèátek: (c,h,s) pøedpoklad (%ld,%ld,%ld), nalezeno\n"
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 #, fuzzy
 msgid "end"
 msgstr "odeslání"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, 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:1287
+#: fdisk/sfdisk.c:1300
 #, 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:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4624,7 +4660,7 @@ msgstr ""
 "Varování: zaèátek roz¹íøeného diskového oddílu posunut z %ld na %ld.\n"
 "(Pouze pro úèely výpisu. Nemìòte jeho obsah.)\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4632,134 +4668,134 @@ 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:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, 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:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "strom diskových oddílù?\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "nalezen Disk Manager - s tím neumím pracovat\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "nalezen DM6 podpis - konèím\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "zvlá¹tní..., roz¹íøený diskový oddíl o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "zvlá¹tní..., BSD diskový oddíl o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " diskový oddíl %s není znám\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 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:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Chyba pøi ukládání starých sektorù - konèím\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, 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:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "pøíli¹ dlouhý èi neúplný øádek - konèím\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, 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:1704
+#: fdisk/sfdisk.c:1717
 #, 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:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nerozpoznaný vstup: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "èíslo je pøíli¹ veliké\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "nesmysly za èíslem\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "není místo pro popis diskového oddílu\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "okolní roz¹iøující diskový oddíl nelze vytvoøit\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 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:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "Ji¾ nejsou volné bloky\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "Chybný typ\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, 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:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "Varování: prázdný diskový oddíl\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, 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:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nerozpoznaný pøíznak 'startovací' - zvolte - èi *\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "neúplná c,h,s specifikace?\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "Roz¹íøený diskový oddíl na neoèekávaném místì\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "chybný vstup\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "pøíli¹ mnoho diskových oddílù\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 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"
@@ -4771,100 +4807,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:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "verze"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Pou¾ití: %s [pøepínaèe] zaøízení ...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "zaøízení: nìco jako /dev/hda èi /dev/sda"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "u¾iteèné pøepínaèe:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 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:2237
+#: fdisk/sfdisk.c:2250
 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:2238
+#: fdisk/sfdisk.c:2251
 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:2239
+#: fdisk/sfdisk.c:2252
 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:2240
+#: fdisk/sfdisk.c:2253
 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:2241
+#: fdisk/sfdisk.c:2254
 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:2242
+#: fdisk/sfdisk.c:2255
 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:2243
+#: fdisk/sfdisk.c:2256
 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:2244
+#: fdisk/sfdisk.c:2257
 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:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                zmìní pouze diskový oddíl s èíslem #"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ¾ádné zmìny nebudou ulo¾eny na disk"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 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:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I SOUBOR :            obnoví tyto sektory ze SOUBORU"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [èi --version]:   vypí¹e informace o verzi"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [èi --help]:      vypí¹e tuto nápovìdu"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "nebezpeèné pøepínaèe:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 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:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4872,116 +4908,116 @@ msgstr ""
 "    -x [èi --show-extended]: vypí¹e informace o roz¹íøených diskových\n"
 "                             oddílech a na vstupu bude oèekávat jejich popis"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 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:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [èi --quiet]:      nebude vypisovat varovné hlá¹ky"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "    Nalezenou geometrii mù¾ete pøepsat pomocí:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [èi --cylinders #]:nastaví poèet cylindrù"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [èi --heads #]:    nastaví poèet hlav"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [èi --sectors #]:  nastaví poèet cylindrù"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "Ovìøování konzistence mù¾ete vypnout pomocí:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 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:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Pou¾ití:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, 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:2270
+#: fdisk/sfdisk.c:2283
 #, 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:2271
+#: fdisk/sfdisk.c:2284
 #, 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:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "¾ádný pøíkaz?\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "celkový poèet blokù: %d\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 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:2580
+#: fdisk/sfdisk.c:2593
 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:2582
+#: fdisk/sfdisk.c:2595
 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:2589
+#: fdisk/sfdisk.c:2602
 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:2615
+#: fdisk/sfdisk.c:2628
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s nelze otevøít.\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s pro ètení nelze otevøít"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, 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:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "volání BLKGETSIZE ioctl pro %s selhalo\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, 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:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -4989,7 +5025,7 @@ msgstr ""
 "Hotovo\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -4999,35 +5035,35 @@ msgstr ""
 "MBR\n"
 "nastartuje pouze z disku s jedním aktivním diskovým oddílem.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, 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:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id %lx je chybné\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Tento disk je právì pou¾íván.\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatální chyba: %s nelze nalézt\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, 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:2893
+#: fdisk/sfdisk.c:2906
 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:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5040,28 +5076,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:2899
+#: fdisk/sfdisk.c:2912
 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:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Stará situace:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, 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:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Nová situace:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5069,19 +5105,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:2932
+#: fdisk/sfdisk.c:2945
 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:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Vyhovuje Vám to? [ynq] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Ulo¾it na disk? [ynq] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5089,15 +5125,15 @@ msgstr ""
 "\n"
 "sfdisk: pøedèasný konec vstupu\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "Konèím - nebyly uèinìny ¾ádné zmìny\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "Odpovìzte prosím y,n èi q\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5105,7 +5141,7 @@ msgstr ""
 "Nová tabulka rozdìlení disku byla úspì¹nì ulo¾ena.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5705,7 +5741,7 @@ msgstr "Ve smy
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "volání KDGHWCLK ioctl selhalo."
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "V Èasovém limitu se nepodaøilo zjistit èas.\n"
 
@@ -5730,57 +5766,67 @@ msgstr "/dev/tty1 ani /dev/vc/1 nelze otev
 msgid "KDGHWCLK ioctl failed"
 msgstr "volání ioctl KDGHWCLK selhalo"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "%s nelze otevøít - volání open() selhalo"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, 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:170
+#: hwclock/rtc.c:171
 #, 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:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s nemá pøeru¹ovací funkce. "
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, 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:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "tikání hodin nelze z %s èíst - volání read() selhalo"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "tikání hodin nelze z %s èíst - volání read() selhalo"
+
+#: hwclock/rtc.c:267
 #, 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:246
+#: hwclock/rtc.c:270
 #, 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:305
+#: hwclock/rtc.c:329
 #, 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:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "Volání ioctl(%s) bylo úspì¹né.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "%s nelze otevøít."
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5791,17 +5837,17 @@ msgstr ""
 "pomocí\n"
 "zvlá¹tního souboru %s. Tento soubor na tomto systému souborù neexistuje.\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "%s nelze otevøít"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "volání(RTC_EPOCH_READ) pro %s selhalo"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
@@ -5810,24 +5856,24 @@ msgstr ""
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:396
+#: hwclock/rtc.c:420
 #, 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:414
+#: hwclock/rtc.c:438
 #, 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:419
+#: hwclock/rtc.c:443
 #, 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:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "volání ioctl(RTC_EPOCH_SET) pro %s selhalo"
@@ -6001,51 +6047,66 @@ msgstr "P
 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:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: vy (u¾ivatel %d) neexistujete.\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: u¾ivatel \"%s\" neexistuje.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr "%s: mù¾e mìnit pouze místní polo¾ky; pou¾ijte yp%s.\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+msgid "Unknown user context"
+msgstr ""
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Mìním finger informace o u¾ivateli %s.\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Chybné heslo."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Heslo: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Chybné heslo."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "Finger informace nebyly zmìnìny.\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Pou¾ití: %s [ -f plné-jméno ] [ -o kanceláø ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6053,11 +6114,11 @@ msgstr ""
 "[ -p telefon-do-kanceláøe ]\n"
 "\t[ -h telefon-domù ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ -- version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6065,58 +6126,70 @@ msgstr ""
 "\n"
 "Ukonèen.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "Polo¾ka je pøíli¹ dlouhá.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' není povoleno.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Kontrolní znaky nejsou povoleny.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr "Finger informace *NEBYLY* zmìnìny. Zkuste to opìt pozdìji.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "Finger informace byly zmìnìny.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "volání malloc selhalo"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" není v /etc/shells.\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr "%s: Vá¹ shell není v /etc/shells, zmìna shellu odmítnuta\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Mìním shell pro %s.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Nový shell"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "Shell nebyl zmìnìn.\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Shell *NEBYL* zmìnìn. Zkuste to opìt pozdìji.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Shell byl zmìnìn.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
@@ -6125,57 +6198,57 @@ msgstr ""
 "Pou¾ití: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "            [ u¾ivatelské jméno ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, 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:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" neexistuje.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" není spustitelným souborem.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' není povoleno.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Kontrolní znaky nejsou povoleny.\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, 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:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" není v /etc/shells.\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, 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:339
+#: login-utils/chsh.c:372
 #, 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:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Pou¾ijte %s -l pro vypsání seznamu\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "Není znám ¾ádný shell.\n"
 
@@ -6372,80 +6445,80 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Máte spu¹tìno pøíli¹ mnoho procesù.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, 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:1071
+#: login-utils/login.c:1070
 #, 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:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE ROOT NA TTY %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, 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:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 #, fuzzy
 msgid "You have new mail.\n"
 msgstr "Máte %spo¹tu.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 #, fuzzy
 msgid "You have mail.\n"
 msgstr "Máte %spo¹tu.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: volání fork selhalo: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "volání setuid() selhalo"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Adresáø %s neexistuje!\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Pøihla¹uji s domácím adresáøem nastaveným na \"/\".\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: nedostatek pamìti pro skript shellu.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: skript shellu %s nelze spustit.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ¾ádný shell: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6454,62 +6527,62 @@ msgstr ""
 "\n"
 "Pøihla¹ovací jméno na %s: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "pøihla¹ovací jméno je pøíli¹ dlouhé.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "JMÉNO je pøíli¹ dlouhé"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "pøihla¹ovací jméno nesmí zaèínat '-'.\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "pøíli¹ mnoho znakù LF\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "PØÍLI© mnoho znakù LF"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, 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:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Poslední pøihlá¹ení: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "z %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "%.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "CHYBNÉ PØIHLÁ©ENÍ U®IVATELE %2$s Z %1$s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, 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:1382
+#: login-utils/login.c:1401
 #, 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:1385
+#: login-utils/login.c:1404
 #, 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"
@@ -6910,55 +6983,65 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: ZÁVA®NÁ CHYBA"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, fuzzy, c-format
 msgid "%s: the password file is busy.\n"
 msgstr "%s: soubor %s je ji¾ pou¾íván.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, fuzzy, c-format
 msgid "%s: the group file is busy.\n"
 msgstr "%s: soubor %s je ji¾ pou¾íván.\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, 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:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: volání link pro %s selhalo: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "Èasový limit pro %s nelze zjistit: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "Èasový limit pro %s nelze zjistit: %s\n"
+
+#: login-utils/vipw.c:217
 #, 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:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: volání fork selhalo\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s nezmìnìno\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: ¾ádné zmìny\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr "Tento systém pou¾ívá stínové skupiny.\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr "Tento systém pou¾ívá stínová hesla.\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "Chcete teï editovat soubor %s [y/n]?"
@@ -7154,7 +7237,7 @@ msgstr "%s: %s nelze p
 msgid "call: %s from to files...\n"
 msgstr "Pou¾ití: %s z na soubory...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, fuzzy, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7165,22 +7248,22 @@ msgstr ""
 "Pokud jej opravdu chcete pou¾ít, tak zadejte `%s [pøepínaèe] %s'.\n"
 "Script nebyl spu¹tìn.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 #, fuzzy
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Pou¾ití: script [-a] [-f] [-q] [soubor]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script spu¹tìn. Soubor je %s.\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "Script spu¹tìn %s"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7189,16 +7272,16 @@ msgstr ""
 "\n"
 "Script ukonèen %s"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script utils. Soubor je %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "volání openpty selhalo\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "Nejsou ¾ádná dal¹í volná pty\n"
 
@@ -7467,42 +7550,42 @@ msgstr "mount: %s nelze otev
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, 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:427
+#: mount/fstab.c:466
 #, 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:439
+#: mount/fstab.c:478
 #, 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:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Zamykací soubor %s nelze zamknout: %s\n"
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Zamykací soubor %s nelze zamknout: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "vypr¹el èas"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7511,191 +7594,123 @@ msgstr ""
 "Odkaz %s nelze vytvoøit.\n"
 "Není nìkde zastaralý zamykací soubor?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "nelze otevøít %s (%s) - mtab nebyl aktualizován"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "chyba pøi zápisu %s: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "chyba pøi zmìnì módu %s: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s nelze pøejmenovat na %s: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: zaøízení %s nelze otevøít: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, 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:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) posun %d, %s ¹ifra\n"
-
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: ¾ádné zaøízení /dev/loop# nelze nalézt"
-
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
+msgid ", offset %lld"
 msgstr ""
-"mount: ¾ádné loop zaøízení nelze nalézt.\n"
-"       Nemá /dev/loop# chybné vìt¹í èíslo zaøízení?"
 
-#: mount/lomount.c:253
+#: mount/lomount.c:104
 #, 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'.)"
+msgid ", sizelimit %lld"
 msgstr ""
-"mount: ®ádné loop zaøízení nelze nalézt a dle %s toto jádro\n"
-"       nezná loop zaøízení. Pokud je tomu tak, pak jej znovu pøelo¾te,\n"
-"       èi zkuste `insmod loop.o'."
 
-#: mount/lomount.c:259
-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?"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
 msgstr ""
-"mount: ®ádné loop zaøízení nelze nalézt. Mo¾ná toto jádro nezná loop "
-"zaøízení\n"
-"       (pak jej znovu pøelo¾te, èi zkuste `insmod loop.o'), èi /dev/loop# "
-"má\n"
-"       chybné vìt¹í èíslo?"
 
-#: mount/lomount.c:263
-msgid "mount: could not find any free loop device"
-msgstr "mount: ¾ádné volné loop zaøízení nelze najít"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ""
 
-#: mount/lomount.c:359
+#: mount/lomount.c:129
 #, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "%s pro ètení nelze otevøít"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Potvrïte nové heslo: "
+msgid ", encryption type %d\n"
+msgstr "Nepodporovaný ¹ifrovací typ %s\n"
 
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "adresáø nelze otevøít\n"
+#: mount/lomount.c:138
+#, 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:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "Heslo musí obsahovat alespoò 6 znakù, zkuste to znovu.\n"
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: ¾ádné zaøízení /dev/loop# nelze nalézt"
 
-#: mount/lomount.c:472
+#: mount/lomount.c:192
 #, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Nelze alokovat více pamìti\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
 msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
+"mount: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
+"mount: ®ádné loop zaøízení nelze nalézt a dle %s toto jádro\n"
+"       nezná loop zaøízení. Pokud je tomu tak, pak jej znovu pøelo¾te,\n"
+"       èi zkuste `insmod loop.o'."
 
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
+#: mount/lomount.c:197
+msgid "mount: could not find any free loop device"
+msgstr "mount: ¾ádné volné loop zaøízení nelze najít"
 
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Nelze zamknout v pamìti. Konèím.\n"
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Init (a¾ 16 ¹estnáctkových èíslic): "
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): úspìch\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "Ne¹estnáctková èíslice '%c'.\n"
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: zaøízení %s nelze smazat: %s\n"
 
-#: mount/lomount.c:764
+#: mount/lomount.c:366
 #, 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"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): úspìch\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): úspìch\n"
+#: mount/lomount.c:374
+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:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "Nedostatek pamìti"
-
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "%s pro ètení nelze otevøít"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"Pou¾ití:\n"
+"  %s loop zaøízení                                    # vypí¹e informace\n"
+"  %s -d loop zaøízení                                 # sma¾e\n"
+"  %s [ -e ¹ifra ] [ -o posun ] loop zaøízení soubor   # nastaví\n"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "Nedostatek pamìti"
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
+msgstr "Podpora pro loop nebyla pøi pøekladu zadána. Pøelo¾te program znovu.\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7711,41 +7726,41 @@ msgstr "[mntent]: 
 msgid "; rest of file ignored"
 msgstr "; ignoruji zbytek souboru"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, 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:400
+#: mount/mount.c:399
 #, 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:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s nelze otevøít pro zápis: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: chyba pøi zápisu %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: chyba pøi zmìnì módu %s: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s vypadá jako odkládací prostor - nepøipojeno"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "pøipojení se nezdaøilo"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: pouze superu¾ivatel mù¾e pøipojit %s na %s"
@@ -7767,103 +7782,107 @@ msgstr "mount: p
 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:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: nepodaøilo se nastavit zaøízení loop\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: zaøízení loop bylo korektnì nastaveno\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s nelze otevøít: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr ""
+
+#: mount/mount.c:687
 #, fuzzy, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: %s nelze pro nastavení rychlosti otevøít"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: rychlost nelze nastavit: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: volání fork selhalo: %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 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:854
+#: mount/mount.c:864
 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:865
+#: mount/mount.c:875
 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:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: musíte zadat typ systému souborù"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr "mount: pøipojení se nezdaøilo"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: pøípojný bod %s není adresáøem"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: pøístup odmítnut"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 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:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s je ji¾ pøipojeno"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc je ji¾ pøipojeno"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, 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:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: pøípojný bod %s neexistuje"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, 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:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: speciální zaøízení %s neexistuje"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7872,12 +7891,12 @@ msgstr ""
 "mount: speciální zaøízení %s neexistuje\n"
 "              (název cesty nezaèíná adresáøem)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, 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:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7886,46 +7905,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:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "tabulka pøipojení je plná"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok nelze pøeèíst"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: blokové zaøízení %s je neznámé"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: typ ss %s není podporován jádrem"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: pravdìpodobnì jste myslel %s"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: mo¾ná jste myslel iso9660 ?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, 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:997
+#: mount/mount.c:1007
 #, 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:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7933,74 +7952,47 @@ msgid ""
 msgstr ""
 "mount: jádro nerozpoznalo %s jako blokové zaøízení (mo¾ná `insmod ovladaè'?)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, 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:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s není blokovým zaøízením"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, 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:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "blokové zaøízení"
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "umount: %s%s nelze pøipojit v re¾imu pouze pro ètení"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, 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:1033
+#: mount/mount.c:1043
 #, 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:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr ""
-
-#: mount/mount.c:1124
-#, fuzzy, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "umount: %s není pøipojeno"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: chystám se pøipojit %s dle %s\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "popis"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: ¾ádný odpovídající diskový oddíl nebyl nalezen"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: nebyl zadán typ - budu pou¾ívat nfs kvùli dvojteèce\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 #, fuzzy
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr "mount: nebyl zadán typ - budu pou¾ívat smbfs kvùli dvojteèce\n"
@@ -8008,22 +8000,22 @@ msgstr "mount: nebyl zad
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: pracuji na pozadí \"%s\"\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: konèím \"%s\"\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s je ji¾ pøipojeno na %s\n"
 
-#: mount/mount.c:1386
+#: mount/mount.c:1362
 #, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8045,7 +8037,7 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Pou¾ití: mount -V               : vypí¹e informace o verzi\n"
@@ -8072,75 +8064,74 @@ msgstr ""
 "Dal¹í pøepínaèe: [-nfFrsvw] [-o volby].\n"
 "Dal¹í informace viz man(8).\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: toto mù¾e provést pouze superu¾ivatel"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nebylo nalezeno - vytváøím jej..\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr ""
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: ¾ádný odpovídající diskový oddíl nebyl nalezen"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: pøipojuji %s\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr "nebyl pøipojen ¾ádný diskový oddíl"
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s nelze v %s nalézt"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, 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:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
 "mount: %s nelze otevøít,tak¾e konverze UUID a LABEL nebude provedena.\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: chybné UUID"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 #, fuzzy
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: musíte zadat typ systému souborù"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, 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:495
+#: mount/mount_guess_fstype.c:523
 #, 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:498
+#: mount/mount_guess_fstype.c:526
 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:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Vyzkou¹ím typ %s\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "Pou¾ívám %s.\n"
@@ -8234,7 +8225,7 @@ msgstr "n
 msgid "bug in xstrndup call"
 msgstr "chyba ve volání xstrndup"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8247,7 +8238,7 @@ msgstr ""
 "         %s [-v] [-p priorita] zvlá¹tní soubor ...\n"
 "         %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8259,101 +8250,33 @@ msgstr ""
 "         %s [-v] [-p priorita] zvlá¹tní soubor ...\n"
 "         %s [-s]\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-#, fuzzy
-msgid "out of memory"
-msgstr "nedostatek pamìti?\n"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: volání stat pro %s selhalo: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 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 %"
 "04o\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, 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:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: blokové zaøízení %s je chybné"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "Nepodporovaný ¹ifrovací typ %s\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: chystám se pou¾ít zaøízení loop %s\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Tento diskový oddíl je ji¾ pou¾íván."
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "odkládací prostor nelze pøevinout"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "/dev/urandom nelze otevøít"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "i-uzly nelze zapsat"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "volání fork selhalo\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Mìním heslo u¾ivatele %s\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s nelze otevøít: %s\n"
@@ -8418,36 +8341,36 @@ msgstr "umount: %s: blokov
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "nenalezl jsem umount2, zkou¹ím umount...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "%s nelze odpojit - zkou¹ím %s\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, 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:329
+#: mount/umount.c:331
 #, 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:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s odpojeno\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: seznam systémù souborù na odpojení nelze nalézt"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 #, fuzzy
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8458,42 +8381,42 @@ msgstr ""
 "         umount -a [-f] [-r] [-n] [-v] [-t typy vfs]\n"
 "         umount [-f] [-r] [-n] [-v] speciální soubor | uzel...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Zkou¹ím odpojit %s\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s nelze v mtab najít\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: podle mtab není %s pøipojeno"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, 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:561
+#: mount/umount.c:578
 #, 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:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: pøipojení %s neodpovídá fstab"
 
-#: mount/umount.c:602
+#: mount/umount.c:616
 #, c-format
-msgid "umount: only root can unmount %s from %s"
-msgstr "unmount: pouze u¾ivatel root mù¾e odpojit %s ze %s"
+msgid "umount: only %s can unmount %s from %s"
+msgstr "unmount: pouze u¾ivatel %s mù¾e odpojit %s ze %s"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr "umount: toto mù¾e provést pouze u¾ivatel root"
 
@@ -8634,7 +8557,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f pøer/sek; %f pøíj (znak/sek)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Pou¾ití: %s [-c] [-n úroveò] [-s velikost bufferu]\n"
@@ -8800,23 +8723,23 @@ msgstr "------ Omezen
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
 msgstr "maximální poèet segmentù = %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "maximální velikost segmentu (v kilobajtech) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "celkové maximum pro sdílenou pamì» (v kilobajtech) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "minimální velikost segmentu (v bajtech) = %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9332,7 +9255,12 @@ msgstr "          Pomoc
 msgid "missing comma"
 msgstr "chybí èárka"
 
-#: sys-utils/readprofile.c:115
+#: sys-utils/readprofile.c:72
+#, fuzzy
+msgid "out of memory"
+msgstr "nedostatek pamìti?\n"
+
+#: sys-utils/readprofile.c:118
 #, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
@@ -9344,6 +9272,7 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
@@ -9358,32 +9287,32 @@ msgstr ""
 "\t -r            vynuluje ve¹keré èítaèe (pouze root)\n"
 "\t -V            vypí¹e informace o verzi a skonèí\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, fuzzy, c-format
 msgid "%s version %s\n"
 msgstr "%s Verze %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Profilovací_krok: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): chybný map øádek\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: \"_stext\" nelze v %s nalézt\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, 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:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "celkem"
 
@@ -9917,30 +9846,117 @@ msgstr "Vstupn
 msgid "Out of memory when growing buffer.\n"
 msgstr "Nedostatek pamìti pro rostoucí buffer.\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: zaøízení %s nelze smazat: %s\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "pøi pøekladu %s nebyla zvolena podpora minix v2\n"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): úspìch\n"
+#~ msgid "Boot (%02X)"
+#~ msgstr "Startovací (%02X)"
 
-#~ 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"
+#~ msgid "None (%02X)"
+#~ msgstr "®ádný (%02X)"
+
+#, fuzzy
+#~ msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) posun %d, %s ¹ifra\n"
 
 #~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "Pou¾ití:\n"
-#~ "  %s loop zaøízení                                    # vypí¹e informace\n"
-#~ "  %s -d loop zaøízení                                 # sma¾e\n"
-#~ "  %s [ -e ¹ifra ] [ -o posun ] loop zaøízení soubor   # nastaví\n"
+#~ "mount: ¾ádné loop zaøízení nelze nalézt.\n"
+#~ "       Nemá /dev/loop# chybné vìt¹í èíslo zaøízení?"
 
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ 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 ""
-#~ "Podpora pro loop nebyla pøi pøekladu zadána. Pøelo¾te program znovu.\n"
+#~ "mount: ®ádné loop zaøízení nelze nalézt. Mo¾ná toto jádro nezná loop "
+#~ "zaøízení\n"
+#~ "       (pak jej znovu pøelo¾te, èi zkuste `insmod loop.o'), èi /dev/loop# "
+#~ "má\n"
+#~ "       chybné vìt¹í èíslo?"
+
+#, fuzzy
+#~ msgid "Error: unable to open %s for reading\n"
+#~ msgstr "%s pro ètení nelze otevøít"
+
+#, fuzzy
+#~ msgid "Retype password: "
+#~ msgstr "Potvrïte nové heslo: "
+
+#, fuzzy
+#~ msgid "Error: gpg key file decryption failed\n"
+#~ msgstr "adresáø nelze otevøít\n"
+
+#, fuzzy
+#~ msgid "Error: Password must be at least %d characters.\n"
+#~ msgstr "Heslo musí obsahovat alespoò 6 znakù, zkuste to znovu.\n"
+
+#, fuzzy
+#~ msgid "Error: Unable to allocate memory\n"
+#~ msgstr "Nelze alokovat více pamìti\n"
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Init (a¾ 16 ¹estnáctkových èíslic): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Ne¹estnáctková èíslice '%c'.\n"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Error: unable to open /etc/fstab for reading\n"
+#~ msgstr "%s pro ètení nelze otevøít"
+
+#, fuzzy
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "umount: %s není pøipojeno"
+
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: chystám se pøipojit %s dle %s\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "popis"
+
+#, fuzzy
+#~ msgid "swapon: invalid loop device name\n"
+#~ msgstr "umount: blokové zaøízení %s je chybné"
+
+#, fuzzy
+#~ msgid "swapon: unable to open loop device %s\n"
+#~ msgstr "mount: chystám se pou¾ít zaøízení loop %s\n"
+
+#, fuzzy
+#~ msgid "swapon: loop device %s already in use\n"
+#~ msgstr "Tento diskový oddíl je ji¾ pou¾íván."
+
+#, fuzzy
+#~ msgid "swapon: unable to open swap device %s\n"
+#~ msgstr "odkládací prostor nelze pøevinout"
+
+#, fuzzy
+#~ msgid "swapon: unable to open /dev/urandom\n"
+#~ msgstr "/dev/urandom nelze otevøít"
+
+#, fuzzy
+#~ msgid "swapon: unable to create pipe\n"
+#~ msgstr "i-uzly nelze zapsat"
+
+#, fuzzy
+#~ msgid "swapon: fork failed\n"
+#~ msgstr "volání fork selhalo\n"
+
+#, fuzzy
+#~ msgid "swapon: random password for %s is %s"
+#~ msgstr "Mìním heslo u¾ivatele %s\n"
+
+#~ msgid "umount: only root can unmount %s from %s"
+#~ msgstr "unmount: pouze u¾ivatel root mù¾e odpojit %s ze %s"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Diskový oddíl %i nekonèí na hranici cylindru:\n"
@@ -9976,9 +9992,6 @@ msgstr "Nedostatek pam
 #~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
 #~ msgstr "%-10s %-10s %-10s %-10s  %-10s %-12s\n"
 
-#~ msgid "umount: only %s can unmount %s from %s"
-#~ msgstr "unmount: pouze u¾ivatel %s mù¾e odpojit %s ze %s"
-
 #~ msgid "'\n"
 #~ msgstr "'\n"
 
diff --git a/po/da.po b/po/da.po
index 9f96b3f0..3c7a4b00 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11y\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
 "PO-Revision-Date: 2002-12-02 21:15GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -21,94 +21,99 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "markerer skrivebeskyttet"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "markerer skrivbar"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "få skrivebeskyttet"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "få sektorstørrelse"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr "få blokstørrelse"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
 msgstr "sæt blokstørrelse"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "få størrelse"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "sæt fremlæsning ('readahead')"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "få fremlæsning ('readahead')"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "tøm buffere"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "genlæs partitionstabellen"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
 msgstr "Brug:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr "  %s --report [enheder]\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "  %s [-v|-q] kommandoer enheder\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Tilgængelige kommandoer:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: Ukendt kommando: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s kræver en parameter\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr "%s lykkedes.\n"
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: kunne ikke åbne %s\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: ioctl-fejl på %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SST   BST   StartSekt    Størr.  Enhed\n"
 
@@ -151,12 +156,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "brug: %s [ -n ] enhed\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s fra %s\n"
@@ -295,49 +300,49 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: ugyldigt cramfs--ugyldig fildataforskydning\n"
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Brug: %s [-larvsmf] /dev/navn\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s er monteret.\t "
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Vil du virkelig fortsætte"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "tjek afbrudt.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zone nr < FIRSTZONE i filen '%s'."
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zone nr >= ZONES i filen '%s'."
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Fjern blok"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Læsefejl: kunne ikke søge til blok i filen '%s'\n"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Læsefejl: ugyldig blok i filen '%s'\n"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -345,122 +350,122 @@ msgstr ""
 "Intern fejl: forsøger at skrive ugyldig blok\n"
 "Skriveforsøg ignoreret\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "søgning mislykkedes i write_block"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Skrivefejl: ugyldig blok i fil '%s'\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "søgning mislykkedes i write_super_block"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "kunne ikke skrive super-blok"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "Kunne ikke skrive inode-oversigten"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "Kunne ikke skrive zone-oversigten"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "Kunne ikke skrive inodes"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "søgning fejlede"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "kunne ikke læse super-blok"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "ugyldigt magisk nummer i super-blok"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Kun 1k blokke/zoner understøttes"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "ugyldigt s_imap_blocks-felt i super-blok"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "ugyldigt s_zmap_blocks-felt i super-blok"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "Kunne ikke allokere buffer til inode-oversigt"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "Kunne ikke allokere buffer til inodes"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "Kunne ikke allokere buffer til inode-optælling"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "Kunne ikke allokere buffer til zoneoptælling"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "Kunne ikke læse inode-oversigt"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "Kunne ikke læse zoneoversigt"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "Kunne ikke læse inodes"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Advarsel: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blokke\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonesize=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxsize=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Filesystem state=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -469,171 +474,171 @@ msgstr ""
 "namelen=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inode %d er markeret som ubrugt, men bruges af filen '%s'\n"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Markér i brug"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Filen '%s' har modus %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "Advarsel: inode-optælling for stor.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "rod-inode er ikke et katalog"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Blokke blev brugt tidligere. Nu i filen '%s'."
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Slet"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Blok %d i filen '%s' er markeret som ubrugt."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Korrigér"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "Kataloget '%s' indeholder forkert inode-antal for filen '%.*s'."
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " Fjern"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr "'%s': ugyldigt katalog: '.' er ikke først\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr "'%s': ugyldigt katalog: ',.' er ikke nummer to\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: ugyldigt katalog: '.' er ikke først\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: ugyldigt katalog: ',.' er ikke nummer to\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "intern fejl"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: ugyldigt katalog: størrelse < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "mislykket søgning i bad_zone"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Inode %d modus ikke slettet."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "Inode %d ikke brugt, markeret som brugt i bitoversigten."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "Inode %d i brug, markeret som ubrugt i bitoversigten."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (modus = %07o), i_nlinks=%d, optalt=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "Sæt i_nlinks til det optalte"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zone %d: markeret som brugt, ingen filer bruger den."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Afmarkér"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Zone %d: i brug, optalt=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Zone %d: ikke i brug, optalt=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Sæt"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "ugyldig inode-størrelse"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "ugyldig v2 inode-størrelse"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "kræver terminal til interaktive reparationer"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "kunne ikke åbne '%s'"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s er i orden, tjekkes ikke.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Gennemtvinger tjek af filsystem på %s.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Filsystem på %s er måske ikke i orden, kræver et tjek.\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -642,12 +647,12 @@ msgstr ""
 "\n"
 "%6ld inodes brugt (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zoner brugt (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -670,7 +675,7 @@ msgstr ""
 "------\n"
 "%6d filer\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -761,7 +766,7 @@ msgstr "for mange inodes - 
 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:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhed: %s\n"
@@ -834,7 +839,7 @@ msgstr "Fejl under lukning af %s"
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Brug: mkfs [-V] [-t fstype] [fs-tilvalg] enhed [størrelse]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -994,63 +999,63 @@ msgstr ""
 "sikkerhed\n"
 "at nogle af enhedsfilerne vil være fejlbehæftede.\n"
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Brug: %s [-c | -l filnavn] [-nXX] [-iXX] /dev/navn [blokke]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s er monteret; vil ikke oprette et filsystem her!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "mislykket søgning til opstartsblok i write_tables"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "kunne ikke slette opstartssektor"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "søgning mislykkedes i write_tables"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "kunne ikke skrive inode-oversigt"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "kunne ikke skrive zoneoversigt"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "kunne ikke skrive inodes"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "mislykket skrivning i write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "for mange ugyldige blokke"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "ikke nok gyldige blokke"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "kunne ikke allokere buffere til oversigter"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "kunne ikke allokere buffere til inodes"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1059,55 +1064,50 @@ msgstr ""
 "Maxsize=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "søgning fejlede under test af blokke"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Mystiske værdier i do_check: sandsynligvis programfejl\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "søgning mislykkedes i check_blocks"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "ugyldige blokke før dataområde: kan ikke oprette filsystem"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d ugyldige blokke\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "en ugyldig blok\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "kan ikke åbne fil med ugyldige blokke"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s: ikke oversat med understøttelse for minix v2\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol-fejl: antallet af blokke ikke angivet"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "kunne ikke åbne %s"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "kunne ikke finde %s"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "vil ikke forsøge at oprette filsystem på '%s'"
@@ -1147,45 +1147,45 @@ msgid "one bad page\n"
 msgstr "en ugyldig side\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d ugyldige sider\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fejl: Ingen steder at opsætte swap?\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: fejl: størrelsen %ld er større end enhedsstørrelsen %d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: fejl: ukendt version %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: fejl: swap-område skal mindst være på %ldkB\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: fejl: afkorter swap-området til %ldkB\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Vil ikke forsøge at oprette swap-enhed på '%s'"
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "fatalt: første side kan ikke læses"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1198,24 +1198,24 @@ msgstr ""
 "opretter en v0 swap. Ingen swap oprettet. Hvis du virkelig vil oprette en\n"
 "v0 swap på denne enhed, kan du gennemtvinge det med tilvalget -f.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Kunne ikke klargøre swap-område: ulæseligt"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Klargører swap-område version %d, størrelse = %llu kB\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "kunne ikke spole tilbage på swap-enheden"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "kunne ikke skrive signatur-side"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync mislykkedes"
 
@@ -1255,57 +1255,56 @@ msgstr "   %s [ -c | -y | -n | -d ] enh\n"
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] enh\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Ubrugelig"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Frit område"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "Disken er blevet udskiftet.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Genstart systemet for at sikre, at partitionstabellen er opdateret korrekt.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1317,768 +1316,782 @@ msgstr ""
 "yderligere information, hvis du har oprettet eller\n"
 "ændret DOS 6.x partitioner.\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "FATAL FEJL"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Tryk en tast for at afslutte cfdisk"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "Kan ikke søge på drev"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Kan ikke læse drev"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Kan ikke skrive på drev"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "For mange partitioner"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "Partition starter før sektor 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "Partition slutter før sektor 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "Partition starter efter slut-på-disk"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "Partition slutter efter slut-på-disk"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partitionen slutter i den sidste partialcylinder"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "logiske partitioner ikke i disk-rækkefølge"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "logisk partitions-overlap"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "forstørret logisk partitions-overlap"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Intern fejl under oprettelse af logisk drev uden udvidet partition !!!!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Kan ikke oprette logisk drev her -- ville resultere i to udvidede partitioner"
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menupunkt for langt. Menu ser muligvis mærkeligt ud."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu uden retning. Vælger standarden horisontal."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Ugyldig tast"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Tryk en tast for at fortsætte"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primær"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Opret en ny primær partition"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Logisk"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Opret en ny logisk partition"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Opret ikke partition"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Intern fejl !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Størrelse (i MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Begyndelse"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Tilføj partition i starten af det frie område"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Slut"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Tilføj partition i slutningen af det frie område"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Ikke plads til at oprette udvidet partition"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr "Ingen partitionstabel eller ugyldig signatur på partitionstabellen"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Vil du starte med nulstillet tabel [j/N] ?"
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "Du angav flere cylindre end der kan være på disken"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "Kan ikke åbne drev"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Åbnede drev skrivebeskyttet - du har ikke adgang til at skrive"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Kan ikke få diskstørrelsen"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Ugyldig primærpartition"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Ugyldig logisk partition"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Advarsel!! Dette ødelægger muligvis data på din disk!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Er du sikke på, at du vil skrive partitionstabellen til disken? (ja eller "
 "nej): "
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "nej"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Skrev ikke partitionstabellen til disken"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Skriv venligst 'ja' eller 'nej'"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Skriver partitionstabel til disken..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Skrev partitionstabel til disken"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Skrev partitionstabel, men genindlæsning mislykkedes. Genstart for at "
 "opdatere tabellen."
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Ingen primærpartitioner er markeret opstartbar. DOS MBR vil ikke kunne "
 "starte op."
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Da flere primærpartitioner er opstartbare, vil DOS MBR ikke kunne starte op."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Angiv filnavn eller tryk RETUR for at vise på skærmen: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan ikke åbne filen '%s'"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Drev: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Ingen  "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Primær"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Logisk "
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Opstart (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Opstart"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
-#, c-format
-msgid "Unknown (%02X)"
-msgstr "Ukendt (%02X)"
+#: fdisk/cfdisk.c:2007
+#, fuzzy, c-format
+msgid "(%02X)"
+msgstr "Ukt(%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Ingen (%02X)"
+#: fdisk/cfdisk.c:2009
+#, fuzzy
+msgid "None"
+msgstr "Færdig"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabel for %s\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
+#: fdisk/cfdisk.c:2046
+#, fuzzy
+msgid "               First       Last\n"
 msgstr "            Første   Sidste\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
+#, fuzzy
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
 " # Type     Sektor   Sektor   Forskyd Længde   Filsystem type (ID)    Flag\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
+#, fuzzy
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
+#: fdisk/cfdisk.c:2131
+#, fuzzy
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         --- Start-----      -----Slut-----    Start antal af\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
+#: fdisk/cfdisk.c:2132
+#, fuzzy
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flag  Hovd Sekt Cyl   ID  Hovd Sekt Cyl    Sektor  Sektorer\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+#, fuzzy
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Rå"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Vis tabellen i råtdata format"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Sektorer"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Vis tabellen ordnet efter sektorer"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Vis kun partitionstabellen"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Vis ikke tabellen"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Hjælpeskærm for cfdisk"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dette er cfdisk, et curses-baseret diskpartitionerings-program, som"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "lader dig oprette, slette eller modificere partitioner på din"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "harddisk."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Kommando     Betydning"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Skift opstartbar-flaget for partitionen ('bootable')"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          Slet partitionen"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Ret cylinder, hoved, sektorer-per-spor parametre"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ADVARSEL: Denne kommando bør kun bruges af folk, der"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             er klar over, hvad de gør."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          Vis denne skærm"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimér partitionens diskforbrug"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Bemærk: Dette kan gøre partitionen inkompatibel med"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          Opret ny partition i frit område"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Udlæs partitionstabellen til skærmen eller en fil"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "             Der er flere forskellige formater på partitionen,"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             som du kan vælge mellem:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Rådata (nøjagtig de, som ville skrives på disken)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabel ordnet efter sektorer"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel i rådata format"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Afslut program uden at skrive partitionstabellen"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          Skift filsystem type"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Skift enhed for visning af partitionsstørrelser"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Skifter mellem MB, sektorer og cylindre"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Skriv partitionstabellen til disk (skal være stort W)"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Siden dette kan ødelægge data på disken, skal du enten"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             bekræfte eller afvise ved at skrive henholdsvis 'ja'"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             eller 'nej'"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pil op       Flyt markøren til forrige partition"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pil ned      Flyt markøren til næste partition"
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Gentegner skærmen"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Vis denne skærm"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Bemærk: Alle kommandoerne kan angives med enten store eller små"
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "bogstaver (undtagen W)."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cylindre"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Skift cylindergeometri"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Hoveder"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Skift hovedgeometri"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Skift sektorgeometri"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Færdig"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "Færdig med geometriændring"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Angiv antallet af cylindre: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Ugyldigt cylinderantal"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Angiv antallet af hoveder: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Ugyldig hovedantal"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Angiv antallet af sektorer per spor: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Ugyldig sektorantal"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Angiv filsystemtype: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "Kan ikke ændre filsystemtype til tom"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "Kan ikke ændre filsystemtype til udvidet"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Opstart"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ukt(%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Ukendt (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Drev: %s"
 
-#: fdisk/cfdisk.c:2593
-#, c-format
-msgid "Size: %lld bytes, %ld MB"
+#: fdisk/cfdisk.c:2580
+#, fuzzy, c-format
+msgid "Size: %lld bytes, %lld MB"
 msgstr "Størrelse: %lld byte, %ld Mb"
 
-#: fdisk/cfdisk.c:2596
-#, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
+#: fdisk/cfdisk.c:2583
+#, fuzzy, c-format
+msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Størrelse: %lld byte, %ld.%ld Gb"
 
-#: fdisk/cfdisk.c:2600
-#, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
+#: fdisk/cfdisk.c:2587
+#, fuzzy, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Hoveder: %d   Sektorer per spor: %d   Cylindre: %d"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Navn"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Flag"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Part-type"
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "Fs-type"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Mærkat]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
+#: fdisk/cfdisk.c:2597
+#, fuzzy
+msgid "    Sectors"
 msgstr "  Sektorer"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
+#: fdisk/cfdisk.c:2599
+#, fuzzy
+msgid "  Cylinders"
+msgstr "Cylindre"
+
+#: fdisk/cfdisk.c:2601
+#, fuzzy
+msgid "  Size (MB)"
 msgstr "Størrelse (MB)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
+#: fdisk/cfdisk.c:2603
+#, fuzzy
+msgid "  Size (GB)"
 msgstr "Størrelse (GB)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Opstartbar"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Skift opstartbar-flaget for partitionen ('bootable')"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Slet"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Slet partitionen"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Skift diskgeometri (kun for eksperter)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Hjælp"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Vis hjælpeskærm"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Maksimér"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimér diskforbruget for partitionen (kun for eksperter)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Ny"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Opret ny partition i frit område"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Udlæs"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Udlæs partitionstabellen til skærmen eller til en fil"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Afslut"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Afslut program uden at ændre partitionstabellen"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Type"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Skift filsystemtype (DOS, Linux, OS/2 osv.)"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Enheder"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Skift enheder for visning af partitionstabellen (MB, sekt, cyl)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Skriv"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Skriv partitionstabellen til disk (dette kan ødelægge data)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "Kan ikke gøre denne partition opstartbar"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "Kan ikke slette en tom partition"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "Kan ikke maksimere denne partition"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Denne partition er ubrugelig"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Denne partition er allerede i brug"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan ikke ændre en tom partitions type"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "Ikke flere partitioner"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Ugyldig kommando"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2113,7 +2126,7 @@ msgstr ""
 "                hoveder og sektorer/spor.\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2133,7 +2146,7 @@ msgstr ""
 "-u: angiv start og slut som sektornumre (i stedet for cylindernumre)\n"
 "-b 2048: (for visse MO-drev) brug sektorer på 2048 byte\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2149,222 +2162,222 @@ msgstr ""
 " eller: fdisk /dev/rd/c0d0  eller: fdisk /dev/ida/c0d0  (for RAID-enheder)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kunne ikke åbne %s\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kunne ikke læse %s\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kunne ikke søge til %s\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kunne ikke skrive %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl mislykkedes på %s\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Kunne ikke allokere mere hukommelse\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Fatal fejl\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Kommando beskrivelse"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a    skift et skrivebeskyttelses-flag"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b    skift bsd-diskmærkat"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c    skift montérbart-flag"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d    slet en partition"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l    vis liste over kendte partitionstyper"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m    vis denne menu"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n    tilføj en ny partition"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o    opret en ny, tom DOS-partitionstabel"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p    vis partitionstabellen"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q    afslut uden at gemme ændringerne"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s    opret en ny, tom Sun-diskmærkat"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t    skift system-id for en partition"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u    skift enheder for visning/indtastning"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v    verificér partitionstabellen"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w    skriv partitionstabel til disk og afslut"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x    ekstra funktionalitet (kun for eksperter)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a    vælg en opstartbar partition"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b    redigér indgang i opstartsfil"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c    vælg sgi swap-partition"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a    skift opstartbar-flaget"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c    skift DOS-kompatilitets-flaget"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a    ændr antallet af alternative cylindre"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c    ændr antallet af cylindre"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr "   d    vis rådataene fra partitionstabellen"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e    ændr antallet af ekstra sektorer per cylinder"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h    ændr antallet af hoveder"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   ændr interleavefaktor"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o    ændr rotationshastighed (omdr. per minut)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r    returnér til hovedmenuen"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s    ændr antallet af sektorer/spor"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ændr antallet af fysiske cylindre"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b    flyt starten på data i en partition"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e    vis udvidede partitioner"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g    opret en IRIX (SGI) partitionstabel"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f    ordn partitionsrækkefølgen"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "Du skal angive"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "hoveder"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "sektorer"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "cylindre"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2373,11 +2386,11 @@ msgstr ""
 "%s%s.\n"
 "Dette kan du gøre fra menuen 'Ekstra funktioner'.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " og "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2396,26 +2409,26 @@ msgstr ""
 "2) opstarts- og partitioneringsprogrammer fra andre OS'er\n"
 "   (Bl.a. DOS FDISK og OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Ugyldig forskydning i primær udvidet partition\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Advarsel: sletter partitioner efter %d\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Advarsel: ekstra lænkepeger (link pointer) i partitionstabel %d\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Advarsel: ignorerer ekstra data i partitionstabel %d\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2427,16 +2440,16 @@ msgstr ""
 "indhold naturligvis ikke genskabes\n"
 "\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Bemærk: sektorstørrelsen er %d (ikke %d)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr "Du vil ikke kunne gemme partitionstabellen.\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
@@ -2444,7 +2457,7 @@ msgstr ""
 "Denne disk har både magiske numre for DOS \n"
 "BSD. Brug 'b'-kommandoen for at gå i BSD-tilstand.\n"
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
@@ -2452,16 +2465,16 @@ msgstr ""
 "Enheden indeholder hverken en gyldig DOS-partitionstabel eller et Sun-, SGI- "
 "eller OSF-diskmærkat.\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Intern fejl\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorerer ekstra udvidet partition %d\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2470,7 +2483,7 @@ msgstr ""
 "Advarsel: ugyldigt flag 0x%04x for partitionstabel %d vil blive rettet med "
 "'w' (skriv)\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2478,78 +2491,78 @@ msgstr ""
 "\n"
 "fik filslut (EOF) tre gange - afslutter..\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Hex-kode (tryk L for en liste over koderne): "
 
-#: fdisk/fdisk.c:1069
+#: fdisk/fdisk.c:1094
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, standard %d): "
 
-#: fdisk/fdisk.c:1136
+#: fdisk/fdisk.c:1161
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Bruger standard-værdi %d\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "Værdi udenfor området.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Advarsel: partition %d er af typen 'tom'\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition %d er valgt\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 msgid "No partition is defined yet!\n"
 msgstr "Ingen partitioner defineret!\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle primære partitioner er allerede definerede!\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Skifter enheder for visning/indtastning til %s\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ADVARSEL: Partition %d er en udvidet partition\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-kompatilitetsflag er sat\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-kompatilitetsflag er ikke sat\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d eksisterer ikke endnu!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2561,7 +2574,7 @@ msgstr ""
 "er nok uklogt. Du kan slette en partition med\n"
 "'d'-kommandoen.\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2569,7 +2582,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:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2579,7 +2592,7 @@ msgstr ""
 "SunOS/Solaris forventer det og selv Linux foretrækker det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2589,52 +2602,52 @@ msgstr ""
 "og partition 11 som 'entire volume' (6), da IRIX forventer det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, 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:1453
+#: fdisk/fdisk.c:1479
 #, 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:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisk=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d har forskellig fysisk/logisk endelse:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, 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:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "burde være (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partition %i slutter ikke på en cylindergrænse.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "burde være (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -2643,7 +2656,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld Mb, %lld byte\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, c-format
 msgid ""
 "\n"
@@ -2652,17 +2665,17 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld Gb, %lld byte\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d hoveder, %d sektorer/spor, %d cylindre"
 
-#: fdisk/fdisk.c:1503
-#, c-format
-msgid ", total %lu sectors"
+#: fdisk/fdisk.c:1529
+#, fuzzy, c-format
+msgid ", total %llu sectors"
 msgstr ", i alt %lu sektorer"
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2671,7 +2684,7 @@ msgstr ""
 "Enheder = %s af %d * %d = %d byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2679,16 +2692,16 @@ msgstr ""
 "Intet at gøre. Rækkefølgen er allerede korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
-#, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
+#: fdisk/fdisk.c:1704
+#, fuzzy, c-format
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Opstart Start       Slut   Blokke   Id  System\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Enhed"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2696,7 +2709,7 @@ msgstr ""
 "\n"
 "Partitionstabellens indgange er ikke i disk-rækkefølge\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2707,92 +2720,93 @@ msgstr ""
 "Disk %s: %d hoveder, %d sektorer, %d cylindre\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
+#: fdisk/fdisk.c:1754
+#, fuzzy
+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:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Advarsel: partition %d indeholder sektor 0\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, 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:1778
+#: fdisk/fdisk.c:1805
 #, 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:1781
+#: fdisk/fdisk.c:1808
 #, 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:1785
+#: fdisk/fdisk.c:1812
 #, 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:1817
+#: fdisk/fdisk.c:1844
 #, 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:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Advarsel: partition %d overlapper med partition %d.\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Advarsel: partition %d er tom\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, 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:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Allokerede sektorer i alt %d er større end de maksimale %d\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d ikke-allokerede sektorer\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 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:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Første %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d er allerede allokeret\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "Ingen tilgængelige frie sektorer\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, 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:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2804,15 +2818,25 @@ msgstr ""
 "\ttilføje DOS-partitioner. (Brug o.)\n"
 "\tADVARSEL: Dette vil ødelægge diskens nuværende indhold.\n"
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "Det maksimale antal partitioner er blevet oprettet\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 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:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "logiske partitioner ikke i disk-rækkefølge"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Ugyldig primærpartition"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2823,20 +2847,20 @@ msgstr ""
 "   %s\n"
 "   p    primær partition (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l    logisk (5 eller derover)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e    udvidet"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ugyldigt partitionsnummer for type '%c'\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2844,11 +2868,11 @@ msgstr ""
 "Partitionstabellen er ændret!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kalder ioctl() for at genindlæse partitionstabellen.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2861,7 +2885,7 @@ msgstr ""
 "Denne kerne bruger stadig den gamle tabel.\n"
 "Den nye tabel vil blive brugt fra næste genstart.\n"
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2873,64 +2897,64 @@ msgstr ""
 "yderligere information, hvis du har oprettet eller\n"
 "ændret DOS 6.x partitioner.\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Synkroniserer diske.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har intet dataområde\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Ny begyndelse på data"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Ekspert kommando (m for hjælp): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Antal cylindre"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Antal hoveder"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Advarsel: sætter sektorforskydning for DOS-kompatilitet\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, 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:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kunne ikke åbne %s\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kunne ikke åbne %s\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ukendt kommando\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 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:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2939,16 +2963,16 @@ msgstr ""
 "enhed\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Detekterede et OSF/1 diskmærkat på %s. Går i diskmærkat-tilstand.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Kommando (m for hjælp): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2957,15 +2981,15 @@ msgstr ""
 "\n"
 "Den nuværende opstartfil er: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Angiv venligt navnet på den ny opstartsfil: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "Opstartsfil uændret\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2975,7 +2999,7 @@ msgstr ""
 "\tBeklager, der er ingen ekspertmenu for SGI-partitionstabeller.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3334,8 +3358,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux swap"
 
@@ -3568,7 +3591,7 @@ msgstr ""
 "Kun \"SGI volume\" hele-disk-sektionen kan bryde dette.\n"
 "Skriv JA, hvis du er sikker på, at du vil mærke partitionen anderledes.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "JA\n"
 
@@ -3733,15 +3756,15 @@ msgstr "Alternative cylindre"
 msgid "Physical cylinders"
 msgstr "Fysiske cylindre"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Rotationshastighed (omdr. per minut)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Interleavefaktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Ekstra sektorer per cylinder"
 
@@ -3796,7 +3819,7 @@ msgstr ""
 "%d %s dækker en anden partition. Din indgang er blevet ændret til\n"
 "%d %s \n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3805,7 +3828,7 @@ msgstr ""
 "Hvis du vil beholde SunOS/Solaris-kompatilitet, bør du beholde denne\n"
 "partition som 'Whole disk' (5), der begynder på 0, med %u sektorer\n"
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3819,7 +3842,7 @@ msgstr ""
 "og opstartsblok. Skriv JA hvis du er helt sikker på, at du vil\n"
 "markere den partition som Linux swap (82): "
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3838,7 +3861,7 @@ msgstr ""
 "Enheder = %s á %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3851,16 +3874,16 @@ msgstr ""
 "Enheder = %s á %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Start       Slut   Blokke   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Antal alternative cylindre"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Antal fysiske cylindre"
 
@@ -3911,20 +3934,24 @@ msgstr "OS/2 Opstartsh
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
+#, fuzzy
+msgid "W95 FAT32"
 msgstr "Win95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "W95 FAT16 (LBA)"
 msgstr "Win95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
+#, fuzzy
+msgid "W95 Ext'd (LBA)"
 msgstr "Win95 udvidet (LBA)"
 
 #: fdisk/i386_sys_types.c:21
@@ -3956,15 +3983,18 @@ msgid "AST SmartSleep"
 msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
+#, fuzzy
+msgid "Hidden W95 FAT32"
 msgstr "Skjult Win95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT32 (LBA)"
 msgstr "Skjult Win95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT16 (LBA)"
 msgstr "Skjult Win95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
@@ -4073,6 +4103,12 @@ msgstr "Gammel Minix"
 msgid "Minix / old Linux"
 msgstr "Minix / gammel Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux swap"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 skjult C-drev"
@@ -4227,89 +4263,89 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "søgefejl på %s - kunne ikke søge til %lu\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "søgefejl: ønskede 0x%08x%08x, fik 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "løbet tør for hukommelse - opgiver\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "læsefejl på %s - kunne ikke læse sektor %lu\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "FEJL: sektor %lu har ikke en MSDOS-signatur\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "skrivefejl på %s - kan ikke skrive sektor %lu\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "kunne ikke åbne partitionssektor-redningsfil (%s)\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "skrivefejl på %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "kunne ikke finde partitions-genskabelsesfil (%s)\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "partitions-genskabelsesfil har forkert størrelse - genskaber ikke\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "løbet tør for hukommelse?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "kan ikke åbne partitions-genskabelsesfilen (%s)\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "fejl under læsning af %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "kan ikke åbne enheden %s for skrivning\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "fejl ved skrivning af sektor %lu på %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: kan ikke bestemme størrelsen\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: kan ikke bestemme geometrien\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4320,22 +4356,22 @@ msgstr ""
 "hel disk. Brug af fdisk på den er sikkert meningsløst.\n"
 "[Brug tilvalget --force hvis du virkelig gerne vil]\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Advarsel: HDIO_GETGEO siger,at der er %lu hoveder\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Advarsel: HDIO_GETGEO siger, at der er %lu sektorer\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Advarsel: BLKGETSIZE/HDIO_GETGEO siger, at der er  %lu cylindre\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4344,7 +4380,7 @@ msgstr ""
 "Advarsel: usandsynligt antal sektorer (%lu) - normalt højst 63\n"
 "Dette vil give problemer med al programmel, der bruger C/H/S-adressering.\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4353,14 +4389,14 @@ msgstr ""
 "\n"
 "Disk %s: %lu cylindre, %lu hoveder, %lu sektorer/spor\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 "%s for partition %s har umulig hoved-værdi: %lu (burde være mellem 0-%lu)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4368,7 +4404,7 @@ msgid ""
 msgstr ""
 "%s for partition %s har umulig sektor-værdi: %lu (burde være mellem 1-%lu)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4377,7 +4413,7 @@ msgstr ""
 "%s for partition %s har umulig cylinder-værdi: %lu (burde være mellem 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4385,11 +4421,11 @@ msgstr ""
 "Id  Navn\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Genindlæser partitionstabel ...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4397,31 +4433,31 @@ msgstr ""
 "Kommandoen for genindlæsning af partitionstabellen mislykkedes\n"
 "Genstart dit system nu, før du formatterer med mkfs\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fejl ved lukning af %s\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ingen sådan partition\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "ukendt format - benyttet sektorer\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# partitionstabel for %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "ikke-implementeret format - benytter %s\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4430,11 +4466,11 @@ msgstr ""
 "Enheder = cylindre á %lu byte, blokke á 1024 byte, tæller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Enhed  Opst Start     Slut  #cyldr. #blokke   Id  System\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4443,11 +4479,11 @@ msgstr ""
 "Enheder = sektorer á 512 byte, tæller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Enhed  Opstart Start       Slut  #sektorer Id  System\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4456,11 +4492,11 @@ msgstr ""
 "Enheder = blokke á 1024 byte, tæller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Enhed  Opstrt Start       Slut   #blokke   Id  System\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4469,31 +4505,31 @@ msgstr ""
 "Enheder = megabyte á 1048576 byte, blokke á 1024 byte, tæller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 #, fuzzy
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Enhed  Opst Start   End     Mb    #blokke   Id  System\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tstart: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tslut: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitionen slutter på cylinder %ld, efter diskens slutning\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "Fandt ingen partitioner\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4504,51 +4540,51 @@ msgstr ""
 "   til C/H/S=*/%ld/%ld (i stedet for %ld/%ld/%ld).\n"
 "I denne visning vil jeg gå ud fra denne geometri.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "der er ingen partitionstabel.\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "mærkeligt, kun %d partitioner er defineret.\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Advarsel: partition %s har størrelsen 0, men er ikke markeret tom\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Advarsel: partition %s har størrelsen 0, men er opstartbar\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Advarsel: partition %s har størrelsen 0, men starter ikke i 0\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Advarsel: partition %s "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "indeholdes ikke i partition %s\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Advarsel: partitionerne %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "og %s overlapper hinanden\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4558,17 +4594,17 @@ msgstr ""
 "lu),\n"
 "og vil ødelægge denne, når der skrives til partitionen.\n"
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Advarsel: partition %s starter i sektor 0\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Advarsel: partition %s når ud over diskens slutning\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4576,17 +4612,17 @@ msgstr ""
 "Kun én af primærpatitionerne må være udvidet\n"
 " (dette er dog ikke noget problem under Linux)\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Advarsel: partition %s starter ikke på en cylindergrænse\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Advarsel: partition %s slutter ikke på en cylindergrænse\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4595,7 +4631,7 @@ msgstr ""
 "Dette generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne "
 "disk.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4603,7 +4639,7 @@ msgstr ""
 "Advarsel: normalt kan man kun starte op fra primærpartitioner\n"
 "LILO ignorerer opstartbar flaget.\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4611,35 +4647,35 @@ msgstr ""
 "Advarsel: ingen primærpartition er markeret opstartbar (aktiv)\n"
 "Det generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne disk.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 #, fuzzy
 msgid "start"
 msgstr "status"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: start: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 #, fuzzy
 msgid "end"
 msgstr "send"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: end: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partition %s slutter på cylinder %ld, efter diskens slutning\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4648,7 +4684,7 @@ msgstr ""
 "Advarsel: ændrede starten på udvidet partition fra %ld til %ld\n"
 "(Vedrører kun oplistningen. Ændrer ikke indholdet.)\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4656,134 +4692,134 @@ msgstr ""
 "Advarsel: udvidet partition starter ikke på en cylindergrænse.\n"
 "DOS og Linux vil opfatte indholdet forskelligt.\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "for mange partitioner - ignorerer dem efter nr. (%d)\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "træ med partitioner?\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "fandt Disk Manager - kan ikke håndtere sådan en\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "fandt DM6 signatur - opgiver\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "mærkeligt... en udvidet partition med størrelsen 0?\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "mærkeligt..., en BSD-partition med størrelsen 0?\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " %s: ukendt partition\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr "flaget -n blev givet: Intet ændret\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Kunne ikke gemme de gamle sektorer- afbryder\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Mislykket skrivning af partition på %s\n"
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "lang eller uafsluttet inddatalinje - afbryder\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "inddatafejl: forventer '=' efter %s-felt\n"
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "inddatafejl: uventet tegn %c efter %s-felt\n"
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ukendt inddata: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "tal for stort\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "uvedkommende tegn efter tallet\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "ikke plads til partitionsbeskrivelse\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "kunne ikke opbygge den omgivende udvidede partition\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr "for mange inddatafelter\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "Ikke plads til mere\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "Ugyldig type\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Advarsel: den angiven størrelse(%lu) overstiger den maksimalt tilladte (%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "Advarsel: tom partition\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Advarsel: ugyldigt partitionsbegyndelse (tidligst %lu)\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ukendt opstartbar-flag,  vælg - eller *\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "delvis c,h,s-specifikation?\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "Udvidet partition ikke hvor den forventedes\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "ugyldige inddata\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "for mange partitioner\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 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"
@@ -4793,47 +4829,47 @@ msgstr ""
 "<start> <størr> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Du behøver normalt kun at angive <start> og <størr> (og måske <type>).\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "version"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "enhed: noget lignende /dev/hda eller /dev/sda"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "nyttige tilvalg:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [eller --show-size]: vis partitionens størrelse"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [eller --id]:        vis eller ændr partitions-id"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [eller --list]:      vis hver enheds partitioner"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [eller --dump]:      det samme, men i et format, der vil passe til "
 "senere inddata"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 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:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4841,52 +4877,52 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:     indlæs/vis i enhederne sektorer/blokke/cylindre/"
 "MB"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [eller --list-types]:vis kendte partitionstyper"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [eller --DOS]:       DOS-kompatibilitet: spilder lidt plads"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [eller --re-read]:   lad kernen genindlæse partitionstabellen"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                   ret kun partitionen med nummer #"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                    undlad at skrive ændringerne til disken"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O fil :                gem de sektorer, der overskrives, i en fil"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fil :                genskab disse sektorer"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [eller --version]:   vis version"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [eller --help]:      vis denne besked"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "farlige tilvalg:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [eller --show-geometry]: vis kernens bud på den geometri"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4894,114 +4930,114 @@ msgstr ""
 "    -x [eller --show-extended]: medtag udvidede partitioner i uddata\n"
 "                                eller forvent beskrivelser af dem i inddata"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [eller --Linux]:      giv ikke råd, der ikke vedrører Linux"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [eller --quiet]:      undertryk advarsler"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "    Du kan tilsidesætte den detekterede geometri med:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [eller --cylinders #]:angiv det cylinderantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [eller --heads #]:    angiv det hovedantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [eller --sectors #]:  angiv det sektorantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "Du kan undertrykke alle forenelighedstjek med:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [eller --force]:      gør hvad jeg siger, selvom det er dumt"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Brug:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s enhed\t\t vis aktive partitioner på enhed\n"
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s enhed n1 n2 ... aktivér partitionerne på n1 ..., deaktivér resten\n"
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An enhed\t aktivér partition n, deaktivér de andre\n"
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "ingen kommando?\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "i alt: %d blokke\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "brug: sfdisk --print-id enhed partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "brug: sfdisk --change-id enhed partitionsnummer id\n"
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "brug: sfdisk --id enhed partitionsnummer [id]\n"
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "du kan kun angive én enhed (undtagen med -l eller -s)\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kunne ikke åbne %s for skrivning\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kunne ikke åbne %s for læsning\n"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: O.k.\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindre, %ld hoveder, %ld sektorer/spor\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE ioctl mislykkedes for %s\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "ugyldig aktiv-byte: 0x%x i stedet for 0x80\n"
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -5009,7 +5045,7 @@ msgstr ""
 "Færdig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5018,35 +5054,35 @@ msgstr ""
 "Du har %d aktive primærpartitioner. Dette generer ikke LILO,\n"
 "men DOS MBR vil kun kunne starte op fra en disk med én aktiv partition.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partition %s har id %x og er ikke skjult\n"
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Ugyldig id %lx\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Denne disk er i brug for øjeblikket.\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatal fejl: kunne ikke finde %s\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Advarsel: %s er ikke en blokenhed\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Tjekker, at ingen benytter denne disk for øjeblikket...\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5059,28 +5095,28 @@ msgstr ""
 "Afmonter alle filsystemer og 'swapoff' alle swappartitioner på denne disk.\n"
 "Brug flaget --no-reread for at undertrykke dette tjek.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Brug flaget --force for at undertrykke alle tjek.\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "O.k.\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Gammel situation:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partitionen %d eksisterer ikke. Kan ikke ændre den\n"
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Ny situation:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5088,19 +5124,19 @@ msgstr ""
 "Jeg kan ikke lide disse partitioner - intet blev ændret.\n"
 "(Hvis du virkelig ønsker det, kan du bruge flaget --force.)\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Jeg kan ikke lide detteher - du bør nok svare Nej\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Er du tilfreds med dette? [jna] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Vil du virkelig skrive dette til disken? [jna] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5108,15 +5144,15 @@ msgstr ""
 "\n"
 "sfdisk: inddata sluttede for tidligt\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "Afslutter - intet blev ændret\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "Svar venligst j,n,a\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5124,7 +5160,7 @@ msgstr ""
 "Skrivning af ny partitionstabel lykkedes\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5724,7 +5760,7 @@ msgstr "Venter i en l
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK ioctl for at aflæse tiden mislykkedes"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "Tidsudløb mens der ventedes på tidsændring.\n"
 
@@ -5749,58 +5785,68 @@ msgstr "Kunne ikke 
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK ioctl mislykkedes"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "open() af %s mislykkedes"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "ioctl() til %s for at aflæse tiden mislykkedes.\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "Venter i løkke på at tiden fra %s ændres\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s har ingen interrupt-funktioner. "
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "read() af %s for at vente på en ur-tik mislykkedes"
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "read() af %s for at vente på en ur-tik mislykkedes"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "read() af %s for at vente på en ur-tik mislykkedes"
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "ioctl() til %s for at afbryde opdaterings-interrupts mislykkedes"
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 "ioctl() til %s for at afbryde opdaterings-interrupts mislykkedes uventet"
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "ioctl() til %s for at sætte tiden mislykkedes.\n"
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) lykkedes.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "Åbning af %s mislykkedes"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5811,17 +5857,17 @@ msgstr ""
 "maskinursenhed via enhedsspecialfilen '%s'. Denne fil eksisterer ikke på "
 "dette system.\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "Kunne ikke åbne %s"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) til %s mislykkedes"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "vi har aflæst epokeværdi %ld fra %s med RTC_EPOCH_READ ioctl.\n"
@@ -5829,23 +5875,23 @@ msgstr "vi har afl
 #. 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:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "Epokeværdien må ikke være mindre end 1900. Du bad om %ld\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr "sætter epokeværdien til %ld med en RTC_EPOCH_SET ioctl til %s.\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "Kernens enheds-driver for %s har ikke en RTC_EPOCH_SET ioctl.\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) til %s mislykkedes"
@@ -6019,51 +6065,67 @@ msgstr "Login p
 msgid "Login on %s from %s denied.\n"
 msgstr "Login på %s fra %s afvist.\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: du (bruger %d) eksisterer ikke.\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: bruger \"%s\" eksisterer ikke.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr "%s: kan kun ændre lokale indgange; brug yp%s i stedet\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+#, fuzzy
+msgid "Unknown user context"
+msgstr "ukendt fejl i nøgle"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Ændrer finger-information for %s.\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Fejl i adgangskode."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Adgangskode: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Ugyldig adgangskode."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "Finger-informationer ikke ændret.\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Brug: %s [ -f fulde-navn ] [ -o kontor ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6071,11 +6133,11 @@ msgstr ""
 "[ -p kontor-telefon ]\n"
 "\t[ -h privat-telefon ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6083,58 +6145,70 @@ msgstr ""
 "\n"
 "Afbrudt.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "felt er for langt.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' er ikke tilladt.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Kontroltegn er ikke tilladte.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr "Finger-informationer *IKKE* ændret. Prøv igen senere.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "Finger-informationer ændret.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "hukommelsesallokering mislykkedes (malloc)"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" er ikke med i /etc/shells.\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr "%s: Din skal er ikke i /etc/shells, udskiftning af skal afvist\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Udskifter skal for %s.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Ny skal"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "Skal ikke udskiftet.\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Skal *IKKE* udskiftet. Prøv igen senere.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Skal udskiftet.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
@@ -6143,57 +6217,57 @@ msgstr ""
 "Brug: %s [ -s skal ] [ --list-shells ] [ --help ] [ --version ]\n"
 "      [ brugernavn ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: skallen skal angives med hel sti.\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" eksisterer ikke.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" er ikke kørbar.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' er ikke tilladt.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Kontroltegn er ikke tilladt.\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Advarsel: \"%s\" er ikke med i /etc/shells\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" er ikke med i /etc/shells.\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: brug tilvalget -l for at se en liste\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Advarsel: \"%s\" ikke med i /etc/shells.\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Brug %s -l for at se en liste.\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "Ingen kendte skaller.\n"
 
@@ -6389,78 +6463,78 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Du har for mange processer kørende.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "OPRINGNING KLOKKEN %s AF %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN PÅ %s FRA %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN PÅ %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN PÅ %s AF %s FRA %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN PÅ %s AF %s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "Du har ny post.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "Du har post.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: mislykket forgrening: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY mislykkedes: %m"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() mislykkedes"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Intet katalog %s!\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Logger ind med hjemmekatalog = \"/\".\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: ingen hukommelse for skal-skript.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kunne ikke køre skal-skript: %s.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ingen skal: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6469,62 +6543,62 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "loginnavn alt for langt.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "for langt NAVN"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "loginnavne må ikke starte med '-'.\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "for mange tomme linjeskift,\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "VOLDSOMT MANGE linjeskift"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login udløb efter %d sekunder\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Sidste login: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "fra %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "på %.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGINFEJL FRA %s, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGINFEJL på %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGINFEJL fra %s, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGINFEJL PÅ %s, %s"
@@ -6925,56 +6999,66 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: UGYLDIG FEJL"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
 msgstr "%s: adgangskodefilen er optaget.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
 msgstr "%s: gruppefilen er optaget.\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: filen %s er optaget. (%s eksisterer)\n"
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: kunne ikke lænke %s: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "Kunne ikke få tidsoverløbet for %s: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "Kunne ikke få tidsoverløbet for %s: %s\n"
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 "%s: kunne ikke fjerne låsen på %s: %s (dine ændringer er stadig i %s)\n"
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: Kunne ikke forgrene (fork)\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s uændret\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: intet ændret\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr "Du bruger skyggegrupper (shadow groups) på dette system.\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr "Du bruger skygge-adgangskoder (shadow passwords) på dette system.\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "Vil du redigere %s nu [j/n]? "
@@ -7166,7 +7250,7 @@ msgstr "%s: kunne ikke omd
 msgid "call: %s from to files...\n"
 msgstr "kald: %s fra til filer...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7177,21 +7261,21 @@ msgstr ""
 "Brug '%s [tilvalg] %s', hvis du virkelig vil bruge den.\n"
 "Skript blev ikke startet.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "brug: script [-a] [-f] [-q] [-t] [fil]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skript påbegyndt, filen er %s\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "Skript påbegyndt på %s"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7200,16 +7284,16 @@ msgstr ""
 "\n"
 "Skript kørt på %s"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skript færdigt, filen er %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "openpty mislykkedes\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "Løbet tør for pty-er\n"
 
@@ -7478,36 +7562,36 @@ msgstr "mount: kunne ikke 
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr "kunne ikke oprette låsefil %s: %s (gennemtving med flaget -n)"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr "kunne ikke lænke låsefilen %s: %s (gennemtving med flaget -n)"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr "kunne ikke åbne låsefilen %s: %s (gennemtving med flaget -n)"
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Kunne ikke låse låsefilen %s: %s\n"
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "kunne ikke låse låsefilen %s: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "tidsoverløb"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7516,190 +7600,126 @@ msgstr ""
 "Kunne ikke oprette lænken %s\n"
 "Måske er der en efterladt låsefil?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "kunne ikke åbne %s (%s) - mtab ikke opdateret"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "fejl ved skrivning af %s: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "fejl ved ændring af filmodus for %s: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "kunne ikke omdøbe %s til %s: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kunne ikke åbne enheden %s: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: kunne ikke få oplysninger om enheden %s: %s\n"
-
-#: mount/lomount.c:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) forskydning %d, %s kryptering\n"
-
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: kunne ikke finde nogen /dev/loop# enhed"
-
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
+msgid ", offset %lld"
 msgstr ""
-"mount: Kunne ikke finde nogen loop-enhed.\n"
-"       Måske har /dev/loop# forkert hovednummer?"
 
-#: mount/lomount.c:253
+#: mount/lomount.c:104
 #, 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'.)"
+msgid ", sizelimit %lld"
 msgstr ""
-"mount: Kunne ikke finde nogen loop-enhed, og ifølge %s\n"
-"       kender denne kerne ikke til loop-enheder.\n"
-"       (Hvis det er rigtigt, genoversæt kernen, eller 'insmod loop.o'.)"
 
-#: mount/lomount.c:259
-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?"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
 msgstr ""
-"mount: Kunne ikke finde nogen loop-enheder. Måske kender denne kerne ikke\n"
-"       til loop-enheder (i så fald genoversæt kernen, eller 'insmod loop."
-"o'),\n"
-"       eller har /dev/loop# bare et forkert hovednummer?"
 
-#: mount/lomount.c:263
-msgid "mount: could not find any free loop device"
-msgstr "mount: kunne ikke finde nogen ledig loop-enhed"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ""
 
-#: mount/lomount.c:359
+#: mount/lomount.c:129
 #, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "kunne ikke åbne %s for læsning\n"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Gentag ny adgangskode: "
+msgid ", encryption type %d\n"
+msgstr "Ikke-understøttet krypteringstype %s\n"
 
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "kunne ikke åbne katalog\n"
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: kunne ikke få oplysninger om enheden %s: %s\n"
 
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "Adgangskoden skal bestå af mindst 6 tegn. Prøv igen.\n"
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: kunne ikke finde nogen /dev/loop# enhed"
 
-#: mount/lomount.c:472
+#: mount/lomount.c:192
 #, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Kunne ikke allokere mere hukommelse\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
 msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
+"mount: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
+"mount: Kunne ikke finde nogen loop-enhed, og ifølge %s\n"
+"       kender denne kerne ikke til loop-enheder.\n"
+"       (Hvis det er rigtigt, genoversæt kernen, eller 'insmod loop.o'.)"
 
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
+#: mount/lomount.c:197
+msgid "mount: could not find any free loop device"
+msgstr "mount: kunne ikke finde nogen ledig loop-enhed"
 
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kunne ikke låse ind i hukommelsen, afslutter.\n"
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Init (op til 16 hex-cifre): "
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): lykkedes\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "Ikke-hex ciffer '%c'.\n"
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: kunne ikke slette enheden %s: %s\n"
 
-#: mount/lomount.c:764
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
-msgstr "Ved ikke, hvordan man får en nøgle til krypteringssystem %d\n"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): lykkedes\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): lykkedes\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr ""
+"Denne 'mount' er oversat uden loop-understøttelse. Genoversæt venligst.\n"
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "ikke nok hukommelse"
-
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "kunne ikke åbne %s for læsning\n"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"brug:\n"
+"  %s loop_enhed                                          # vis info\n"
+"  %s -d loop_enhed                                       # slet\n"
+"  %s [ -e kryptering ] [ -o forskydning ] loop_enhed fil # klargør\n"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "ikke nok hukommelse"
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
+"Der var ingen loop-understøttelse tilgængelig ved oversættelsen. Genoversæt "
+"venligst.\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7716,41 +7736,41 @@ msgstr "[mntent]: linje %d i %s er ugyldig%s\n"
 msgid "; rest of file ignored"
 msgstr "; resten af filen blev ignoreret"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: ifølge mtab er %s allerede monteret som %s"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: ifølge mtab er %s monteret som %s"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kunne ikke åbne %s for skrivning: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fejl ved skrivning til %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: fejl ved ændring af filmodus for %s: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ligner et swap-område - ikke monteret"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "montering mislykkedes"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: kun root kan montere %s som %s"
@@ -7772,103 +7792,107 @@ msgstr "mount: dropper ops
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: skal til at benytte loop-enheden %s\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: klargøring af loop-enhed mislykkedes\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: klargøringen af loop-enhed lykkedes\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kunne ikke åbne %s: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr ""
+
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: kunne ikke åbne %s for at sætte hastigheden"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kunne ikke sætte hastigheden: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kunne ikke forgrene: %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr "mount: denne version blev oversat uden understøttelse for 'nfs'-typen"
 
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: montering af nfs version 4 mislykkedes, prøver version 3..\n"
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Jeg kunne ikke bestemme filsystemtypen, og ingen var angivet"
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: du skal angive filsystemtypen"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr "mount: montering mislykkedes"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: monteringspunkt %s er ikke et katalog"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: adgang nægtet"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr "mount: skal være superbruger for at bruge 'mount'"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s er optaget"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc er allerede monteret"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: enten er %s allerede monteret eller %s optaget"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: monteringspunkt %s eksisterer ikke"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: monteringspunkt %s er en symbolsk lænke ud i ingenting"
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: specialenhed %s eksisterer ikke"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7877,12 +7901,12 @@ msgstr ""
 "mount: specialenhed %s eksisterer ikke\n"
 "       (en sti er ikke et katalog)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ikke allerede monteret, eller forkert tilvalg"
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7891,47 +7915,47 @@ msgstr ""
 "mount: forkert filsystemtype, forkert tilvalg, ugyldig superblok på %s,\n"
 "       eller for mange monterede filsystemer"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "monteringstabellen er fuld"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kunne ikke læse superblokken"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ukendt enhed"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: filsystemtype %s understøttes ikke af kernen"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: du mente sikkert %s"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: du mente måske iso9660 ?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s har forkert enhedsnummer eller filsystemtypen %s understøttes ikke"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s er ikke en blokenhed, og 'stat' fejler?"
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7940,74 +7964,47 @@ msgstr ""
 "mount: kernen genkender ikke %s som en blokenhed\n"
 "       (måske hjælper 'insmod enheds-driver'?)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s er ikke en blokenhed (brug eventuelt '-o loop'?)"
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s er ikke en blokenhed"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s er ikke en gyldig blokenhed"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "blokenhed "
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kunne ikke montere %s%s skrivebeskyttet"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s er skrivebeskyttet, men eksplicit '-w'-tilvalg blev givet"
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s er skrivebeskyttet, monterer skrivebeskyttet"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr "mount: mærket %s optræder på både %s og %s\n"
-
-#: mount/mount.c:1124
-#, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "umount: %s gentaget - ikke monteret"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: vil montere %s som %s\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "mærke"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: fandt ingen sådan partition"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: ingen type blev angive - Jeg antager nfs på grund af kolonnet\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: ingen type blev angivet - Jeg antager smbfs p.g.a. det "
@@ -8016,22 +8013,22 @@ msgstr ""
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: kører \"%s\" i baggrunden\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: opgiver \"%s\"\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s er allerede monteret som %s\n"
 
-#: mount/mount.c:1386
+#: mount/mount.c:1362
 #, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8053,7 +8050,7 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Brug:  mount -V                 : vis version\n"
@@ -8078,40 +8075,39 @@ msgstr ""
 "Andre tilvalg: [-nfFrsvw] [-o tilvalg].\n"
 "Læs mange flere detaljer med 'man 8 mount'.\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: dette kan kun root gøre"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ingen %s fundet - opretter den..\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr "mount: mærket %s optræde både på %s og %s - ikke monteret\n"
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: fandt ingen sådan partition"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: monterer %s\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr "intet blev monteret"
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: kunne ikke finde %s i %s"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kunne ikke finde %s i %s eller %s"
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8119,34 +8115,34 @@ msgstr ""
 "mount: kunne ikke åbne %s, så UUID- og MÆRKE­konvertering kan ikke "
 "gennemføres.\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: ugyldig UUID"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: fejl ved gæt af filsystemtype\n"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, 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:495
+#: mount/mount_guess_fstype.c:523
 #, 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:498
+#: mount/mount_guess_fstype.c:526
 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:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Jeg vil forsøge type %s\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "Forsøger %s\n"
@@ -8240,7 +8236,7 @@ msgstr "ukendt NFS-statusv
 msgid "bug in xstrndup call"
 msgstr "programfejl i xstrndup-kald"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8253,7 +8249,7 @@ msgstr ""
 "      %s [-v] [-p prioritet] speciel ...\n"
 "      %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8264,98 +8260,31 @@ msgstr ""
 "      %s -a [-v]\n"
 "      %s [-v] speciel ...\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "løbet tør for hukommelse"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s på %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: kan ikke finde %s: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr "swapon: advarsel: %s har usikre filrettigheder %04o, %04o anbefales\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: Dropper filen %s - den lader til at være fragmenteret.\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr "Ikke superbruger.\n"
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s: ugyldig blokenhed"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "Ikke-understøttet krypteringstype %s\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: skal til at benytte loop-enheden %s\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Denne partition er allerede i brug"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "kunne ikke spole tilbage på swap-enheden"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "kunne ikke åbne /dev/urandom"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "kunne ikke skrive inodes"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "forgrening mislykkedes\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Ændrer adgangskode for %s\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: kunne ikke åbne %s: %s\n"
@@ -8420,36 +8349,36 @@ msgstr "umount: %s: blokenheder tillades ikke p
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, forsøger umount...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "kunne ikke afmontere %s med umount - forsøger %s i stedet\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s optaget - genmonteret skrivebeskyttet\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kunne ikke montere %s skrivebeskyttet\n"
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s afmonteret\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: kunne ikke finde listen over filsystemer, der skulle afmonteres"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
@@ -8459,42 +8388,42 @@ msgstr ""
 "      umount -a [-f] [-r] [-n] [-v] [-t vfstyper] [-O tilvalg]\n"
 "      umount [-f] [-r] [-n] [-v] speciel | knude...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Forsøger at afmontere %s\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunne ikke finde %s i mtab\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s er ikke monteret (ifølge mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: det lader til, at %s er monteret flere gange"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s er ikke i fstab (og du er ikke root)"
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s montering stemmer ikke med fstab"
 
-#: mount/umount.c:602
-#, c-format
-msgid "umount: only root can unmount %s from %s"
+#: mount/umount.c:616
+#, fuzzy, c-format
+msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: kun root kan afmontere %s fra %s"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr "umount: dette kan kun root gøre"
 
@@ -8633,7 +8562,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f tal/sek; %f flt (tegn/sek)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Brug: %s [-c] [-n level] [-s bufstr.]\n"
@@ -8797,23 +8726,23 @@ msgstr "---- Gr
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
 msgstr "maks antal segmenter= %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "maks seg-stør. (kbyte) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "maks total delt hukommelse (kbyte) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "min seg-stør. (byte) = %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9332,7 +9261,11 @@ msgstr "      brug -R 1 for at montere skrivebeskyttet, -R 0 for skriveadgang."
 msgid "missing comma"
 msgstr "manglende komma"
 
-#: sys-utils/readprofile.c:115
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "løbet tør for hukommelse"
+
+#: sys-utils/readprofile.c:118
 #, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
@@ -9344,6 +9277,7 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
@@ -9359,32 +9293,32 @@ msgstr ""
 "\t -n                deaktivér automatisk bestemmelse af byterækkefølge\n"
 "\t -V                vis version og afslut\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, fuzzy, c-format
 msgid "%s version %s\n"
 msgstr "%s Version %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): forkert oversigtlinje\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: kunne ikke finde \"_stext\" i %s\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: profiladresse udenfor området. Forkert map-fil?\n"
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "total"
 
@@ -9902,31 +9836,119 @@ msgstr "For lang inddatalinje.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Løb tør for hukommelse under forstørring af buffer.\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: kunne ikke slette enheden %s: %s\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: ikke oversat med understøttelse for minix v2\n"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): lykkedes\n"
+#~ msgid "Boot (%02X)"
+#~ msgstr "Opstart (%02X)"
 
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
-#~ msgstr ""
-#~ "Denne 'mount' er oversat uden loop-understøttelse. Genoversæt venligst.\n"
+#~ msgid "None (%02X)"
+#~ msgstr "Ingen (%02X)"
+
+#, fuzzy
+#~ msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) forskydning %d, %s kryptering\n"
 
 #~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "brug:\n"
-#~ "  %s loop_enhed                                          # vis info\n"
-#~ "  %s -d loop_enhed                                       # slet\n"
-#~ "  %s [ -e kryptering ] [ -o forskydning ] loop_enhed fil # klargør\n"
+#~ "mount: Kunne ikke finde nogen loop-enhed.\n"
+#~ "       Måske har /dev/loop# forkert hovednummer?"
 
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ 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 ""
-#~ "Der var ingen loop-understøttelse tilgængelig ved oversættelsen. "
-#~ "Genoversæt venligst.\n"
+#~ "mount: Kunne ikke finde nogen loop-enheder. Måske kender denne kerne "
+#~ "ikke\n"
+#~ "       til loop-enheder (i så fald genoversæt kernen, eller 'insmod loop."
+#~ "o'),\n"
+#~ "       eller har /dev/loop# bare et forkert hovednummer?"
+
+#, fuzzy
+#~ msgid "Error: unable to open %s for reading\n"
+#~ msgstr "kunne ikke åbne %s for læsning\n"
+
+#, fuzzy
+#~ msgid "Retype password: "
+#~ msgstr "Gentag ny adgangskode: "
+
+#, fuzzy
+#~ msgid "Error: gpg key file decryption failed\n"
+#~ msgstr "kunne ikke åbne katalog\n"
+
+#, fuzzy
+#~ msgid "Error: Password must be at least %d characters.\n"
+#~ msgstr "Adgangskoden skal bestå af mindst 6 tegn. Prøv igen.\n"
+
+#, fuzzy
+#~ msgid "Error: Unable to allocate memory\n"
+#~ msgstr "Kunne ikke allokere mere hukommelse\n"
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Init (op til 16 hex-cifre): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Ikke-hex ciffer '%c'.\n"
+
+#~ msgid "Don't know how to get key for encryption system %d\n"
+#~ msgstr "Ved ikke, hvordan man får en nøgle til krypteringssystem %d\n"
+
+#, fuzzy
+#~ msgid "Error: unable to open /etc/fstab for reading\n"
+#~ msgstr "kunne ikke åbne %s for læsning\n"
+
+#~ msgid "mount: the label %s occurs on both %s and %s\n"
+#~ msgstr "mount: mærket %s optræder på både %s og %s\n"
+
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "umount: %s gentaget - ikke monteret"
+
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: vil montere %s som %s\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "mærke"
+
+#~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
+#~ msgstr "mount: mærket %s optræde både på %s og %s - ikke monteret\n"
+
+#, fuzzy
+#~ msgid "swapon: invalid loop device name\n"
+#~ msgstr "umount: %s: ugyldig blokenhed"
+
+#, fuzzy
+#~ msgid "swapon: unable to open loop device %s\n"
+#~ msgstr "mount: skal til at benytte loop-enheden %s\n"
+
+#, fuzzy
+#~ msgid "swapon: loop device %s already in use\n"
+#~ msgstr "Denne partition er allerede i brug"
+
+#, fuzzy
+#~ msgid "swapon: unable to open swap device %s\n"
+#~ msgstr "kunne ikke spole tilbage på swap-enheden"
+
+#, fuzzy
+#~ msgid "swapon: unable to open /dev/urandom\n"
+#~ msgstr "kunne ikke åbne /dev/urandom"
+
+#, fuzzy
+#~ msgid "swapon: unable to create pipe\n"
+#~ msgstr "kunne ikke skrive inodes"
+
+#, fuzzy
+#~ msgid "swapon: fork failed\n"
+#~ msgstr "forgrening mislykkedes\n"
+
+#, fuzzy
+#~ msgid "swapon: random password for %s is %s"
+#~ msgstr "Ændrer adgangskode for %s\n"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Partition %i slutter ikke på en cylinder-grænse:\n"
diff --git a/po/de.po b/po/de.po
index d9b7f5ec..5249822d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -38,108 +38,113 @@
 # Hinweise zur Übersetzung:
 # =========================
 # command - Befehl
-# bad     - beschädigt (z. B. »beschädigte Blöcke«)
-#           bzw. ungültig (z. B. »ungültige »magic number« im Superblock«)
+# bad     - beschädigt (z. B. „beschädigte Blöcke“)
+#           bzw. ungültig (z. B. „ungültige ‚magic number‘ im Superblock“)
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11z\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
-"PO-Revision-Date: 2003-03-03 11:54:55+0100\n"
+"Project-Id-Version: util-linux 2.12\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
+"PO-Revision-Date: 2003-08-14 15:43:31+0200\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "Nur-Lesen setzen"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "Lesen-Schreiben setzen"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "Nur-Lesen ermitteln"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "Sektorgröße ermitteln"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr "Blockgröße ermitteln"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
 msgstr "Blockgröße setzen"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "Größe ermitteln"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "Readahead (vorausschauendes Lesen) setzen"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "Readahead ermitteln"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "Puffer leeren"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "Partitionstabelle erneut lesen"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
 msgstr "Aufruf:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr "  %s --report [Geräte]\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr " %s [-V] [-v|-q] Befehle Geräte\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Verfügbare Befehle:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: Unbekannter Befehl: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s erwartet ein Argument\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr "%s erfolgreich beendet.\n"
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: Konnte %s nicht öffnen\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: IOCTL-Fehler bei %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "NurL  RA   SGr   BGr   Startsek     Größe   Gerät\n"
 
@@ -187,12 +192,12 @@ msgstr "Aufruf: %s [ -n ] Gerät\n"
 
 # "mkfs aus util-linux-2.10d"
 # "mkfs von util-linux-2.10d"
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s von %s\n"
@@ -242,7 +247,7 @@ msgstr "%s: Fehler %d beim Entpacken! %p(%d)\n"
 #: disk-utils/fsck.cramfs.c:243
 #, c-format
 msgid "%s: size error in symlink `%s'\n"
-msgstr "%s: Größenfehler bei symbolischer Verknüpfung »%s«\n"
+msgstr "%s: Größenfehler bei symbolischer Verknüpfung „%s“\n"
 
 #: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
 #, c-format
@@ -252,7 +257,7 @@ msgstr "  entpacke Block bei %ld nach %ld (%ld)\n"
 #: disk-utils/fsck.cramfs.c:287
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
-msgstr "%s: unsinniger Modus auf »%s« (%o)\n"
+msgstr "%s: unsinniger Modus auf „%s“ (%o)\n"
 
 #: disk-utils/fsck.cramfs.c:319
 #, c-format
@@ -331,49 +336,49 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: ungültiges cramfs - ungültiges Dateidatenoffset\n"
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Aufruf: %s [-larvsmf] /dev/name\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s ist eingehängt.\t"
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Möchten Sie wirklich fortfahren"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "Überprüfung abgebrochen. \n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
-msgstr "Zonennummer < FIRSTZONE in Datei »%s«."
+msgstr "Zonennummer < FIRSTZONE in Datei „%s“."
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
-msgstr "Zonennummer >= ZONES in Datei »%s«."
+msgstr "Zonennummer >= ZONES in Datei „%s“."
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Block entfernen"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
-msgstr "Lesefehler: kann nicht zu Block springen in Datei »%s«\n"
+msgstr "Lesefehler: kann nicht zu Block springen in Datei „%s“\n"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
-msgstr "Fehler beim Lesen: beschädigter Block in Datei »%s«\n"
+msgstr "Fehler beim Lesen: beschädigter Block in Datei „%s“\n"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -381,122 +386,122 @@ msgstr ""
 "Interner Fehler: beim Versuch einen beschädigten Block zu schreiben\n"
 "Schreibanweisung übergangen\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
-msgstr "»seek« fehlgeschlagen in write_block"
+msgstr "„seek“ fehlgeschlagen in write_block"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
-msgstr "Fehler beim Schreiben: beschädigter Block in Datei »%s«\n"
+msgstr "Fehler beim Schreiben: beschädigter Block in Datei „%s“\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
-msgstr "»seek« failed in write_super_block"
+msgstr "„seek“ failed in write_super_block"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "Konnte den Superblock nicht schreiben"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
-msgstr "Konnte die »inode map« nicht schreiben"
+msgstr "Konnte die „inode map“ nicht schreiben"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
-msgstr "Konnte die »zone map« nicht schreiben"
+msgstr "Konnte die „zone map“ nicht schreiben"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
-msgstr "Konnte die »inodes« nicht schreiben"
+msgstr "Konnte die „inodes“ nicht schreiben"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
-msgstr "»seek« gescheitert."
+msgstr "„seek“ gescheitert."
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "Konnte den Superblock nicht lesen"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 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:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Es werden nur Blöcke/Zonen von 1k Größe unterstützt"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
-msgstr "Ungültiger Wert im Feld »s_imap_block« im Superblock"
+msgstr "Ungültiger Wert im Feld „s_imap_block“ im Superblock"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
-msgstr "Ungültiger Wert im Feld »s_zmap_block« im Superblock"
+msgstr "Ungültiger Wert im Feld „s_zmap_block“ im Superblock"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
-msgstr "Kein Speicherplatz für »inode map« verfügbar"
+msgstr "Kein Speicherplatz für „inode map“ verfügbar"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
-msgstr "Kein Speicherplatz für »inodes« verfügbar"
+msgstr "Kein Speicherplatz für „inodes“ verfügbar"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
-msgstr "Kein Speicherplatz für »inode count« verfügbar"
+msgstr "Kein Speicherplatz für „inode count“ verfügbar"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
-msgstr "Kein Speicherplatz für »zone count« verfügbar"
+msgstr "Kein Speicherplatz für „zone count“ verfügbar"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
-msgstr "Kann »inode map« nicht lesen"
+msgstr "Kann „inode map“ nicht lesen"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
-msgstr "Kann »zone map« nicht lesen"
+msgstr "Kann „zone map“ nicht lesen"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
-msgstr "Kann »inodes« nicht lesen."
+msgstr "Kann „inodes“ nicht lesen."
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Warnung: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld Blöcke\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonesize=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxsize=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Filesystem state=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -505,173 +510,173 @@ msgstr ""
 "namelen=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
-"Inode %d ist als unbenutzt gekennzeichnet, aber Datei »%s« benutzt sie\n"
+"Inode %d ist als unbenutzt gekennzeichnet, aber Datei „%s“ benutzt sie\n"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Inode als benutzt kennzeichnen"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
-msgstr "Die Datei »%s« hat Mode %05o\n"
+msgstr "Die Datei „%s“ hat Mode %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
-msgstr "Warnung: »inode count« zu groß.\n"
+msgstr "Warnung: „inode count“ zu groß.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
-msgstr "»root inode« ist kein Verzeichnis"
+msgstr "„root inode“ ist kein Verzeichnis"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
-msgstr "Block wurde zuvor benutzt. Nun in Datei »%s«."
+msgstr "Block wurde zuvor benutzt. Nun in Datei „%s“."
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Zurücksetzen"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
-msgstr "Block %d in Datei »%s« ist als unbenutzt markiert."
+msgstr "Block %d in Datei „%s“ ist als unbenutzt markiert."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Korrigieren"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
-"Das Verzeichnis »%s« enthält eine ungültige Inode-Nummer für Datei »%.*s«."
+"Das Verzeichnis „%s“ enthält eine ungültige Inode-Nummer für Datei „%.*s“."
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " Entfernen"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
-msgstr "»%s«: ungültiges Verzeichnis: ».« kommt nicht zuerst\n"
+msgstr "„%s“: ungültiges Verzeichnis: „.“ kommt nicht zuerst\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
-msgstr "»%s«: ungültiges Verzeichnis: »..« kommt nicht als zweites\n"
+msgstr "„%s“: ungültiges Verzeichnis: „..“ kommt nicht als zweites\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
-msgstr "%s: ungültiges Verzeichnis: ».« kommt nicht zuerst\n"
+msgstr "%s: ungültiges Verzeichnis: „.“ kommt nicht zuerst\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
-msgstr "%s: ungültiges Verzeichnis: »..« kommt nicht als zweites\n"
+msgstr "%s: ungültiges Verzeichnis: „..“ kommt nicht als zweites\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: ungültiges Verzeichnis: Größe < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "seek in bad_zone fehlgeschlagen"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Inode %d Modus nicht zurückgesetzt."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "Inode %d nicht benutzt, in Bitmap als benutzt markiert."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "Inode %d benutzt, in Bitmap als unbenutzt markiert."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (Modus = %07o), i_nlinks=%d, gezählt=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "Setze i_nlinks auf count"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zone %d: als benutzt markiert, keine Datei benutzt sie."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
-msgstr ""
+msgstr "Mark. entf."
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Zone %d: in Benutzung, gezählt=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Zone %d: nicht in Benutzung, gezählt=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
-msgstr ""
+msgstr "Setzen"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "ungültige INode-Größe"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "ungültige V2-INode-Größe"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "Brauche Terminal für interaktive Reparaturen."
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
-msgstr "Konnte »%s« nicht öffnen"
+msgstr "Konnte „%s“ nicht öffnen"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s ist in Ordnung, keine Überprüfung.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Überprüfung des Dateisystem auf %s erzwungen.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Dateisystem auf %s ist gestört (dirty), Überprüfung erforderlich.\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -680,12 +685,12 @@ msgstr ""
 "\n"
 "%6ld INodes benutzten (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zones benutzten (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -708,7 +713,7 @@ msgstr ""
 "------\n"
 "%6d Dateien\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -788,7 +793,7 @@ msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 #: disk-utils/mkfs.bfs.c:192
 #, c-format
 msgid "blocks argument too large, max is %lu"
-msgstr "»blocks«-Argument zu groß, max ist %lu"
+msgstr "„blocks“-Argument zu groß, max ist %lu"
 
 #: disk-utils/mkfs.bfs.c:207
 msgid "too many inodes - max is 512"
@@ -799,7 +804,7 @@ msgstr "zu viele Inodes - Maximum ist 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "nicht genügend Platz; es werden wenigstens %lu Blöcke benötigt"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Gerät: %s\n"
@@ -857,11 +862,11 @@ msgstr "Seek-Fehler"
 
 #: disk-utils/mkfs.bfs.c:278
 msgid "error writing . entry"
-msgstr "Fehler beim Schreiben des ».«-Eintrags"
+msgstr "Fehler beim Schreiben des „.“-Eintrags"
 
 #: disk-utils/mkfs.bfs.c:282
 msgid "error writing .. entry"
-msgstr "Fehler beim Schreiben des »..«-Eintrags"
+msgstr "Fehler beim Schreiben des „..“-Eintrags"
 
 #: disk-utils/mkfs.bfs.c:286
 #, c-format
@@ -872,7 +877,7 @@ msgstr "Fehler beim Schließen von %s"
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Aufruf: mkfs [-V] [-t FS-Typ] [FS-Optionen] Gerät [Größe]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -921,7 +926,7 @@ msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
-"Sehr langer (%u Bytes) Dateiname »%s« gefunden.\n"
+"Sehr langer (%u Bytes) Dateiname „%s“ gefunden.\n"
 " Bitte setzen Sie MAX_INPUT_NAMELEN in mkcramfs.c hoch und übersetzen Sie\n"
 " erneut. Breche jetzt ab.\n"
 
@@ -941,7 +946,7 @@ msgstr ""
 #: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
-msgstr "AIEEE: Block auf > 2*Blocklänge (%ld) »komprimiert«\n"
+msgstr "AIEEE: Block auf > 2×Blocklänge (%ld) „komprimiert“\n"
 
 #: disk-utils/mkfs.cramfs.c:641
 #, c-format
@@ -1036,63 +1041,63 @@ msgstr ""
 "WARNUNG: Gerätenummern abgeschnitten auf %u Bits. Das bedeutet beinahe mit\n"
 "Sicherheit, dass einige Gerätedateien falsch sind.\n"
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Aufruf: %s [-c | -l Datei] [-nXX] [-iXX] /dev/Name [Blöcke]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s ist eingehängt; es wird hier kein Dateisystem angelegt!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
-msgstr ""
+msgstr "Seek auf Bootblock fehlgeschlagen in write_tables"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
-msgstr ""
+msgstr "kann Bootsektor nicht löschen"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
-msgstr ""
+msgstr "Seek fehlgeschlagen in write_tables"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
-msgstr ""
+msgstr "kann Inode-Tabellen nicht schreiben"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
-msgstr ""
+msgstr "kann Zonentabelle nicht schreiben"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
-msgstr "Fehler beim Schreiben der Inodes"
+msgstr "kann Inodes nicht Schreiben"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
-msgstr ""
+msgstr "Schreiben fehlgeschlagen in write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "zu viele beschädigte Blöcke"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "nicht genügend gute Blöcke"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
-msgstr ""
+msgstr "kann Puffer für Tabellen nicht reservieren"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
-msgstr ""
+msgstr "kann Puffer für Inodes nicht reservieren"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1101,58 +1106,54 @@ msgstr ""
 "Maxgröße=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
-msgstr ""
+msgstr "Seek fehlgeschlagen während Blocküberprüfung"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
-msgstr ""
+msgstr "Merkwürdige Werte in do_check: wahrscheinlich Fehler\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
-msgstr ""
+msgstr "Seek fehlgeschlagen in check_blocks"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
+"schlechte Blöcke vor dem Datenbereich: kann kein Dateisystem herstellen"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d beschädigte Blöcke\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "ein beschädigter Block\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr ""
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr ""
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "kann %s nicht öffnen"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
-msgstr "Es wird nicht versucht, ein Dateisystem auf »%s« zu erzeugen"
+msgstr "Es wird nicht versucht, ein Dateisystem auf „%s“ zu erzeugen"
 
 #: disk-utils/mkswap.c:178
 #, c-format
@@ -1176,7 +1177,7 @@ msgstr "Aufruf: %s [-c] [-v0|-v1] [-pSEITENGRÖSSE] /dev/Name [Größe in kB]\n"
 
 #: disk-utils/mkswap.c:349
 msgid "too many bad pages"
-msgstr "Zu viele beschädigte »Seiten«"
+msgstr "Zu viele beschädigte „Seiten“"
 
 #: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1145
 #: text-utils/more.c:2090 text-utils/more.c:2101
@@ -1185,50 +1186,50 @@ msgstr "Speicher ist aufgebraucht"
 
 #: disk-utils/mkswap.c:380
 msgid "one bad page\n"
-msgstr "Eine beschädigte »Seite«\n"
+msgstr "Eine beschädigte „Seite“\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
-msgstr "%d beschädigte »Seiten«\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
+msgstr "%d beschädigte „Seiten“\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 "%s: Es wurde nicht angegeben, wo der Swapbereich angelegt werden soll.\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr ""
 "%s: Fehler: Die angegebene Größe %ld ist größer als die des Gerätes: %d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: Fehler: unbekannte Version %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: Fehler: Der Swapbereich muss mindestens %ldkB groß sein\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: Warnung: Der Swapbereich wird nur mit der Größe %ldkB angelegt\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
-msgstr "Es wird nicht versucht, Swap auf '%s' anzulegen"
+msgstr "Es wird nicht versucht, Swap auf ‚%s‘ anzulegen"
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "fatal: erste Seite nicht lesbar"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1236,32 +1237,32 @@ 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 einen gültigen »Sun disklabel«.\n"
-"Das bedeutet wahrscheinlich, dass das Anlegen eines v0-Swapbereiches die\n"
+"%s: Das Gerät %s enthält einen gültigen „Sun disklabel“.\n"
+"Das bedeutet wahrscheinlich, dass das Anlegen eines v0‐Swapbereiches die\n"
 "Partitionstabelle zerstören wird.\n"
 "Es wird kein Swapbereich angelegt. Wenn Sie wirklich einen Swapbereich\n"
-"anlegen wollen, so benutzen Sie die -f Option.\n"
+"anlegen wollen, so benutzen Sie die Option -f.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Es ist nicht möglich, einen Swapbereich einzurichten: nicht lesbar"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Swapbereich Version %d wird angelegt, Größe %llu KBytes\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "kann Swap-Gerät nicht zurückspulen"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "kann Signaturseite nicht schreiben"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
-msgstr "Aufruf von »fsync« fehlgeschlagen"
+msgstr "Aufruf von „fsync“ fehlgeschlagen"
 
 #: disk-utils/setfdprm.c:31
 #, c-format
@@ -1271,12 +1272,12 @@ msgstr "Ungültige Nummer: %s\n"
 #: disk-utils/setfdprm.c:81
 #, c-format
 msgid "Syntax error: '%s'\n"
-msgstr "Syntaxfehler: »%s«\n"
+msgstr "Syntaxfehler: „%s“\n"
 
 #: disk-utils/setfdprm.c:91
 #, c-format
 msgid "No such parameter set: '%s'\n"
-msgstr "Keine solche Parametermenge: »%s«\n"
+msgstr "Keine solche Parametermenge: „%s“\n"
 
 #: disk-utils/setfdprm.c:101
 #, c-format
@@ -1302,58 +1303,57 @@ msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] Gerät\n"
 
 # "Unbrauchbar"
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Unbenutzbar"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Freier Bereich"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "Festplatte wurde verändert.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Rebooten Sie das System, um sicherzustellen, dass die Partitionstabelle neu "
 "gelesen wird.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1365,232 +1365,232 @@ msgstr ""
 "oder verändert haben, dann schauen Sie bitte in die\n"
 "cfdisk-manual-Seite nach weiteren Informationen\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "FATALER FEHLER"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Eine Taste drücken, um cfdisk zu beenden"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
-msgstr "Konnte »seek()« nicht auf der Festplatte benutzen"
+msgstr "Konnte „seek()“ nicht auf der Festplatte benutzen"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Konnte nicht von der Festplatte lesen"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Konnte nicht auf die Festplatte schreiben"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Zu viele Partitionen"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "Partition fängt vor Sektor 0 an"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "Partition endet vor Sektor 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "Partition fängt hinter dem Ende der Festplatte an"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "Partition endet hinter dem Ende der Festplatte"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partition endet im letzten teilweisen Zylinder"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "logische Partitionen nicht in Platten-Reihenfolge"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "logische Partitionen überlappen"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "vergrößerte logische Partitionen überlappen"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!! Interner Fehler beim Erzeugen einer log. Part. ohne eine erw. Part. !!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Kann hier keine log. Part. anlegen -- eine zweite erw. müsste erzeugt werden."
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menüeintrag ist zu lang. Das Menü könnte ungewöhnlich aussehen"
 
 # "Ausrichtung" "Nehme horizontale Voreinstellung."
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menü ohne Richtung, verwende horizontal."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Diese Taste ist hier nicht verwendbar"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Eine Taste drücken, um fortzufahren"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primäre"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Erzeuge eine neue primäre Partition"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Logische"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Erzeuge eine neue logische Partition"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Erzeuge keine neue Partition"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Interner Fehler !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Größe (in MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Anfang"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Erzeuge Partition am Anfang des freien Bereiches"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Ende"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Erzeuge Partition am Ende des freien Bereiches"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Kein Platz, um die erweiterte Partition anzulegen"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr ""
 "Keine Partitionstabelle oder unbekannte Signatur in der Partitionstabelle"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Möchten Sie mit einer Null-Tabelle beginnen [y/N]"
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "Sie haben mehr Zylinder angegeben, als auf die Festplatte passen"
 
 # That's not a direct translation, but I've tried to be
 # more informative.
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "Konnte nicht auf die Festplatte zugreifen"
 
 # "Nur lesender Zugriff möglich - Sie haben keine Schreibberechtigung" (joey)
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 "Platte wurde nur zum Lesen geöffnet - Sie haben keine Rechte zum Schreiben"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Konnte die Größe der Festplatte nicht feststellen"
 
 # "Ungültige primäre Partition"
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Beschädigte primäre Partition"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Beschädigte logische Partition"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Warnung!!  Dies kann Daten auf der Festplatte zerstören!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Sind Sie sicher, dass Sie die Partitionstabelle schreiben wollen? (ja/nein): "
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "nein"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Die Partitionstabelle wurde nicht auf die Festplatte geschrieben"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
-msgstr "Bitte »ja« oder »nein« eingeben"
+msgstr "Bitte „ja“ oder „nein“ eingeben"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Die Partitionstabelle wird auf die Festplatte geschrieben..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Die Partitionstabelle wurde auf die Festplatte geschrieben"
 
 # That's not a good translation, but I guess, I can't make it longer.
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Die Tabelle wurde geschr., aber das Neueinlesen schlug fehl.  Rebooten Sie."
 
 # This one isn't really correct.
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Keine primäre Partition als bootfähig markiert; der DOS-MBR kann nicht "
 "booten."
 
 # This one isn't really correct.
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
@@ -1599,570 +1599,574 @@ msgstr ""
 
 # "Geben sie einen Dateinamen ein oder drücken Sie Return, um es auf dem Bildschirm anzuzeigen: "
 # is too long
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Dateiname oder Return um es auf dem Bildschirm anzuzeigen: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
-msgstr "Konnte »%s« nicht öffnen"
+msgstr "Konnte „%s“ nicht öffnen"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Festplatte: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Keine  "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Primäre"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "  Logische"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Boot (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Boot"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
+#: fdisk/cfdisk.c:2007
 #, c-format
-msgid "Unknown (%02X)"
-msgstr "Unbekannt (%02X)"
+msgid "(%02X)"
+msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Keine (%02X)"
+#: fdisk/cfdisk.c:2009
+msgid "None"
+msgstr "Kein"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabelle von %s\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
-msgstr "            Erster   Letzter\n"
+#: fdisk/cfdisk.c:2046
+msgid "               First       Last\n"
+msgstr "               Erster   Letzter\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
-" # Typ      Sektor   Sektor   Offset  Länge    Dateisystemtyp (ID)    Flags\n"
+" # Typ        Sektor      Sektor   Offset    Länge    Dateisystemtyp (ID)  "
+"Flags\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"-----\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
-msgstr "         ---Anfangs----      -----End------   Start  Anzahl der\n"
+#: fdisk/cfdisk.c:2131
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
+msgstr "         ---Anfangs----      -----End------   Anfangs-   Anzahl der\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
-msgstr " # Flags Kopf Sekt Zyl.  ID  Kopf Sekt Zyl    Sektor  Sektoren\n"
+#: fdisk/cfdisk.c:2132
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr " # Flags Kopf Sekt Zyl.  ID  Kopf Sekt Zyl    Sektor     Sektoren\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
-msgstr "»Roh«"
+msgstr "„Roh“"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 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:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Sektoren"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Die Tabelle nach Sektoren sortiert ausgeben"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabelle"
 
 # "Nur die Partitionstabelle ausgeben" (joey)
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Einfach die Tabelle ausgeben"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Zeige die Tabelle nicht an"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Hilfe für cfdisk"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dies ist cfdisk, ein Programm das curses benutzt und es ihnen"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "erlaubt, auf Ihren Festplatten Partitionen anzulegen, zu löschen"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "und zu verändern."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
 # "Befehl"
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Befehl     Bedeutung"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "--------     ---------"
 
 # "  b          Wechselt zwischen bootfähig und nicht bootfähig."
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 "  b          (De)Aktivieren des bootfähig-flags der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 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:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             WARNUNG: Diese Funktion sollte nur von Leuten benutzt"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             werden, die wissen, was sie tun."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          Diese Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximieren der Nutzung der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Beachten Sie, dass dies die Partition nicht mehr kompatibel"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             zu DOS, OS/2, ... machen kann"
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          Aus dem freien Bereich eine neue Partition erzeugen"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          Die Partitionstab. auf dem Bildschirm oder in eine Datei "
 "ausgeben"
 
 # "verschiedene"
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "             Es gibt mehrere Formate für die Partitionstabelle, aus"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             denen man wählen kann"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
-"                r - »Rohe« Daten (was auf die Festplatte geschrieben würde)"
+"                r - „Rohe“ Daten (was auf die Festplatte geschrieben würde)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabelle nach Sektoren sortiert"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - Tabelle mit den reinen Daten"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Das Programm beenden ohne die Partitionstabelle zu schreiben"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          Den Dateisystemtyp ändern"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Einheit für die Größenanzeige ändern"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Wechselt zwischen MB, Sektoren und Zylindern"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Die Partitionstabelle auf die Festplatte schreiben (großes W)"
 
 # or "Da dieses ..." ?
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Da dies Daten auf der Festplatte zerstören kann, müssen"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
-msgstr "             Sie das Schreiben mit »yes« oder »no« bestätigen oder"
+msgstr "             Sie das Schreiben mit „yes“ oder „no“ bestätigen oder"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             ablehnen"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pfeil-hoch   Den Cursor zur vorherigen Partition bewegen"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pfeil-runter Den Cursor zur nächsten Partition bewegen"
 
 # "Baut den Bildschirm neu auf"
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "Strg-L       Zeichnet den Bildschirm erneut"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Diese Hilfe anzeigen"
 
 # "Hinweis"
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Hinweis: Alle Befehle können mit Klein- oder Großbuchstaben "
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "eingegeben werden (außer W zum Schreiben)."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr " Zylinder"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Die Anzahl der Zylinder ändern"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Köpfe"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Die Anzahl der Köpfe ändern"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Die Anzahl der Sektoren pro Spur ändern"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Fertig"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "Ändern der Geometrie beenden"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Geben Sie die Anzahl der Zylinder ein: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Ungültiger Wert für die Anzahl der Zylinder"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Geben Sie die Anzahl der Köpfe ein: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Ungültiger Wert für die Anzahl der Köpfe"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Geben Sie die Anzahl der Sektoren pro Spur ein: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Ungültiger Wert für die Anzahl der Sektoren"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Geben Sie den Dateisystemtyp ein: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
-msgstr "Der Dateisystemtyp kann nicht auf »leer« gesetzt werden"
+msgstr "Der Dateisystemtyp kann nicht auf „leer“ gesetzt werden"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
-msgstr "Der Dateisystemtyp kann nicht auf »erweitert« gesetzt werden"
-
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Boot"
+msgstr "Der Dateisystemtyp kann nicht auf „erweitert“ gesetzt werden"
 
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unb(%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Unbekannt (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Festplatte: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, c-format
-msgid "Size: %lld bytes, %ld MB"
-msgstr "Größe: %lld Bytes, %ld MB"
+msgid "Size: %lld bytes, %lld MB"
+msgstr "Größe: %lld Bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
-msgstr "Größe: %lld Bytes, %ld,%ld GB"
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "Größe: %lld Bytes, %lld,%lld GB"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2587
 #, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
-msgstr "Köpfe: %d   Sektoren pro Spur: %d   Zylinder: %d"
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "Köpfe: %d   Sektoren pro Spur: %d   Zylinder: %lld"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Name"
 
 # I currently don't know a better translation
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Flags"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Part. Typ"
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "Dateisystemtyp"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Bezeichner]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
-msgstr " Sektoren"
+#: fdisk/cfdisk.c:2597
+msgid "    Sectors"
+msgstr "   Sektoren"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
-msgstr "Größe (MB)"
+#: fdisk/cfdisk.c:2599
+msgid "  Cylinders"
+msgstr "   Zylinder"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
-msgstr "Größe (GB)"
+#: fdisk/cfdisk.c:2601
+msgid "  Size (MB)"
+msgstr " Größe (MB)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2603
+msgid "  Size (GB)"
+msgstr " Größe (GB)"
+
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
-msgstr "Bootbar"
+msgstr " Bootbar"
 
 # "Bootfähigkeit der aktuellen Partition ändern" (joey)
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "(De)Aktivieren des bootfähig-flags der aktuellen Partition"
 
 # "Löschen"
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Löschen"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Die Festplattengeometrieparameter ändern (nur für Experten)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Hilfe"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Die Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Maxim."
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximieren der Nutzung der aktuellen Partition (nur für Experten)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Neue"
 
 # "Erzeuge aus dem freien Bereich eine neue Partition"
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Neue Partition im freiem Bereich anlegen"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Ausgabe"
 
 # "Gib die Partitionstabelle auf dem Bildschirm oder in eine Datei aus"
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Partitionstabelle auf dem Bildschirm oder in Datei ausgeben"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Ende"
 
 # "Beende das Programm ohne die Partitionstabelle zu schreiben"
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Das Programm beenden, ohne die Partitionstabelle zu speichern"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Den Typ des Dateisystems (DOS, Linux, OS/2, etc.) ändern"
 
 # Maybe without the dot.
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Einheit."
 
 # "Ändert die Einheiten der Größenanzeige ("
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Zwischen den Einheiten für die Größenanzeige wechseln (MB, Sekt., Zyl.)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Schreib."
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Die Partitionstabelle schreiben (dies kann Daten zerstören)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "Diese Partition kann nicht als bootfähig markiert werden"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "Eine leere Partition kann nicht gelöscht werden"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "Die Nutzung dieser Partition kann nicht maximiert werden"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Diese Partition ist unbenutzbar"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Diese Partition ist bereits in Benutzung"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "Der Dateisystemtyp einer leeren Partition kann nicht geändert werden"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "Keine weiteren Partitionen"
 
 # "Ungültige Taste"
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Unzulässiger Befehl"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2197,7 +2201,7 @@ msgstr ""
 "                the number of heads and the number of sectors/track.\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2216,10 +2220,10 @@ msgstr ""
 "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"
+"-u: „Anfang“ und „Ende“ werden in Sektoren statt in Zylindern angegeben\n"
 "-b 2048: (für bestimmte MO-Geräte) 2048-Byte-Sektoren benutzen\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2236,226 +2240,226 @@ msgstr ""
 "        oder: fdisk /dev/ida/c0d0  (RAID-Festplatten)\n"
 "        ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Konnte %s nicht lesen\n"
 
 # "Konnte in %s nicht positionieren"
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Konnte in %s nicht positionieren\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Konnte %s nicht schreiben\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE-IOCTL fehlgeschlagen bei %s\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Konnte keinen weiteren Speicher reservieren\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Fataler Fehler\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Befehl  Bedeutung"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   (De)Aktivieren eines Nur-Lese-Flags"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
-msgstr "   b   »bsd disklabel« bearbeiten"
+msgstr "   b   „bsd disklabel“ bearbeiten"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   (De)Aktivieren des Mountable(Einhängbarkeit)-Flags"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   Eine Partition löschen"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   Die bekannten Dateisystemtypen anzeigen"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   Dieses Menü anzeigen"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   Eine neue Partition anlegen"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   Eine neue leere DOS Partitionstabelle anlegen"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   Die Partitionstabelle anzeigen"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   Ende ohne Speichern der Änderungen"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
-msgstr "   s   Einen neuen leeren »Sun disklabel« anlegen"
+msgstr "   s   Einen neuen leeren „Sun disklabel“ anlegen"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   Den Dateisystemtyp einer Partition ändern"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   Die Einheit für die Anzeige/Eingabe ändern"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   Die Partitionstabelle überprüfen"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr ""
 "   w   Die Tabelle auf die Festplatte schreiben und das Programm beenden"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Zusätzliche Funktionen (nur für Experten)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   Wählen der bootfähigen Partition"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
-msgstr "   b   Bearbeiten des »bootfile«-Eintrags"
+msgstr "   b   Bearbeiten des „bootfile“-Eintrags"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   Die sgi-swap-Partition auswählen"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a   (De)Aktivieren des bootfähig-Flags"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   (De)Aktivieren des DOS Kompatibilitätsflags"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   Die Anzahl der alternierenden Zylinder ändern"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   Die Anzahl der Zylinder ändern"
 
 # XXX
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
-msgstr "   d   Die »raw«-Daten der Partitionstabelle anzeigen"
+msgstr "   d   Die „raw“-Daten der Partitionstabelle anzeigen"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   Die Anzahl der Extra-Sektoren pro Zylinder ändern"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   Die Anzahl der Köpfe ändern"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   Den Interleave-Faktor ändern"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   Umdrehungsgeschwindigkeit ändern (U/min)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   Zurück zum Hauptmenü"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   Die Anzahl der Sektoren/Spur ändern"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   Die Anzahl der physischen Zylinder ändern"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 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:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   Erweiterte Partitionen anzeigen"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   Eine IRIX-Partitionstabelle (SGI) anlegen"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f   Partitionsreihenfolge korrigieren"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "Sie müssen angeben"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "Köpfe"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "Sektoren"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "Zylinder"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2464,11 +2468,11 @@ msgstr ""
 "%s%s.\n"
 "Sie können dies im Zusatzfunktionsmenü tun.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " und "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2487,26 +2491,26 @@ msgstr ""
 "2) Boot- und Partitionierungssoftware anderer Betriebssysteme\n"
 "   (z. B. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Ungültiges Offset in primärer erweiterter Partition\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Warnung: lösche Partitionen hinter %d\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Warnung: zusätzlicher Link-Pointer in Partitionstabelle %d\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Warnung: ignoriere weitere Daten in Partitionstabelle %d\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2520,42 +2524,42 @@ msgstr ""
 "vorherige Inhalt unrettbar verloren.\n"
 "\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, 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:888
+#: fdisk/fdisk.c:912
 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:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 "Diese Platte hat sowohl DOS- als auch BSD-Magic.\n"
-"Nutzen Sie den »b«-Befehl, um in den BSD-Modus zu gehen.\n"
+"Nutzen Sie den „b“-Befehl, um in den BSD-Modus zu gehen.\n"
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 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 einen »Sun«, »SGI« oder »OSF disklabel«\n"
+"noch einen „Sun“, „SGI“ oder „OSF disklabel“\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Interner Fehler\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Die zusätzliche erweiterte Partition %d ignorieren\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2564,7 +2568,7 @@ msgstr ""
 "Warnung: Schreiben wird ungültiges Flag 0x%04x in Part.-tabelle %d "
 "korrigieren\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2572,78 +2576,78 @@ msgstr ""
 "\n"
 "dreimalig EOF bekommen - beende...\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Hex code (L um eine Liste anzuzeigen): "
 
-#: fdisk/fdisk.c:1069
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1094
+#, c-format
 msgid "%s (%u-%u, default %u): "
-msgstr "%s (%d-%d, Vorgabe: %d): "
+msgstr "%s (%u-%u, Vorgabe: %u): "
 
-#: fdisk/fdisk.c:1136
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1161
+#, c-format
 msgid "Using default value %u\n"
-msgstr "Benutze den Standardwert %d\n"
+msgstr "Benutze den Standardwert %u\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "Wert außerhalb des Bereichs.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Warnung: Partition %d hat leeren Typ\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition %d ausgewählt\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 msgid "No partition is defined yet!\n"
 msgstr "Noch keine Partition definiert!\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle primären Partitionen sind schon definiert worden!\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "Zylinder"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "Sektor"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, 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:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "WARNUNG: Partition %d ist eine erweiterte Partition\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-Kompatibilitätsflag ist gesetzt\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-Kompatibilitätsflag ist nicht gesetzt\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d existiert noch nicht!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2653,9 +2657,9 @@ msgstr ""
 "Typ 0 bedeutet für viele Systeme (allerdings nicht\n"
 "Linux) freien Platz. Partitionen mit Typ 0 zu haben\n"
 "ist wahrscheinlich unklug. Sie können eine Partition\n"
-"mit dem »d«-Kommando löschen.\n"
+"mit dem „d“-Kommando löschen.\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2663,73 +2667,73 @@ msgstr ""
 "Es ist nicht möglich, eine Partition in eine Erweiterte zu ändern oder\n"
 "umgekehrt.  Bitte löschen Sie die Partition zuerst.\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
 "\n"
 msgstr ""
-"Ziehen Sie in Betracht, Partition 3 als »Whole disk« (ganze Platte, 5)\n"
+"Ziehen Sie in Betracht, Partition 3 als „Whole disk“ (ganze Platte, 5)\n"
 "zu lassen, wie es SunOS/Solaris erwartet und sogar Linux es mag.\n"
 "\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
 "\n"
 msgstr ""
-"Ziehen Sie in Betracht, Partition 9 als »Volume Header« (5) und Partition "
+"Ziehen Sie in Betracht, Partition 9 als „Volume Header“ (5) und Partition "
 "11\n"
 "als gesamte Platte zu lassen, wie es IRIX erwartet.\n"
 "\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, 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:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Partition %d hat unterschiedliche phys./log. Anfänge (nicht-Linux?):\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisch=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d hat unterschiedliche phys./log. Enden:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i beginnt nicht an einer Zylindergrenze:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "sollte sein (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partition %i endet nicht an einer Zylindergrenze.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "sollte sein (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -2738,7 +2742,7 @@ msgstr ""
 "\n"
 "Platte %s: %ld MByte, %lld Byte\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, c-format
 msgid ""
 "\n"
@@ -2747,26 +2751,26 @@ msgstr ""
 "\n"
 "Platte %s: %ld.%ld GByte, %lld Byte\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d Köpfe, %d Sektoren/Spuren, %d Zylinder"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
-msgstr ", zusammen %lu Sektoren"
+msgid ", total %llu sectors"
+msgstr ", zusammen %llu Sektoren"
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
-"Einheiten = %s von %d * %d = %d Bytes\n"
+"Einheiten = %s von %d × %d = %d Bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2778,16 +2782,16 @@ msgstr ""
 # "   Device"
 # "    Gerät"
 # 2002-05-10 12:15:13 CEST -ke-
-#: fdisk/fdisk.c:1678
+#: fdisk/fdisk.c:1704
 #, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
-msgstr " %*s boot.  Anfang      Ende    Blöcke   Id  Dateisystemtyp\n"
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s boot.     Anfang        Ende     Blöcke   Id  System\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Gerät"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2795,7 +2799,7 @@ msgstr ""
 "\n"
 "Partitionstabelleneinträge sind nicht in Platten-Reihenfolge\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2808,93 +2812,93 @@ msgstr ""
 
 # Ist "Kp" eine gute Abkürzung für "Kopf" ?
 # Kf ist besser (2001-11-24 21:30:51 CET -ke-)
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
-msgstr "Nr AF  Kp Sek  Zyl  Kp Sek  Zyl   Anfang     Größe ID\n"
+#: fdisk/fdisk.c:1754
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "Nr AF  Kp Sek  Zyl  Kp Sek  Zyl     Anfang     Größe ID\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Warnung: Partition %d enthält Sektor 0\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: Kopf %d größer als Maximum %d\n"
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: Sektor %d größer als Maximum %d\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partition %d: Zylinder %d größer als Maximum %d\n"
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partition %d: verheriger Sektor %d widerspricht sich mit gesamt %d\n"
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Warnung: ungültiger Anfang-der-Daten in Partition %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Warnung: Partition %d überlappt mit Partition %d.\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Warnung: Partition %d ist leer\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 "Logische Partition %d ist nicht vollständig in Partition %d enthalten\n"
 
-#: fdisk/fdisk.c:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Gesamtanzahl belegter Sektoren %d größer als Maximum %d\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d unbenutzte Sektoren\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partition %d ist schon festgelegt.  Vor Wiederanlegen bitte löschen.\n"
 
 # %s can be "Sektor" or "Zylinder".
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Erster %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d wird bereits benutzt\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "Es sind keine freien Sektoren verfügbar\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, 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:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2906,15 +2910,26 @@ msgstr ""
 "\tzuerst eine neue, leere DOS-Partitionstabelle (mit o).\n"
 "\tWARNUNG: Das zerstört den momentanen Inhalt Ihrer Platte.\n"
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "Die maximale Anzahl von Partitionen wurde erzeugt\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Sie müssen erst eine Partion löschen und eine erweiterte anlegen.\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "logische Partitionen nicht in Platten-Reihenfolge"
+
+# "Ungültige primäre Partition"
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Beschädigte primäre Partition"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2925,20 +2940,20 @@ msgstr ""
 "   %s\n"
 "   p      Primäre Partition (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l      Logische Partition (5 oder größer)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e      Erweiterte"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, 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:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2946,11 +2961,11 @@ msgstr ""
 "Die Partitionstabelle wurde verändert!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Rufe ioctl() um Partitionstabelle neu einzulesen.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2963,7 +2978,7 @@ msgstr ""
 "Der Kernel benutzt noch die alte Tabelle.\n"
 "Die neue Tabelle wird beim nächsten Neustart verwendet.\n"
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2975,65 +2990,65 @@ msgstr ""
 "oder verändert haben, dann schauen Sie bitte in die\n"
 "fdisk-manual-Seite nach weiteren Informationen\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Synchronisiere Platten.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d hat keinen Datenbereich\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Neuer Datenanfang"
 
 # That sounds pretty ummm...
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Expertenkommando (m für Hilfe): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Anzahl der Zylinder"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Anzahl der Köpfe"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Anzahl der Sektoren"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Warnung: setze Sektoren-Offset für DOS-Kompatibilität\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Festplatte %s enthält keine gültige Partitionstabelle\n"
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: Unbekannter Befehl\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Dieser Kernel stellt Sektorengröße selbst fest - Option -b ignoriert\n"
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -3042,16 +3057,16 @@ msgstr ""
 "angegebenen Gerät benutzt werden\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-msgstr ""
+msgstr "Ein ODF/1-Disklabel auf %s entdeckt, gehe in Disklabel-Modus.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Befehl (m für Hilfe): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -3060,22 +3075,25 @@ msgstr ""
 "\n"
 "Momentane Bootdatei ist: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Bitte geben Sie den Namen der neuen Boot-Datei an: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "Boot-Datei unverändert\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
 "\n"
 msgstr ""
+"\n"
+"\tTut mir leid, kein Experten-Menü für SGI-Partitionstabellen verfügbar.\n"
+"\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3090,6 +3108,18 @@ msgid ""
 "\t   to remove the disk logically from your AIX\n"
 "\t   machine.  (Otherwise you become an AIXpert)."
 msgstr ""
+"\n"
+"\tEs gibt ein AIX-Label auf dieser Platte.\n"
+"\tDiese können leider von Linux momentan nicht\n"
+"\tgehandhabt werden. Dennoch einige Hinweise:\n"
+"\t1. fdisk wird den Inhalt beim Schreiben zerstören\n"
+"\t2. Stellen Sie sicher, dass diese Platte NICHT noch\n"
+"\t   immer ein wichtiger Teil einer Plattengruppe ist.\n"
+"\t   (Anderenfalls könnte diese Platten mitgelöscht\n"
+"\t   werden, wenn sie nicht gespiegelt werden.)\n"
+"\t3. Bevor Sie diese physische Platte löschen, entfernen\n"
+"\t   Sie sie unbedingt logisch aus Ihrer AIX-Maschine.\n"
+"\t   (Anderenfalls werden Sie ein AIXperte.)"
 
 #: fdisk/fdiskbsdlabel.c:122
 #, c-format
@@ -3098,7 +3128,7 @@ msgid ""
 "BSD label for device: %s\n"
 msgstr ""
 "\n"
-"»BSD label« von %s\n"
+"„BSD label“ für Gerät: %s\n"
 
 #: fdisk/fdiskbsdlabel.c:130
 msgid "   d   delete a BSD partition"
@@ -3106,11 +3136,11 @@ msgstr "   d   Eine BSD-Partition löschen"
 
 #: fdisk/fdiskbsdlabel.c:131
 msgid "   e   edit drive data"
-msgstr ""
+msgstr "   e   Plattendaten editieren"
 
 #: fdisk/fdiskbsdlabel.c:132
 msgid "   i   install bootstrap"
-msgstr ""
+msgstr "   i   Bootstrap installieren"
 
 #: fdisk/fdiskbsdlabel.c:133
 msgid "   l   list known filesystem types"
@@ -3142,7 +3172,7 @@ msgstr "   w   Disklabel auf Platte schreiben"
 
 #: fdisk/fdiskbsdlabel.c:144
 msgid "   x   link BSD partition to non-BSD partition"
-msgstr ""
+msgstr "   x   BSD-Partition mit Nicht-BSD-Partition verknüpfen"
 
 #: fdisk/fdiskbsdlabel.c:176
 #, c-format
@@ -3152,16 +3182,16 @@ msgstr "Partition %s hat einen ungültigen Startsektor 0.\n"
 #: fdisk/fdiskbsdlabel.c:180
 #, c-format
 msgid "Reading disklabel of %s at sector %d.\n"
-msgstr ""
+msgstr "Lese Disklabel von %s bei Sektor %d.\n"
 
 #: fdisk/fdiskbsdlabel.c:190
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
-msgstr ""
+msgstr "Es gibt keine *BSD-Partition auf %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:204
 msgid "BSD disklabel command (m for help): "
-msgstr "»BSD disklabel« Befehl (m für Hilfe): "
+msgstr "„BSD disklabel“ Befehl (m für Hilfe): "
 
 #: fdisk/fdiskbsdlabel.c:318
 #, c-format
@@ -3190,15 +3220,15 @@ msgstr "Flags:"
 
 #: fdisk/fdiskbsdlabel.c:325
 msgid " removable"
-msgstr ""
+msgstr " entfernbar"
 
 #: fdisk/fdiskbsdlabel.c:327
 msgid " ecc"
-msgstr ""
+msgstr " ecc"
 
 #: fdisk/fdiskbsdlabel.c:329
 msgid " badsect"
-msgstr ""
+msgstr " badsect"
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
@@ -3230,32 +3260,32 @@ msgstr "Zylinder: %ld\n"
 #: fdisk/fdiskbsdlabel.c:338
 #, c-format
 msgid "rpm: %d\n"
-msgstr ""
+msgstr "U/min: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:339
 #, c-format
 msgid "interleave: %d\n"
-msgstr ""
+msgstr "Interleave: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:340
 #, c-format
 msgid "trackskew: %d\n"
-msgstr ""
+msgstr "Spurabweichung: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:341
 #, c-format
 msgid "cylinderskew: %d\n"
-msgstr ""
+msgstr "Zylinderabweichung: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:342
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr ""
+msgstr "Kopfwechsel: %ld\t\t# Millisekunden\n"
 
 #: fdisk/fdiskbsdlabel.c:344
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
-msgstr ""
+msgstr "Spur-zu-Spur-Wechsel: %ld\t# Millisekunden\n"
 
 #: fdisk/fdiskbsdlabel.c:346
 msgid "drivedata: "
@@ -3277,16 +3307,16 @@ msgstr "#       Anfang      Ende     Größe    Typ      [fsize bsize   cpg]\n"
 #: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
 msgid "Writing disklabel to %s.\n"
-msgstr "Schreibe »disklabel« auf %s.\n"
+msgstr "Schreibe „disklabel“ auf %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
 #, c-format
 msgid "%s contains no disklabel.\n"
-msgstr "%s enthält keinen »disklabel«.\n"
+msgstr "%s enthält keinen „disklabel“.\n"
 
 #: fdisk/fdiskbsdlabel.c:427
 msgid "Do you want to create a disklabel? (y/n) "
-msgstr "Wollen Sie einen »disklabel« anlegen (y/n)? "
+msgstr "Wollen Sie einen „disklabel“ anlegen (y/n)? "
 
 #: fdisk/fdiskbsdlabel.c:467
 msgid "bytes/sector"
@@ -3306,31 +3336,31 @@ msgstr "Sektoren/Zylinder"
 
 #: fdisk/fdiskbsdlabel.c:481
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
-msgstr "Muss <= Sektoren/Spur * Spuren/Zylinder sein (Voreinstellung).\n"
+msgstr "Muss <= Sektoren/Spur × Spuren/Zylinder sein (Voreinstellung).\n"
 
 #: fdisk/fdiskbsdlabel.c:483
 msgid "rpm"
-msgstr ""
+msgstr "U/min"
 
 #: fdisk/fdiskbsdlabel.c:484
 msgid "interleave"
-msgstr ""
+msgstr "Interleave"
 
 #: fdisk/fdiskbsdlabel.c:485
 msgid "trackskew"
-msgstr ""
+msgstr "Spurverschiebung"
 
 #: fdisk/fdiskbsdlabel.c:486
 msgid "cylinderskew"
-msgstr ""
+msgstr "Zylinderverschiebung"
 
 #: fdisk/fdiskbsdlabel.c:487
 msgid "headswitch"
-msgstr ""
+msgstr "Kopfwechsel"
 
 #: fdisk/fdiskbsdlabel.c:488
 msgid "track-to-track seek"
-msgstr ""
+msgstr "Spur‐zu‐Spur‐Wechsel"
 
 #: fdisk/fdiskbsdlabel.c:529
 #, c-format
@@ -3424,8 +3454,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux Swap"
 
@@ -3465,11 +3494,11 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Platte %s (»SGI Disklabel«): %d Köpfe, %d Sektoren\n"
+"Platte %s („SGI Disklabel“): %d Köpfe, %d Sektoren\n"
 "%d Zylinder, %d physische Zylinder\n"
 "%d Extrasekt./Zyl, Interleave %d:1\n"
 "%s\n"
-"Einheiten = %s mit %d * 512 Bytes\n"
+"Einheiten = %s mit %d × 512 Bytes\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:212
@@ -3481,8 +3510,8 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Platte %s (»SGI disklabel«): %d Köpfe, %d Sektoren, %d Zylinder\n"
-"Einheiten: %s mit %d * 512 Bytes\n"
+"Platte %s („SGI disklabel“): %d Köpfe, %d Sektoren, %d Zylinder\n"
+"Einheiten: %s mit %d × 512 Bytes\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:218
@@ -3518,7 +3547,7 @@ msgstr ""
 "\n"
 "Ungültige Bootdatei!\n"
 "\tDie Bootdatei muss ein absoluter, nichtleerer Pfadname sein,\n"
-"\tz. B. »/unix« oder »/unix.save«.\n"
+"\tz. B. „/unix“ oder „/unix.save“.\n"
 
 #: fdisk/fdisksgilabel.c:308
 msgid ""
@@ -3544,7 +3573,7 @@ msgid ""
 msgstr ""
 "\n"
 "\tVorsicht, die Existenz der Bootdatei wird nicht geprüft.\n"
-"\tSGIs Voreinstellung ist »/unix« und als Sicherung »/unix.save«.\n"
+"\tSGIs Voreinstellung ist „/unix“ und als Sicherung „/unix.save“.\n"
 
 #: fdisk/fdisksgilabel.c:346
 #, c-format
@@ -3553,7 +3582,7 @@ msgid ""
 "\tBootfile is changed to \"%s\".\n"
 msgstr ""
 "\n"
-"\tBootdatei geändert auf »%s«.\n"
+"\tBootdatei geändert auf „%s“.\n"
 
 #: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
@@ -3605,31 +3634,37 @@ msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Partitionen %d und %d überlappen sich mit %d Sektoren.\n"
 
 #: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Unbenutzter Bereich - Sektor %d-%d\n"
+msgstr "Unbenutzte Lücke von %8u Sektoren - Sektor %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
 msgstr ""
+"\n"
+"Die Bootpartition existiert nicht.\n"
 
 #: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
 msgstr ""
+"\n"
+"Die Swappartition existiert nicht.\n"
 
 #: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
 msgstr ""
+"\n"
+"Die Swappartition hat keinen Swap-Typ.\n"
 
 #: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
-msgstr ""
+msgstr "\tSie haben einen unüblichen Boot-Dateinamen gewählt.\n"
 
 #. caught already before, ...
 #: fdisk/fdisksgilabel.c:542
@@ -3644,16 +3679,16 @@ 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 ist höchst empfehlenswert, die Partition an Position 0 vim Type »SGI "
-"volhdr«\n"
+"Es ist höchst empfehlenswert, die Partition an Position 0 vim Type „SGI "
+"volhdr“\n"
 "sein zu lassen, da das IRIX-System sich darauf verlässt, um aus ihrem\n"
 "Verzeichnis alleinstehende Programme wie sash und fx zu holen. Nur die "
 "Sektion\n"
-"»SGI volume« für die ganze Platte darf diese Forderung verletzen.\n"
+"„SGI volume“ für die ganze Platte darf diese Forderung verletzen.\n"
 "Geben Sie JAWOHL ein, wenn Sie sicher sind, diese\n"
 "Partition von anderem Typ sein lassen zu wollen.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "JAWOHL\n"
 
@@ -3680,7 +3715,7 @@ msgid ""
 "covers the entire disk and is of type `SGI volume'\n"
 msgstr ""
 "Es ist höchst empfehlenswert, die elfte Partition die ganze\n"
-"Platte überdecken und sie vom Typ »SGI volume« sein zu lassen.\n"
+"Platte überdecken und sie vom Typ „SGI volume“ sein zu lassen.\n"
 
 #: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
@@ -3814,15 +3849,15 @@ msgstr ""
 msgid "Physical cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr ""
 
@@ -3872,14 +3907,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3888,7 +3923,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3900,7 +3935,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3909,20 +3944,20 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Festplatte %s (»Sun disklabel«): %d Köpfe, %d Sektoren, %d Zylinder\n"
-"Einheiten: %s mit %d * 512 Bytes\n"
+"Festplatte %s („Sun disklabel“): %d Köpfe, %d Sektoren, %d Zylinder\n"
+"Einheiten: %s mit %d × 512 Bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -3974,21 +4009,21 @@ msgstr "OS/2 Bootmanager"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
-msgstr "Win95 FAT32"
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA)"
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA)"
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
-msgstr "Win95 Erw. (LBA)"
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 Erw. (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -4016,19 +4051,19 @@ msgstr "Verst. HPFS/NTFS"
 
 #: fdisk/i386_sys_types.c:27
 msgid "AST SmartSleep"
-msgstr ""
+msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
-msgstr "Verst. Win95 FAT32"
+msgid "Hidden W95 FAT32"
+msgstr "Verst. W95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
-msgstr "Verst. Win95 FAT32 (LBA)"
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "Verst. W95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
-msgstr "Verst. Win95 FAT16 (LBA)"
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "Verst. W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4136,6 +4171,12 @@ msgstr "Old Minix"
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux Swap"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 verst. C:-Lw."
@@ -4290,91 +4331,91 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
-msgstr ""
+msgstr "Seek-Fehler auf %s – kann nicht nach %lu springen\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
-msgstr "Speicher ist aufgebraucht - Abbruch\n"
+msgstr "Speicher ist aufgebraucht – Abbruch\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
-msgstr "Fehler beim Lesen von %s - Sektor %lu konnte nicht gelesen werden\n"
+msgstr "Fehler beim Lesen von %s – Sektor %lu konnte nicht gelesen werden\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr ""
-"Fehler beim Schreiben auf %s - der Sektor %lu konnte nicht geschrieben "
+"Fehler beim Schreiben auf %s – der Sektor %lu konnte nicht geschrieben "
 "werden\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "Fehler beim Schreiben auf %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "Speicher aufgebraucht?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "Fehler beim Lesen von %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "Konnte das Gerät %s nicht zum Schreiben öffnen\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "Fehler beim Schreiben des Sektors %lu auf %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Festplatte %s: Die Geometrie konnte nicht festgestellt werden\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4382,29 +4423,29 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4413,27 +4454,27 @@ msgstr ""
 "\n"
 "Festplatte %s: %lu Zylinder, %lu Köpfe, %lu Sektoren/Spur\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4441,41 +4482,41 @@ msgstr ""
 "Id  Name\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Die Partitionstabelle wird erneut gelesen...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fehler beim Schließen von %s\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: es gibt keine derartige Partition\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# Partitionstabelle von %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4485,11 +4526,11 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Gerät  boot. Anfang   Ende  #Zyl.    #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4498,11 +4539,11 @@ msgstr ""
 "Einheit = Sektoren von 512 Bytes, Zählung beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Gerät  boot.   Anfang      Ende  #Sektoren Id  System\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4511,11 +4552,11 @@ msgstr ""
 "Einheit = Blöcke von 1024 Bytes, Zählung beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Gerät  boot.  Anfang      Ende   #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4525,30 +4566,30 @@ msgstr ""
 "beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Gerät  boot. Anfang Ende   MiB    #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "Keine Partitionen gefunden\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4556,86 +4597,86 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
 # XXX - Merge with next strings.
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr ""
 
 # XXX - Merge with next strings.
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Warnung: Partition %s fängt bei Sektor 0 an\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Warnung: Partition %s beginnt nicht an einer Zylindergrenze\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Warnung: Partition %s endet nicht an einer Zylindergrenze\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4645,13 +4686,13 @@ msgstr ""
 "         Dies spielt bei LILO keine Rolle, aber der DOS-MBR wird diese\n"
 "         Festplatte nicht booten.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4660,40 +4701,40 @@ msgstr ""
 "         Dies spielt bei LILO keine Rolle, aber der DOS-MBR wird auf\n"
 "         dieser Festplatte nicht booten.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 msgid "start"
 msgstr "Anfang"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s: Anfang: (c,h,s) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 msgid "end"
 msgstr "Ende"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s: Ende: (c,h,s) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "Partition %s endet am Zylinder %ld, hinter dem Ende der Platte\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4701,341 +4742,341 @@ msgstr ""
 "Warnung: erweiterte Partition beginnt nicht an einer Zylindergrenze\n"
 "DOS und Linux werden den Inhalt unterschiedlich interpretieren.\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "Zu viele Partitionen - ignoriere alle hinter Nr. (%d)\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "Partitionsbaum?\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " %s: nicht erkannte Partition\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
-msgstr "Die Option »-n« wurde verwendet: Es wurde nichts verändert\n"
+msgstr "Die Option „-n“ wurde verwendet: Es wurde nichts verändert\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Speichern der alten Sektoren fehlgeschlagen - Abbruch\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "Zahl zu groß\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr ""
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "Für mehr kein Platz\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "ungültige Eingabe\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "Zu viele Partitionen\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
-msgstr ""
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
+msgstr "%ld Blöcke\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "Konnte %s nicht zum Lesen/Schreiben öffnen\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "Konnte %s nicht zum Lesen öffnen\n"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
 # And again one for show_geometry()...
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld Zylinder, %ld Köpfe, %ld Sektoren/Spur\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -5043,7 +5084,7 @@ msgstr ""
 "Fertig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5052,36 +5093,36 @@ msgstr ""
 "Sie haben %d aktive primäre Partitionen.  Dies spielt bei LILO keine Rolle,\n"
 "aber der DOS-MBR bootet nur Festplatten mit einer aktiven Partition.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Diese Platte ist momentan in Benutzung.\n"
 
 # This is a stat()
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5089,60 +5130,60 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Alte Aufteilung:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Neue Aufteilung:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5150,7 +5191,7 @@ msgstr ""
 "Die neue Partitionstabelle wurde erfolgreich geschrieben\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5159,7 +5200,7 @@ msgstr ""
 
 #: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
-msgstr "»getopt --help« gibt weitere Informationen.\n"
+msgstr "„getopt --help“ gibt weitere Informationen.\n"
 
 #: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
@@ -5265,7 +5306,7 @@ msgstr "Uhrport auf 0x%x gestellt\n"
 # debug
 #: hwclock/cmos.c:209
 msgid "funky TOY!\n"
-msgstr "»funky TOY«!\n"
+msgstr "„funky TOY“!\n"
 
 # The second %s can be:
 # "clock read"
@@ -5273,7 +5314,7 @@ msgstr "»funky TOY«!\n"
 #: hwclock/cmos.c:263
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr "%s: atomares »%s« schlug bei 1000 Iterationen fehl!"
+msgstr "%s: atomares „%s“ schlug bei 1000 Iterationen fehl!"
 
 #: hwclock/cmos.c:587
 #, c-format
@@ -5320,7 +5361,7 @@ msgstr "%s: Warnung: Unbekannte dritte Zeile in der adjtime-Datei\n"
 
 #: hwclock/hwclock.c:305
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
-msgstr "(Erwartet: »UTC« oder »LOCAL« oder nichts.)\n"
+msgstr "(Erwartet: „UTC“ oder „LOCAL“ oder nichts.)\n"
 
 # XXX
 #: hwclock/hwclock.c:312
@@ -5411,7 +5452,7 @@ msgstr "%s  %.6f Sekunden\n"
 
 #: hwclock/hwclock.c:589
 msgid "No --date option specified.\n"
-msgstr "Es wurde keine »--date«-Option angegeben.\n"
+msgstr "Es wurde keine „--date“-Option angegeben.\n"
 
 #: hwclock/hwclock.c:595
 msgid "--date argument too long\n"
@@ -5423,22 +5464,22 @@ msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
-"Der Wert der »--date«-Option ist kein gültiges Datum.\n"
+"Der Wert der „--date“-Option ist kein gültiges Datum.\n"
 "Es darf kein Anführungszeichen enthalten.\n"
 
 #: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
-msgstr "Der »date«-Befehl wird aufgerufen: %s\n"
+msgstr "Der „date“-Befehl wird aufgerufen: %s\n"
 
 #: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr "Konnte »date« nicht in der /bin/sh-Shell starten. popen() schlug fehl"
+msgstr "Konnte „date“ nicht in der /bin/sh-Shell starten. popen() schlug fehl"
 
 #: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
-msgstr "Ausgabe des »date«-Befehls: %s\n"
+msgstr "Ausgabe des „date“-Befehls: %s\n"
 
 #: hwclock/hwclock.c:624
 #, c-format
@@ -5449,7 +5490,7 @@ msgid ""
 "The response was:\n"
 "  %s\n"
 msgstr ""
-"Der »date«-Befehl, der von %s aufgerufen wurde, lieferte\n"
+"Der „date“-Befehl, der von %s aufgerufen wurde, lieferte\n"
 "unerwartete Ergebnisse.\n"
 "Der Befehl war:\n"
 "  %s\n"
@@ -5466,7 +5507,7 @@ msgid ""
 "The response was:\n"
 " %s\n"
 msgstr ""
-"Der »date«-Befehl, der von %s aufgerufen wurde, lieferte keine ganze Zahl, "
+"Der „date“-Befehl, der von %s aufgerufen wurde, lieferte keine ganze Zahl, "
 "wo die umgewandelte Zeit erwartet wurde.\n"
 "Der Befehl war:\n"
 "  %s\n"
@@ -5651,7 +5692,7 @@ msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr ""
-"Um den Epochenwert zu ändern, müssen sie die »epoch«-Option benutzen, um "
+"Um den Epochenwert zu ändern, müssen sie die „epoch“-Option benutzen, um "
 "anzugeben auf welchen Wert er gesetzt werden soll.\n"
 
 #: hwclock/hwclock.c:1159
@@ -5704,7 +5745,7 @@ msgstr ""
 "  --help        diese Hilfe zeigen\n"
 "  --show        Zeit der Hardwareuhr anzeigen\n"
 "  --set         die Hardwareuhr auf die Zeit setzen, die mit der\n"
-"                  »--date«-Option angegeben wurde\n"
+"                  „--date“-Option angegeben wurde\n"
 "  --hctosys     die Systemzeit von der Hardwareuhr setzen\n"
 "  --systohc     die Hardwareuhr auf die Systemzeit setzen\n"
 "  --adjust      die Hardwareuhr anpassen, um systematische bedingte "
@@ -5712,7 +5753,7 @@ msgstr ""
 "                  seit dem letzten Setzen oder Anpassen auszugleichen\n"
 "  --getepoch    den Epochenwert der Hardwareuhr anzeigen\n"
 "  --setepoch    den Epochenwert der Hardwareuhr auf den Wert stellen,\n"
-"                  der mit der »--epoch«-Option angegeben wurde\n"
+"                  der mit der „--epoch“-Option angegeben wurde\n"
 "  --version     die Version von hwclock anzeigen \n"
 "\n"
 "Optionen: \n"
@@ -5788,7 +5829,7 @@ msgstr "Sie müssen root sein, um die Systemuhr zu ändern.\n"
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
-msgstr "Sie müssen root sein, um den »epoch«-Wert zu ändern.\n"
+msgstr "Sie müssen root sein, um den „epoch“-Wert zu ändern.\n"
 
 #: hwclock/hwclock.c:1484
 msgid "Cannot access the Hardware Clock via any known method.\n"
@@ -5801,7 +5842,7 @@ msgid ""
 "Use the --debug option to see the details of our search for an access "
 "method.\n"
 msgstr ""
-"Benutzen Sie die »--debug«-Option um die versuchten Zugriffsarten "
+"Benutzen Sie die „--debug“-Option um die versuchten Zugriffsarten "
 "anzuzeigen.\n"
 
 # debug
@@ -5813,7 +5854,7 @@ msgstr "Warte in Schleife auf Änderung der Zeit von KDGHWCLK\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK-Ioctl scheiterte beim Auslesen der Zeit."
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "Zeitüberschreitung beim Warten auf Zeitänderung.\n"
 
@@ -5838,58 +5879,68 @@ msgstr "Konnte /dev/tty1 oder /dev/vc/1 nicht öffnen"
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK-Ioctl fehlgeschlagen"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "Konnte %s nicht öffnen"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "ioctl() auf %s, um die Zeit zu lesen, fehlgeschlagen.\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "Warte in Schleife auf Änderung der Zeit aus %s\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s hat keine Interrupt-Funktionen."
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "ioctl() auf %s, um auf Zeittick zu warten, fehlgeschlagen."
 
-#: hwclock/rtc.c:243
-#, c-format
-msgid "ioctl() to %s to turn off update interrupts failed"
-msgstr ""
-
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "ioctl() auf %s, um auf Zeittick zu warten, fehlgeschlagen."
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "ioctl() auf %s, um auf Zeittick zu warten, fehlgeschlagen."
+
+#: hwclock/rtc.c:267
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
+msgstr "ioctl() auf %s, um Update-Interrupts abzuschalten, fehlgeschlagen."
+
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
-msgstr ""
+msgstr "ioctl() auf %s, um Update-Interrupts einzuschalten, fehlgeschlagen."
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "ioctl() auf %s, um die Zeit zu setzen, fehlgeschlagen.\n"
 
 # debug
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
-msgstr "»ioctl(%s)« war erfolgreich.\n"
+msgstr "„ioctl(%s)“ war erfolgreich.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "Konnte %s nicht öffnen"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5900,17 +5951,17 @@ msgstr ""
 "Gerätetreiber ‚rtc‘ mittels der Gerätedatei %s ansprechen. Diese Datei "
 "existiert auf diesem System nicht.\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "Konnte %s nicht öffnen"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) auf %s fehlgeschlagen"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "Wir haben Epoche %ld aus %s mit dem RTC_EPOCH_READ-Ioctl gelesen.\n"
@@ -5918,59 +5969,60 @@ msgstr "Wir haben Epoche %ld aus %s mit dem RTC_EPOCH_READ-Ioctl gelesen.\n"
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:396
+#: hwclock/rtc.c:420
 #, 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 forderten %ld an.\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr "Setze Epoche auf %ld mit RTC_EPOCH_SET-Ioctl auf %s.\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
-msgstr ""
+msgstr "Der Kernel-Gerätetreiber für %s hat keinen RTC_EPOCH_SET-Ioctl.\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
-msgstr ""
+msgstr "ioctl(RTC_EPOCH_SET) auf %s fehlt"
 
+# Debug-Zeugs
 #: login-utils/agetty.c:312
 msgid "calling open_tty\n"
-msgstr ""
+msgstr "calling open_tty\n"
 
 #. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
-msgstr ""
+msgstr "calling termio_init\n"
 
 #: login-utils/agetty.c:330
 msgid "writing init string\n"
-msgstr ""
+msgstr "writing init string\n"
 
 #. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
-msgstr ""
+msgstr "before autobaud\n"
 
 #: login-utils/agetty.c:352
 msgid "waiting for cr-lf\n"
-msgstr ""
+msgstr "waiting for cr-lf\n"
 
 #: login-utils/agetty.c:356
 #, c-format
 msgid "read %c\n"
-msgstr ""
+msgstr "read %c\n"
 
 #. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
-msgstr ""
+msgstr "reading login name\n"
 
 #: login-utils/agetty.c:386
 #, c-format
@@ -5979,24 +6031,24 @@ msgstr "%s: Fehler beim Ausführen von %s: %m"
 
 #: login-utils/agetty.c:406
 msgid "can't malloc initstring"
-msgstr "Konnte keinen Speicher für den »initstring« reservieren"
+msgstr "Konnte keinen Speicher für den „initstring“ reservieren"
 
 #: login-utils/agetty.c:471
 #, c-format
 msgid "bad timeout value: %s"
-msgstr ""
+msgstr "ungültiger Auszeit-Wert: %s"
 
 #: login-utils/agetty.c:480
 msgid "after getopt loop\n"
-msgstr ""
+msgstr "after getopt loop\n"
 
 #: login-utils/agetty.c:530
 msgid "exiting parseargs\n"
-msgstr ""
+msgstr "exiting parseargs\n"
 
 #: login-utils/agetty.c:542
 msgid "entered parse_speeds\n"
-msgstr ""
+msgstr "entered parse_speeds\n"
 
 #: login-utils/agetty.c:545
 #, c-format
@@ -6005,11 +6057,11 @@ msgstr "falsche Geschwindigkeit: %s"
 
 #: login-utils/agetty.c:547
 msgid "too many alternate speeds"
-msgstr ""
+msgstr "zu viele alternative Geschwindigkeiten"
 
 #: login-utils/agetty.c:549
 msgid "exiting parsespeeds\n"
-msgstr ""
+msgstr "exiting parsespeeds\n"
 
 #: login-utils/agetty.c:649
 #, c-format
@@ -6040,17 +6092,17 @@ msgstr "%s: nicht offen für Lesen/Schreiben"
 #. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
-msgstr ""
+msgstr "duping\n"
 
 #. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
-msgstr ""
+msgstr "%s: dup‐Problem: %m"
 
 #: login-utils/agetty.c:752
 msgid "term_io 2\n"
-msgstr ""
+msgstr "term_io 2\n"
 
 #: login-utils/agetty.c:937
 msgid "user"
@@ -6063,12 +6115,12 @@ msgstr "Benutzer"
 #: login-utils/agetty.c:1025
 #, c-format
 msgid "%s: read: %m"
-msgstr ""
+msgstr "%s: gelesen: %m"
 
 #: login-utils/agetty.c:1071
 #, c-format
 msgid "%s: input overrun"
-msgstr ""
+msgstr "%s: Eingabe‐Überlauf"
 
 #: login-utils/agetty.c:1195
 #, c-format
@@ -6090,18 +6142,18 @@ msgstr "login: wenig Speicher, Einloggen könnte fehlschlagen\n"
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
 #: login-utils/checktty.c:105
 msgid "can't malloc for ttyclass"
-msgstr ""
+msgstr "can't malloc for ttyclass"
 
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
 #: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
-msgstr ""
+msgstr "can't malloc for grplist"
 
 #. there was a default rule, but user didn't match, reject!
 #: login-utils/checktty.c:422
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
-msgstr ""
+msgstr "Login on %s from %s denied by default.\n"
 
 #. if we get here, /etc/usertty exists, there's a line
 #. matching our username, but it doesn't contain the
@@ -6110,54 +6162,70 @@ msgstr ""
 #: login-utils/checktty.c:433
 #, c-format
 msgid "Login on %s from %s denied.\n"
-msgstr ""
+msgstr "Login on %s from %s denied.\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
-msgstr ""
+msgstr "%s: Sie (Nuter %d) existieren nicht.\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr "%s: Nutzer »%s« existiert nicht.\n"
+msgstr "%s: Nutzer „%s“ existiert nicht.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
+msgstr "%s: kann nur lokale Einträge ändern; stattdessen yp%s benutzen.\n"
+
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+#, fuzzy
+msgid "Unknown user context"
+msgstr "unbekannter Fehler im Schlüssel"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
 msgstr ""
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
 #, c-format
-msgid "Changing finger information for %s.\n"
+msgid "%s: Can't set default context for /etc/passwd"
 msgstr ""
 
-#: 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
+#: login-utils/chfn.c:173
+#, c-format
+msgid "Changing finger information for %s.\n"
+msgstr "Ändere finger-Information für %s.\n"
+
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
-msgstr ""
+msgstr "Passwort‐Fehler."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Passwort: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Inkorrektes Passwort."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "Finger-Information nicht verändert.\n"
 
 # XXX - Merge with next strings.
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Aufruf: %s [ -f ganzer_Name ] [ -o Bureau ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6165,11 +6233,11 @@ msgstr ""
 "[ -p Bureau-Telefon ]\n"
 "\t[ -h Heim-Telefon ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6177,58 +6245,70 @@ msgstr ""
 "\n"
 "Abgebrochen.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "Feld ist zu lang.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr "»%c« ist nicht erlaubt.\n"
+msgstr "„%c“ ist nicht erlaubt.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Steuerzeichen sind nicht erlaubt.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr "Finger-Information *NICHT* geändert. Später erneut versuchen.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "Finger-Information geändert.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
-msgstr "»malloc« schlug fehl"
+msgstr "„malloc“ schlug fehl"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: „%s“ ist nicht in /etc/shells aufgeführt\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr "%s: Ihre Shell fehlt in /etc/shells, Shell ändern ist fehlgeschlagen\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Shell für %s ändern.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Neue Shell"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "Shell nicht geändert.\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr ""
+msgstr "Shell *NICHT* geändert. Später nochmal versuchen.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Shell geändert.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
@@ -6237,58 +6317,58 @@ msgstr ""
 "Aufruf: %s [ -s Shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "        [ Benutzername ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: Shell muss ein voller Pfadname sein.\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
-msgstr "%s: »%s« existiert nicht.\n"
+msgstr "%s: „%s“ existiert nicht.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
-msgstr "%s: »%s« ist nicht ausführbar.\n"
+msgstr "%s: „%s“ ist nicht ausführbar.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: ›%c‹ ist nicht erlaubt.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Steuerungszeichen sind nicht erlaubt.\n"
 
 # Unten noch mal mit Punkt
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
-msgstr "Warnung: »%s« ist nicht in /etc/shells aufgeführt\n"
+msgstr "Warnung: „%s“ ist nicht in /etc/shells aufgeführt\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
-msgstr "%s: »%s« ist nicht in /etc/shells aufgeführt\n"
+msgstr "%s: „%s“ ist nicht in /etc/shells aufgeführt\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: Benutzen Sie die Option -l für eine Liste\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
-msgstr "Warnung: »%s« ist nicht in /etc/shells aufgeführt.\n"
+msgstr "Warnung: „%s“ ist nicht in /etc/shells aufgeführt.\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
-msgstr "Rufen Sie »%s -l« auf, um die Liste zu sehen.\n"
+msgstr "Rufen Sie „%s -l“ auf, um die Liste zu sehen.\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "Keine bekannten Shells.\n"
 
@@ -6308,17 +6388,17 @@ msgstr "Konnte %s nicht zum Lesen öffnen"
 #: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
-msgstr ""
+msgstr "stat(%s) fehlgeschlagen"
 
 #: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
-msgstr ""
+msgstr "%s hat nicht den korrekten Dateimodus"
 
 #: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
-msgstr ""
+msgstr "kann keine Daten von %s lesen"
 
 #: login-utils/islocal.c:38
 #, c-format
@@ -6348,7 +6428,7 @@ msgstr "last: malloc-Fehlschlag.\n"
 
 #: login-utils/last.c:441
 msgid "last: gethostname"
-msgstr ""
+msgstr "last: gethostname"
 
 #: login-utils/last.c:490
 #, c-format
@@ -6447,7 +6527,7 @@ msgstr "Leerer Benutzername in %s:%d. Abbruch."
 #: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr "Ungültiger Nutzername »%s« in %s:%d. Abbruch."
+msgstr "Ungültiger Nutzername „%s“ in %s:%d. Abbruch."
 
 #: login-utils/login.c:667
 msgid "login: Out of memory\n"
@@ -6490,78 +6570,78 @@ msgid "You have too many processes running.\n"
 msgstr "Sie haben zu viele Prozesse am Laufen.\n"
 
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP AT %s BY %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN ON %s FROM %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN ON %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN ON %s BY %s FROM %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN ON %s BY %s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "Sie haben neue E-Mail.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "Sie haben E-Mail.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: Kann keinen neuen Prozess erzeugen: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY fehlgeschlagen: %m"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() fehlgeschlagen"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Konnte nicht in das Verzeichnis %s wechseln!\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
-msgstr "Logge ein mit Heimatverzeichnis = »/«.\n"
+msgstr "Logge ein mit Heimatverzeichnis = „/“.\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: kein Speicher für Shellskipt.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: konnte Shellskipt nicht ausführen: %s.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: keine Shell: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6570,66 +6650,66 @@ msgstr ""
 "\n"
 "%s Anmeldung: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "Login-Name viel zu lang.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "NAME zu lang"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 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:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "zu viele nackte Zeilenvorschübe\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "EXZESSIV viele Zeilenvorschübe"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login nach %d Sekunden abgebrochen\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Letzte Anmeldung: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "von %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "auf %.*s\n"
 
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN FAILURE FROM %s, %s"
 
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN FAILURE ON %s, %s"
 
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN FAILURES FROM %s, %s"
 
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -6729,7 +6809,7 @@ msgstr "Zu viele Argumente.\n"
 #: login-utils/passwd.c:339
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Kann Nutzernamen nirgends finden. Ist »%s« wirklich ein Nutzer?"
+msgstr "Kann Nutzernamen nirgends finden. Ist „%s“ wirklich ein Nutzer?"
 
 #: login-utils/passwd.c:343
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
@@ -6870,7 +6950,7 @@ msgstr "Fehler beim Abschalten\t%s\n"
 #: login-utils/shutdown.c:458
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
-msgstr "Führe Programm »%s« aus...\n"
+msgstr "Führe Programm „%s“ aus...\n"
 
 #: login-utils/shutdown.c:461
 #, c-format
@@ -6946,32 +7026,32 @@ msgstr "shutdown: konnte %s nicht aushängen: %s\n"
 
 #: login-utils/simpleinit.c:130
 msgid "Booting to single user mode.\n"
-msgstr ""
+msgstr "Boote zum Single-User-Modus.\n"
 
 #: login-utils/simpleinit.c:134
 msgid "exec of single user shell failed\n"
-msgstr ""
+msgstr "„exec“ der Single-User-Shell fehlgeschlagen\n"
 
 #: login-utils/simpleinit.c:138
 msgid "fork of single user shell failed\n"
-msgstr ""
+msgstr "„fork“ der Single-User-Shell fehlgeschlagen\n"
 
 #: login-utils/simpleinit.c:206
 msgid "error opening fifo\n"
-msgstr "Fehler beim Öffnen der »fifo«\n"
+msgstr "Fehler beim Öffnen der „fifo“\n"
 
 #: login-utils/simpleinit.c:210
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr ""
+msgstr "Fehler beim Setzen von „close-on-exec“ auf /dev/initctl"
 
 #: login-utils/simpleinit.c:257
 msgid "error running finalprog\n"
-msgstr ""
+msgstr "Fehler beim „exec“ von finalprog\n"
 
 #. Error
 #: login-utils/simpleinit.c:261
 msgid "error forking finalprog\n"
-msgstr ""
+msgstr "Fehler beim „fork“ von finalprog\n"
 
 #: login-utils/simpleinit.c:343
 msgid ""
@@ -6983,23 +7063,23 @@ msgstr ""
 
 #: login-utils/simpleinit.c:416
 msgid "lstat of path failed\n"
-msgstr ""
+msgstr "„lstat“ des Pfades fehlgeschlagen\n"
 
 #: login-utils/simpleinit.c:424
 msgid "stat of path failed\n"
-msgstr ""
+msgstr "„stat“ des Pfades fehlgeschlagen\n"
 
 #: login-utils/simpleinit.c:432
 msgid "open of directory failed\n"
-msgstr ""
+msgstr "Öffnen des Verzeichnisses fehlgeschlagen\n"
 
 #: login-utils/simpleinit.c:506
 msgid "fork failed\n"
-msgstr ""
+msgstr "„fork“ fehlgeschlagen\n"
 
 #: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
-msgstr "»exec()« schlug fehl\n"
+msgstr "„exec“ fehlgeschlagen\n"
 
 #: login-utils/simpleinit.c:561
 msgid "cannot open inittab\n"
@@ -7007,20 +7087,20 @@ msgstr "Konnte inittab nicht öffnen\n"
 
 #: login-utils/simpleinit.c:628
 msgid "no TERM or cannot stat tty\n"
-msgstr ""
+msgstr "kein TERM oder kann nicht auf TTY zugreifen\n"
 
 #: login-utils/simpleinit.c:934
 #, c-format
 msgid "error stopping service: \"%s\""
-msgstr "Fehler beim Stoppen des Service »%s«"
+msgstr "Fehler beim Stoppen des Service „%s“"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr ""
+msgstr "zu viele IOVs (Code in wall/ttymsg.c ändern)"
 
 #: login-utils/ttymsg.c:85
 msgid "excessively long line arg"
-msgstr ""
+msgstr "übermäßig langes Zeilenargument"
 
 # This is only used when strerror(errno) is much too long
 #: login-utils/ttymsg.c:139
@@ -7038,60 +7118,70 @@ msgstr "Prozesserzeugung (fork): %s"
 msgid "%s: BAD ERROR"
 msgstr ""
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
-msgstr ""
+msgstr "%s: die Passwortdatei ist in Benutzung.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
-msgstr ""
+msgstr "%s: die Gruppendatei ist in Benutzung.\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
-msgstr ""
+msgstr "%s: die Datei %s ist in Benutzung (%s existiert).\n"
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr ""
+msgstr "%s: kann %s nicht verlinken: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "mount: Konnte die Adresse von %s nicht herausfinden\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "%s: Konnte „_stext“ nicht in %s finden\n"
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
-msgstr ""
+msgstr "%s: kann %s nicht entsperren: %s (Ihre Änderungen sind noch in %s)\n"
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: Kann keinen neuen Prozess erzeugen (fork)\n"
 
 # "nicht geändert"
 # "wurde nicht geändert"
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s unverändert\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
-msgstr ""
+msgstr "%s: keine Änderungen durchgeführt\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
-msgstr ""
+msgstr "Sie benutzen Shadow-Gruppen auf diesem System.\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
-msgstr ""
+msgstr "Sie benutzen Shadow-Passwörter auf diesem System.\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
-msgstr ""
+msgstr "Würden Sie jetzt gerne %s bearbeiten [j/n]? "
 
 #: login-utils/wall.c:104
 #, c-format
@@ -7113,7 +7203,7 @@ msgstr "Rundsendenachricht von %s@%s"
 #: login-utils/wall.c:204
 #, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr ""
+msgstr "%s: werde nicht aus %s lesen - benutze Standardeingabe.\n"
 
 #: login-utils/wall.c:209
 #, c-format
@@ -7123,7 +7213,7 @@ msgstr "%s: Konnte %s nicht lesen.\n"
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr "%s: Konnte »stat« nicht auf eine temporäre Datei anwenden.\n"
+msgstr "%s: Konnte „stat“ nicht auf eine temporäre Datei anwenden.\n"
 
 #: login-utils/wall.c:241
 #, c-format
@@ -7161,7 +7251,7 @@ 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's Day"
+msgstr "St. Tib’s Day"
 
 #: misc-utils/kill.c:206
 #, c-format
@@ -7171,7 +7261,7 @@ msgstr "%s: Unbekanntes Signal %s\n"
 #: misc-utils/kill.c:269
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr "%s: Konnte den Prozess »%s« nicht finden.\n"
+msgstr "%s: Konnte den Prozess „%s“ nicht finden.\n"
 
 #: misc-utils/kill.c:313
 #, c-format
@@ -7196,7 +7286,7 @@ msgstr "logger: Konnte %s nicht öffnen: %s.\n"
 #: 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:259
 #, c-format
@@ -7245,7 +7335,7 @@ msgstr "namei: Konnte nicht in das root-Verzeichnis wechseln!\n"
 # XXX
 #: misc-utils/namei.c:157
 msgid "namei: could not stat root!\n"
-msgstr ""
+msgstr "namei: Konnte nicht auf Wurzelverzeichnis zugreifen!\n"
 
 #: misc-utils/namei.c:171
 msgid "namei: buf overflow\n"
@@ -7285,37 +7375,37 @@ 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 ""
+msgstr "Aufrug: %s von nach Dateien...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
 "Use `%s [options] %s' if you really want to use it.\n"
 "Script not started.\n"
 msgstr ""
-"Warnung: »%s« ist eine Verknüpfung.\n"
-"Benutzen Sie »%s [optionen] %s«, wenn Sie es tatsächlich starten wollen.\n"
+"Warnung: „%s“ ist eine Verknüpfung.\n"
+"Benutzen Sie „%s [optionen] %s“, wenn Sie es tatsächlich starten wollen.\n"
 "Script nicht gestartet.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Aufruf: script [-a] [-f] [-q] [-t] [Datei]\n"
 
 # Not really nice...
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script wurde gestartet, die Datei ist %s\n"
 
 # The %s must be at the end, 'cause it contains the \n
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "Script wurde gestartet: %s"
 
 # The %s must be at the end, 'cause it contains the \n
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7324,16 +7414,16 @@ msgstr ""
 "\n"
 "Script beendet: %s"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script wurde beendet, die Datei ist %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
-msgstr "»openpty« ist fehlgeschlagen\n"
+msgstr "„openpty“ ist fehlgeschlagen\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "Keine ptys mehr.\n"
 
@@ -7506,12 +7596,12 @@ msgstr "  [ -bfreq Freqnummer ]\n"
 
 #: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
-msgstr ""
+msgstr "kann Stromsparmodus nicht (zurück)setzen\n"
 
 #: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
-msgstr "»klogctl« Fehler: %s\n"
+msgstr "„klogctl“ Fehler: %s\n"
 
 #: misc-utils/setterm.c:1149
 #, c-format
@@ -7525,7 +7615,7 @@ msgstr "Fehler beim Schreiben des Bildschirmdumps\n"
 #: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
-msgstr ""
+msgstr "konnte %s nicht lsesn, und kann Ioctl-Dump nicht durchführen\n"
 
 #: misc-utils/setterm.c:1244
 #, c-format
@@ -7552,36 +7642,36 @@ msgstr "write: %s ist nicht auf %s eingeloggt.\n"
 #: misc-utils/write.c:139
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
-msgstr ""
+msgstr "write: %s hat Benachrichtigung auf %s deaktiviert\n"
 
 #: misc-utils/write.c:146
 msgid "usage: write user [tty]\n"
-msgstr ""
+msgstr "Aufruf: write Nutzer [TTY]\n"
 
 #: misc-utils/write.c:234
 #, c-format
 msgid "write: %s is not logged in\n"
-msgstr ""
+msgstr "write: %s ist nicht eingeloggt\n"
 
 #: misc-utils/write.c:243
 #, c-format
 msgid "write: %s has messages disabled\n"
-msgstr ""
+msgstr "write: %s hat Benachrichtigung deaktiviert\n"
 
 #: misc-utils/write.c:247
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
-msgstr ""
+msgstr "write: %s ist mehr als einmal eingeloggt; schreibe auf %s\n"
 
 #: misc-utils/write.c:313
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
-msgstr ""
+msgstr "Nachricht von %s@%s (als %s) auf %s um %s ..."
 
 #: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
-msgstr ""
+msgstr "Nachricht von %s@%s auf %s um %s ..."
 
 #: mount/fstab.c:114
 #, c-format
@@ -7602,21 +7692,21 @@ msgstr "mount: Konnte %s nicht öffnen - benutze %s stattdessen\n"
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "Konnte die Lock-Datei %s nicht anlegen: %s (benutzen Sie die Option -n, um "
 "dies zu umgehen)"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "Konnte keinen Link für die Lock-Datei %s anlegen: %s (benutzen Sie die "
 "Option -n, um dies zu umgehen)"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
@@ -7625,22 +7715,22 @@ msgstr ""
 
 # This one should be merged with the next one by using
 # error() instead of printf()
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
-msgstr "Konnte die Lock-Datei %s nicht »locken«: %s\n"
+msgstr "Konnte die Lock-Datei %s nicht sperren: %s\n"
 
 # sperren
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
-msgstr "Konnte die Lock-Datei %s nicht »locken«: %s"
+msgstr "Konnte die Lock-Datei %s nicht sperren: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "Zeitüberschreitung"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7649,193 +7739,133 @@ msgstr ""
 "Konnte Verknüpfung %s nicht anlegen\n"
 "Vielleicht gibt es noch eine abgelaufene Lock-Datei?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "Konnte %s nicht öffnen (%s) - mtab nicht aktualisiert"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "Konnte %s nicht in %s umbenennen: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: Konnte das Gerät %s nicht öffnen: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: Konnte keine Informationen über das Gerät %s erhalten: %s\n"
+msgid ", offset %lld"
+msgstr ", Offset %lld"
 
-#: mount/lomount.c:184
+#: mount/lomount.c:104
 #, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr ""
+msgid ", sizelimit %lld"
+msgstr ", Größenbeschränkung %lld"
 
-# XXX - pretty dumb
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: Konnte kein Gerät /dev/loop# finden"
+# Verschlüsselungstyp
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", Verschlüsselungsmethode %s (Typ %d)"
 
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
-msgstr ""
-"mount: Konnte kein »loop«-Gerät finden.\n"
-"       Vielleicht hat /dev/loop# eine falsche Major-Nummer?"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ", Offset %d"
 
-#: mount/lomount.c:253
+# Verschlüsselungstyp
+#: mount/lomount.c:129
 #, 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: 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.)"
+msgid ", encryption type %d\n"
+msgstr ", Verschlüsselungstyp %d\n"
+
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: Konnte keine Informationen über das Gerät %s erhalten: %s\n"
+
+# XXX - pretty dumb
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: Konnte kein Gerät /dev/loop# finden"
 
-#: mount/lomount.c:259
+#: mount/lomount.c:192
 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?"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"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: Konnte kein „loop“-Gerät finden. Vielleicht kennt dieser Kernel\n"
+"       kein „loop“-Gerät? (Wenn dies der Fall ist, dann sollten Sie den\n"
+"       Kernel neu kompilieren oder „modprobe loop“ ausführen.)"
 
-#: mount/lomount.c:263
+#: mount/lomount.c:197
 msgid "mount: could not find any free loop device"
-msgstr "mount: Konnte kein freies »loop«-Gerät finden"
+msgstr "mount: Konnte kein freies „loop“-Gerät finden"
 
-#: mount/lomount.c:359
-#, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "Konnte %s nicht zum Lesen öffnen\n"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Neues Passwort wiederholen: "
-
-#: mount/lomount.c:456
-msgid "Error: gpg key file decryption failed\n"
+#: mount/lomount.c:294
+msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:463
+#: mount/lomount.c:340
 #, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "Das Passwort muss mindesten 6 Zeichen haben, nochmal bitte.\n"
-
-#: mount/lomount.c:472
-#, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Konnte keinen weiteren Speicher reservieren\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
-msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-msgstr ""
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s, %s, %d): Erfolg\n"
 
-#: mount/lomount.c:611
+# this is actually an open()...
+#: mount/lomount.c:356
 #, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
-
-#: mount/lomount.c:631
-msgid "Couldn't lock into memory, exiting.\n"
-msgstr ""
-
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Initialisierung (bis zu 16 Hexadezimalziffern): "
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: Konnte das Gerät %s nicht löschen: %s\n"
 
-# "Ziffer" ?
-#: mount/lomount.c:661
+#: mount/lomount.c:366
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "Das Zeichen »%c« ist keine hexadezimale Ziffer.\n"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): Erfolg\n"
 
-#: mount/lomount.c:764
-#, c-format
-msgid "Don't know how to get key for encryption system %d\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
+"Dieses mount wurde ohne Loop-Unterstützung übersetzt. Bitte neu übersetzen.\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s, %s, %d): Erfolg\n"
-
-#: mount/lomount.c:831
+# Setup
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+msgstr ""
+"Aufruf:\n"
+"  Informationen anzeigen:\n"
+"    %s loop-Gerät\n"
+"  Löschen:\n"
+"    %s -d loop-Gerät\n"
+"  Setup:\n"
+"    %s [ -e Verschlüsselungsmethode ] [ -o Offset ] loop-Gerät Datei\n"
+
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
 msgid "not enough memory"
 msgstr "Nicht genügend Speicher"
 
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "Konnte %s nicht zum Lesen öffnen\n"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
-msgstr ""
-
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
-
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
+"Zur Übersetzungszeit war keine Loop-Unterstützung verfügbar. Bitte neu "
+"übersetzen.\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7853,217 +7883,220 @@ msgstr "[mntent]: Zeile %d in %s ist fehlerhaft%s\n"
 msgid "; rest of file ignored"
 msgstr "; der Rest der Datei wurde ignoriert"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: Laut mtab ist %s schon auf %s eingehängt"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: Laut mtab ist %s auf %s eingehängt"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: Konnte %s nicht zum Schreiben öffnen: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: Fehler beim Schreiben von %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: Fehler beim Ändern der Zugriffsrechte von %s: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s sieht wie ein Swap-Bereich aus - nicht eingehängt"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "mount ist fehlgeschlagen"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr "mount: Nur »root« kann %s auf %s einhängen"
+msgstr "mount: nur „root“ kann %s auf %s einhängen"
 
 #: mount/mount.c:584
 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:589
 msgid "mount: type specified twice"
-msgstr "mount: Der Typ wurde doppelt angegeben"
+msgstr "mount: der Typ wurde doppelt angegeben"
 
 #: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
-msgstr ""
+msgstr "mount: überspringe Aufsetzen des „loop“-Geräts\n"
 
 #: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
-msgstr "mount: werde das »loop«-Gerät %s verwenden\n"
+msgstr "mount: werde das „loop“-Gerät %s verwenden\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
-msgstr ""
+msgstr "mount: Aufsetzen des „loop“-Geräts fehlgeschlagen\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
-msgstr ""
+msgstr "mount: „loop“-Gerät erfolgreich aufgesetzt\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: Konnte %s nicht öffnen: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: Argument für -p oder --pass-fd muss eine Zahl sein"
+
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: Kann %s nicht zum Setzen der Geschwindigkeit öffnen"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: Kann keinen neuen Prozess erzeugen: %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 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:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: Mit NFS Version 4 fehlgeschlagen, versuche Version 3...\n"
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 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: konnte Dateisystemtyp nicht feststellen, und es wurde keiner angegeben"
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: Sie müssen den Dateisystemtyp angeben"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
-msgstr "mount: mount ist fehlgeschlagen"
+msgstr "mount: Einhängen ist fehlgeschlagen"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
-msgstr "mount: Mountpunkt %s ist kein Verzeichnis"
+msgstr "mount: Einhängepunkt %s ist kein Verzeichnis"
 
-# libc.po: "Keine Berechtigung"
-#: mount/mount.c:879
+# "mount: Zugriff verweigert"
+#: mount/mount.c:889
 msgid "mount: permission denied"
-msgstr "mount: Zugriff verweigert"
+msgstr "mount: keine Berechtigung"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr "mount: muss Superuser sein, um mount zu verwenden"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s wird gerade benutzt"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc ist bereits eingehängt"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ist bereits eingehängt oder %s wird gerade benutzt"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: Einhängepunkt %s existiert nicht"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr ""
-"mount: Einhängepunkt %s ist eine symbolische Verknüpfung,\n"
-"       deren Ziel nicht existiert"
+msgstr "mount: Einhängepunkt %s ist eine symbolische Verknüpfung auf nirgendwo"
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: Gerätedatei %s existiert nicht"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
+"mount: Spezialgerät %s existiert nicht\n"
+"       (ein Pfadpräfix ist kein Verzeichnis)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 "mount: %s ist noch nicht eingehängt oder es wurden\n"
 "       ungültige Optionen angegeben"
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
 "mount: Falscher Dateisystemtyp, ungültige Optionen, der\n"
-"       »Superblock« von %s ist beschädigt oder es sind\n"
+"       „Superblock“ von %s ist beschädigt oder es sind\n"
 "       zu viele Dateisysteme eingehängt"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "Einhängetabelle ist voll"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: Konnte den Superblock nicht lesen"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: unbekanntes Gerät"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
-msgstr "mount: Der Dateisystemtyp »%s« wird nicht vom Kernel unterstützt"
+msgstr "mount: Der Dateisystemtyp „%s“ wird nicht vom Kernel unterstützt"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
-msgstr "mount: Wahrscheinlich meinten sie »%s«"
+msgstr "mount: Wahrscheinlich meinten sie „%s“"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
-msgstr "mount: Vielleicht meinten Sie »iso9660«?"
+msgstr "mount: Vielleicht meinten Sie „iso9660“?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -8071,120 +8104,90 @@ msgstr ""
 "       Dateisystemtyp %s wird nicht unterstützt"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount: %s ist kein blockorientiertes Gerät und »stat« schlägt fehl?"
+msgstr "mount: %s ist kein blockorientiertes Gerät und „stat“ schlägt fehl?"
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 "mount: Das Kernel erkennt %s nicht als blockorientiertes\n"
-"       Gerät (Vielleicht hilft »insmod Treiber«?)"
+"       Gerät (Vielleicht hilft „insmod Treiber“?)"
 
 # "versuchen"
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s ist kein blockorientiertes Gerät\n"
-"       (Vielleicht probieren Sie »-o loop«?)"
+"       (Vielleicht probieren Sie „-o loop“?)"
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ist kein blockorientiertes Gerät"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ist kein gültiges blockorientiertes Gerät"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "blockorientiertes Gerät "
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: Konnte %s%s nicht im Nur-Lese-Modus einhängen"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
-msgstr "mount: %s%s is schreibgeschützt, doch Option »-w« ist explizit gegeben"
+msgstr "mount: %s%s is schreibgeschützt, doch Option „-w“ ist explizit gegeben"
 
 # That sounds somehow dumb.
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s ist schreibgeschützt, wird eingehängt im Nur-Lese-Modus"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr ""
-
-#: mount/mount.c:1124
-#, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "mount: %s doppelt - nicht eingehängt"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: werde %s mit %s einhängen\n"
-
-# I think this should not be translated
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-# dito
-#: mount/mount.c:1135
-msgid "label"
-msgstr "label"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: Keine passende Partition gefunden"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
-"mount: Kein Typ angegeben - aufgrund des Doppelpunkts wird NFS angenommen\n"
+"mount: kein Typ angegeben - aufgrund des Doppelpunkts wird NFS angenommen\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
-"mount: Kein Typ angegeben - aufgrund des //-Präfixes wird smbfs angenommen\n"
+"mount: kein Typ angegeben - aufgrund des //-Präfixes wird smbfs angenommen\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
-msgstr "mount: »%s« wird im Hintergrund fortgesetzt\n"
+msgstr "mount: „%s“ wird im Hintergrund fortgesetzt\n"
 
 # Not really nice
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
-msgstr "mount: »%s« schlug fehl\n"
+msgstr "mount: „%s“ schlug fehl\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ist bereits auf %s eingehängt\n"
 
-#: mount/mount.c:1386
-#, fuzzy
+#: mount/mount.c:1362
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8205,7 +8208,7 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Aufruf: mount -V                 : Version ausgeben\n"
@@ -8213,7 +8216,7 @@ msgstr ""
 "        mount                    : eingehängte Dateisysteme auflisten\n"
 "        mount -l                 : dito, inklusive Volume-Label\n"
 "So weit mit dem informativen Part. Als nächstes das Einhängen.\n"
-"Der Befehl lautet »mount [-t fstype] irgendwas irgendwo«.\n"
+"Der Befehl lautet „mount [-t fstype] irgendwas irgendwo“.\n"
 "Details, die in /etc/fstab stehen, können weggelassen werden.\n"
 "        mount -a [-t|-O] ...     : alles aus der /etc/fstab einhängen\n"
 "        mount gerät              : Gerät an bekanntem Ort einhängen\n"
@@ -8228,43 +8231,42 @@ msgstr ""
 "Ein Gerät kann über seinen Namen, also /dev/hda1 oder /dev/cdrom, gegeben\n"
 "werden, oder über sein Label, mittels -L Label, oder über die UUID, mit -U "
 "UUID.\n"
-"Weitere Optionen: [-nfFrsvw] [-o optionen].\n"
+"Weitere Optionen: [-nfFrsvw] [-o optionen] [-p passwdfd].\n"
 "Für viele weitere Details: man 8 mount.\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
-msgstr "mount: Nur »root« kann dies tun"
+msgstr "mount: Nur „root“ kann dies tun"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nicht gefunden - Erzeuge sie...\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr ""
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: keine passende Partition gefunden"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: Hänge %s ein\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr "nichts wurde eingehängt"
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: Konnte %s nicht in %s finden"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: Konnte %s nicht in %s oder %s finden"
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8272,15 +8274,15 @@ msgstr ""
 "mount: konnte %s nicht öffnen, also können UUID- und LABEL-Konvertierung\n"
 "       nicht durchgeführt werden.\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: ungültige UUID"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: Fehler beim Erraten des Dateisystemtyps\n"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, 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"
@@ -8288,25 +8290,25 @@ msgstr "mount: Es wurde kein Dateisystemtyp für %s angegeben\n"
 # Maybe:
 # "       Es werden alle Dateisystemtypen ausprobiert, die\n"
 # "       in %s oder %s aufgelistet sind\n"
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 "       Werde alle Dateisystemtypen probieren, die in %s oder\n"
 "       %s aufgelistet sind\n"
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr "       und es sieht so aus, als sei dies Swap-Bereich\n"
 
 # Maybe: "       Es wird der Typ %s ausprobiert\n"
 # or   : ... "probieren"
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Werde den Typ %s versuchen\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "Versuche %s\n"
@@ -8339,11 +8341,11 @@ msgstr "mount: übermäßig langes Options-Argument\n"
 
 #: mount/nfsmount.c:382
 msgid "Warning: Unrecognized proto= option.\n"
-msgstr "Warnung: unbekannte »proto=«-Option.\n"
+msgstr "Warnung: unbekannte „proto=“-Option.\n"
 
 #: mount/nfsmount.c:389
 msgid "Warning: Option namlen is not supported.\n"
-msgstr "Warnung: Die Option »namlen« wird nicht unterstützt.\n"
+msgstr "Warnung: Die Option „namlen“ wird nicht unterstützt.\n"
 
 #: mount/nfsmount.c:393
 #, c-format
@@ -8352,7 +8354,7 @@ msgstr "Unbekannter nfs-Mount-Parameter: %s=%d\n"
 
 #: mount/nfsmount.c:427
 msgid "Warning: option nolock is not supported.\n"
-msgstr "Warnung: Die Option »nolock« wird nicht unterstützt.\n"
+msgstr "Warnung: Die Option „nolock“ wird nicht unterstützt.\n"
 
 #: mount/nfsmount.c:432
 #, c-format
@@ -8369,39 +8371,39 @@ msgstr "NFS über TCP wird nicht unterstützt.\n"
 
 #: mount/nfsmount.c:723
 msgid "nfs socket"
-msgstr ""
+msgstr "NFS-Socket"
 
 #: mount/nfsmount.c:727
 msgid "nfs bindresvport"
-msgstr ""
+msgstr "NFS-bindresvport"
 
 #: mount/nfsmount.c:741
 msgid "nfs server reported service unavailable"
-msgstr ""
+msgstr "NFS-Server meldete Service als nicht verfügbar"
 
 #: mount/nfsmount.c:750
 msgid "used portmapper to find NFS port\n"
-msgstr ""
+msgstr "Portmapper benutzt um NFS-Port zu finden\n"
 
 #: mount/nfsmount.c:754
 #, c-format
 msgid "using port %d for nfs deamon\n"
-msgstr ""
+msgstr "benutze Port %d für NFS-Dämonen\n"
 
 #: mount/nfsmount.c:765
 msgid "nfs connect"
-msgstr ""
+msgstr "NFS-Verbindung"
 
 #: mount/nfsmount.c:852
 #, c-format
 msgid "unknown nfs status return value: %d"
-msgstr ""
+msgstr "unbekannter NFS-Status-Rückgabewert: %d"
 
 #: mount/sundries.c:55
 msgid "bug in xstrndup call"
 msgstr "Fehler im Aufruf von xstrndup"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8414,7 +8416,7 @@ msgstr ""
 "        %s [-v] [-p Priorität] Spezialdatei ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8425,103 +8427,35 @@ msgstr ""
 "        %s -a [-v]\n"
 "        %s [-v] Spezialdatei ...\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "Speicher ist alle"
-
 # The first %s is swapon/swapoff
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s für %s\n"
 
 # stat
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
-msgstr "swapon: Konnte »stat« nicht auf %s anwenden: %s\n"
+msgstr "swapon: Konnte „stat“ nicht auf %s anwenden: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: Warnung: %s hat unsichere Zugriffsrechte %04o, %04o wird empfohlen\n"
 
 # holes
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: Überspringe die Datei %s - sie scheint Löcher zu enthalten.\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr "Nicht Superuser.\n"
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s: kein gültiges blockorientiertes Gerät"
-
-# Verschlüsselungstyp
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "Die Verschlüsselungsmethode %s wird nicht unterstützt\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: werde das »loop«-Gerät %s verwenden\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Diese Partition ist bereits in Benutzung"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "kann Swap-Gerät nicht zurückspulen"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "Konnte /dev/urandom nicht öffnen"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "Fehler beim Schreiben der Inodes"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "mount: mount ist fehlgeschlagen"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Ändere Passwort für %s\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: Konnte %s nicht öffnen: %s\n"
@@ -8557,7 +8491,7 @@ msgstr "umount: %s ist nicht eingehängt"
 #: mount/umount.c:227
 #, c-format
 msgid "umount: %s: can't write superblock"
-msgstr "umount: %s: Konnte den »Superblock« nicht schreiben"
+msgstr "umount: %s: Konnte den „Superblock“ nicht schreiben"
 
 # XXX - I did have a better one for busy
 # libc.po:
@@ -8583,43 +8517,43 @@ msgstr "umount: %s: nur der Superuser kann umount durchführen"
 #: mount/umount.c:237
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
-msgstr ""
+msgstr "umount: %s: Blockgeräte auf Dateisystem nicht erlaubt"
 
 #: mount/umount.c:239
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "kein umount2, versuche umount...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "konnte %s nicht aushängen - versuche stattdessen %s\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 "umount: %s wird momentan noch benutzt - im Nur-Lese-Modus wiedereingehängt\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: konnte %s nicht im Nur-Lese-Modus wieder einhängen\n"
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ausgehängt\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: Kann die Liste der Dateisysteme zum Aushängen nicht finden"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
@@ -8629,44 +8563,44 @@ msgstr ""
 "        umount -a [-f] [-r] [-n] [-v] [-t VFS-Typen] [-O optionen]\n"
 "        umount [-f] [-r] [-n] [-v] Spezialdatei | Verzeichnis ...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Versuche, %s auszuhängen\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
-msgstr "Konnte %s nicht in »mtab« finden\n"
+msgstr "Konnte %s nicht in „mtab“ finden\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
-msgstr "umount: %s ist laut »mtab« nicht eingehängt"
+msgstr "umount: %s ist laut „mtab“ nicht eingehängt"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s scheint mehrfach eingehängt zu sein"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: fstab enthält %s nicht (Nur root kann es aushängen)"
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount und fstab stimmen nicht überein"
 
-#: mount/umount.c:602
+#: mount/umount.c:616
 #, c-format
-msgid "umount: only root can unmount %s from %s"
-msgstr "umount: Nur »root« kann %s von %s aushängen"
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: Nur %s kann %s von %s unmounten"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
-msgstr "umount: Nur »root« kann dies tun"
+msgstr "umount: Nur „root“ kann dies tun"
 
 #: sys-utils/ctrlaltdel.c:27
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -8797,7 +8731,7 @@ msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
 
 # "Level"
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Aufruf: %s [-c] [-n Level] [-s Puffergröße]\n"
@@ -8928,7 +8862,7 @@ msgid ""
 "\t-a : all (default)\n"
 msgstr ""
 "\t-s : Semaphoren\n"
-"\r-a : alles (Voreinstellung)\n"
+"\t-a : alles (Voreinstellung)\n"
 
 #: sys-utils/ipcs.c:133
 msgid ""
@@ -8966,23 +8900,23 @@ msgstr "----- Gemeinsamer Speicher: Grenzen -----\n"
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
 msgstr "Maximale Anzahl der Segmente = %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "Maximale Segmentgröße (kB) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "Maximaler gesamter gemeinsamer Speicher (KByte) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "Minimale Segmentgröße (Bytes) = %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9502,8 +9436,12 @@ msgstr ""
 msgid "missing comma"
 msgstr "fehlendes Komma"
 
-#: sys-utils/readprofile.c:115
-#, c-format
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "Speicher ist alle"
+
+#: sys-utils/readprofile.c:118
+#, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9514,14 +9452,15 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
 "%s: Aufruf: %s [optionen]\n"
-"\t -m <mapfile>  (Voreinstellung = »%s«\n"
-"\t                 und »%s«)\n"
-"\t -p <pro-file> (Voreinstellung = »%s«)\n"
+"\t -m <mapfile>  (Voreinstellung = „%s“\n"
+"\t                 und „%s“)\n"
+"\t -p <pro-file> (Voreinstellung = „%s“)\n"
 "\t -M <mult>     Profiling-Multiplier auf <mult> setzen\n"
 "\t -i            nur Informationen über die Schrittweite ausgeben\n"
 "\t -v            ausführliche Daten ausgeben\n"
@@ -9531,32 +9470,32 @@ msgstr ""
 "\t -n            Byte-Anordnungs-Erkennung abschalten\n"
 "\t -V            Versionsinformation ausgeben und beenden\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s Version %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
-msgstr ""
+msgstr "%s: %s(%i): falsche Tabellen-Zeile\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
-msgstr "%s: Konnte »_stext« nicht in %s finden\n"
+msgstr "%s: Konnte „_stext“ nicht in %s finden\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: Profil-Adresse außerhalb des Bereichs. Falsche Map-Datei?\n"
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "gesamt"
 
@@ -9647,7 +9586,7 @@ msgstr ", Fehler"
 
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
-msgstr "»LPGETIRQ« Fehler"
+msgstr "„LPGETIRQ“ Fehler"
 
 #: sys-utils/tunelp.c:291
 #, c-format
@@ -9662,7 +9601,7 @@ msgstr "%s benutzt Polling\n"
 #: text-utils/col.c:153
 #, c-format
 msgid "col: bad -l argument %s.\n"
-msgstr "col: Ungültiges Argument %s für die Option »-l«.\n"
+msgstr "col: Ungültiges Argument %s für die Option „-l“.\n"
 
 #: text-utils/col.c:535
 msgid "usage: col [-bfpx] [-l nline]\n"
@@ -9853,7 +9792,7 @@ msgstr "[Drücken Sie ›h‹ für Hilfe.]"
 #: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
-msgstr "»%s« Zeile %d"
+msgstr "„%s“ Zeile %d"
 
 #: text-utils/more.c:1511
 #, c-format
@@ -9870,7 +9809,7 @@ msgstr "...Überspringe\n"
 
 #: text-utils/more.c:1672
 msgid "Regular expression botch"
-msgstr "Fehler beim Ausführen von »re_exec()«"
+msgstr "Fehler beim Ausführen von „re_exec()“"
 
 #: text-utils/more.c:1684
 msgid ""
@@ -9965,7 +9904,7 @@ msgid ""
 msgstr ""
 "%s: Aufruf: %s [-zahl] [-p zkette] [-cefnrs] [+zeile] [+/muster/] [dateien]\n"
 
-# libc: "Die Option »%s« erfordert ein Argument\n"
+# libc: "Die Option „%s“ erfordert ein Argument\n"
 #: text-utils/pg.c:266
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
@@ -10081,37 +10020,61 @@ msgstr "Eingabezeile ist zu lang.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 
-# this is actually an open()...
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: Konnte das Gerät %s nicht löschen: %s\n"
+#~ msgid "mount: the label %s occurs on both %s and %s\n"
+#~ msgstr "mount: das Label %s gibt es sowohl auf %s als auch auf %s\n"
+
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "mount: %s doppelt - nicht eingehängt"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): Erfolg\n"
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: werde %s mit %s einhängen\n"
+
+# I think this should not be translated
+#~ msgid "UUID"
+#~ msgstr "UUID"
 
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
+# dito
+#~ msgid "label"
+#~ msgstr "Label"
+
+#~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
 #~ msgstr ""
-#~ "Dieses mount wurde ohne Loop-Unterstützung übersetzt. Bitte neu "
-#~ "übersetzen.\n"
+#~ "mount: das Label %s gibt es sowohl auf %s als auch\n"
+#~ "       auf %s - nicht eingehängt\n"
+
+#~ msgid "umount: only root can unmount %s from %s"
+#~ msgstr "umount: Nur „root“ kann %s von %s aushängen"
+
+#~ msgid "Boot (%02X)"
+#~ msgstr "Boot (%02X)"
+
+#~ msgid "None (%02X)"
+#~ msgstr "Keine (%02X)"
 
-# Setup
 #~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "Aufruf:\n"
-#~ "  Informationen anzeigen:\n"
-#~ "    %s loop-Gerät\n"
-#~ "  Löschen:\n"
-#~ "    %s -d loop-Gerät\n"
-#~ "  Setup:\n"
-#~ "    %s [ -e Verschlüsselungsmethode ] [ -o Offset ] loop-Gerät Datei\n"
-
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ "mount: Konnte kein „loop“-Gerät finden.\n"
+#~ "       Vielleicht hat /dev/loop# eine falsche Major-Nummer?"
+
+#~ 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 ""
-#~ "Zur Übersetzungszeit war keine Loop-Unterstützung verfügbar. Bitte neu "
-#~ "übersetzen.\n"
+#~ "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?"
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Initialisierung (bis zu 16 Hexadezimalziffern): "
+
+# "Ziffer" ?
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Das Zeichen „%c“ ist keine hexadezimale Ziffer.\n"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Partition %i endet nicht an einer Zylindergrenze:\n"
@@ -10120,13 +10083,10 @@ msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 #~ msgstr "Konnte die Hilfedatei nicht öffnen"
 
 #~ msgid "number `%s' to `%s' out of range\n"
-#~ msgstr "Der Wert »%s« für »%s« ist außerhalb des Bereiches\n"
+#~ msgstr "Der Wert „%s“ für „%s“ ist außerhalb des Bereiches\n"
 
 #~ msgid "unrecognized option `%s'\n"
-#~ msgstr "unbekannte Option »%s«\n"
-
-#~ msgid "umount: only %s can unmount %s from %s"
-#~ msgstr "umount: Nur %s kann %s von %s unmounten"
+#~ msgstr "unbekannte Option „%s“\n"
 
 #~ msgid ""
 #~ "Re-read table failed with error %d: %s.\n"
@@ -10144,10 +10104,10 @@ msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 #~ msgstr "Aufruf: banner [-w Breite]\n"
 
 #~ 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"
 
 #~ msgid "Message '%s' is OK\n"
-#~ msgstr "Meldung »%s« ist in Ordnung\n"
+#~ msgstr "Meldung „%s“ ist in Ordnung\n"
 
 # XXX - Merge with next strings.
 #~ msgid "Usage: %s [ -s shell ] "
@@ -10201,14 +10161,14 @@ msgstr "Speicher ist alle beim Vergrößern eines Puffers.\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"
+#~ "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: Der Dateisystemtyp kann nicht mit einem »remount« geändert werden\n"
+#~ "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"
+#~ msgstr "Konnte keine Informationen über das „loop“-Gerät erhalten"
 
 #~ msgid ""
 #~ "Usage: mount [-hV]\n"
@@ -10250,7 +10210,7 @@ msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 #~ msgstr "Konnte /dev/rtc nicht öffnen"
 
 #~ msgid "%s%d contains no disklabel.\n"
-#~ msgstr "%s%d enthält keinen »disklabel«.\n"
+#~ msgstr "%s%d enthält keinen „disklabel“.\n"
 
 #~ msgid "mount: %s has wrong major or minor number"
 #~ msgstr "mount: %s hat eine falsche Major oder Minor Geräte-Nummer"
@@ -10271,4 +10231,4 @@ msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 #~ msgstr "Konnte die Geometrie nicht aus der Partitionstabelle ableiten"
 
 #~ msgid "'/' in \"%s\""
-#~ msgstr "»%s« enthält einen »/«"
+#~ msgstr "„%s“ enthält einen „/“"
diff --git a/po/es.po b/po/es.po
index 30421c2f..1355ec1c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
 # Mensajes en español para util-linux.
 # Copyright (C) 2000 Beth Powell <bpowell@turbolinux.com>.
-# Copyright (C) 2001, 2002 Santiago Vila Doncel <sanvila@unex.es>.
+# Copyright (C) 2001, 2002, 2003 Santiago Vila Doncel <sanvila@unex.es>.
 # Beth Powell <bpowell@turbolinux.com>, 2000.
 # Santiago Vila Doncel <sanvila@unex.es>, 2001, 2002, 2003.
 #
@@ -11,103 +11,108 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11z\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
-"PO-Revision-Date: 2003-02-22 14:10+0100\n"
+"Project-Id-Version: util-linux 2.12\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
+"PO-Revision-Date: 2003-08-09 16:18+0200\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "establece sólo lectura"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "establece lectura/escritura"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "obtiene sólo lectura"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "obtiene el tamaño del sector"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr "obtiene el tamaño del bloque"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
 msgstr "establece el tamaño del bloque"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "obtiene el tamaño"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "establece `readahead'"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "obtiene `readahead'"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "vacía los búferes"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "vuelve a leer la tabla de particiones"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr "  %s --report [dispositivos]\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "  %s [-v|-q] órdenes dispositivos\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Órdenes disponibles:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: Orden desconocida: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s necesita un argumento\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr "%s ha tenido éxito.\n"
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: no se puede abrir %s\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: error de ioctl en %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 
@@ -151,12 +156,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "uso: %s [ -n ] dispositivo\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s de %s\n"
@@ -300,49 +305,49 @@ msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
 "%s: cramfs inválido, desplazamiento inválido de los datos de ficheros\n"
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Uso: %s [-larvsmf] /dev/nombre\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s está montado.\t "
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "¿Está seguro de que desea continuar?"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "comprobación anulada.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Número de zona < FIRSTZONE en el fichero `%s'."
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Número de zona >= ZONES en el fichero `%s'."
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Eliminar bloque"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Error de lectura: no se puede buscar en un bloque en el fichero '%s'\n"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Error de lectura: bloque incorrecto en el fichero '%s'\n"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -350,122 +355,122 @@ msgstr ""
 "Error interno: se está intentando escribir un bloque incorrecto\n"
 "La petición de escritura no se tiene en cuenta\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "Error de búsqueda en write_block"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Error de escritura: bloque incorrecto en el fichero '%s'\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "Error de búsqueda en write_super_block"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "No se puede escribir el superbloque"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "No se puede escribir la tabla de nodos-i"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "No se puede escribir la tabla de zonas"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "No se pueden escribir nodos-i"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "Error de búsqueda"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "No se puede leer el superbloque"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "Número mágico incorrecto en el superbloque"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Sólo se da soporte a bloques o zonas de 1k"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "Campo s_imap_blocks incorrecto en superbloque"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "Campo s_zmap_blocks incorrecto en superbloque"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "No se puede asignar búfer para la tabla de nodos-i"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "No se puede asignar búfer para los nodos-i"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "No se puede asignar búfer para el número de nodos-i"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "No se puede asignar búfer para el número de zonas"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "No se puede leer la tabla de nodos-i"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "No se puede leer la tabla de zonas"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "No se pueden leer los nodos-i"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Atención: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld nodos-i\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld bloques\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Primera zona de datos=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Tamaño de zona=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Tamaño máximo=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Estado del sistema de ficheros=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -474,178 +479,178 @@ msgstr ""
 "Longitud de nombre=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 "El nodo-i %d se ha marcado como no utilizado, pero se utiliza para\n"
 "el fichero '%s'\n"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Marcar en uso"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "El fichero `%s' tiene el modo %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "Atención: número de nodos-i demasiado elevado.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "El nodo-i raíz no es un directorio"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr ""
 "El bloque ya se ha utilizado anteriormente.\n"
 "Ahora está en el fichero `%s'."
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Borrar"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "El bloque %d en el fichero `%s' está marcado como no utilizado."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Correcto"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "El directorio `%s' contiene un número de nodo-i incorrecto\n"
 "para el fichero '%.*s'."
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " Eliminar"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr "`%s': directorio incorrecto: '.' no es el primero\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr "`%s': directorio incorrecto: '..' no es el segundo\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: directorio incorrecto: '.' no es el primero\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: directorio incorrecto: '..' no es el segundo\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "Error interno"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: directorio incorrecto: tamaño < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "Error de búsqueda en bad_zone"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "No se ha borrado el modo del nodo-i %d."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "El nodo-i %d no está en uso; marcado como en uso en el mapa de bits."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "El nodo-i %d está en uso; marcado como no en uso en el mapa de bits."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Nodo-i %d (modo = %07o), i_nlinks=%d, contados=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "Establece i_nlinks en número contado"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zona %d: marcada como en uso; ningún fichero la utiliza."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Eliminar marca"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Zona %d: en uso, contados=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Zona %d: no en uso, contados=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Establecer"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "tamaño de nodo-i incorrecto"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "tamaño de nodo-i v2 incorrecto"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "Se necesita terminal para reparaciones interactivas"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "No se puede abrir '%s'"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s está limpio; no se comprueba.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Forzando comprobación del sistema de ficheros en %s.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr ""
 "El sistema de ficheros en %s contiene elementos extraños; debe comprobarse.\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -654,12 +659,12 @@ msgstr ""
 "\n"
 "%6ld nodos-i utilizados (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zonas utilizadas (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -682,7 +687,7 @@ msgstr ""
 "------\n"
 "%6d ficheros\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -773,7 +778,7 @@ msgstr "demasiados nodos-i; el m
 msgid "not enough space, need at least %lu blocks"
 msgstr "no hay suficiente espacio, se necesitan al menos %lu bloques"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -847,7 +852,7 @@ msgstr "error al cerrar %s"
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Uso: mkfs [-V] [-t tipo_sf] [opciones_sf] dispositivo [tamaño]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1014,63 +1019,63 @@ msgstr ""
 "significa casi con certeza que algunos ficheros de dispositivos serán "
 "erróneos.\n"
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c | -l nombrefichero] [-nXX] [-iXX] /dev/nombre [bloques]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s está montado; no se creará un sistema de ficheros aquí"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "Error de búsqueda de bloque de inicio en write_tables"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "No se puede borrar el sector de inicio"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "Error de búsqueda en write_tables"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "No se puede escribir la tabla de nodos-i"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "No se puede escribir la tabla de zonas"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "No se pueden escribir los nodos-i"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "Error de escritura en write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "Hay demasiados bloques incorrectos"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "No hay suficientes bloques correctos"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "No se puede asignar búferes para mapas"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "No se puede asignar búfer para los nodos-i"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1079,57 +1084,52 @@ msgstr ""
 "Tamaño máximo=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "Error de búsqueda durante comprobación de bloques"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores extraños en do_check: probablemente existan errores\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "Error de búsqueda en check_blocks"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
 "Bloques incorrectos antes del área de datos: no se puede crear\n"
 "el sistema de ficheros"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d bloques incorrectos\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "Un bloque incorrecto\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "No se puede abrir el fichero de bloques incorrectos"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s: no se ha compilado con soporte para minix v2\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "error de strtol: no se ha especificado el número de bloques"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "No se puede abrir %s"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "No se puede ejecutar `stat' sobre %s"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "No se intentará crear el sistema de ficheros en '%s'"
@@ -1170,46 +1170,46 @@ msgid "one bad page\n"
 msgstr "Una página incorrecta\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d páginas incorrectas\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 "%s: error: no se ha especificado dónde configurar el espacio de intercambio\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: error: el tamaño %ld es superior al tamaño del dispositivo %d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: error: versión desconocida %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: error: el área de intercambio debe tener como mínimo %ldkB\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: atención: el área de intercambio se trunca a %ldkB\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "No se intentará crear el dispositivo de intercambio en '%s'"
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "muy grave: no se puede leer la primera página"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1224,24 +1224,24 @@ msgstr ""
 "Si realmente desea crear el espacio de intercambio swap v0 en dicho\n"
 "dispositivo, utilice la opción -f para forzar la operación.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "No se puede configurar el espacio de intercambio: no se puede leer"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Configurando espacio de intercambio versión %d, tamaño = %llu kB\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "No se puede rebobinar el dispositivo de intercambio"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "No se puede escribir la página de firma"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync ha fallado"
 
@@ -1283,59 +1283,58 @@ msgstr "   %s [ -c | -y | -n | -d ] dispositivo\n"
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] dispositivo\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Inutilizable"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Espacio libre"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "Se ha modificado el disco.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Reinicie el sistema para asegurarse de que la tabla de particiones esté "
 "bien\n"
 "actualizada.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1347,784 +1346,789 @@ msgstr ""
 "particiones DOS 6.x, consulte la página de manual de cfdisk\n"
 "para obtener más información.\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "ERROR MUY GRAVE"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Pulse una tecla para salir de cfdisk"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "No se puede buscar en la unidad de disco"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "No se puede leer la unidad de disco"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "No se puede escribir en la unidad de disco"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Hay demasiadas particiones"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "La partición empieza antes del sector 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "La partición termina antes del sector 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "La partición empieza después del fin de disco"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "La partición termina después del fin de disco"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr "La partición termina en el último cilindro parcial"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "Las particiones lógicas no están en orden de disco"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "Solapamiento de particiones lógicas"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "Solapamiento de particiones lógicas ampliadas"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr "¡¡¡¡ Error interno al crear unidad lógica sin partición extendida !!!!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "No se puede crear una unidad lógica aquí; se crearían dos particiones "
 "extendidas"
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr ""
 "Elemento de menú demasiado largo; la apariencia del menú puede ser extraña."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menú sin dirección; la opción predeterminada es horizontal."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Tecla no permitida"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Pulse una tecla para continuar"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primaria"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Crea una nueva partición primaria"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Lógica"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Crea una nueva partición lógica"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "No crea ninguna partición"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "¡¡¡¡ Error interno !!!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Tamaño (en MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Principio"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Añade la partición al principio del espacio libre"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Final"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Añade la partición al final del espacio libre"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "No hay espacio para crear la partición extendida"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr ""
 "No hay tabla de particiones o firma desconocida en tabla de particiones"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "¿Quiere comenzar con una tabla vacía? [y/N]"
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "Ha especificado más cilindros de los que caben en el disco"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "No se puede abrir la unidad de disco"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 "El disco abierto es de sólo lectura; no tiene permiso para escribir en él"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "No se puede obtener el tamaño del disco"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Partición primaria incorrecta"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Partición lógica incorrecta"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "¡Atención!: esta operación puede destruir datos del disco"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "¿Está seguro de que desea escribir la tabla de particiones en el disco?\n"
 "     (sí o no): "
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "No se ha escrito la tabla de particiones en el disco"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "sí"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Por favor escriba `sí' (con acento) o `no'"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Se está escribiendo la tabla de particiones en el disco..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Se ha escrito la tabla de particiones en el disco"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Se ha escrito la tabla de particiones, pero la nueva lectura de la tabla\n"
 "ha fallado. Reinicie para actualizar la tabla."
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Ninguna partición primaria está marcada como iniciable.\n"
 "El MBR de DOS no podrá iniciar esto."
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Hay marcada como iniciable más de una partición primaria.\n"
 "El MBR de DOS no puede iniciar esto."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Escriba el nombre de fichero o pulse Intro para visualizar en pantalla: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "No se puede abrir el fichero '%s'"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unidad de disco: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:1970
+# Masculino, porque se refiere a un tipo de partición.
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
-msgstr "   Ninguna"
+msgstr "   Ninguno"
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Lóg"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Primaria"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Lógica"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Inicio (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Inicio"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
+#: fdisk/cfdisk.c:2007
 #, c-format
-msgid "Unknown (%02X)"
-msgstr "Desconocido (%02X)"
+msgid "(%02X)"
+msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Ninguno (%02X)"
+# Masculino, porque se refiere a "Indicadores"
+#: fdisk/cfdisk.c:2009
+msgid "None"
+msgstr "Ninguno"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabla de particiones para %s\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
-msgstr "            Primer   Último\n"
+#: fdisk/cfdisk.c:2046
+msgid "               First       Last\n"
+msgstr "              Primer     Último\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
-"Nº Tipo     Sector   Sector   Despl.  Longitud  Tipo sist. fich. (ID) "
+"Nº Tipo       Sector      Sector   Despl.  Longitud  Tipo sist. fich. (ID) "
 "Indicad.\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
-msgstr "         ----Inicio----      -----Final----   Sector Número de\n"
+#: fdisk/cfdisk.c:2131
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
+msgstr "         ----Inicio----      -----Final----   Comienzo   Número de\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
-msgstr "Nº Ind.  Cab. Sec. Cil.  ID  Cab. Sec. Cil.  inicial sectores\n"
+#: fdisk/cfdisk.c:2132
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr "Nº Ind.  Cab. Sec. Cil.  ID  Cab. Sec. Cil.    Sector    Sectores\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "En bruto (raw)"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Imprime la tabla utilizando el formato de datos en bruto"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Sectores"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Imprime la tabla ordenada por sectores"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabla"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Sólo imprime la tabla de particiones"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "No imprime la tabla"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Pantalla de ayuda para cfdisk"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk es un programa de particiones de disco basado en curses que"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "permite crear, suprimir y modificar particiones en la unidad"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "de disco duro."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Orden        Significado"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-----        -----------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Conmuta el indicador de iniciable de la partición actual"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          Suprime la partición actual"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Cambia los parámetros de cilindros, cabezas y sectores por pista"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ATENCIÓN: Se recomienda utilizar esta opción únicamente"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             si se conoce el funcionamiento de la misma."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximiza la utilización del disco de la partición actual"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Esta opción puede hacer que la partición sea"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             incompatible con DOS, OS/2,..."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          Crea una nueva partición a partir del espacio libre"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          Imprime la tabla de particiones en la pantalla o en un fichero"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "             Hay varios formatos distintos para la partición"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             entre los que puede elegir:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - Datos en bruto (exactamente lo que escribiría en el "
 "disco)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabla ordenada por sectores"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - Tabla con formato en bruto"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Sale del programa sin escribir la tabla de particiones"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          Cambia el tipo de sistema de ficheros"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr ""
 "  u          Cambia las unidades de visualización del tamaño de la partición"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, sectores y cilindros"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Escribe la tabla de particiones en el disco (W en mayúsculas)"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Esta operación de escritura puede causar la destrucción"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             de datos del disco, por lo que debe confirmarla o rechazarla"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             escribiendo `sí' o `no'"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Flecha arriba  Desplaza el cursor a la partición anterior"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Flecha abajo   Desplaza el cursor a la partición siguiente"
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "Ctrl-L       Vuelve a dibujar la pantalla"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Nota: todas las órdenes pueden escribirse en mayúsculas o minúsculas"
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "(salvo W para operaciones de escritura)."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Cambia la geometría de cilindros"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Cabezas"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Cambiar geometría de cabezas"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Cambiar geometría de sectores"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Fin"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "Ha finalizado la operación de cambio de geometría"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Escriba el número de cilindros: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Valor de cilindros no permitido"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Escriba el número de cabezas: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Valor de cabezas no permitido"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Escriba el número de sectores por pista: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Valor de sectores no permitido"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Escriba el tipo de sistema de ficheros: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "No se puede cambiar el tipo de sistema de ficheros a vacío"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "No se puede cambiar el tipo de sistema de ficheros a extendido"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Inicio"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc.(%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Pri/Lóg"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Desconocido (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unidad de disco: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, c-format
-msgid "Size: %lld bytes, %ld MB"
-msgstr "Tamaño: %lld bytes, %ld MB"
+msgid "Size: %lld bytes, %lld MB"
+msgstr "Tamaño: %lld bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
-msgstr "Tamaño: %lld bytes, %ld.%ld GB"
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "Tamaño: %lld bytes, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2587
 #, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
-msgstr "Cabezas: %d   Sectores por pista: %d   Cilindros: %d"
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "Cabezas: %d   Sectores por pista: %d   Cilindros: %lld"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Nombre"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Indicadores"
 
 # Este espacio inicial es para que no se pegue con la s de Indicadores
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr " Tipo"
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "Tipo de S.F."
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Etiqueta]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
-msgstr "  Sectores"
+#: fdisk/cfdisk.c:2597
+msgid "    Sectors"
+msgstr "   Sectores"
+
+#: fdisk/cfdisk.c:2599
+msgid "  Cylinders"
+msgstr "  Cilindros"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
-msgstr "Tamaño(MB)"
+#: fdisk/cfdisk.c:2601
+msgid "  Size (MB)"
+msgstr " Tamaño(MB)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
+#: fdisk/cfdisk.c:2603
+msgid "  Size (GB)"
 msgstr "Tamaño (GB)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Iniciable"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Conmuta el indicador de iniciable de la partición actual"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Suprimir"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Suprime la partición actual"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometría"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Cambia la geometría del disco (sólo para usuarios avanzados)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Ayuda"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Maximiza el uso de disco de la partición actual (sólo usuarios avanzados)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Nueva"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Crea una nueva partición a partir del espacio libre"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Imprimir"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Imprime la tabla de particiones en la pantalla o en un fichero"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Salir"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Sale del programa sin escribir la tabla de particiones"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Cambia el tipo de sistema de ficheros (DOS, Linux, OS/2, etc.)"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Unidades"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Cambia las unidades para el tamaño de la partición (MB, sect., cil.)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Escribir"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "Escribe la tabla de particiones en el disco (puede destruirse información)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "No se puede convertir esta partición en una partición iniciable"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "No se puede suprimir una partición vacía"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "No se puede maximizar esta partición"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Esta partición se encuentra en estado inutilizable"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Esta partición ya está en uso"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "No se puede cambiar el tipo de una partición vacía"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "No hay más particiones"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Orden ilegal"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2159,7 +2163,7 @@ msgstr ""
 "                el número de cabezas y el número de sectores por pista.\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2180,7 +2184,7 @@ msgstr ""
 "-u: Obtener Principio y Final en sectores (en lugar de cilindros)\n"
 "-b 2048: (Para algunas unidades MO) Utilizar sectores de 2048 bytes\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2196,222 +2200,222 @@ msgstr ""
 "  o:  fdisk /dev/rd/c0d0  o fdisk /dev/ida/c0d0  (para dispositivos RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "No se puede leer %s\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "No se puede buscar en %s\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "No se puede escribir %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE ha fallado en %s\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "No se puede asignar más memoria\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Error muy grave\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Orden  Acción"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   Conmuta el indicador de sólo lectura"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b   Modifica la etiqueta de disco bsd"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   Conmuta indicador de montable"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   Suprime una partición"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   Lista los tipos de particiones conocidos"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   Imprime este menú"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   Añade una nueva partición"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   Crea una nueva tabla de particiones DOS vacía"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   Imprime la tabla de particiones"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   Sale sin guardar los cambios"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   Crea una nueva etiqueta de disco Sun"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   Cambia el identificador de sistema de una partición"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   Cambia las unidades de visualización/entrada"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   Verifica la tabla de particiones"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   Escribe la tabla en el disco y sale"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Funciones adicionales (sólo para usuarios avanzados)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   Selecciona partición iniciable"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b   Modifica entrada de fichero de inicio"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   Selecciona partición de intercambio sgi"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a   Conmuta el indicador de iniciable"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   Conmuta el indicador de compatibilidad con DOS"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   Cambia el número de cilindros alternativos"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   Cambia el número de cilindros"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   Imprime los datos en bruto de la tabla de particiones"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   Cambia el número de sectores adicionales por cilindro"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   Cambia el número de cabezas"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   Cambia el factor de interleave"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   Cambia la velocidad de rotación (r.p.m.)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   Vuelve al menú principal"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   Cambia el número de sectores por pista"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   Cambia el número de cilindros físicos"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   Mueve el principio de los datos de una partición"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   Lista las particiones extendidas"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   Crea una tabla de particiones IRIX (SGI)"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f   Corrige el orden de las particiones"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "Debe establecer"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "cabezas"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "sectores"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "cilindros"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2420,11 +2424,11 @@ msgstr ""
 "%s%s.\n"
 "Puede efectuar esta operación desde el menú de funciones adicionales.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " y "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2443,28 +2447,28 @@ msgstr ""
 "2) software de arranque o particionamiento de otros sistemas operativos\n"
 "   (p.ej. FDISK de DOS, FDISK de OS/2)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Desplazamiento incorrecto en particiones extendidas primarias\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Atención: se están suprimiendo las particiones después de %d\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Atención: puntero de enlace adicional en tabla de particiones %d\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "Atención: no se tienen en cuenta los datos adicionales de la tabla de "
 "particiones %d\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2476,16 +2480,16 @@ msgstr ""
 "operación, el contenido anterior no se podrá recuperar.\n"
 "\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Nota: el tamaño del sector es %d (no %d)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr "No podrá escribir la tabla de particiones.\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
@@ -2493,7 +2497,7 @@ msgstr ""
 "Este disco tiene tanto magia DOS como BSD.\n"
 "Utilice la orden 'b' para ir al modo BSD.\n"
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
@@ -2501,16 +2505,16 @@ msgstr ""
 "El dispositivo no contiene una tabla de particiones DOS válida ni una "
 "etiqueta de disco Sun o SGI o OSF\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Error interno\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "No se tiene en cuenta la partición extendida adicional %d\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2519,7 +2523,7 @@ msgstr ""
 "Atención: el indicador 0x%04x inválido de la tabla de particiones %d se "
 "corregirá mediante w(rite)\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2527,78 +2531,78 @@ msgstr ""
 "\n"
 "se ha detectado EOF tres veces - saliendo...\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Código hexadecimal (escriba L para ver los códigos): "
 
-#: fdisk/fdisk.c:1069
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1094
+#, c-format
 msgid "%s (%u-%u, default %u): "
-msgstr "%s (%d-%d, valor predeterminado %d): "
+msgstr "%s (%u-%u, valor predeterminado %u): "
 
-#: fdisk/fdisk.c:1136
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1161
+#, c-format
 msgid "Using default value %u\n"
-msgstr "Se está utilizando el valor predeterminado %d\n"
+msgstr "Se está utilizando el valor predeterminado %u\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "El valor está fuera del rango.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Número de partición"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Atención: la partición %d es de tipo vacío\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Se ha seleccionado la partición %d\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 msgid "No partition is defined yet!\n"
 msgstr "¡No hay ninguna partición definida!\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr "¡Ya se han definido todas las particiones primarias!\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Se cambian las unidades de visualización/entrada a %s\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ATENCIÓN: la partición %d es una partición extendida\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "El indicador de compatibilidad con DOS está establecido\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "El indicador de compatibilidad con DOS no está establecido\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partición %d todavía no existe\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2610,7 +2614,7 @@ msgstr ""
 "tener particiones de tipo 0. Puede suprimir una\n"
 "partición con la orden `d'.\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2618,7 +2622,7 @@ msgstr ""
 "No puede convertir una partición en extendida ni viceversa.\n"
 "Primero debe suprimirla.\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2628,7 +2632,7 @@ msgstr ""
 "ya que así lo prevé SunOS/Solaris e incluso es adecuado para Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2638,53 +2642,53 @@ msgstr ""
 "y la partición 11 como volumen completo (6) ya que IRIX así lo espera.\n"
 "\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Se ha cambiado el tipo de sistema de la partición %d por %x (%s)\n"
 
-#: fdisk/fdisk.c:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "La partición %d tiene distintos principios físicos/lógicos (¿no Linux?):\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " físicos=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lógicos=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "La partición %d tiene distintos finales físicos/lógicos:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "La partición %i no empieza en el límite del cilindro:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "debe ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "La partición %i no termina en un límite de cilindro.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "debe ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -2693,7 +2697,7 @@ msgstr ""
 "\n"
 "Disco %s: %ld MB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, c-format
 msgid ""
 "\n"
@@ -2702,17 +2706,17 @@ msgstr ""
 "\n"
 "Disco %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d cabezas, %d sectores/pista, %d cilindros"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
-msgstr ", %lu sectores en total"
+msgid ", total %llu sectors"
+msgstr ", %llu sectores en total"
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2721,7 +2725,7 @@ msgstr ""
 "Unidades = %s de %d * %d = %d bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2729,17 +2733,17 @@ msgstr ""
 "No hay nada que hacer. El orden ya es correcto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
+#: fdisk/fdisk.c:1704
 #, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
-msgstr "%*s Inicio  Principio   Fin    Bloques  Id  Sistema\n"
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s Inicio    Comienzo      Fin      Bloques  Id  Sistema\n"
 
 # Nota: si se pone Dispositivo no queda bien el resto de la línea.
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Disposit."
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2747,7 +2751,7 @@ msgstr ""
 "\n"
 "Las entradas de la tabla de particiones no están en el orden del disco\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2758,92 +2762,92 @@ msgstr ""
 "Disco %s: %d cabezas, %d sectores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
-msgstr "Nº IA Cab Sect Cil Cab Sect Cil    Inicio  Tamaño ID\n"
+#: fdisk/fdisk.c:1754
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "Nº IA Cab Sect Cil Cab Sect Cil     Inicio    Tamaño ID\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Atención: la partición %d contiene el sector 0\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partición %d: el cabeza %d supera el máximo %d\n"
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partición %d: el sector %d supera el máximo %d\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partición %d: el cilindro %d supera el máximo %d\n"
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partición %d: sectores anteriores %d no concuerdan con total %d\n"
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Atención: inicio de datos incorrecto en partición %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Atención: la partición %d se solapa con la partición %d.\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Atención: la partición %d está vacía\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partición lógica %d no está por completo en la partición %d\n"
 
-#: fdisk/fdisk.c:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "El total de sectores asignados %d supera el máximo %d\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d sectores no asignados\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "La partición %d ya está definida. Suprímala antes de volver a añadirla.\n"
 
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Primer %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ya está asignado\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "No hay disponible ningún sector libre\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Último %s o +tamaño o +tamañoM o +tamañoK"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2855,16 +2859,26 @@ msgstr ""
 "        tabla de particiones DOS vacía primero. (Use o.)\n"
 "        ATENCIÓN: Esto destruirá el contenido de este disco.\n"
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "Se ha creado el número máximo de particiones\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Primero debe suprimir alguna partición y añadir una partición extendida\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "Las particiones lógicas no están en orden de disco"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Partición primaria incorrecta"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2875,20 +2889,20 @@ msgstr ""
 "%s\n"
 "   p   Partición primaria (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l   Partición lógica (5 o superior)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e   Partición extendida"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Número de partición inválido para el tipo `%c'\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2896,11 +2910,11 @@ msgstr ""
 "¡Se ha modificado la tabla de particiones!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Llamando a ioctl() para volver a leer la tabla de particiones.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2914,7 +2928,7 @@ msgstr ""
 "El núcleo todavía usa la tabla antigua.\n"
 "La nueva tabla se usará en el próximo reinicio.\n"
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2926,68 +2940,68 @@ msgstr ""
 "particiones DOS 6.x, consulte la página man de fdisk\n"
 "para ver información adicional.\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Se están sincronizando los discos.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partición %d no tiene ninguna área de datos\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Nuevo principio de datos"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Orden avanzada (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Número de cilindros"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Número de cabezas"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Número de sectores"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Atención: estableciendo desplazamiento de sector para compatibilidad con "
 "DOS\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "El disco %s no contiene una tabla de particiones válida\n"
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: orden desconocida\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Este núcleo encuentra el tamaño del sector por sí mismo; no se tiene en "
 "cuenta la opción -b\n"
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2996,18 +3010,18 @@ msgstr ""
 "dispositivo especificado\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Se ha detectado una etiqueta de disco OSF/1 en %s, entrando en el modo de\n"
 "etiqueta de disco.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Orden (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -3016,15 +3030,15 @@ msgstr ""
 "\n"
 "El fichero de inicio actual es: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Escriba el nombre del nuevo fichero de inicio: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "No se ha modificado el fichero de inicio\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3034,7 +3048,7 @@ msgstr ""
 "\tNo hay menú para usuarios avanzados para las tablas de particiones SGI.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3395,8 +3409,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux swap"
 
@@ -3583,9 +3596,9 @@ msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Las particiones %d y %d se solapan en %d sectores.\n"
 
 #: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Espacio no utilizado de %8d sectores - sectores %8d-%d\n"
+msgstr "Espacio no utilizado de %8u sectores - sectores %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:523
 msgid ""
@@ -3636,7 +3649,7 @@ msgstr ""
 "Escriba SÍ si está seguro de querer dar una etiqueta distinta a esta "
 "partición.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "SÍ\n"
 
@@ -3698,6 +3711,9 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
+"Atención: El ioctl de BLKGETSIZE falló en %s. Se usará un valor para\n"
+"la geometría del cilindro de %d. Este valor podría estar truncado para\n"
+"dispositivos > 33.8 GB.\n"
 
 #: fdisk/fdisksgilabel.c:738
 #, c-format
@@ -3806,15 +3822,15 @@ msgstr "Cilindros alternativos"
 msgid "Physical cylinders"
 msgstr "Cilindros físicos"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Velocidad de rotación (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Factor de interleave"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Sectores adicionales por cilindro"
 
@@ -3869,7 +3885,7 @@ msgstr ""
 "el valor %d %s que ha especificado se solapa con otra partición.\n"
 "La entrada que ha realizado se ha cambiado por %d %s\n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3878,7 +3894,7 @@ msgstr ""
 "Si desea mantener la compatibilidad con SunOS/Solaris, se recomienda dejar\n"
 "esta partición como disco completo (5), con principio en 0, con %u sectores\n"
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3892,7 +3908,7 @@ msgstr ""
 "Escriba SÍ si está seguro de que desea que la partición\n"
 "esté marcada con 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3911,7 +3927,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3924,16 +3940,16 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Indic.  Principio   Fin    Bloques  Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Número de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Número de cilindros físicos"
 
@@ -3984,21 +4000,21 @@ msgstr "OS/2 Boot Manager"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
-msgstr "Win95 FAT32"
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA)"
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA)"
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
-msgstr "Win95 Ext'd (LBA)"
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 Ext'd (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -4029,16 +4045,16 @@ msgid "AST SmartSleep"
 msgstr "SmartSleep de AST"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
-msgstr "Hidden Win95 FAT32"
+msgid "Hidden W95 FAT32"
+msgstr "Hidden W95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
-msgstr "Hidden Win95 FAT32 (LBA)"
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "Hidden W95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
-msgstr "Hidden Win95 FAT16 (LBA)"
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "Hidden W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4146,6 +4162,12 @@ msgstr "Old Minix"
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux swap"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "Unidad C: oculta de OS/2"
@@ -4300,91 +4322,91 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "Error de búsqueda en %s; no se puede buscar en %lu\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "Error de búsqueda: se esperaba 0x%08x%08x, se ha obtenido 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "No queda memoria; se abandona el intento\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "Error de lectura en %s; no se puede leer el sector %lu\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERROR: el sector %lu no tiene una firma msdos\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "Error de escritura en %s; no se puede escribir el sector %lu\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "No se puede abrir el fichero de guardar sector de partición (%s)\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "Error de escritura en %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "No se puede ejecutar stat para fichero de restaurar partición (%s)\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "Tamaño incorrecto de fichero de restaurar partición; no se efectúa "
 "restauración\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "¿No queda memoria?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "No se puede abrir fichero de restaurar partición (%s)\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "Error al leer %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "No se puede abrir el dispositivo %s para escribir\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "Error al escribir el sector %lu en %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disco %s: no se puede obtener el tamaño\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disco %s: no se puede obtener la geometría\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4395,22 +4417,22 @@ msgstr ""
 "disco entero. Usar fdisk con ella probablemente no tiene sentido.\n"
 "[Use la opción --force si realmente desea realizar esta operación.]\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Atención: HDIO_GETGEO indica que hay %lu cabezas\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Atención: HDIO_GETGEO indica que hay %lu sectores\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Atención: HDIO_GETGEO indica que hay %lu cilindros\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4419,7 +4441,7 @@ msgstr ""
 "Atención: número improbable de sectores (%lu); normalmente 63 como máximo\n"
 "Esto causará problemas con el software que direccione con Cil./Cab./Sector\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4428,7 +4450,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindros, %lu cabezas, %lu sectores/pista\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4436,7 +4458,7 @@ msgstr ""
 "%s de partición %s tiene un valor imposible para cabeza: %lu\n"
 "(debe estar entre 0 y %lu)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4445,7 +4467,7 @@ msgstr ""
 "%s de partición %s tiene un valor imposible para sector: %lu\n"
 "(debe estar entre 1 y %lu)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4454,7 +4476,7 @@ msgstr ""
 "%s de partición %s tiene un valor imposible para cilindros: %lu\n"
 "(debe estar entre 0 y %lu)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4462,11 +4484,11 @@ msgstr ""
 "Id  Nombre\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Volviendo a leer la tabla de particiones...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4474,31 +4496,31 @@ msgstr ""
 "La orden para volver a leer la tabla de particiones ha fallado.\n"
 "Reinicie el sistema ahora, antes de utilizar mkfs.\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Error al cerrar %s\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: esta partición no existe\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "Formato no reconocido; utilizando sectores\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabla de particiones de %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato no implementado; utilizando %s\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4507,11 +4529,11 @@ msgstr ""
 "Unidades = cilindros de %lu bytes, bloques de 1024 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Disp.  Inic. Princ.   Fin   Nºcil    Nºbloq.   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4520,11 +4542,11 @@ msgstr ""
 "Unidades = sectores de 512 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Disp.  Inicio  Principio   Fin   Nº sect.  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4533,12 +4555,12 @@ msgstr ""
 "Unidades = bloques de 1024 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Disp.  Inic.  Principio   Fin    Nºbloques Id  Sistema\n"
 
 # FIXME: ¿Qué es un mebibyte?
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4548,34 +4570,34 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Disp.  Inic Princ.  Fin    MiB    Nºbloques Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tprincipio: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%ld,%"
 "ld)\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tfin: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partición termina en el cilindro %ld, más allá del final del disco\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "No se ha encontrado ninguna partición\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4586,53 +4608,53 @@ msgstr ""
 "  para Cil./Cab./Sect.=*/%ld/%ld (en lugar de %ld/%ld/%ld).\n"
 "Para este listado se presupondrá esta geometría.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "No existe ninguna tabla de particiones.\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Extrañamente sólo hay %d particiones definidas.\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Atención: la partición %s tiene tamaño 0 pero no está marcada como vacía\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Atención: la partición %s tiene tamaño 0 y es iniciable\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "Atención: la partición %s tiene tamaño 0 y principio distinto de cero\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Atención: la partición %s "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "no se encuentra dentro de la partición %s\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Atención: las particiones %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "y %s se solapan\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4641,17 +4663,17 @@ msgstr ""
 "Atención: la partición %s contiene parte de la tabla de particiones\n"
 "(sector %lu), y la destruirá cuando se llene\n"
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Atención: la partición %s empieza en el sector 0\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Atención: la partición %s finaliza más allá del final del disco\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4659,17 +4681,17 @@ msgstr ""
 "Como máximo una de las particiones primarias puede ser extendida\n"
 " (aunque esto no es un problema bajo Linux)\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Atención: la partición %s no empieza en un límite de cilindro\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Atención: la partición %s no termina en un límite de cilindro\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4678,7 +4700,7 @@ msgstr ""
 "Esto no es poblema para LILO, pero el MBR de DOS no se iniciará con este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4686,7 +4708,7 @@ msgstr ""
 "Atención: normalmente sólo es posible iniciar desde particiones primarias.\n"
 "LILO no tiene en cuenta el indicador de iniciable.\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4696,11 +4718,11 @@ msgstr ""
 "Esto no es problema para LILO, pero el MBR de DOS no iniciará con este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 msgid "start"
 msgstr "comienzo"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4708,24 +4730,24 @@ msgstr ""
 "Partición %s: principio: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 msgid "end"
 msgstr "final"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partición %s: fin: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%"
 "ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partición %s termina en el cilindro %ld, más allá del final del disco\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4734,7 +4756,7 @@ msgstr ""
 "Atención: se desplaza el comienzo de la partición extd de %ld a %ld\n"
 "(Solamente para visualizarlo. No se cambia su contenido.)\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4743,133 +4765,133 @@ msgstr ""
 "DOS y Linux interpretarán el contenido de forma diferente.\n"
 "\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "demasiadas particiones - se ignoran las posteriores al nº (%d)\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "¿árbol de particiones?\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Administrador de disco detectado; no se puede tratar esto\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "Detectada firma DM6 - abandonando\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "Situación anómala: ¿partición extendida de tamaño 0?\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "Situación anómala: ¿partición BSD de tamaño 0?\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " %s: partición no reconocida\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Se ha especificado el indicador -n: no se ha producido ningún cambio\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Error al guardar los sectores antiguos; anulando la operación\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Error al escribir la partición en %s\n"
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "Línea de entrada larga o incompleta; se abandona la operación\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "Error de entrada: se esperaba `=' después del campo %s\n"
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "Error de entrada: carácter inesperado %c tras campo %s\n"
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "Entrada no reconocida: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "Número demasiado elevado\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "Datos extraños tras el número\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "No hay espacio para descriptor de partición\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "No se puede crear partición extendida adyacente\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr "Demasiados campos de entrada\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "No queda más espacio\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "Tipo no permitido\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Atención: el tamaño dado (%lu) supera el tamaño máximo permitido (%lu)\n"
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "Atención: partición vacía\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Atención: principio de partición incorrecto (antes %lu)\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "Indicador de iniciable no reconocido; elija - o *\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "¿Especificación parcial de cil,cab,sect?\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "Partición extendida en ubicación no esperada\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "Entrada incorrecta\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "Hay demasiadas particiones\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 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"
@@ -4881,48 +4903,48 @@ msgstr ""
 "<cil,cab,sec>\n"
 "Normalmente sólo debe especificar <principio> y <tamaño> (y quizás <tipo>).\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "versión"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: similar a /dev/hda or /dev/sda"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "opciones útiles:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]:  Muestra el tamaño de una partición"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [o --id]:         Imprime o cambia el identificador de partición"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:       Muestra las particiones de cada dispositivo"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [o --dump]:       Igual, pero con un formato adecuado para entrada\n"
 "                         posterior"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [o --increment]:  Número de cilindros, etc. desde 1 y no desde 0"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4930,60 +4952,60 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  Acepta/muestra en unidades de\n"
 "                         sectores/bloques/cilindros/MB"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]: Muestra los tipos de particiones conocidos"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [o --DOS]:        Para compatibilidad con DOS: se pierde algo de "
 "espacio"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [o --re-read]:    Hace que el núcleo vuelva a leer la tabla de\n"
 "                         particiones"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 "    -N# :                Cambia únicamente la partición con el número #"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 No escribe realmente en el disco"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fichero :         Guarda los sectores que se van a sobreescribir\n"
 "                         en `fichero'"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fichero:          Restaura estos sectores de nuevo"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:    Imprime la versión"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:       Imprime este mensaje"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "opciones peligrosas:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [o --show-geometry]:  Imprime la idea del núcleo sobre la geometría"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4991,7 +5013,7 @@ msgstr ""
 "    -x [o --show-extended]:  Muestra también las particiones extendidas en\n"
 "                             salida o espera sus descriptores en entrada"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
@@ -4999,114 +5021,114 @@ msgstr ""
 "para\n"
 "                           Linux"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:       Suprime mensajes de aviso"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "    Puede modificar la geometría detectada utilizando:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C# [o --cylinders #]: Establece el número de cilindros que se utilizarán"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 "    -H# [o --heads #]:     Establece el número de cabezas que se utilizarán"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 "    -S# [o --sectors #]:   Establece el número de sectores que se utilizarán"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "Puede desactivar toda comprobación de coherencia con:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [o --force]:       Hace lo que ordene el usuario, aunque sea ilógico"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositivo\t\t Enumera las particiones activas del dispositivo\n"
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s dispositivo n1 n2 ... activar particiones n1 ..., desactivar el resto\n"
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An dispositivo\t activa la partición n, desactiva el resto\n"
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "¿ninguna orden?\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "total: %d bloques\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "uso: sfdisk --print-id dispositivo número-partición\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "uso: sfdisk --change-id dispositivo número-partición Id\n"
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "uso: sfdisk --id dispositivo número-partición [Id]\n"
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "puede especificar sólo un dispositivo (salvo con -l o -s)\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "No se puede abrir %s para lectura-escritura\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "No se puede abrir %s para lectura\n"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcto\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilindros, %ld cabezas, %ld sectores por pista\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "Error de ioctl BLKGETSIZE para %s\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte activo incorrecto: 0x%x en lugar de 0x80\n"
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -5114,7 +5136,7 @@ msgstr ""
 "Fin\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5123,35 +5145,35 @@ msgstr ""
 "Tiene %d particiones primarias activas. No tiene importancia para LILO,\n"
 "pero el MBR de DOS sólo puede iniciar discos con una partición activa.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "la partición %s tiene el identificador %x y no está oculta\n"
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificador %lx incorrecto\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Actualmente este disco está en uso.\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Error muy grave: no se puede encontrar %s\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Atención: %s no es un dispositivo de bloques\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Comprobando que nadie esté utilizando este disco en este momento...\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5166,28 +5188,28 @@ msgstr ""
 "esta\n"
 "comprobación.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilice el indicador --force para eludir todas las comprobaciones.\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "Correcto\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Situación anterior:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partición %d no existe; no se puede cambiar\n"
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Situación nueva:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5196,21 +5218,21 @@ msgstr ""
 "nada.\n"
 "(Si realmente desea realizar esta operación, use la opción --force.)\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 "El sistema no encuentra adecuada esta operación; probablemente deba "
 "responder No\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "¿Está satisfecho con esta operación? [ynq] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "¿Desea escribir esta información en el disco? [ynq] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5218,15 +5240,15 @@ msgstr ""
 "\n"
 "sfdisk: final de entrada antes de lo previsto\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "Se está saliendo; no se ha cambiado nada\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda con una de las entradas siguientes: y,n,q\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5234,7 +5256,7 @@ msgstr ""
 "La nueva tabla de particiones se ha escrito correctamente\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5868,7 +5890,7 @@ msgstr "Esperando en bucle que cambie la hora de KDGHWCLK\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "Error de ioctl KDGHWCLK al leer la hora"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "Se ha excedido el tiempo de espera del cambio de hora.\n"
 
@@ -5893,58 +5915,68 @@ msgstr "No se puede abrir /dev/tty1 o /dev/vc/1"
 msgid "KDGHWCLK ioctl failed"
 msgstr "Error de ioctl KDGHWCLK"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "Error de open() de %s"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "Error de ioctl() con %s al leer la hora.\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "Esperando en bucle que cambie la hora de %s\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s no tiene funciones de interrupción. "
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "Error de read() de %s al esperar señal de reloj"
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "Error de read() de %s al esperar señal de reloj"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "Error de read() de %s al esperar señal de reloj"
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "Error de ioctl() con %s al desactivar interrupciones de actualización"
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 "Error inesperado de ioctl() con %s al activar interrupciones de actualización"
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "Error de ioctl() con %s al establecer la hora.\n"
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) ha finalizado correctamente.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "Error al abrir %s"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5956,17 +5988,17 @@ msgstr ""
 "dispositivo 'rtc' de Linux mediante el fichero especial de dispositivo %s.\n"
 "Este fichero no existe en este sistema.\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "No se puede abrir %s"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "Error de ioctl(RTC_EPOCH_READ) con %s"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "Se ha leído el valor de época %ld de %s con ioctl RTC_EPOCH_READ.\n"
@@ -5974,17 +6006,17 @@ msgstr "Se ha le
 #. 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:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "El valor de época no puede ser inferior a 1900. Ha solicitado %ld\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr "Estableciendo época en %ld con ioctl RTC_EPOCH_SET en %s.\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
@@ -5992,7 +6024,7 @@ msgstr ""
 "El controlador de dispositivo del núcleo para %s no tiene la ioctl "
 "RTC_EPOCH_SET.\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "Error de ioctl(RTC_EPOCH_SET) de %s"
@@ -6168,52 +6200,68 @@ msgstr "Inicio de sesi
 msgid "Login on %s from %s denied.\n"
 msgstr "Inicio de sesión en %s desde %s denegado.\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: el usuario %d no existe.\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: el usuario \"%s\" no existe.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 "%s: sólo se pueden modificar entradas locales; utilice yp%s en su lugar.\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+#, fuzzy
+msgid "Unknown user context"
+msgstr "error desconocido en la clave"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Cambiando información de finger para %s.\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Error de contraseña."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Contraseña incorrecta."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "No se ha cambiado la información de finger.\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Uso: %s [ -f nombre-completo ] [ -o oficina ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6221,11 +6269,11 @@ msgstr ""
 "[ -p teléfono-oficina ]\n"
 "\t[ -h teléfono-particular ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6233,64 +6281,76 @@ msgstr ""
 "\n"
 "Operación anulada.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "Campo demasiado largo.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' no está permitido.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Los caracteres de control no están permitidos.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 "*NO* se ha cambiado la información de finger. Inténtelo de nuevo más "
 "adelante.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "Se ha cambiado la información de finger.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "La asignación de memoria (malloc) ha fallado"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" no figura en /etc/shells.\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
 "%s: el intérprete de órdenes no está en /etc/shells; cambio de intérprete de "
 "órdenes denegado\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Cambiando intérprete de órdenes para %s.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Nuevo intérprete de órdenes"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "No se ha cambiado el intérprete de órdenes.\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr ""
 "*NO* se ha cambiado el intérprete de órdenes. Inténtelo de nuevo más "
 "adelante.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Se ha cambiado el intérprete de órdenes.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
@@ -6299,57 +6359,57 @@ msgstr ""
 "Uso: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "     [ nombredeusuario ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: el intérprete de órdenes debe ser un nombre de ruta completo.\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" no existe.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" no es ejecutable.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' no está permitido.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: los caracteres de control no están permitidos.\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Atención: \"%s\" no figura en /etc/shells\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" no figura en /etc/shells.\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: utilice la opción -l para ver una lista\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Atención: \"%s\" no figura en /etc/shells.\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Utilice %s -l para ver una lista.\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "No hay ningún intérprete de órdenes conocido.\n"
 
@@ -6545,79 +6605,79 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Tiene demasiados procesos en ejecución.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "Conexión telefónica en %s por %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "Inicio de sesión con root en %s desde %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "Inicio de sesión con root en %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "Inicio de sesión en %s por %s desde %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "Inicio de sesión en %s por %s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "Tiene correo nuevo.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "Tiene correo.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: error en fork: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "Fallo en TIOCSCTTY: %m"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() ha fallado"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "No hay ningún directorio %s\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Iniciando la sesión con directorio de inicio = \"/\".\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: no queda memoria para script de intérprete de órdenes.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 "login: no se ha podido ejecutar el script de intérprete de órdenes: %s.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: no hay intérprete de órdenes: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6626,62 +6686,62 @@ msgstr ""
 "\n"
 "Inicio de sesión de %s: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "Nombre de inicio de sesión demasiado largo.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "Nombre demasiado largo"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "Los nombres de inicio de sesión no pueden empezar por '-'.\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "Demasiados avances de línea solos.\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "Excesivos avances de línea"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "El inicio de sesión ha superado el tiempo de espera tras %d segundos\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Último inicio de sesión: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "desde %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "en %.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "Error de inicio de sesión desde %s, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "Error de inicio de sesión en %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d errores de inicio de sesión desde %s, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d errores de inicio de sesión en %s, %s"
@@ -7095,55 +7155,65 @@ msgstr "%s: error incorrecto"
 
 # FIXME: El fichero se llama "passwd", no "password"
 # Comunicar al autor.
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
 msgstr "%s: el fichero `passwd' está ocupado.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
 msgstr "%s: el fichero `group' está ocupado.\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: el fichero %s está ocupado (%s presente).\n"
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: no se puede enlazar %s: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "No se puede obtener el tiempo de espera para %s: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "No se puede obtener el tiempo de espera para %s: %s\n"
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: no se puede desbloquear %s: %s (los cambios todavía están en %s)\n"
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: no se puede bifurcar (fork)\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s no se ha modificado\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: no se ha efectuado ningún cambio\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr "Está utilizando grupos ocultos en este sistema.\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr "Esta utilizando conbtraseñas ocultas en este sistema.\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "¿Quiere editar %s ahora? [y/n] "
@@ -7337,7 +7407,7 @@ msgstr "%s: fallo al cambiar el nombre de %s a %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "llamada: %s de los ficheros...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7348,21 +7418,21 @@ msgstr ""
 "Utilice `%s [opciones] %s' si quiere utilizarlo de verdad.\n"
 "No se inicia la transcripción.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "uso: script [-a] [-f] [-q] [-t] [fichero]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado; el fichero es %s\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado (%s)"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7371,16 +7441,16 @@ msgstr ""
 "\n"
 "Script terminado (%s)"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script terminado; el fichero es %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "openpty ha fallado\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "No quedan pty\n"
 
@@ -7650,42 +7720,42 @@ msgstr "mount: no se ha podido abrir %s; en su lugar se utiliza %s\n"
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "No se puede crear el fichero de bloqueo %s: %s (utilice -n para modificar "
 "este valor)"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "No se puede enlazar el fichero de bloqueo %s: %s (utilice -n para modificar "
 "este valor)"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "No se puede abrir el fichero de bloqueo %s: %s (utilice -n para modificar "
 "este valor)"
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "No se puede bloquear el fichero de bloqueo %s: %s\n"
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "No se puede bloquear el fichero de bloqueo %s: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "Tiempo de espera excedido"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7694,192 +7764,127 @@ msgstr ""
 "No se puede crear enlace %s\n"
 "Puede que haya un fichero de bloqueo obsoleto.\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "No se puede abrir %s (%s) - mtab no actualizado"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "Error al escribir %s: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "Error al cambiar el modo de %s: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "No se puede cambiar el nombre %s por %s: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: no se puede abrir el dispositivo %s: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: no se puede obtener información sobre el dispositivo %s: %s\n"
+msgid ", offset %lld"
+msgstr ", desplazamiento %lld"
 
-#: mount/lomount.c:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) desplazamiento %d, %s cifrado\n"
+#: mount/lomount.c:104
+#, c-format
+msgid ", sizelimit %lld"
+msgstr ", tamaño límite %lld"
 
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: no se puede encontrar ningún dispositivo /dev/loop#"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", cifrado %s (tipo %d)"
 
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
-msgstr ""
-"mount: No se puede encontrar ningún dispositivo de bucle.\n"
-"       Puede que /dev/loop# tenga un número principal incorrecto."
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ", desplazamiento %d"
 
-#: mount/lomount.c:253
+#: mount/lomount.c:129
 #, 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: No se puede encontrar ningún dispositivo de bucle y, según %s,\n"
-"       este núcleo no conoce el dispositivo de bucle.\n"
-"       (En este caso, vuelva a realizar la compilación o `insmod loop.o'.)"
+msgid ", encryption type %d\n"
+msgstr ", tipo de cifrado %d\n"
 
-#: mount/lomount.c:259
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: no se puede obtener información sobre el dispositivo %s: %s\n"
+
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: no se puede encontrar ningún dispositivo /dev/loop#"
+
+#: mount/lomount.c:192
 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?"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: No se ha encontrado ningún dispositivo de bucle. Tal vez este núcleo "
-"no\n"
-"       conozca el dispositivo de bucle (vuelva a compilar o `insmod loop."
-"o')\n"
-"       o tal vez /dev/loop# tenga el número principal incorrecto."
+"mount: No se puede encontrar ningún dispositivo de bucle. ¿Puede que este\n"
+"       núcleo no sepa acerca del dispositivo de bucle? (En tal caso, vuelva "
+"a\n"
+"       realizar la compilación o `modprobe loop'.)"
 
-#: mount/lomount.c:263
+#: mount/lomount.c:197
 msgid "mount: could not find any free loop device"
 msgstr "mount: no se ha encontrado ningún dispositivo de bucle libre"
 
-#: mount/lomount.c:359
-#, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "No se puede abrir %s para lectura\n"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Vuelva a escribir la nueva contraseña: "
-
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "La apertura del directorio ha fallado\n"
-
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr ""
-"La contraseña debe tener como mínimo 6 caracteres; inténtelo de nuevo.\n"
-
-#: mount/lomount.c:472
-#, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "No se puede asignar más memoria\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
-msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-msgstr ""
-
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
-
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "No se pudo bloquear en memoria, saliendo.\n"
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Inicialización (hasta 16 dígitos hexadecimales): "
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): ejecución correcta\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "Dígito no hexadecimal '%c'.\n"
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: no se puede suprimir el dispositivo %s: %s\n"
 
-#: mount/lomount.c:764
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
-msgstr "No se sabe cómo obtener la clave para el sistema de cifrado %d\n"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): ejecución correcta\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): ejecución correcta\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr ""
+"Este montaje se ha compilado sin soporte de bucle. Vuelva a realizar la "
+"compilación.\n"
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "No hay suficiente memoria"
-
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "No se puede abrir %s para lectura\n"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"uso:\n"
+"  %s dispositivo_bucle                                # dar información\n"
+"  %s -d dispositivo_bucle                             # eliminar\n"
+"  %s [ -e cifrado ] [ -o despl ] disp_bucle fichero   # configurar\n"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "No hay suficiente memoria"
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
+"Al compilar no había soporte de bucle disponible. Vuelva a realizar la "
+"compilación.\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7895,41 +7900,41 @@ msgstr "[mntent]: la l
 msgid "; rest of file ignored"
 msgstr "; el resto del fichero no se tiene en cuenta"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: según mtab, %s ya está montado en %s"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: según mtab, %s está montado en %s"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: no se puede abrir %s para escritura: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: error al escribir %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: error al cambiar el modo de %s: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s parece espacio de intercambio - no montado"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "montaje erróneo"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: sólo el usuario root puede montar %s en %s"
@@ -7951,106 +7956,110 @@ msgstr "mount: omitiendo la configuraci
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: se va a utilizar el dispositivo de bucle %s\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: error al configurar dispositivo de bucle\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configuración correcta de dispositivo de bucle\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: no se puede abrir %s: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: el argumento para -p o --pass-fd debe ser un número"
+
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: no se puede abrir %s para establecer la velocidad"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: no se puede bifurcar (fork): %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr "mount: esta versión se ha compilado sin soporte para el tipo `nfs'"
 
 # FIXME: Falta un . en el original.
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: falló con la versión 4 de nfs mount, probando con la 3...\n"
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: no se ha podido determinar el tipo de sistema de ficheros y no se ha\n"
 "especificado ninguno"
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: debe especificar el tipo de sistema de ficheros"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr "mount: montaje erróneo"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: el punto de montaje %s no es un directorio"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: permiso denegado"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr "mount: debe ser superusuario para utilizar mount"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s está ocupado"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc ya está montado"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ya está montado o %s está ocupado"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: el punto de montaje %s no existe"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: el punto de montaje %s es un enlace simbólico sin destino"
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: el dispositivo especial %s no existe"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8059,12 +8068,12 @@ msgstr ""
 "mount: el dispositivo especial %s no existe\n"
 "       (un prefijo de ruta no es un directorio)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s no está montado todavía o una opción es incorrecta"
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8074,36 +8083,36 @@ msgstr ""
 "superbloque incorrecto en %s,\n"
 "       o número de sistemas de ficheros montados excesivo"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "tabla de dispositivos montados completa"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: no se puede leer el superbloque"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: dispositivo desconocido"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr ""
 "mount: el tipo de sistema de ficheros %s no está soportado por el núcleo"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablemente quería referirse a %s"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: ¿tal vez quería referirse a iso9660?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -8111,12 +8120,12 @@ msgstr ""
 "%s no soportado"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s no es un dispositivo de bloques y ¿stat falla?"
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8125,78 +8134,51 @@ msgstr ""
 "mount: el núcleo no reconoce %s como dispositivo de bloques\n"
 "       (¿tal vez `insmod driver'?)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s no es un dispositivo de bloques (pruebe `-o loop')"
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s no es un dispositivo de bloques"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s no es un dispositivo de bloques válido"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "dispositivo de bloques "
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "umount: no se puede montar %s%s de sólo lectura"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s está protegido contra escritura pero se ha dado la opción `-w'"
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 "mount: %s%s está protegido contra escritura; se monta como sólo lectura"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr "mount: la etiqueta %s aparece tanto en %s como en %s\n"
-
-#: mount/mount.c:1124
-#, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "mount: %s duplicado - no se monta"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: se montará %s mediante %s\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "etiqueta"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: no se ha encontrado esta partición"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: no se ha especificado ningún tipo; se presupone nfs por los dos "
 "puntos\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: no se ha especificado ningún tipo; se presupone smbfs por el "
@@ -8205,23 +8187,22 @@ msgstr ""
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: ejecutando en segundo plano \"%s\"\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: se abandona \"%s\"\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ya está montado en %s\n"
 
-#: mount/mount.c:1386
-#, fuzzy
+#: mount/mount.c:1362
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8242,7 +8223,7 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Uso: mount -V                 : muestra la versión\n"
@@ -8266,43 +8247,42 @@ msgstr ""
 "cdrom,\n"
 "o mediante la etiqueta, utilizando -L etiqueta, o mediante uuid, mediante -U "
 "uuid.\n"
-"Otras opciones: [-nfFrsvw] [-o opciones].\n"
+"Otras opciones: [-nfFrsvw] [-o opciones] [-p passwdfd].\n"
 "Escriba man 8 mount para saber mucho más.\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: sólo el usuario root puede efectuar esta acción"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: no se ha encontrado %s; se está creando...\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr "mount: la etiqueta %s aparece tanto en %s como en %s - no se monta\n"
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: no se ha encontrado esta partición"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: montando %s\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr "no se ha montado nada"
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: no se puede encontrar %s en %s"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: no se puede encontrar %s en %s o %s"
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8310,34 +8290,34 @@ msgstr ""
 "mount: no se ha podido abrir %s; así que no se puede efectuar la conversión\n"
 "de UUID y ETIQUETA\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: UUID incorrecto"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: error al intentar adivinar el tipo de sistema de ficheros\n"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: no ha especificado ningún tipo de sistema de ficheros para %s\n"
 
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Se probará con todos los tipos indicados en %s o %s\n"
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr "       y parece que sea un espacio de intercambio\n"
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Se probará con el tipo %s\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "Probando con %s\n"
@@ -8431,7 +8411,7 @@ msgstr "Valor de retorno de nfs status desconocido: %d"
 msgid "bug in xstrndup call"
 msgstr "Error en la llamada xstrndup"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8444,7 +8424,7 @@ msgstr ""
 "       %s [-v] [-p prioridad] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8455,100 +8435,33 @@ msgstr ""
 "       %s -a [-v]\n"
 "       %s [-v] especial ...\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "no queda memoria"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s en %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: no se puede ejecutar stat para %s: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: atención: %s tiene permisos %04o que no son seguros, se sugiere %"
 "04o\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: omitiendo el fichero %s; parece que tiene huecos.\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr "No es el superusuario.\n"
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s: dispositivo de bloques inválido"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "Tipo de cifrado no soportado %s\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: se va a utilizar el dispositivo de bucle %s\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Esta partición ya está en uso"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "No se puede rebobinar el dispositivo de intercambio"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "No se ha podido abrir /dev/urandom"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "No se pueden escribir los nodos-i"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "La bifurcación (fork) ha fallado\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Cambiando contraseña para %s\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: no se puede abrir %s: %s\n"
@@ -8614,36 +8527,36 @@ msgstr ""
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existe; se está probando con umount...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "no se ha podido ejecutar umount en %s; en su lugar se prueba con %s\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ocupado; se ha vuelto a montar como de sólo lectura\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: no se ha podido volver a montar %s como de sólo lectura\n"
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "Se ha ejecutado umount en %s\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: no se puede encontrar lista de sistemas de ficheros para desmontar"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
@@ -8653,42 +8566,42 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opciones]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Se está intentando ejecutar umount en %s\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "No se puede encontrar %s en mtab\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no está montado (según mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s se ha montado varias veces"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s no está en fstab (y usted no es el usuario root)"
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montaje de %s no concuerda con fstab"
 
-#: mount/umount.c:602
+#: mount/umount.c:616
 #, c-format
-msgid "umount: only root can unmount %s from %s"
-msgstr "umount: sólo el usuario root puede desmontar %s desde %s"
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: sólo %s puede desmontar %s desde %s"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr "umount: sólo el usuario root puede efectuar esta acción"
 
@@ -8830,7 +8743,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f enteros/seg.; %f recepción (caracteres/seg.)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Uso: %s [-c] [-n nivel] [-s tamañobúfer]\n"
@@ -9001,23 +8914,23 @@ msgstr "---- L
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
 msgstr "número máx. segmentos = %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "tamaño máx. segmento (kbytes) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "total máx. memoria compartida (kbytes) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "tamaño mín. segmento (bytes) = %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9540,8 +9453,12 @@ msgstr ""
 msgid "missing comma"
 msgstr "falta una coma"
 
-#: sys-utils/readprofile.c:115
-#, c-format
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "no queda memoria"
+
+#: sys-utils/readprofile.c:118
+#, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9552,6 +9469,7 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
@@ -9571,32 +9489,32 @@ msgstr ""
 "bytes\n"
 "         -V            Muestra la versión y sale\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s versión %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Paso de sondeo: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): línea de mapa incorrecta\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: no se puede encontrar \"_stext\" en %s\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s dirección del perfil fuera de rango. ¿Fichero `map' incorrecto?\n"
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "total"
 
@@ -10122,32 +10040,60 @@ msgstr "L
 msgid "Out of memory when growing buffer.\n"
 msgstr "No queda memoria al aumentar el tamaño del búfer.\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: no se puede suprimir el dispositivo %s: %s\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: no se ha compilado con soporte para minix v2\n"
+
+#~ msgid "mount: the label %s occurs on both %s and %s\n"
+#~ msgstr "mount: la etiqueta %s aparece tanto en %s como en %s\n"
+
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "mount: %s duplicado - no se monta"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): ejecución correcta\n"
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: se montará %s mediante %s\n"
 
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "etiqueta"
+
+#~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
 #~ msgstr ""
-#~ "Este montaje se ha compilado sin soporte de bucle. Vuelva a realizar la "
-#~ "compilación.\n"
+#~ "mount: la etiqueta %s aparece tanto en %s como en %s - no se monta\n"
+
+#~ msgid "umount: only root can unmount %s from %s"
+#~ msgstr "umount: sólo el usuario root puede desmontar %s desde %s"
+
+#~ msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) desplazamiento %d, %s cifrado\n"
 
 #~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "uso:\n"
-#~ "  %s dispositivo_bucle                                # dar información\n"
-#~ "  %s -d dispositivo_bucle                             # eliminar\n"
-#~ "  %s [ -e cifrado ] [ -o despl ] disp_bucle fichero   # configurar\n"
+#~ "mount: No se puede encontrar ningún dispositivo de bucle.\n"
+#~ "       Puede que /dev/loop# tenga un número principal incorrecto."
 
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ 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 ""
-#~ "Al compilar no había soporte de bucle disponible. Vuelva a realizar la "
-#~ "compilación.\n"
+#~ "mount: No se ha encontrado ningún dispositivo de bucle. Tal vez este "
+#~ "núcleo no\n"
+#~ "       conozca el dispositivo de bucle (vuelva a compilar o `insmod loop."
+#~ "o')\n"
+#~ "       o tal vez /dev/loop# tenga el número principal incorrecto."
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Inicialización (hasta 16 dígitos hexadecimales): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Dígito no hexadecimal '%c'.\n"
+
+#~ msgid "Don't know how to get key for encryption system %d\n"
+#~ msgstr "No se sabe cómo obtener la clave para el sistema de cifrado %d\n"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "La partición %i no termina en el límite del cilindro:\n"
@@ -10173,9 +10119,6 @@ msgstr "No queda memoria al aumentar el tama
 #~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
 #~ msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
 
-#~ msgid "umount: only %s can unmount %s from %s"
-#~ msgstr "umount: sólo %s puede desmontar %s desde %s"
-
 #~ msgid "cannot open %s %s\n"
 #~ msgstr "No se puede abrir %s %s\n"
 
diff --git a/po/et.po b/po/et.po
index bd1eac87..c49bd7f0 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11r\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
 "PO-Revision-Date: 2002-05-19 20:04GMT+0300\n"
 "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -19,94 +19,98 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr ""
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr ""
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr ""
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr ""
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr ""
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
 msgstr ""
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
 msgstr ""
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:81
+msgid "get size in bytes"
+msgstr ""
+
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr ""
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr ""
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr ""
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr ""
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
 msgstr "kasutamine:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: Ei suuda avada faili %s\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
@@ -149,12 +153,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Kasutamine: %s [ -n ] seade\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s paketist %s\n"
@@ -286,49 +290,49 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Kasutamine: %s [-larvsmf] /dev/seade\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s on monteeritud. "
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Kas Te soovite tõesti jätkata"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "katkestan kontrolli\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Tsooni nr. < FIRSTZONE failis `%s'"
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Tsooni nr. >= ZONES failis `%s'"
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Kas eemaldada plokk"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Viga lugemisel: ei suuda seekida plokile failis `%s'\n"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Viga lugemisel: vigane plokk failis `%s'\n"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -336,122 +340,122 @@ msgstr ""
 "Sisemine viga: katse kirjutada vigasesse plokki\n"
 "Kirjutamise katset ignoreeriti\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "seek ei õnnestunud ploki kirjutamisel"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Viga kirjutamisel: vigane plokk failis `%s'\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "seek ei õnnestunud superploki kirjutamisel"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "ei suuda kirjutada superplokki"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "ei suuda kirjutada i-kirjete kaarti"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "ei suuda kirjutada tsoonide kaarti"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "ei suuda kirjutada i-kirjeid"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "seek ei õnnestunud"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "ei suuda lugeda superplokki"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "vigane maagiline number superplokis"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Ainult 1k plokid ja tsoonid on toetatud"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "vigane s_imap_blocks väli superplokis"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "vigane s_zmap_blocks väli superplokis"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "ei jätku mälu i-kirjete kaardile"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "ei jätku mälu i-kirjete puhvrile"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "ei jätku mälu i-kirjete loendurile"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "ei jätku mälu tsoonide loendurile"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "ei suuda lugeda i-kirjete kaarti"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "ei suuda lugeda tsoonide kaarti"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "ei suuda lugeda i-kirjeid"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Hoiatus: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld i-kirjet\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld plokki\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Esimene andmete tsoon=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Tsooni suurus=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Max. suurus=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Failisüsteemi olek=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -460,171 +464,171 @@ msgstr ""
 "nime pikkus=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "I-kirje %d on märgitud mittekasutatuks, aga kasutatud failis `%s'\n"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Märkida kasutatuks"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Fail `%s' on moodiga %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "Hoiatus: i-kirjete arv on liiga suur\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "juurkataloogi i-kirje ei kirjelda kataloogi"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Plokk on juba kasutatud, kuid leidus uuesti failis `%s'."
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Kas puhastada"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Plokk %d failis `%s' on märgitud mittekasutatuks."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Kas parandada"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "Kataloog `%s' sisaldab vigast i-kirje numbrit failile `%.*s'"
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " Kas eemaldada"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr "`%s': vigane kataloog: `.' pole esimene\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr "`%s': vigane kataloog: `..' pole teine\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "`%s': vigane kataloog: `.' pole esimene\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "`%s': vigane kataloog: `..' pole teine\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "sisemine viga"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "`%s': vigane kataloog: suurus < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "seek ei õnnestunud funktsioonis bad_zone"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "I-kirje %d moodi ei puhastatud."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "I-kirje %d pole kasutusel, märgitud kasutatuks bitmapis."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "I-kirje %d on kasutusel, märgitud mittekasutatuks bitmapis."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "I-kirje %d (mood = %07o), i_nlinks=%d, loendatud=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "Seada i_nlinks loendatud arvuks"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Tsoon %d; märgitud kasutatuks, kuid ükski fail ei kasuta seda."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Märkida mittekasutatuks"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Tsoon %d: kasutusel, loendatud=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Tsoon %d: kasutusel, loendatud=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Seada bitt bitmapis"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "vigane i-kirje suurus"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "vigane v2 i-kirje suurus"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "interaktiivseks parandamiseks on vaja terminali"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "ei suuda avada seadet %s"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s on puhas ega vaja kontrolli\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Pealesunnitud kontroll failisüsteemil %s\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Failisüsteem %s on \"must\" ja vajab kontrolli\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -633,12 +637,12 @@ msgstr ""
 "\n"
 "%6ld i-kirjet kasutusel (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld tsooni kasutusel (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -661,7 +665,7 @@ msgstr ""
 "------\n"
 "%6d faili\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -752,7 +756,7 @@ msgstr "liiga palju i-kirjeid - maksimum on 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "pole piisavalt vaba ruumi, vaja oleks vähemalt %lu plokki"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Seade: %s\n"
@@ -825,7 +829,7 @@ msgstr "viga %s sulgemisel"
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Kasutamine: mkfs [-V] [-t fstüüp] [fs-võtmed] seade [suurus]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -961,63 +965,63 @@ msgid ""
 "that some device files will be wrong.\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Kasutamine: %s [-c | -l failinimi] [-nXX] [-iXX] /dev/nimi [plokke]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s on monteeritud - siia failisüsteemi ei tee!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "boot-plokki seekimine tabelite kirjutamisel ei õnnestunud"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "ei suuda puhastada boot-sektorit"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "seek ei õnnestunud tabelite kirjutamisel"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "ei suuda kirjutada i-kirjete kaarti"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "ei suuda kirjutada tsoonide kaarti"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "ei suuda kirjutada i-kirjeid"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "ploki kirjutamine ei õnnestunud"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "liiga palju vigaseid plokke"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "liiga vähe korras plokke"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "ei jätku mälu kaartide puhvritele"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "ei jätku mälu i-kirjete puhvrile"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1026,56 +1030,51 @@ msgstr ""
 "Max. suurus=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "seek ei õnnestunud plokkide testimisel"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Imelikud väärtused funktsioonis do_check - ilmselt bugid\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "seek ei õnnestunud plokkide kontrollimisel"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "vigased plokid enne andmepiirkonda - ei suuda failisüsteemi tekitada"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d vigast plokki\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "üks vigane plokk\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "ei suuda vigaste plokkide faili avada"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s pole kompileeritud minix v2 toega\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol viga: plokkide arvu pole antud"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "ei suuda avada seadet %s"
 
 # XXX stat'ida
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "ei suuda stat'ida seadet %s"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "ei ürita luua failisüsteemi seadmele `%s'"
@@ -1114,45 +1113,45 @@ msgid "one bad page\n"
 msgstr "üks vigane lehekülg\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d vigast lehekülge\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: Viga - ei ole öeldud, kuhu saalimisala tekitada\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: Viga - suurus %ld on suurem kui seadme maht %d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: Viga - tundmatu versioon %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: Viga - saalimisala peab olema vähemalt %ldkB\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: Hoiatus - piiran saalimisala %ld kB-ga\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "ei ürita luua saalimisala seadmele `%s'"
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "fataalne viga: esimene lehkülg pole kättesaadav"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1166,24 +1165,24 @@ msgstr ""
 "Saalimisala ei tekitataud. Kui Te tõesti soovite sellele seadmele\n"
 "v0 saalimisala tekitada, kasutage -f võtit selle sundimiseks.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Ei suuda saalimisala tekitada: seade pole loetav"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Tekitan saalimisala versiooniga %d, suurus = %lu KiB\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "ei suuda tagasi kerida saalimisseadet"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "ei suuda kirjutada signatuuriga lehekülge"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync ei õnnestunud"
 
@@ -1223,56 +1222,55 @@ msgstr "%s [ -c | -y | -n | -d ] seade\n"
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "%s [ -c | -y | -n ] seade\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Kasutamatu"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Vaba ruum"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "Ketast sai muudetud\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr "Tehke algkäivitus, et uuendused mõjuma hakkaksid\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1284,768 +1282,782 @@ msgstr ""
 "partitsioone, lugege palun cfdisk'i manuali\n"
 "lisainformatsiooni hankimiseks.\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "FATAALNE VIGA"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Vajuta mõnda klahvi cfdiskist väljumiseks"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "Ei suuda kettal seekida"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Ei suuda kettalt lugeda"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Ei suuda kettale kirjutada"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Liiga palju partitsioone"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "Partitsioon algab enne sektorit 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "Partitsioon lõppeb enne sektorit 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "Partitsioon algab pärast ketta lõppu"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "Partitsioon lõppeb pärast ketta lõppu"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "Loogilised partitsioonid on füüsilisest erinevas järjestuses"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "Loogilised partitsioonid kattuvad"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "Suurendatud loogilised partitsioonid kattuvad"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "Sisemine viga: loogilise partitsiooni loomisel puudub extended-partitsioon"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Siia ei saa loogilist partitsiooni luua - see tekitakse teise extended'i"
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menüükirje on liiga pikk. Menüü võib naljakas välja näha."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menüü ilma suunata, eeldan horisontaalset"
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Vale klahv"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Vajuta mõnda klahvi jätkamiseks"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primaarne"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Loo uus primaarne partitsioon"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Loogiline"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Loo uus loogiline partitsioon"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Tühista"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Ära loo partitsiooni"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Sisemine viga !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Suurus (MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Beginning"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Lisada partitsioon vaba ruumi algusse"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "End"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Lisada partitsioon vaba ruumi lõppu"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Pole ruumi extended-partitsiooni tegemiseks"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr "Puuduv partitsioonitabel või vale signatuur partitsioonitabelis"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Kas soovite alustada tühja tabeliga [y/N] ?"
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "Te andiste suurema silindrite arvu kui kettale mahub"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "Ei suuda avada kettaseadet"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Avasin ketta ainult lugemiseks - kirjutamiseks pole õigust"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Ei suuda kindlaks teha ketta mahtu"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Vigane primaarne partitsioon"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Vigane loogiline partitsioon"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Hoiatus!!  See võib Teie kettal andmeid hävitada!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Olete kindel, et soovite salvestada partitsioonitabelit? (jah või ei):"
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "ei"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Ei kirjutanud partitsioonitabelit kettale"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "jah"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Palun sisestage `jah' või `ei'"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Kirjutan partitsioonitabelit kettale..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Kirjutasin partitsioonitabeli kettale"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Kirjutasin partitsioonitabeli, aga tagasi lugemine ebaõnnestus. Reboot abiks."
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Ükski primaarne partitsioon pole märgitud buutivaks. DOSi MBR ei suuda siit "
 "buutida."
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Rohkem kui üks primaarne partitsioon on märgitud buutivaks. DOSi MBR ei "
 "suuda siit buutida."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Siseta failinimi või vajuta RETURN ekraanil näitamiseks: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ei suuda avada faili `%s'"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Kettaseade: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Vaba   "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr " Primaarne"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr " Loogiline"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Buutiv (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Buutiv"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
-#, c-format
-msgid "Unknown (%02X)"
+#: fdisk/cfdisk.c:2007
+#, fuzzy, c-format
+msgid "(%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Pole (%02X)"
+#: fdisk/cfdisk.c:2009
+#, fuzzy
+msgid "None"
+msgstr "valmis (D)"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitsioonitabel kettal %s\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
+#: fdisk/cfdisk.c:2046
+#, fuzzy
+msgid "               First       Last\n"
 msgstr "            Esimene  Viimane\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
+#, fuzzy
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
 " # Tüüp     Sektor   Sektor   Offset  Pikkus   Failisüst. tüüp (ID)   Lipud\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
+#, fuzzy
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
+#: fdisk/cfdisk.c:2131
+#, fuzzy
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Algus-----      -----Lõpp-----  Esimene Sektorite\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
+#: fdisk/cfdisk.c:2132
+#, fuzzy
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Lipud Pea  Sekt Sil   ID  Pea  Sekt Sil    sektor    arv\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+#, fuzzy
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "tooRes"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Trükkida tabel toores formaadis (baithaaval)"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Sektorid"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Trükkida tabel järjestatuna sektorite järgi"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Trükkida lihtsalt tabel"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Ei trüki midagi"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "cfdiski abiinfo ekraan"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "See on cfdisk, curses'il baseeruv ketta partitsioneerimise"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "programm, mis lubab luua, kustutada ja muuta partitsioone Teie"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "arvuti kõvakettal."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Käsk        Tähendus"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Vahetada buuditavuse lippu jooksval partitsioonil"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          Kustutada jooksev partitsioon"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Muuta silindrite, peade ja rajal olevate sektorite arvu"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             HOIATUS: See käsk on ainult neile, kes teavad, mida "
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             nad teevad."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          Näidata sedasama ekraani"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimiseerida jooksva partitsiooni kettakasutus"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Märkus: see võib teha ketta mitteühilduvaks DOSi,"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             OS/2 ja muude operatsioonisüteemidega."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          Luua uus partitsioon vaba ruumi sisse"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Väljastada partitsioonitabel ekraanile või faili"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "             Väljastamisel võite valida mitme formaadi vahel:"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr " "
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - tooRes - see baidijada, mis kettale kirjutataks"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Sektorite järgi järjestatud tabel"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel teksti kujul (umbes nagu peaekraanil)"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Väljuda programmist ilam muutusi salvestamata"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          Muuta jooksva partitsiooni failisüsteemi tüüpi"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Muuta partitsioonide suuruse ja asukoha ühikuid"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Variandid on MB, sektorid ja silindrid"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Kirjutada partitsioonitabel kettale (jah, suurtäht)"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Kuna see võib kettalt andmeid hävitada, küsitakse"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             enne kirjutamist kinnitust. Vastata tuleb eestikeelse"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             täissõnaga (`jah' või `ei')."
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nool üles    Viia kursor eelmisele reale"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nool alla    Viia kursor järgmisele reale"
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Joonistada ekraan üle"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Näidata sedasama ekraani"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Märkus: kõiki neid käske saab sisestada nii suur- kui väiketähtedena,"
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "välja arvatud suur W."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "silindrid (C)"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Muuta silindrite arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "pead (H)"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Muuta peade arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Muuta sektorite arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "valmis (D)"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "Muutused geomeetrias on tehtud"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Sisestage silindrite arv: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Vigane silindrite arv"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Sisetage peade arv: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Vigane peade arv"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Sisestage sektorite arv rajal: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Vigane sektorite arv"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Sisestage failisüsteemi tüübi number: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "Failisüsteemi tüüpi ei saa muuta tühjaks"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "Failisüsteemi tüüpi ei saa muuta extended'iks"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Buutiv"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Tundmatu (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Kettaseade: %s"
 
-#: fdisk/cfdisk.c:2593
-#, c-format
-msgid "Size: %lld bytes, %ld MB"
+#: fdisk/cfdisk.c:2580
+#, fuzzy, c-format
+msgid "Size: %lld bytes, %lld MB"
 msgstr "Maht: %lld baiti, %ld MB"
 
-#: fdisk/cfdisk.c:2596
-#, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
+#: fdisk/cfdisk.c:2583
+#, fuzzy, c-format
+msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Maht: %lld baiti, %ld.%ld GB"
 
-#: fdisk/cfdisk.c:2600
-#, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
+#: fdisk/cfdisk.c:2587
+#, fuzzy, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Päid: %d    Sektoreid rajal: %d    Silindreid: %d"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Nimi"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Lipud"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Tüüp"
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "FS tüüp"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Label]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
+#: fdisk/cfdisk.c:2597
+#, fuzzy
+msgid "    Sectors"
 msgstr "Sektoreid"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
+#: fdisk/cfdisk.c:2599
+#, fuzzy
+msgid "  Cylinders"
+msgstr "silindrid (C)"
+
+#: fdisk/cfdisk.c:2601
+#, fuzzy
+msgid "  Size (MB)"
 msgstr "Maht (MB)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
+#: fdisk/cfdisk.c:2603
+#, fuzzy
+msgid "  Size (GB)"
 msgstr "Maht (GB)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Buutiv"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Vahetada buuditavuse lippu jooksval partitsioonil"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "kustutaDa"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Kustutada jooksev partitsioon"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geomeetria"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Muuta ketta geomeetriat (ainult ekspertidele)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Help"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Näidata abiinfot"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Maksimiseerida"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimiseerida jooksva partitsiooni kettakasutus (ainult ekspertidele)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "uus (N)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Luua uus partitsioon vaba ruumi sisse"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Prindi"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Väljastada partitsioonitabel ekraanile või faili"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Välja"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Väljuda programmist ilam muutusi salvestamata"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Tüüp"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Muuta failisüsteemi tüüpi (DOS, Linux, OS/2 jne)"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Uhikud"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Muuta partitsioonide suuruse näitamise ühikuid (MB, sektorid, silindrid)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "salvesta (W)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Kirjutada partitsioonitabel kettale (võib hävitada andmed)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "Seda partitsiooni ei saa buutivaks teha"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "Tühja partitsiooni ei saa kustutada"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "Seda partitsiooni ei saa maksimiseerida"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "See partitsioon pole kasutatav"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "See partitsioon on juba olemas"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "Tühja partitsiooni tüüpi ei saa muuta"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "Rohkem partitsioone ei ole"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Vigane käsk"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 #, fuzzy
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2080,7 +2092,7 @@ msgstr ""
 "                sektorite arvud\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2102,7 +2114,7 @@ msgstr ""
 "-b 2048: kasutada 2048-baidiseid sektoreid (vajalik näiteks mõnel MO "
 "seadmel)\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2119,222 +2131,222 @@ msgstr ""
 "jaoks)\n"
 "            ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Ei suuda avada seadet %s\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Ei suuda lugeda seadet %s\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ei suuda seekida seadmel %s\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Ei suuda kirjutada seadmele %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl ei õnnestunud seadmel %s\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Mälu sai otsa\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Fataalne viga\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Käsk    Tähendus"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   lülitada kirjutuskaitse lipp sisse/välja"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b redigeerida NSD partitsioonitabelit"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   lülitada monteeritavuse lipp sisse/välja"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   kustutada partitsioon"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   anda nimekiri tuntud partitsioonitüüpidest"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   näidata sedasama menüüd"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   lisada uus partitsioon"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   luua uus tühi DOSi partitsioonitabel"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   näidata partitsioonitabelit"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   väljuda salvetsamata"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   luua uus tühi Sun'i partitsioonitabel"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   muuta partitsiooni tüüpi"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   muuta sisestamise ja tabeli näitamise ühikuid"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   kontrollida partitsioonitabelit"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   kirjutada tabel kettale ja väljuda"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   lisafunktsionaalsus (ainult ekspertidele)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   valida buutiv partitsioon"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b   redigeerida buutfaili kirjet"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   valida SGI saalimispartitsioon"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a   lülitada buuditavuse lipp sisse/välja"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   lülitada DOSiga ühilduvuse rezhiim sisse/välja"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   muuta alternatiivsete silindrite arvu"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   muuta silindrite arvu"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   näidata partitsioonitabelit baidikaupa"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   muuta lisasektorite arvu silindril"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   muuta peade arvu"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   muuta interleave-tegurit"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   muuta pöörlemise kiirust (rpm)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   tagasi peamenüüsse"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   muuta sektorite arvu rajal"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   muuta füüsiliste silindrite arvu"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   liigutada andmete algust partitsioonis"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   näidata extended-partitsioonide nimekirja"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   luua IRIXi (SGI) partitsioonitabel"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f   parandada partitsioonide järjekord"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "Te peate määrama, et eksisteerib nii-ja-nii-mitu"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "pead"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "sektorit"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "silindrit"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2343,11 +2355,11 @@ msgstr ""
 "%s%s.\n"
 "Te saate seda teha lisafunktsionaalsuse menüüst.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " ja "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2366,26 +2378,26 @@ msgstr ""
 "2) muude operatsioonisüsteemide buutimise ja partitsioneerimise\n"
 "tarkvaraga (näiteks DOSi FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Vigane offset primaarses extended-partitsioonis\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Hoiatus: kustutan partitsioonid pärast %d\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Hoiatus: üleliigne 'link pointer' partitsioonitabelis %d\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Hoiatus: ignoreerin üleliigseid andmeid partitsioonitabelis %d\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2396,37 +2408,37 @@ msgstr ""
 "kuni Te ise otsustate need kettale kirjutada. Pärast seda pole vana sisu\n"
 "loomulikult enam taastatav.\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Märkus: sektori suurus on %d (mitte %d)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr "Partitsioonitabelit ei saa salvestada\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr "Seade ei sisalda ei DOSi, Suni, SGI ega ODF partitsioonitabelit\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Sisemine viga\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignoreerin lisa-extended partistsiooni %d\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2435,7 +2447,7 @@ msgstr ""
 "Hoiatus: vigane lipp 0x%04x (partitsioonitabelis %d) parandatakse\n"
 "kirjutamisel (w) ära\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2443,79 +2455,79 @@ msgstr ""
 "\n"
 "Sain EOF-i kolm korda järjest - aitab\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Kuueteistkümnendsüsteemis kood (L näitab koodide nimekirja): "
 
-#: fdisk/fdisk.c:1069
+#: fdisk/fdisk.c:1094
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, vaikimisi %d): "
 
-#: fdisk/fdisk.c:1136
+#: fdisk/fdisk.c:1161
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Kasutan vaikimisi väärtust %d\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "Väärtus on piiridest väljas\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Partitsiooni number"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Hoiatus: partitsioonil %d on tühi tüüp\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Ignoreerin lisa-extended partistsiooni %d\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 #, fuzzy
 msgid "No partition is defined yet!\n"
 msgstr "Ühtegi partitsiooni pole defineeritud\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "silinder"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Sisestamisel ja näitamisel on nüüd ühikuteks %s\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "Hoiatus: partitsioon %d on extended-partitsioon\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOSiga ühilduvuse lipp on püsti\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOSiga ühilduvuse lipp pole püsti\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partitsiooni %d pole veel olemas!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2527,7 +2539,7 @@ msgstr ""
 "tekitada tüüpi 0 partitsioone. Te saate partitsiooni\n"
 "kustutada käsuga 'd'.\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2535,7 +2547,7 @@ msgstr ""
 "Partitsiooni ei saa muuta extended'iks ega extendedist harilikuks.\n"
 "Selle asemel tuleb partitsioon kustutada ja uus luua.\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2544,7 +2556,7 @@ msgstr ""
 "Soovitav on jätta partitsioon 3 terveks kettaks (5),\n"
 "sest SunOs/Solaris eeldab seda ja see meeldib isegi Linuxile.\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2553,61 +2565,61 @@ msgstr ""
 "Kaaluge partitsiooni 9 jätmist köite päiseks (0) ja\n"
 "partitsiooni 11 jätmist terveks kettaks (6) nagu IRIX seda eeldab\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Partitsiooni %d tüüp on nüüd %x (%s)\n"
 
-#: fdisk/fdisk.c:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "Partitsiooni %d füüsiline ja loogiline algus ei lange kokku:\n"
 "(Pole Linuxi oma?)\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     füüs=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "loogiline=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partitsiooni %d füüsiline ja loogiline lõpp ei lange kokku:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partitsioon %i ei alga silindri piirilt:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "peaks olema (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partitsioon %d ei lõppe silindri piiril\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "peaks olema (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2617,7 +2629,7 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -2625,19 +2637,19 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
+msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2645,16 +2657,16 @@ msgstr ""
 "Midagi pole vaja teha, järjestus on juba õige\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
-#, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
+#: fdisk/fdisk.c:1704
+#, fuzzy, c-format
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot    Algus       Lõpp   Plokke   Id  Süsteem\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Seade"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2662,7 +2674,7 @@ msgstr ""
 "\n"
 "Partitsioonitabeli kirjed on füüsilisest erinevas järjekorras\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2673,91 +2685,92 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
+#: fdisk/fdisk.c:1754
+#, fuzzy
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Pä Sek  Sil  Pä Sek  Sil    Algus     Maht ID\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Hoiatus: partitsioon %d sisaldab sektorit 0\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partitsioon %d: pea %d on suurem kui peade arv %d\n"
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partitsioon %d: sektor %d on suurem kui sektroite arv rajal %d\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partitsioon %d: silinder %d on suurem kui silindrite arv %d\n"
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partitsioon %d: eelnevate sektorite arv %d ei klapi summarsega (%d)\n"
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Hoiatus: partitsioonis %d on andmete algus vigane\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Hoiatus: partitsioon %d kattub partitsiooniga %d\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Hoiatus: partitsioon %d on tühi\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Loogiline partitsioon %d pole üleni partitsioonis %d\n"
 
-#: fdisk/fdisk.c:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Kogu kasutataud sektorite arv %d on suurem kui sektorite koguarv %d\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d vaba sektorit\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partitsioon %d on juba olemas. Kustutage see enne uuesti lisamist\n"
 
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Esimene %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "Vabad sektorid on otsas\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Viimane %s või +suurus või +suurusM või +suurusK"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2770,17 +2783,27 @@ msgstr ""
 "\t(käsuga o).\n"
 "\tHOIATUS: see hävitab ketta praeguse sisu!\n"
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "Maksimaalne arv partitsioone on juba loodud\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Te peate kõigepealt mõne partitsiooni kustutama ja asemele\n"
 "extended partitsiooni tegema\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "Loogilised partitsioonid on füüsilisest erinevas järjestuses"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Vigane primaarne partitsioon"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2791,20 +2814,20 @@ msgstr ""
 "   %s\n"
 "   p   primaarse partitsiooni (1-4) loomine\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l   loogilise partitsiooni (5-...) loomine"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e   extended partitsiooni loomine"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Vigane partitsiooni number tüübile `%c'\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2812,11 +2835,11 @@ msgstr ""
 "Partitsioonitabelit on muudetud!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kasutan ioctl() partitsioonitabeli uuesti lugemiseks\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2830,7 +2853,7 @@ msgstr ""
 "Tuum kasutab endiselt vana tabelit,\n"
 "uus tabel hakkab kehtima järgmisest buudist alates.\n"
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2842,64 +2865,64 @@ msgstr ""
 "partitsioone, lugege palun fdisk'i manuali\n"
 "lisainformatsiooni jaoks.\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Kirjutan puhvreid kettale\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitsioonil %d pole andmetele ruumi eraldatud\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Andmete uus algus"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Eksperdi käsk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Sisestage silindrite arv"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Sisetage peade arv"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Sisetage sektorite arv"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Hoiatus: sean sektorite offseti DOSiga ühilduvuse jaoks\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Seade %s ei sisalda äratuntavat partitsioonitabelit\n"
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Ei suuda avada faili %s\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tundmatu käsk\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Kasutatav tuum leiab sektori suuruse ise - ignoreerin -b võtit\n"
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2908,18 +2931,18 @@ msgstr ""
 "täpselt määratud seadmega\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Leidisn seadmelt %s OSF/1 partitsioonitabeli, lähen OSF/1 rezhiimi.\n"
 "DOSi partitsioonitabeli rezhiimi naasmiseks kasutage käsku `r'.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Käsk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2928,15 +2951,15 @@ msgstr ""
 "\n"
 "Aktiivne buutfail on %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Palun sisestage uue buutfaili nimi: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "Buutfail jäi samaks\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2946,7 +2969,7 @@ msgstr ""
 "\tVabandust, SGI partitsioonitabeli jaoks pole ekspertmenüüd\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3308,8 +3331,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linuxi swap"
 
@@ -3542,7 +3564,7 @@ msgstr ""
 "terve ketta kirje tohib seda reeglit rikkuda.\n"
 "Kui olete kindel, et soovite seda tüüpi muuta, kirjutage YES\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -3704,15 +3726,15 @@ msgstr "Alternatiivseid silindreid"
 msgid "Physical cylinders"
 msgstr "Füüsilisi silindreid"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Pöörlemiskiirus (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Vahelejätu tegur"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Lisasektoreid silindril"
 
@@ -3766,7 +3788,7 @@ msgstr ""
 "Kolmas partitsioon ei kata kogu ketast, aga sisesatud väärtus %d %s\n"
 "katab mingi muu partitsiooni. Sisestatud kirje uueks väärtuseks on %d %s\n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3775,7 +3797,7 @@ msgstr ""
 "Kui soovite hoida ühilduvust SunOS'i/Solarisega, jätke see partitsioon\n"
 "kogu ketast katma (5), alguseks 0, pikkuseks %u sektorit\n"
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3789,7 +3811,7 @@ msgstr ""
 "sisestage YES, kui olete tõdesti kindlad, et tahate partitsiooni tüübiks\n"
 "panna 82 (Linuxi saalimisala):"
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3808,7 +3830,7 @@ msgstr ""
 "Ühikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3821,16 +3843,16 @@ msgstr ""
 "Ühikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Lipp    Algus       Lõpp   Plokke   ID  Süsteem\n"
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Alternatiivsete silindrite arv"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Füüsiliste silindrite arv"
 
@@ -3881,20 +3903,24 @@ msgstr "OS/2 Boot Manager"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
+#, fuzzy
+msgid "W95 FAT32"
 msgstr "Win95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "W95 FAT16 (LBA)"
 msgstr "Win95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
+#, fuzzy
+msgid "W95 Ext'd (LBA)"
 msgstr "Win95 Ext'd (LBA)"
 
 #: fdisk/i386_sys_types.c:21
@@ -3926,15 +3952,18 @@ msgid "AST SmartSleep"
 msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
+#, fuzzy
+msgid "Hidden W95 FAT32"
 msgstr "Peidetud Win95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT32 (LBA)"
 msgstr "Peidetud Win95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT16 (LBA)"
 msgstr "Peidetud Win95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
@@ -4043,6 +4072,12 @@ msgstr "Vana Minix"
 msgid "Minix / old Linux"
 msgstr "Minix / vana Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linuxi swap"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 peidetud C: ketas"
@@ -4197,89 +4232,89 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "Postisioneerimise viga seadmel %s - ei saa minna positsioonile %lu\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "Positsioneerimise viga: tahtsin 0x%08x%08x, sain 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "Mälu sai otsa - annan alla\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "Lugemisviga seadmel %s - ei saa lugeda sektorit %lu\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "VIGA: sektor %lu ei sisalda msdos'i signatuuri\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "Kirjutamisviga seadmel %s - ei saa kirjutada sektorit %lu\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "Ei suuda avada partitsioonitabeli salvestusfaili (%s)\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "Kirjutamise viga seadmel %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "Ei saa lugeda partitsioonitabeli salvestusfaili staatust (%s)\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "Partitsioonitabeli salvestusfail on vale pikkusega - ei taasta\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "Mälu sai otsa\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "Ei saa avada partitsioonitabeli salvestusfaili (%s)\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "Viga %s lugemisel\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "ei suuda avada seadet %s kirjutamiseks\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "Viga sektori %lu kirjutamisel seadmele %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Ketas %s: ei suuda mahtu kindlaks teha\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Ketas %s: ei suuda geomeetriat kindlaks teha\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4290,22 +4325,22 @@ msgstr ""
 "terve ketas. fdiski kasutamine on ilmselt mõttetu.\n"
 "Kasutage --force võtit, kui tõesti tahate seda teha.\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Hoiatus: HDIO_GETGEO ütles, et seadmel on %lu pead\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Hoiatus: HDIO_GETGEO ütles, et seadmel on %lu sektorit\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Hoiatus: BLKGETSIZE/HDIO_GETGEO ütles, et seadmel on %lu silindrit\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4315,7 +4350,7 @@ msgstr ""
 "See tekitab probleeme kõigi programmidega, mis üritavad kasutada\n"
 "C/H/S (silinder/pea/sektor) adresseerimist.\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4324,14 +4359,14 @@ msgstr ""
 "\n"
 "Ketas %s: %lu silindrit, %lu pead, %lu sektorit rajal\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 "%s partitsioonil %s sisaldab vigast pead numbrit: %lu (peaks olema 0-%lu)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4340,7 +4375,7 @@ msgstr ""
 "%s partitsioonil %s sisaldab vigast sektori väärtust: %lu (peaks olema 1-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4349,7 +4384,7 @@ msgstr ""
 "%s partitsioonil %s sisaldab vigast silindri väärtust: %lu (peaks olema 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4357,11 +4392,11 @@ msgstr ""
 "ID  Nimi\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Loen uuesti partitsioonitabelit...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4369,31 +4404,31 @@ msgstr ""
 "Partitsioonitabeli ülelugemine ei õnnestunud\n"
 "Tehke arvutile kohe alglaadimine, enne mkfs kasutamist\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Viga %s sulgemisel\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: sellist partitsiooni ei ole\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "Tundmatu formaat - kasutan sektoreid\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s partitsioonitabel\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "Seda formaati pole veel realiseeritud - kasutan %s\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4402,11 +4437,11 @@ msgstr ""
 "Ühikud = silindrid %lu baidiga, plokid 1024 baidiga, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Seade  Buut Algus     Lõpp   #sil     #plokke   ID  Süsteem\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4415,11 +4450,11 @@ msgstr ""
 "Ühikud = sektorid 512 baidiga, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Seade  Buut    Algus      Lõpp   #sektors  ID  Süsteem\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4428,11 +4463,11 @@ msgstr ""
 "Ühikud = 1024-baidised plokid, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Seade  Buut   Algus      Lõpp    #plokke   ID  Süsteem\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4441,31 +4476,31 @@ msgstr ""
 "Ühikud = megabaidid (1048576 baiti), plokid (1024 baiti), loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 #, fuzzy
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Seade  Buut Algus   Lõpp    MB    #plokke   ID  Süsteem\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\talgus: (c,h,s) ootasin (%ld,%ld,%ld), sain (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tlõpp: (c,h,s) ootasin (%ld,%ld,%ld), sain (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "Partitsioon lõpeb silindril %ld, tagapool ketta lõppu\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "Ei leidnud ühtegi partitsiooni\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4476,51 +4511,51 @@ msgstr ""
 "C/H/S=*/%ld/%ld jaoks (mitte %ld/%ld/%ld).\n"
 "Eeldan seda geomeetriat nimekirja näitamisel.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Imelik, ainult  %d partitsiooni on defineeriud\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, aga pole märgitud tühjaks\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, kuid on märgitud buutivaks\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, kuid algus pole 0\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Hoiatus: partitsioon %s "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "ei sisaldu partitsioonis %s\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Hoiatus: partitsioonid %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "ja %s kattuvad\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4529,17 +4564,17 @@ msgstr ""
 "Hoiatus: partitsioon %s sisaldab osa partitsioonitabelist (sektor %lu)\n"
 "ja hävitab selle, kui ta andmetega täidetakse\n"
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Hoiatus: partitsioon %s algab sektorilt 0\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Hoiatus: partitsioon %s sõidab üle ketta otsa\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4547,17 +4582,17 @@ msgstr ""
 "Ainult üks primaarsetest partitsioonidest tohib olla extended\n"
 "(kuigi see pole Linuxis probleemiks)\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Hoiatus: partitsioon %s ei alga silindri piirilt\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Hoiatus: partitsioon %s ei lõppe silindri piiril\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4567,7 +4602,7 @@ msgstr ""
 "LILO jaoks pole see oluline, aga DOS-i MBR võib buutimisel raskustesse "
 "sattuda.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4575,7 +4610,7 @@ msgstr ""
 "Hoiatus: harilikult saab buutida ainult primaarsetelt partitsioonidelt,\n"
 "ainult LILO ignoreerib buuditavuse lippu.\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4583,39 +4618,39 @@ msgstr ""
 "Hoiatus: ükski primaarne partitsioon pole märgitud buutivaks (aktiivseks).\n"
 "See pole LILO jaoks oluline, aga DOS-i MBR ei suuda siit kettalt buutida.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 msgid "start"
 msgstr ""
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 #, fuzzy
 msgid "end"
 msgstr "End"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4623,340 +4658,340 @@ msgstr ""
 "Hoiatus: extended partitsioon ei alga silindri piirilt.\n"
 "DOS ja Linux interpreteerivad selle sisu erinevalt.\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
-msgstr ""
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
+msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr ""
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "Hoiatus: tühi partitsioon\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "Liiga palju partitsioone\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Kasutamine: %s [ võtmed ] seade ...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "kasutamine:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "kokku: %d plokki\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ei suuda avada seadet %s lugemiseks ja kirjutamiseks\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ei suuda avada seadet %s lugemiseks\n"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -4964,42 +4999,42 @@ msgstr ""
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fataalne viga: ei suuda leida %s\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Hoiatus: %s pole plokkseade\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5007,66 +5042,66 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "Palun sisestage y, n või q\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5663,7 +5698,7 @@ msgstr "Ootan ts
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK ioctl kella lugemiseks ei õnnestunud"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "Taimaut oodates kellaaja muutumist\n"
 
@@ -5688,57 +5723,67 @@ msgstr "Ei suuda avada seadet /dev/tty1 v
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK ioctl ei õnnestunud"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "%s avamine ei õnnestunud"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "ioctl() abil kella lugemine %s kaudu ei õnnestnud\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "Ootan tsükils, kuni %s kaudu saadud aeg edasi läheb\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s ei paku katkestusfunktsioone. "
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "%s lugemine kella tiksu ootamisel ei õnnestunud"
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "%s lugemine kella tiksu ootamisel ei õnnestunud"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "%s lugemine kella tiksu ootamisel ei õnnestunud"
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "%s ioctl() abil ei õnnestunud välja lülitada kella katkestusi"
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr "%s ioctl() abil ei õnnestunud sisse lülitada kella katkestusi"
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "ioctl() %s kaudu kella seadmiseks ei õnnestunud\n"
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) õnnestus\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "%s avamine ei õnnestunud"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5748,17 +5793,17 @@ msgstr ""
 "Epohhi väärtuse manipuleerimiseks tuleb kasutada 'rtc' draiverit seadmefaili "
 "%s kaudu. Antud süsteemis seda faili ei leidu\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "Ei suuda avada seadet %s"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "%s ioctl(RTC_EPOCH_READ) ei õnnestunud"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "lugesime epohhi %ld %s kaudu RTC_EPOCH_READ ioctl abil\n"
@@ -5766,23 +5811,23 @@ msgstr "lugesime epohhi %ld %s kaudu RTC_EPOCH_READ ioctl abil\n"
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "Epohhi väärtus ei tohi olla alla 1900. Teie andsite %ld\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr "sean epohhiks %ld %s RTC_EPOCH_SET ioctl abil\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "Tuuma draiver %s jaoks ei toeta RTC_EPOCH_SET ioctl'i\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "%s ioctl(RTC_EPOCH_SET) ei õnnestunud"
@@ -5958,51 +6003,66 @@ msgstr "Sisselogimisest liinil %s masinast %s keeldutakse vaikereegli t
 msgid "Login on %s from %s denied.\n"
 msgstr "Sisselogimisest liinil %s masinast %s keeldutakse\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: Teid (kasutajat %d) pole olemas\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: Kasutajat \"%s\" pole olemas\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr "%s: ainult lokaalseid kirjeid saab muuta - kasutage programmi yp%s\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+msgid "Unknown user context"
+msgstr ""
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Muudan kasutaja %s kohta käivat informatsiooni\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Miski ei klapi"
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Parool: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Vale parool"
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "Kasutaja informatsioon ei muutunud\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Kasutamine: %s [ -f pärisnimi ] [ -o kontor] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6010,11 +6070,11 @@ msgstr ""
 "[ -p töötelefon]\n"
 "\t[ -h kodune telefon] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6022,58 +6082,70 @@ msgstr ""
 "\n"
 "Katkestatud\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "väli on liiga pikk\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' ei ole lubatud\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Juttsümbolid ei ole lubatud\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr "Kasutaja informatsiooni ei muudetud. Proovige hiljem uuesti\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "Mälu sai otsa"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" pole kirjas failis /etc/shells\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr "%s: Teie shell pole kirjas failis /etc/shells, shelli ei muuda\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Muudame kasutaja %s shelli\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Uus shell"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "Shell jäi samaks\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Shelli ei muudetud, proovige hiljem uuesti\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Shell on muudetud\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
@@ -6082,57 +6154,57 @@ msgstr ""
 "Kasutamine: %s [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ kasutajanimi ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: shelli peab andma koos täieliku teega\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" ei eksisteeri\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" ei ole täidetav\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' ei ole lubatud\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Juhtsümbolid ei ole lubatud\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Hoiatus: \"%s\" pole kirjas failis /etc/shells\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" pole kirjas failis /etc/shells\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: kasutage -l lubatud shellide nimekirja vaatamiseks\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Hoiatus: \"%s\" pole kirjas failis /etc/shells\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Kasutage %s -l lubatud shellide nimekirja vaatamiseks\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "Ei leidu ühtegi lubatud shelli\n"
 
@@ -6326,78 +6398,78 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Teil on liiga palju protsesse töötamas\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP AT %s BY %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN ON %s FROM %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN ON %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN ON %s BY %s FROM %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN ON %s BY %s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "Teile on uusi kirju\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "Teile on kirju\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: Viga fork'imisel: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ei õnnestunud: %m"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() ei õnnestunud"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Kataloogi %s pole!\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Login sisse kodukataloogiga \"/\"\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: Ei jätku mälu shell-skriptile\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: Ei suutnud käivitada shell skripti: %s\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: shelli pole: %s\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6406,62 +6478,62 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "Kasutajanimi on liiga pikk\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "Nimi on liiga pikk"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "Kasutajanimed ei tohi alata miinusega\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "Liiga palju tühje ridu\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "TOHUTULT reavahetusi"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login timed out after %d seconds\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Viimati loginud: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "masinast %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "terminalil %.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN FAILURE FROM %s, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN FAILURE ON %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN FAILURES FROM %s, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -6862,57 +6934,67 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: Vigane veakood"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
 msgstr ""
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
 msgstr ""
 
 # XXX bug
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr ""
 
 # XXX bug
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr ""
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, c-format
+msgid "%s: Can't get context for %s"
+msgstr ""
+
+#: login-utils/vipw.c:208
+#, c-format
+msgid "%s: Can't set context for %s"
+msgstr ""
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr ""
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr ""
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr ""
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr ""
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr ""
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr ""
@@ -7105,7 +7187,7 @@ msgstr "%s: %s 
 msgid "call: %s from to files...\n"
 msgstr "Kasutamine: %s kust kuhu failid...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7113,37 +7195,37 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Kasutamine: script [-a] [-f] [-q] [-t] [fail]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr ""
 
@@ -7414,216 +7496,150 @@ msgstr ""
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr ""
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr ""
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr ""
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr ""
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
+msgid ", offset %lld"
 msgstr ""
 
-#: mount/lomount.c:184
+#: mount/lomount.c:104
 #, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
+msgid ", sizelimit %lld"
 msgstr ""
 
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr ""
-
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
 msgstr ""
 
-#: mount/lomount.c:253
+#: mount/lomount.c:126
 #, 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'.)"
+msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:259
-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?"
+#: mount/lomount.c:129
+#, c-format
+msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:263
-msgid "mount: could not find any free loop device"
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:359
-#, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "ei suuda avada seadet %s lugemiseks\n"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Uus parool uuesti: "
-
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "kataloogi avamine ei õnnestunud\n"
-
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "Parool peab olema vähemalt 6 sümbolit. Proovige uuesti\n"
-
-#: mount/lomount.c:472
-#, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Mälu sai otsa\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
 msgstr ""
 
-#: mount/lomount.c:490
-#, c-format
+#: mount/lomount.c:192
 msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
+"mount: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
+#: mount/lomount.c:197
+msgid "mount: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr ""
-
-#: mount/lomount.c:661
+#: mount/lomount.c:340
 #, c-format
-msgid "Non-hex digit '%c'.\n"
+msgid "set_loop(%s,%s,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:764
+#: mount/lomount.c:356
+#, fuzzy, c-format
+msgid "loop: can't delete device %s: %s\n"
+msgstr "%s: ei suuda käivitada programmi %s: %m"
+
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
+msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
 
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "ei suuda avada seadet %s lugemiseks\n"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
-msgstr ""
-
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
 msgstr ""
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 
 #: mount/mntent.c:168
@@ -7640,41 +7656,41 @@ msgstr ""
 msgid "; rest of file ignored"
 msgstr ""
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr ""
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr ""
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr ""
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
@@ -7696,257 +7712,234 @@ msgstr ""
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr ""
+
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: ei suuda avada seadet %s kiiruse seadmiseks"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr ""
 
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr ""
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr ""
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr ""
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr ""
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr ""
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr ""
-
-#: mount/mount.c:1124
-#, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr ""
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr ""
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr ""
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr ""
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr ""
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1386
+#: mount/mount.c:1362
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -7967,77 +7960,76 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr ""
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr ""
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr ""
@@ -8131,7 +8123,7 @@ msgstr ""
 msgid "bug in xstrndup call"
 msgstr ""
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8140,7 +8132,7 @@ msgid ""
 "       %s [-s]\n"
 msgstr ""
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8148,96 +8140,31 @@ msgid ""
 "       %s [-v] special ...\n"
 msgstr ""
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "Mälu sai otsa"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr ""
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr ""
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-msgid "swapon: invalid loop device name\n"
-msgstr ""
-
-#: mount/swapon.c:309
-msgid "swapon: invalid encryption type\n"
-msgstr ""
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "ei suuda avada seadet %s"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "See partitsioon on juba olemas"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "ei suuda tagasi kerida saalimisseadet"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "ei suuda avada lugemiseks seadet /dev/urandom"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "ei suuda kirjutada i-kirjeid"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "fork ei õnnestunud\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Muudame kasutaja %s parooli\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr ""
@@ -8302,77 +8229,77 @@ msgstr ""
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:602
+#: mount/umount.c:616
 #, c-format
-msgid "umount: only root can unmount %s from %s"
+msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8502,7 +8429,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr ""
@@ -8654,22 +8581,22 @@ msgstr ""
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
-msgid "max number of segments = %ld\n"
+msgid "max number of segments = %lu\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:280
 #, c-format
-msgid "max seg size (kbytes) = %ld\n"
+msgid "max seg size (kbytes) = %lu\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:282
 #, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+msgid "max total shared memory (pages) = %lu\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:284
 #, c-format
-msgid "min seg size (bytes) = %ld\n"
+msgid "min seg size (bytes) = %lu\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:289
@@ -9177,7 +9104,11 @@ msgstr ""
 msgid "missing comma"
 msgstr ""
 
-#: sys-utils/readprofile.c:115
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "Mälu sai otsa"
+
+#: sys-utils/readprofile.c:118
 #, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
@@ -9189,37 +9120,38 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, fuzzy, c-format
 msgid "%s version %s\n"
 msgstr "mkfs versioon %s (%s)\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr ""
 
@@ -9697,6 +9629,67 @@ msgstr ""
 msgid "Out of memory when growing buffer.\n"
 msgstr ""
 
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s pole kompileeritud minix v2 toega\n"
+
+#~ msgid "Boot (%02X)"
+#~ msgstr "Buutiv (%02X)"
+
+#~ msgid "None (%02X)"
+#~ msgstr "Pole (%02X)"
+
+#, fuzzy
+#~ msgid "Error: unable to open %s for reading\n"
+#~ msgstr "ei suuda avada seadet %s lugemiseks\n"
+
+#, fuzzy
+#~ msgid "Retype password: "
+#~ msgstr "Uus parool uuesti: "
+
+#, fuzzy
+#~ msgid "Error: gpg key file decryption failed\n"
+#~ msgstr "kataloogi avamine ei õnnestunud\n"
+
+#, fuzzy
+#~ msgid "Error: Password must be at least %d characters.\n"
+#~ msgstr "Parool peab olema vähemalt 6 sümbolit. Proovige uuesti\n"
+
+#, fuzzy
+#~ msgid "Error: Unable to allocate memory\n"
+#~ msgstr "Mälu sai otsa\n"
+
+#, fuzzy
+#~ msgid "Error: unable to open /etc/fstab for reading\n"
+#~ msgstr "ei suuda avada seadet %s lugemiseks\n"
+
+#, fuzzy
+#~ msgid "swapon: unable to open loop device %s\n"
+#~ msgstr "ei suuda avada seadet %s"
+
+#, fuzzy
+#~ msgid "swapon: loop device %s already in use\n"
+#~ msgstr "See partitsioon on juba olemas"
+
+#, fuzzy
+#~ msgid "swapon: unable to open swap device %s\n"
+#~ msgstr "ei suuda tagasi kerida saalimisseadet"
+
+#, fuzzy
+#~ msgid "swapon: unable to open /dev/urandom\n"
+#~ msgstr "ei suuda avada lugemiseks seadet /dev/urandom"
+
+#, fuzzy
+#~ msgid "swapon: unable to create pipe\n"
+#~ msgstr "ei suuda kirjutada i-kirjeid"
+
+#, fuzzy
+#~ msgid "swapon: fork failed\n"
+#~ msgstr "fork ei õnnestunud\n"
+
+#, fuzzy
+#~ msgid "swapon: random password for %s is %s"
+#~ msgstr "Muudame kasutaja %s parooli\n"
+
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Partitsioon %i ei lõppe silindri piiril:\n"
 
diff --git a/po/fi.po b/po/fi.po
index cdf5db1a..c427d344 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,106 +10,111 @@
 # Tätä tiedostoa ja muutettuja versioita saa kopioida
 # ja levittää vapaasti edellyttäen, että tätä otsikkoa
 # ei poisteta, ja muutetut versiot merkitään muutetuiksi.
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11z\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
-"PO-Revision-Date: 2003-02-07 22:22+0200\n"
+"Project-Id-Version: util-linux 2.12\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
+"PO-Revision-Date: 2003-08-20 11:40+0300\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "aseta vain luku -tilaan"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "aseta luku-kirjoitus-tilaan"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "hae vain luku -tila"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "hae sektorikoko"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr "hae lohkokoko"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
 msgstr "aseta lohkokoko"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "hae koko"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "aseta lukuennakko"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "hae lukuennakko"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "tyhjennä puskurit"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "lue osiotaulu uudelleen"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
 msgstr "Käyttö:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr "  %s --report [laitteet]\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "  %s [-v|-q] komennot laitteet\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Käytettävissä olevat komennot:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: Tuntematon komento: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s vaatii argumentin\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr "%s onnistui.\n"
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: tiedostoa %s ei voi avata\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: ioctl-virhe laitteessa %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   AlkuSekt     Koko    Laite\n"
 
@@ -152,12 +157,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "käyttö: %s [ -n ] laite\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s paketista %s\n"
@@ -296,49 +301,49 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: virheellinen cramfs--virheellinen tiedostodatan siirtymä\n"
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Käyttö: %s [-larvsmf] /dev/nimi\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s on liitetty.\t "
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Haluatko varmasti jatkaa"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "tarkistus keskeytetty.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Vyöhykenumero < FIRSTZONE tiedostossa \"%s\"."
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Vyöhykenumero >= ZONES tiedostossa \"%s\"."
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Poista lohko"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Lukuvirhe: siirtyminen lohkoon ei onnistu tiedostossa \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Lukuvirhe: viallinen lohko tiedostossa \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -346,122 +351,122 @@ msgstr ""
 "Sisäinen virhe: yritetään kirjoittaa viallista lohkoa\n"
 "Kirjoituspyyntöä ei huomioida\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "siirtyminen epäonnistui funktiossa write_block"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Kirjoitusvirhe: viallinen lohko tiedostossa \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "siirtyminen epäonnistui funktiossa write_super_block"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "superlohkon kirjoitus ei onnistu"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "I-solmukarttaa ei voi kirjoittaa"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "Vyöhykekartan kirjoitus ei onnistu"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "I-solmuja ei voi kirjoittaa"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "siirtyminen epäonnistui"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "superlohkoa ei voi lukea"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "virheellinen taikaluku superlohkossa"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Vain 1k-lohkot/vyöhykkeet ovat tuettuja"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "virheellinen s_imap_blocks-kenttä superlohkossa"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "virheellinen s_zmap_blocks-kenttä superlohkossa"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "I-solmukartalle ei voi varata puskuria"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "I-solmuille ei voi varata puskuria"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "I-solmujen laskemiseen ei voi varata puskuria"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "Vyöhykkeen laskemiseen ei voi varata puskuria"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "I-solmukarttaa ei voi lukea"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "Vyöhykekarttaa ei voi lukea"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "I-solmuja ei voi lukea"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Varoitus: Ensimmäinenvyöhyke != Norm_ensimmäinenvyöhyke\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld i-solmua\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld lohkoa\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Ensimmäinendatavyöhyke=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Vyöhykekoko=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxkoko=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Tied.järj. tila=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -470,172 +475,172 @@ msgstr ""
 "nimenpituus=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Käyttämättömäksi merkittyä i-solmua %d käytetään tiedostoon \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Merkitse käyttöön"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Tiedostolla \"%s\" on tila %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "Varoitus i-solmujen määrä on liian suuri.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "juuren i-solmu ei ole hakemisto"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Lohkoa on käytetty aikaisemmin. Nyt tiedostossa \"%s\"."
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Lohko %d tiedostossa \"%s\" on merkitty käyttämättömäksi."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Korjaa"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "Hakemisto \"%s\" sisältää virheellisen i-solmunumeron tiedostolle \"%.*s\"."
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " Poista"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr "\"%s\": viallinen hakemisto: \".\" ei ole ensimmäisenä\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr "\"%s\": viallinen hakemisto: \"..\" ei ole toisena\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: viallinen hakemisto: \".\" ei ole ensimmäisenä\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: viallinen hakemisto: \"..\" ei ole toisena\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "sisäinen virhe"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: viallinen hakemisto: koko < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "siirtyminen epäonnistui funktiossa bad_zone"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "I-solmun %d tila ei ole tyhjennetty."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "I-solmua %d ei käytetä, merkitty käytetyksi bittikartassa."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "I-solmu %d käytössä, merkitty käyttämättömäksi bittikartassa."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "I-solmu %d (tila = %07o), i_linkkimäärä=%d, laskettu=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "Aseta i_linkkimäärä lasketun mukaiseksi"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Vyöhyke %d: merkitty käyttöön, mutta mikään tiedosto ei käytä sitä."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Poista merkintä"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Vyöhyke %d: käytössä, laskettu=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Vyöhyke %d: ei käytössä, laskettu=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Aseta"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "virheellinen i-solmun koko"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "virheellinen v2 i-solmun koko"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "vuorovaikutteisiin korjauksiin tarvitaan pääte"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "laitetta \"%s\" ei voi avata"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s on puhdas, ei tarkistusta.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Pakotetaan tiedostojärjestelmän tarkistus laitteella %s.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Tiedostojärjestelmä laitteella %s on likainen, vaatii tarkistuksen.\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -644,12 +649,12 @@ msgstr ""
 "\n"
 "%6ld i-solmua käytetty (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld vyöhykettä käytety (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -672,7 +677,7 @@ msgstr ""
 "------\n"
 "%6d tiedostoa\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -763,7 +768,7 @@ msgstr "liian monta i-solmua - maksimi on 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "tila ei riitä, vaaditaan vähintään %lu lohkoa"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Laite: %s\n"
@@ -838,7 +843,7 @@ msgstr ""
 "Käyttö: mkfs [-V] [-t tied.järj. tyyppi] [tied.järj.valitsimet] laite "
 "[koko]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -998,63 +1003,63 @@ msgstr ""
 "VAROITUS: laitenumerot typistetty %u bittiin. Tämä tarkoittaa lähes\n"
 "varmasti, että jotkut laitetiedostot ovat väärin.\n"
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Käyttö: %s [-c | -l tiedostonimi] [-nXX] [-iXX] /dev/nimi [lohkot]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s on liitetty; ei tehdä tiedostojärjestelmää tähän!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "siirtyminen käynnistyslohkoon epäonnistui funktiossa write_tables"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "käynnistyssektorin tyhjentäminen ei onnistu"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "siirtyminen epäonnistui funktiossa write_tables"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "i-solmukarttaa ei voi kirjoittaa"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "vyöhykekarttaa ei voi kirjoittaa"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "i-solmuja ei voi kirjoittaa"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "kirjoitus epäonnistui funktiossa write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "liian monta viallista lohkoa"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "ei riittävästi ehjiä lohkoja"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "kartoille ei voi varata puskureita"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "i-solmuille ei voi varata puskureita"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1063,57 +1068,52 @@ msgstr ""
 "Maxkoko=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "siirtyminen epäonnistui lohkojen testauksen aikana"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 "Outoja arvoja funktiossa do_check: todennäköisesti ohjelmistovirheitä\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "siirtyminen epäonnistui funktiossa check_blocks"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
 "virheellisiä lohkoja ennen data-aluetta: tiedostojärjestelmää ei voi luoda"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d viallista lohkoa\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "yksi viallinen lohko\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "vialliset lohkot sisältävää tiedostoa ei voi avata"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s: ei ole käännetty minix v2 -tuen kanssa\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol-virhe: lohkojen määrää ei ole annettu"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "laitetta %s ei voi avata"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "tiedoston %s tilaa ei voi lukea"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "ei yritetä luoda tiedostojärjestelmää kohteeseen \"%s\""
@@ -1153,45 +1153,45 @@ msgid "one bad page\n"
 msgstr "yksi viallinen sivu\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d viallista sivua\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: virhe: Sivutustilan kohde?\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: virhe: koko %ld on suurempi kuin laitteen koko %d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: virhe: tuntematon versio %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: virhe: sivutusalueen on oltava vähintään %ld kt:n kokoinen\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: varoitus: typistetään sivutusalue kokoon %ld kt\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Ei yritetä luoda sivutuslaitetta kohteeseen \"%s\""
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "vakavaa: ensimmäinen sivu on lukukelvoton"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1204,24 +1204,24 @@ msgstr ""
 "osiotaulun. Sivutusta ei luotu. Jos todella haluat luoda v0-sivutuksen\n"
 "kyseiselle laitteelle, käytä valitsinta -f sen pakottamiseen.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Sivutustilaa ei voi luoda: ei luettavissa"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Asetetaan sivutustila, versio %d, koko = %llu kt\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "sivutuslaitteella ei voi siirtyä taaksepäin"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "allekirjoitussivua ei voi kirjoittaa"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync epäonnistui"
 
@@ -1262,58 +1262,57 @@ msgstr "   %s [ -c | -y | -n | -d ] laite\n"
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] laite\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Ei käytettävissä"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Vapaa tila"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "Levy on vaihdettu.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Järjestelmä on syytä käynnistää uudelleen osiotaulun päivittymisen "
 "varmistamiseksi.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1324,770 +1323,774 @@ msgstr ""
 "VAROITUS: Jos DOS 6.x -osioita luotiin tai muutettiin,\n"
 "katso lisätietoja cfdiskin manuaalista.\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "VAKAVA VIRHE"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Paina mitä tahansa näppäintä poistuaksesi cfdiskistä"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "Levyasemalla ei voi siirtyä"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Levyasemaa ei voi lukea"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Levyasemalle ei voi kirjoittaa"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Liian monta osiota"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "Osion alku on ennen sektoria 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "Osion loppu on ennen sektoria 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "Osion alku on levyn lopun jälkeen"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "Osion loppu on levyn lopun jälkeen"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr "Osion loppu on viimeisellä osittaisella sylinterillä"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "loogiset osiot eivät ole levyjärjestyksessä"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "loogiset osiot ovat päällekkäiset"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "suurennetut loogiset osiot ovat päällekkäiset"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Sisäinen virhe luotaessa loogista asemaa ilman laajennettua osiota !!!!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Tähän ei voi luoda loogista asemaa -- luotaisiin kaksi laajennettua osiota"
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Liian pitkä valikon kohta. Valikko voi näyttää oudolta."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Valikko ilman suuntaa. Käytetään oletuksena vaakasuuntaa."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Väärä näppäin"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Paina näppäintä jatkaaksesi"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Ensiö"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Luo uusi ensiöosio"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Looginen"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Luo uusi looginen osio"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Älä luo osiota"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Sisäinen virhe !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Koko (Mt): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Alku"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Lisää osio tyhjän tilan alkuun"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Loppu"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Lisää osio tyhjän tilan loppuun"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Laajennetun osion luomiseen ei ole tilaa"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr "Ei osiotaulua tai tuntematon allekirjoitus osiotaulussa"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Haluatko aloittaa tyhjällä osiotaululla [y/N]?"
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "Annoit suuremman sylinterimäärän kuin levylle mahtuu"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "Levyasemaa ei voi avata"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Levy avattiin vain luku -tilassa - sinulla ei ole kirjoitusoikeutta"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Levyn kokoa ei voi hakea"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Viallinen ensiöosio"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Viallinen looginen osio"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Varoitus!! Tämä voi tuhota dataa levyltä!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Oletko varma, että haluat kirjoittaa osiotaulun levylle? (kyllä tai ei):"
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "ei"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Osiotaulua ei kirjoitettu levylle"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "kyllä"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Kirjoita \"kyllä\" tai \"ei\""
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Kirjoitetaan osiotaulua levylle..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Osiotaulu kirjoitettiin levylle"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Osiotaulu kirjoitettiin, mutta uudelleenluku epäonnistui. Tietokone on "
 "käynnistettävä uudelleen, jotta taulu päivittyy."
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Yhtään ensiöosiota ei ole merkitty käynnistettäväksi. DOS MBR ei käynnistä "
 "tätä."
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Useampi kuin yksi ensiöosio on merkitty käynnistettäväksi. DOS MBR ei "
 "käynnistä tätä."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Syötä tiedostonimi tai paina RETURN saadaksesi näytölle: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Tiedostoa \"%s\" ei voi avata"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Levyasema: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sektori 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektori %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Ei mitään"
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Ens/Loog"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Ensiö"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Looginen"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Käynnistettävä (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Käynnistettävä"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
+#: fdisk/cfdisk.c:2007
 #, c-format
-msgid "Unknown (%02X)"
-msgstr "Tuntematon (%02X)"
+msgid "(%02X)"
+msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Ei mitään (%02X)"
+#: fdisk/cfdisk.c:2009
+msgid "None"
+msgstr "Ei mitään"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Laitteen %s osiotaulu\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
-msgstr "           Alku-    Loppu-\n"
+#: fdisk/cfdisk.c:2046
+msgid "               First       Last\n"
+msgstr "               Alku-      Loppu-\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
-" # Tyyppi  sektori  sektori   Siirt.  Pituus   Tied.järj. tyyppi (ID) Liput\n"
+" # Tyyppi    sektori     sektori   Siirt.    Pituus   Tied.järj. tyyppi (ID) "
+"Liput\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
-msgstr "         ----Alku----         ----Loppu----    Alku- Sektorien\n"
+#: fdisk/cfdisk.c:2131
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
+msgstr "         ----Alku----         ----Loppu----    Alku-     Sektorien\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
-msgstr " # Liput Päät Sekt Syl   ID  Päät Sekt Syl   sektori määrä\n"
+#: fdisk/cfdisk.c:2132
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr " # Liput Päät Sekt Syl   ID  Päät Sekt Syl    sektori    määrä\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ----------\n"
+#: fdisk/cfdisk.c:2133
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- ------------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Raaka"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Näytä taulu raa'assa datamuodossa"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Sektorit"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Näytä taulu järjestettynä sektoreiden mukaan"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Taulu"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Näytä osiotaulu"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Älä näytä taulua"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Cfdiskin ohjeruutu"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Tämä on cfdisk, curses-pohjainen levynosiointiohjelma, "
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "jolla voi luoda, poistaa ja muuttaa kiintolevyllä "
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "olevia osioita."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright © 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Komento      Merkitys"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-------      --------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          Poista nykyinen osio"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Muuta sylinteri-, pää- ja sektoriparametreja"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             VAROITUS: Tätä valitsinta tulee käyttää vain niiden,"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             jotka tietävät mitä ovat tekemässä."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          Näytä tämä ohjeruutu"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimoi nykyisen osion levynkäyttö"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Huom: Tämä saattaa tehdä osiosta epäyhteensopivan"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             mm. DOSin ja OS/2:n kanssa."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          Luo uusi osio tyhjästä tilasta"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Tulosta osiotaulu ruudulle tai tiedostoon"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "             Osioille on useita erilaisia muotoja,"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             joista voit valita:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - Raaka data (tasan se, mitä levylle kirjoitettaisiin)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Sektoreittain järjestetty taulu"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - Taulu raa'assa muodossa"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Lopeta ohjelma kirjoittamatta osiotaulua"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          Muuta tiedostojärjestelmän tyyppiä"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Muuta osiokokonäkymän yksiköitä"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Vaihtaa megatavujen, sektoreiden ja sylinterien välillä"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Kirjoita osiotaulu levylle (on annettava iso kirjain W)"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Koska tämä saattaa tuhota levyllä olevaa dataa, kirjoitus"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             on joko varmistettava tai peruttava kirjoittamalla \"kyllä\" tai"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             \"ei\""
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nuoli ylös   Siirrä osoitin edelliseen osioon"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nuoli alas   Siirrä osoitin seuraavaan osioon"
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Piirtää ruudun uudelleen"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Näytä tämä ohjeruutu"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Huom: Kaikki komennot voi antaa joko isoilla tai pienillä"
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "kirjaimilla (paitsi taulun kirjoitus (W) )."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Sylinterit"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Muuta sylinterigeometriaa"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Päät"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Vaihda päägeometriaa"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Vaihda sektorigeometriaa"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Valmis"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "Geometrian muutos valmis"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Anna sylinterien määrä: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Virheellinen sylinteriarvo"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Anna päiden määrä: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Virheellinen pääarvo"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Anna sektorien määrä uraa kohden: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Virheellinen sektorimäärä"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Anna tiedostojärjestelmän tyyppi: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa tyhjäksi"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa laajennetuksi"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Käynnistettävä"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Tunt(%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Ens/Loog"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Tuntematon (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Levyasema: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, c-format
-msgid "Size: %lld bytes, %ld MB"
-msgstr "Koko: %lld tavua, %ld Mt"
+msgid "Size: %lld bytes, %lld MB"
+msgstr "Koko: %lld tavua, %lld Mt"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
-msgstr "Koko: %lld tavua, %ld.%ld Gt"
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "Koko: %lld tavua, %lld.%lld Gt"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2587
 #, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
-msgstr "Päät: %d   Sektorit/ura: %d   Sylinterit: %d"
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "Päät: %d   Sektorit/ura: %d   Sylinterit: %lld"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Nimi"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Liput"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Osiotyyppi"
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "Tied.järj.tyyppi"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Nimiö]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
-msgstr "  Sektorit"
+#: fdisk/cfdisk.c:2597
+msgid "    Sectors"
+msgstr "   Sektorit"
+
+#: fdisk/cfdisk.c:2599
+msgid "  Cylinders"
+msgstr " Sylinterit"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
-msgstr "Koko (Mt)"
+#: fdisk/cfdisk.c:2601
+msgid "  Size (MB)"
+msgstr " Koko (Mt)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
-msgstr "Koko (Gt)"
+#: fdisk/cfdisk.c:2603
+msgid "  Size (GB)"
+msgstr " Koko (Gt)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Käynnistettävä"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Poista"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Poista nykyinen osio"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Muuta levyn geometriaa (vain asiantuntijoille)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Ohje"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Näytä ohjeruutu"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Maksimoi"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimoi nykyisen osion tilankäyttö (vain asiantuntijoille)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Uusi"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Luo uusi osio tyhjästä tilasta"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Näytä"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Tulosta osiotaulu ruudulle tai tiedostoon"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Lopeta"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Lopeta ohjelma kirjoittamatta osiotaulua"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Tyyppi"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Vaihda tiedostojärjestelmän tyyppi (DOS, Linux, OS/2, jne)"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Yksiköt"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Vaihda osiokokonäytön yksiköt (Mt, sekt, syl)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Kirjoita"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Kirjoita osiotaulu levylle (tämä saattaa tuhota dataa)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "Tästä osiosta ei voi tehdä käynnistettävää"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "Tyhjää osiota ei voi poistaa"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "Tätä osiota ei voi maksimoida"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Tämä osio on ei ole käytettävissä"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Tämä osio on jo käytössä"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "Tyhjän osion tyyppiä ei voi vaihtaa"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "Ei enempää osioita"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Virheellinen komento"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright © 1994-2002 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2122,7 +2125,7 @@ msgstr ""
 "                sekä sektoreita/ura-määrästä.\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2142,7 +2145,7 @@ msgstr ""
 "-u: anna Alku ja Loppu sektoreina (sylinterien sijaan)\n"
 "-b 2048: (tietyille MO-levyille) käytä 2048 tavun sektoreita\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2158,222 +2161,222 @@ msgstr ""
 " tai: fdisk /dev/rd/c0d0  tai: fdisk /dev/ida/c0d0  (RAID-laitteet)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Laitetta %s ei voi lukea\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Laitteella %s ei voi siirtyä\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Laitteelle %s ei voi kirjoittaa\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE-ioctl epäonnistui laitteelle %s\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Muistia ei voi varata enempää\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Vakava virhe\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Komento  merkitys"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a    aseta vain luku -lippu päälle/pois"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b    muokkaa bsd-levynimiötä"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c    aseta liitettävyyslippu päälle/pois"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d    poista osio"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l    listaa tunnetut osiotyypit"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m    näytä tämä valikko"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n    lisää uusi osio"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o    luo uusi tyhjä DOS-osiotaulu"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p    näytä osiotaulu"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q    lopeta tallentamatta muutoksia"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s    luo uusi tyhjä Sun-levynimiö"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t    vaihda osion järjestelmä-id:tä"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u    vaihda näkymä/syöteyksiköt"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v    varmista osiotaulu"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w    kirjoita taulu levylle ja poistu"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x    lisätoiminnot (vain asiantuntijoille)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a    valitse käynnistettävä osio"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b    muokkaa käynnistystiedostomerkintää"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c    valitse sgi-sivutusosio"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a    aseta käynnistettävyyslippu päälle/pois"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c    aseta dos-yhteensopivuuslippu päälle/pois"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a    muuta vaihtoehtoisten sylinterien määrää"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c    muuta sylinterien määrää"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr "   d    näytä osiotaulun raaka data"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e    muuta sylinterikohtaisten lisäsektorien määrää"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h    muuta päiden määrää"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i    muuta lomituskerrointa"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o    muuta pyörimisnopeutta (rpm)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r    palaa päävalikkoon"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s    muuta sektorien määrää uraa kohden"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y    muuta fyysisten sylintereiden määrää"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b    siirrä datan alkua osiossa"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e    listaa laajennetut osiot"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g    luo IRIX (SGI) -osiotaulu"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f    korjaa osiojärjestys"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "On asetettava"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "päät"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "sektorit"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "sylinterit"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2382,11 +2385,11 @@ msgstr ""
 "%s%s.\n"
 "Tämän voi tehdä lisätoimintovalikosta.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " ja "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2405,26 +2408,26 @@ msgstr ""
 "2) muiden käyttöjärjestelmien käynnistys- ja osiointiohjelmat\n"
 "   (esim. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Virheellinen siirtymä laajennetussa ensiöosiossa\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Varoitus: poistetaan osion %d jälkeiset osiot\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Varoitus: ylimääräinen linkkiosoitin osiotaulussa %d\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Varoitus: jätetään huomiotta ylimääräinen data osiotaulussa %d\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2435,16 +2438,16 @@ msgstr ""
 "kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellistä sisältöä ei\n"
 "tietenkään voida enää palauttaa.\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Huom: sektorikoko on %d (ei %d)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr "Et pysty kirjoittamaan osiotaulua.\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
@@ -2452,22 +2455,22 @@ msgstr ""
 "Tällä levyllä on sekä DOS-, että BSD-taikatavut.\n"
 "Siirry BSD-tilaan \"b\"-komennolla.\n"
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr "Laitteella ei ole kelvollista DOS-, Sun-, SGI- eikä OSF-levynimiötä\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Sisäinen virhe\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ylimääräistä laajennettua osiota %d ei huomioida\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2476,7 +2479,7 @@ msgstr ""
 "Varoitus: osiotaulun %2$d virheellinen lippu 0x%1$04x korjataan "
 "kirjoitettaessa (w)\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2484,79 +2487,79 @@ msgstr ""
 "\n"
 "saatiin EOF kolmesti - poistutaan..\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Heksakoodi (L listaa koodit): "
 
-#: fdisk/fdisk.c:1069
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1094
+#, c-format
 msgid "%s (%u-%u, default %u): "
-msgstr "%s (%d-%d, oletus %d): "
+msgstr "%s (%u-%u, oletus %u): "
 
-#: fdisk/fdisk.c:1136
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1161
+#, c-format
 msgid "Using default value %u\n"
-msgstr "Käytetään oletusarvoa %d\n"
+msgstr "Käytetään oletusarvoa %u\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "Arvo sallitun välin ulkopuolella.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Osionumero"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Varoitus: osiolla %d on tyhjä tyyppi\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Valittiin osio %d\n"
 
 #
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 msgid "No partition is defined yet!\n"
 msgstr "Osioita ei ole vielä määritelty!\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr "Kaikki ensiöosiot on jo määritelty!\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "sylinteri"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "sektori"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Vaihdetaan näkymä/syöteyksiköiksi %s\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VAROITUS: Osio %d on laajennettu osio\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-yhteensopivuuslippu on asetettu\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-yhteensopivuuslippua ei ole asetettu\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Osiota %d ei ole vielä olemassa!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2568,7 +2571,7 @@ msgstr ""
 "pitäminen ei todennäköisesti ole viisasta. Osion voi\n"
 "poistaa käyttämällä \"d\"-komentoa.\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2576,7 +2579,7 @@ msgstr ""
 "Osiota ei voi muuttaa laajennetuksi osioksi, eikä päinvastoin.\n"
 "Se on poistettava ensin.\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2585,7 +2588,7 @@ msgstr ""
 "Osion 3 tyypiksi on syytä jättää Koko levy (5),\n"
 "koska SunOS/Solaris odottaa sitä, ja jopa Linux pitää siitä.\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2594,52 +2597,52 @@ msgstr ""
 "Osion 9 tyypiksi on syytä jättää osio-otsikko (0),\n"
 "ja osion 11 tyypiksi Koko osio (6), koska IRIX odottaa sitä.\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Osion %d järjestelmätyypiksi vaihdettiin %x (%s)\n"
 
-#: fdisk/fdisk.c:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Osiolla %d on eri fyysiset/loogiset alkukohdat (ei-Linux?):\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyysinen=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "looginen=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Osiolla %d on eri fyysiset/loogiset loppukohdat:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Osion %i alku ei ole sylinterin rajalla:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "pitää olla (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Osion %i loppu ei ole sylinterin rajalla.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "pitää olla (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -2648,7 +2651,7 @@ msgstr ""
 "\n"
 "Levy %s: %ld Mt, %lld tavua\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, c-format
 msgid ""
 "\n"
@@ -2657,24 +2660,24 @@ msgstr ""
 "\n"
 "Levy %s: %ld.%ld Gt, %lld tavua\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d päätä, %d sektoria/ura, %d sylinteriä"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
-msgstr ", yhteensä %lu sektoria"
+msgid ", total %llu sectors"
+msgstr ", yhteensä %llu sektoria"
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr "Yksiköt = %2$d * %3$d = %4$d -tavuiset %1$s\n"
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2682,16 +2685,16 @@ msgstr ""
 "Ei mitään tehtävää. Järjestys on jo oikea.\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
+#: fdisk/fdisk.c:1704
 #, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
-msgstr "%*s Käynn    Alku       Loppu  Lohkot   Id  Järjestelmä\n"
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s Käynn     Alku          Loppu    Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Laite"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2699,7 +2702,7 @@ msgstr ""
 "\n"
 "Osiotaulumerkinnät eivät ole levyjärjestyksessä\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2710,92 +2713,92 @@ msgstr ""
 "Levy %s: %d päätä, %d sektoria, %d sylinteriä\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
-msgstr "No AF Pää Sekt Syl Pää Sekt Syl    Alku      Koko ID\n"
+#: fdisk/fdisk.c:1754
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "No AF Pää Sekt Syl Pää Sekt Syl     Alku       Koko ID\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varoitus: osio %d sisältää sektorin 0\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Osio %d: pää %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Osio %d: sektori %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Osio %d: sylinteri %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Osio %d: edellinen sektorimäärä %d on ristiriidassa yhteismäärän %d kanssa\n"
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varoitus: virheellinen datan alkukohta osiossa %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Varoitus: osio %d ja osio %d ovat (osittain) päällekkäiset.\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varoitus: osio %d on tyhjä\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Looginen osio %d ei ole kokonaan osiossa %d\n"
 
-#: fdisk/fdisk.c:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Varattujen sektoreiden kokonaismäärä %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d varaamatonta sektoria\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Osio %d on jo määritelty. Poista se ennen uudelleen lisäämistä.\n"
 
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Ensimmäinen %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektori %d on jo varattu\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "Ei vapaita sektoreita käytettävissä\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Viimeinen %s tai +koko tai +kokoM tai +kokoK"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2807,15 +2810,25 @@ msgstr ""
 "\tuusi DOS-osiotaulu. (Komento o.)\n"
 "\tVAROITUS: Uuden osiotaulun luominen tuhoaa levyn nykyisen sisällön.\n"
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "Maksimimäärä osioita on luotu\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Jokin osio on poistettava ja lisättävä laajennettu osio ensin\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "loogiset osiot eivät ole levyjärjestyksessä"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Viallinen ensiöosio"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2826,20 +2839,20 @@ msgstr ""
 "   %s\n"
 "   p    ensiöosio (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l    looginen (5 tai yli)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e    laajennettu"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Virheellinen osionumero tyypille \"%c\"\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2847,11 +2860,11 @@ msgstr ""
 "Osiotaulua on muutettu!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kutsutaan osiotaulun uudelleen lukeva ioctl().\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2864,7 +2877,7 @@ msgstr ""
 "Ydin käyttää edelleen vanhaa taulua.\n"
 "Uutta taulua käytetään seuraavasta käynnistyksestä alkaen.\n"
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2875,64 +2888,64 @@ msgstr ""
 "VAROITUS: Jos DOS 6.x -osioita luotiin tai muutettiin,\n"
 "katso lisätietoja fdiskin manuaalisivulta.\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Synkronoidaan levyt.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Osiolla %d ei ole data-aluetta\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Uusi datan alku"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Asiantuntijakomento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Sylinterien määrä"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Päiden määrä"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Sektorien määrä"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varoitus: asetetaan sektorisiirtymä DOS-yhteensopivuutta varten\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Levy %s ei sisällä kelvollista osiotaulua\n"
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tuntematon komento\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Tämä ydin löytää sektorin koon itse -- -b-valitsinta ei huomioida\n"
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2941,17 +2954,17 @@ msgstr ""
 "laitteen kanssa\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Havaittiin OSF/1-levynimiö laitteella %s, siirrytään levynimiötilaan.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Komento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2960,15 +2973,15 @@ msgstr ""
 "\n"
 "Nykyinen käynnistystiedosto on: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Anna uuden käynnistystiedoston nimi: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "Käynnistystiedosto muuttumaton\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2978,7 +2991,7 @@ msgstr ""
 "\tValitan, SGI-osiotauluille ei ole asiantuntijavalikkoa.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3338,8 +3351,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux-sivutus"
 
@@ -3522,9 +3534,9 @@ msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Osiot %d ja %d ovat päällekkäiset %d sektorin verran.\n"
 
 #: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Käyttämätön %8d sektorin alue - sektorit %8d-%d\n"
+msgstr "Käyttämätön %8u sektorin alue - sektorit %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:523
 msgid ""
@@ -3573,7 +3585,7 @@ msgstr ""
 "Vain \"SGI volume\" -kokolevyosuus voi rikkoa tätä sääntöä.\n"
 "Kirjoita KYLLÄ, jos olet varma tämän osion merkitsemisestä toisin.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "KYLLÄ\n"
 
@@ -3631,6 +3643,9 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
+"Varoitus: BLKGETSIZE-ioctl epäonnistui laitteelle %s. Käytetään geometrian\n"
+"sylinteriarvoa %d. Tämä arvo voi typistyä laitteilla, jotka ovat suurempia\n"
+"kuin 33,8 Gt.\n"
 
 #: fdisk/fdisksgilabel.c:738
 #, c-format
@@ -3739,15 +3754,15 @@ msgstr "Vaihtoehtoiset sylinterit"
 msgid "Physical cylinders"
 msgstr "Fyysiset sylinterit"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Pyörimisnopeus (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Lomituskerroin"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Ylimääräisiä sektoreita sylinterillä"
 
@@ -3801,7 +3816,7 @@ msgstr ""
 "Kolmas osio ei kata koko levyä, mutta arvo %d %s kattaa jonkin toisen\n"
 "osion. Merkintä on muutettu arvoon %d %s\n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3810,7 +3825,7 @@ msgstr ""
 "Jos halutaan säilyttää SunOS/Solaris-yhteensopivuus, tämän osion tyyppinä\n"
 "on syytä säilyttää Koko levy (5), alkaen kohdasta 0, %u sektoria\n"
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3824,7 +3839,7 @@ msgstr ""
 "Kirjoita KYLLÄ, jos olet erittäin varma, että haluat osion tyypiksi\n"
 "merkittävän 82 (Linux-sivutus): "
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3844,7 +3859,7 @@ msgstr ""
 "Yksiköt = %12$d * 512 -tavuiset %11$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3857,16 +3872,16 @@ msgstr ""
 "Yksiköt = %6$d * 512 -tavuiset %5$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Lippu   Alku        Loppu  Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Vaihtoehtoisten sylinterien määrä"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Fyysisten sylinterien määrä"
 
@@ -3917,21 +3932,21 @@ msgstr "OS/2 Alkulatauksen hallinta"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
-msgstr "Win95 FAT32"
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA)"
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA)"
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
-msgstr "Win95 Laaj (LBA)"
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 Laaj (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -3962,16 +3977,16 @@ msgid "AST SmartSleep"
 msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
-msgstr "Kätketty Win95 FAT32"
+msgid "Hidden W95 FAT32"
+msgstr "Kätketty W95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
-msgstr "Kätketty Win95 FAT32 (LBA)"
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "Kätketty W95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
-msgstr "Kätketty Win95 FAT16 (LBA)"
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "Kätketty W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4079,6 +4094,12 @@ msgstr "Vanha Minix"
 msgid "Minix / old Linux"
 msgstr "Minix/vanha Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux-sivutus"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 kätketty C:-asema"
@@ -4233,89 +4254,89 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "siirtymisvirhe laitteella %s - kohtaan %lu ei voi siirtyä\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "siirtymisvirhe: haluttiin 0x%08x%08x, saatiin 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "muisti lopussa - luovutetaan\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "virhe luettaessa laitetta %s - sektoria %lu ei voi lukea\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "VIRHE: sektorilla %lu ei ole msdos-allekirjoitusta\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "virhe kirjoitettaessa laitteelle %s - sektoria %lu ei voi kirjoittaa\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "osion sektoreiden tallennustiedostoa (%s) ei voi avata\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "virhe kirjoitettaessa %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "osionpalautustiedoston %s tilaa ei voi lukea\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "osion palautustiedoston koko on väärä - ei palauteta\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "muisti lopussa?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "osionpalautustiedostoa (%s) ei voi avata\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "virhe luettaessa tiedostoa %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "laitetta %s ei voi avata kirjoitusta varten\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "virhe kirjoitettaessa sektoria %lu laitteelle %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Levy %s: kokoa ei voi hakea\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Levy %s: geometriaa ei voi hakea\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4326,22 +4347,22 @@ msgstr ""
 "levyltä. Sen muokkaaminen fdiskillä on todennäköisesti turhaa.\n"
 "[Käytä --force -valitsinta jos todella haluat tehdä niin]\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Varoitus: HDIO_GETGEO kertoo, että päitä on %lu\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Varoitus: HDIO_GETGEO kertoo, että sektoreita on %lu\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Varoitus: BLKGETSIZE/HDIO_GETGEO kertoo, että sylintereitä on %lu\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4351,7 +4372,7 @@ msgstr ""
 "Tästä aiheutuu ongelmia kaikkien C/H/S-osoitusta käyttävien ohjelmien "
 "kanssa.\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4362,13 +4383,13 @@ msgstr ""
 
 # ensimmäinen %s on "start" tai "end", joita ei voi suomentaa
 # bugiraportti täytyy lähettää joskus
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr "Osion %2$s %1$s pääarvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4376,7 +4397,7 @@ msgid ""
 msgstr ""
 "Osion %2$s \"%1$s\":n sektoriarvo on mahdoton: %3$lu (tulee olla 1-%4$lu)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4384,7 +4405,7 @@ msgid ""
 msgstr ""
 "Osion %2$s \"%1$s\":n sylinteriarvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4392,11 +4413,11 @@ msgstr ""
 "Id  Nimi\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Luetaan osiotaulu uudelleen...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4404,31 +4425,31 @@ msgstr ""
 "Osiotaulun uudelleenlukukomento epäonnistui\n"
 "Käynnistä järjestelmä uudelleen nyt, ennen mkfs:n käyttöä\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Virhe suljettaessa %s\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: osiota ei ole\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "tunnistamaton muoto - käytetään sektoreita\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s:n osiotaulu\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "toteuttamaton muoto - käytetään %s\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4438,11 +4459,11 @@ msgstr ""
 "alkaen\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Laite Käynn Alku      Loppu #syl     #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4451,11 +4472,11 @@ msgstr ""
 "Yksiköt = 512-tavuiset sektorit, alkaen kohdasta %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Laite  Käynn   Alku        Loppu #sektorit Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4464,11 +4485,11 @@ msgstr ""
 "Yksiköt = 1024-tavuiset lohkot, alkaen kohdasta %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Laite  Käynn  Alku        Loppu  #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4478,30 +4499,30 @@ msgstr ""
 "d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Laite Käynn Alku    Loppu  Mt     #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\talku: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tloppu: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "osio loppuu sylinterillä %ld, joka on levyn lopun jälkeen\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "Osioita ei löytynyt\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4512,51 +4533,51 @@ msgstr ""
 "  arvoille C/H/S=*/%ld/%ld (ei %ld/%ld/%ld).\n"
 "Tässä listauksessa käytetään tuota geometriaa.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "osiotaulua ei ole.\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "outoa, vain %d osiota määritelty.\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Varoitus: osion %s koko on 0, mutta sitä ei ole merkitty tyhjäksi\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Varoitus: osion %s koko on 0 ja se on merkitty käynnistettäväksi\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varoitus: osion %s koko on 0 ja alkukohta ei ole nolla\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Varoitus: osio %s "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "ei sisälly osioon %s\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Varoitus: osiot %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "ja %s ovat päällekkäiset\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4565,17 +4586,17 @@ msgstr ""
 "Varoitus: osio %s sisältää osan osiotaulusta (sektori %lu), ja se tulee\n"
 "tuhoutumaan kun osiota käytetään\n"
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varoitus: osio %s alkaa sektorilta 0\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varoitus: osio %s jatkuu levyn lopun yli\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4583,17 +4604,17 @@ msgstr ""
 "Vain yksi ensiöosio voi olla laajennettu\n"
 " (tämä ei tosin ole ongelma Linuxissa)\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varoitus: osio %s ei ala sylinterin rajalta\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varoitus: osio %s ei lopu sylinterin rajalle\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4602,7 +4623,7 @@ msgstr ""
 "(aktiiviseksi)\n"
 "Se ei haittaa LILOa, mutta DOS MBR ei käynnistä tältä levyltä.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4610,7 +4631,7 @@ msgstr ""
 "Varoitus: yleensä vain ensiöosiolta voi käynnistää\n"
 "LILO ei välitä \"käynnistettävä\"-lipusta.\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4619,32 +4640,32 @@ msgstr ""
 "(aktiiviseksi). Se ei haittaa LILOa, mutta DOS MBR ei käynnistä tältä "
 "levyltä.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 msgid "start"
 msgstr "alun"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "osio %s: alku: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 msgid "end"
 msgstr "lopun"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "osio %s: loppu: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "osio %s loppuu sylinterillä %ld, levyn lopun jälkeen\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4653,7 +4674,7 @@ msgstr ""
 "Varoitus: laajennetun osion alkua siirretty kohdasta %ld kohtaan %ld\n"
 "(Vain listaustarkoituksiin. Älä muuta sen sisältöä.)\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4661,133 +4682,133 @@ msgstr ""
 "Varoitus: laajennetun osion alku ei ole sylinterin rajalla.\n"
 "DOS ja Linux tulkitsevat sisällön eri tavoin.\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "liian monta osiota - ei huomioida numeron (%d) jälkeisiä\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "osiopuu?\n"
 
 # huono suomennos
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "havaittiin Disk Manager - sitä ei voi käsitellä\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6-allekirjoitus löytyi - luovutetaan\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "outoa..., laajennettu osio, jonka koko on 0?\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "outoa..., BSD-osio, jonka koko on 0?\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " %s: tunnistamaton osio\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr "valitsin -n oli annettu: Mitään ei muutettu\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Vanhojen sektoreiden tallennus epäonnistui - keskeytetään\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s\n"
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "liian pitkä tai epätäydellinen syöterivi - lopetetaan\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "syötevirhe: kentän %s jälkeen odotetaan löytyvän \"=\"\n"
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "syötevirhe: odottamaton merkki %c kentän %s jälkeen\n"
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "tunnistamaton syöte: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "liian suuri luku\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "roskaa numeron perässä\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "ei tilaa osiokahvalle\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "ympäröivää laajennettua osiota ei voi rakentaa\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr "liian monta syötekenttää\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "Ei enempää tilaa\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "Virheellinen tyyppi\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Varoitus: annettu koko (%lu) ylittää suurimman sallitun koon (%lu)\n"
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "Varoitus: tyhjä osio\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varoitus: virheellinen osion alku (aikaisintaan %lu)\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "tunnistamaton \"käynnistettävä\"-lippu - valitse - tai *\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "osittainen c,h,s-määritys?\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "Laajennettu osio ei ole odotetussa paikassa\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "virheellinen syöte\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "liian monta osiota\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -4797,98 +4818,98 @@ msgstr ""
 "<alku> <koko> <tyyppi [E,S,L,X,hex]> <käynnistettävä [-,*]> <c,h,s> <c,h,s>\n"
 "Yleensä riittää <alku> ja <koko> (ja ehkä <tyyppi>).\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "versio"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "laite: esimerkiksi /dev/hda tai /dev/sda"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "hyödylliset valitsimet:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [tai --show-size]: näytä osion koko"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [tai --id:        näytä tai muuta osio-id"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [tai --list]:     listaa kaikkien laitteiden osiot"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr "    -d [tai --dump]:     sama kuin edellä, muoto sopiva syötteeksi"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [tai --increment]:numeroi sylinterit, ym. alkaen 1:stä, ei 0:sta"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:  käytä yksikköinä sektoreita/lohkoja/sylintereitä/Mt"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [tai --list-types]:listaa tunnetut osiotyypit"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [tai --DOS]:      DOS-yhteensopivuutta varten; tuhlaa vähän tilaa"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [tai --re-read]:  käske ytimen lukea osiotaulu uudelleen"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                muuta vain osiota numero #"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 älä kirjoita levylle oikeasti"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O tiedosto :        tallenna ylikirjoitettavat sektori tiedostoon"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I tiedosto :        palauta nämä sektorit"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [tai --version]:  näytä versio"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [tai --help]:     näytä tämä viesti"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "vaaralliset valitsimet:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [tai --show-geometry]: näytä ytimen käsitys geometriasta"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4896,115 +4917,115 @@ msgstr ""
 "    -x [tai --show-extended]: listaa myös laajennetut osiot tulosteessa\n"
 "                             tai odota syötteestä niiden kahvoja"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [tai --Linux]:     älä huomauta Linuxissa merkityksettömistä asioista"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [tai --quiet]:     vaienna varoitusviestit"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "    Voit ohittaa tunnistetun geometrian käyttämällä:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [tai --cylinders #]:aseta käytettävä sylinterien määrä"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -h# [tai --heads #]:    aseta käytettävä päiden määrä"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [tai --sectors #]:  aseta käytettävä sektorien määrä"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "Kaikki tarkistukset voi ohittaa valitsimella:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [tai --force]:     tee mitä käsken, vaikka se olisi tyhmää"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s laite\t\t listaa laitteella olevat aktiiviset osiot\n"
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s laite n1 n2 ... aktivoi osiot n1 ..., inaktivoi loput\n"
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An laite\t aktivoi osio n, poista muiden aktivointi\n"
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "ei komentoa?\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "yhteensä: %d lohkoa\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "käyttö: sfdisk --print-id laite osionumero\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "käyttö: sfdisk --change-id laite osionumero Id\n"
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "käyttö: sfdisk --id laite osionumero [Id]\n"
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "vain yhden laitteen voi antaa (paitsi valitsimella -l tai -s)\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "laitetta %s ei voi avata lukua-kirjoitusta varten\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "laitetta %s ei voi avata lukua varten\n"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld sylinteriä, %ld päätä, %ld sektoria/ura\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE-ioctl epäonnistui laitteelle %s\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "virheellinen aktiivinen tavu: 0x80:n asemesta 0x%x\n"
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -5012,7 +5033,7 @@ msgstr ""
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5021,35 +5042,35 @@ msgstr ""
 "Aktiivisia ensiöosioita on %d kappaletta. Tämä ei haittaa LILOa, mutta\n"
 "DOS MBR käynnistää vain levyltä, jolla on tasan yksi aktiivinen osio.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "osiolla %s id on %x eikä osiota ole kätketty\n"
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Virheellinen Id %lx\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Levy on tällä hetkellä käytössä.\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Vakava virhe: laitetta %s ei löydy\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varoitus: %s ei ole lohkolaite\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Tarkistetaan, että kukaan ei käytä levyä juuri nyt...\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5062,28 +5083,28 @@ msgstr ""
 "(komento umount) ja kaikki levyllä olevat sivutusosiot (komento swapoff).\n"
 "Käytä valitsinta --no-reread tämän testin ohittamiseen.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Käytä --force -valitsinta ohittaaksesi kaikki tarkistukset.\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Vanha tilanne:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Osiota %d ei ole olemassa, sitä ei voi muuttaa\n"
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Uusi tilanne:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5091,19 +5112,19 @@ msgstr ""
 "En pidä näistä osioista - mitään ei muutettu.\n"
 "(Jos todella haluat tätä, käytä valitsinta --force.)\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr "En pidä tästä - kannattaa todennäköisesti vastata \"No\"\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Oletko tyytyväinen tähän? [ynq] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Haluatko kirjoittaa tämän levylle? [ynq] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5111,15 +5132,15 @@ msgstr ""
 "\n"
 "sfdisk: ennenaikainen syötteen loppu\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "Lopetetaan - mitään ei muutettu\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "Vastaa joko y, n tai q\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5127,7 +5148,7 @@ msgstr ""
 "Uusi osiotaulu kirjoitettiin onnistuneesti\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5737,7 +5758,7 @@ msgstr "Odotetaan silmukassa KDGHWCLK-ajan muuttumista\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "ajan lukeva KDGHWCLK-ioctl epäonnistui"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "Aikakatkaisu odotettaessa ajan muutosta.\n"
 
@@ -5762,59 +5783,69 @@ msgstr "Laitetta /dev/tty1 tai /dev/vc/1 ei voi avata"
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK-ioctl epäonnistui"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "aikaa lukeva ioctl() laitteelle %s epäonnistui.\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "Odotetaan silmukassa laitteen %s ajan muuttumista\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "laitteella %s ei ole keskeytysfunktioita. "
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "kellon tikitystä odottava luku laitteelle %s epäonnistui"
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "kellon tikitystä odottava luku laitteelle %s epäonnistui"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "kellon tikitystä odottava luku laitteelle %s epäonnistui"
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "päivityskeskeytykset lopettava ioctl() laitteelle %s epäonnistui"
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 "päivityskeskeytykset aloittava ioctl() laitteelle %s epäonnistui "
 "odottamattomasti"
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "ajan asettava ioctl() laitteelle %s epäonnistui.\n"
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) onnistui.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "Tiedoston %s avaaminen epäonnistui"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5824,17 +5855,17 @@ msgstr ""
 "Ytimen epoch-arvon muuttamiseksi on käytettävä Linuxin \"rtc\"-laiteajuria "
 "laitetiedoston %s kautta. Tässä järjestelmässä ei ole kyseistä tiedostoa.\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "Laitetta %s ei voi avata"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) laitteelle %s epäonnistui"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "luimme epoch-arvon %ld laitteelta %s ioctl:llä RTC_EPOCH_READ.\n"
@@ -5842,23 +5873,23 @@ msgstr "luimme epoch-arvon %ld laitteelta %s ioctl:ll
 #. 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:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "Epoch-arvo ei voi olla pienempi kuin 1900. Pyyntö oli %ld\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr "asetetaan epoch-arvoksi %ld, ioctl RTC_EPOCH_SET laitteelle %s.\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "Ytimen laiteajurissa laitteelle %s ei ole ioctl:ää RTC_EPOCH_SET.\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) laitteelle %s epäonnistui"
@@ -6032,53 +6063,69 @@ msgstr "Kirjautuminen p
 msgid "Login on %s from %s denied.\n"
 msgstr "Kirjautuminen päätteelle %s osoitteesta %s evätty.\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: sinua (käyttäjä %d) ei ole olemassa.\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: käyttäjä \"%s\" ei ole olemassa.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 "%s: vain paikallisia merkintöjä voi muuttaa; käytä sen sijaan komentoa yp%"
 "s.\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+#, fuzzy
+msgid "Unknown user context"
+msgstr "unknown error in key"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Vaihdetaan käyttäjän %s finger-tiedot.\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Salasanavirhe."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Salasana: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Väärä salasana."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "Finger-tietoja ei muutettu.\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Käyttö: %s [ -f kokonimi ] [ -o toimisto ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6086,11 +6133,11 @@ msgstr ""
 "[ -p toimistopuhelin ]\n"
 "\t[ -h kotipuhelin ]"
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6098,58 +6145,70 @@ msgstr ""
 "\n"
 "Keskeytetty.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "kenttä on liian pitkä.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "merkki \"%c\" ei ole sallittu.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Ohjausmerkkejä ei sallita.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr "Finger-tietoja *EI* muutettu. Yritä myöhemmin uudelleen.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "Finger-tietoja muutettiin.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "\"malloc\" epäonnistui"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" ei ole listattuna tiedostossa /etc/shells.\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr "%s: Kuori ei ole tiedostossa /etc/shells, kuoren vaihto evätty\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Vaihdetaan käyttäjän %s kuori.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Uusi kuori"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "Kuorta ei vaihdettu.\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Kuorta *EI* vaihdettu. Yritä myöhemmin uudelleen.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Kuori vaihdettu.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
@@ -6158,57 +6217,57 @@ msgstr ""
 "Käyttö: %s [ -s kuori ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ käyttäjätunnus ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: kuori on annettava polkuineen.\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" ei ole olemassa.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" ei ole käynnistettävä.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: merkkiä \"%c\" ei sallita.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Ohjausmerkkejä ei sallita.\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Varoitus: \"%s\" ei ole listattuna tiedostossa /etc/shells\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" ei ole listattuna tiedostossa /etc/shells.\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: käytä -l -valitsinta nähdäksesi listan\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Varoitus: \"%s\" ei ole listattu tiedostossa /etc/shells.\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Käytä %s -l nähdäksesi listan.\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "Ei tunnettuja kuoria.\n"
 
@@ -6406,78 +6465,78 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Liian monta prosessia käynnissä.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "KÄYTTÄJÄN %2$s MODEEMIYHTEYS PÄÄTTEELLÄ %1$s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s OSOITTEESTA %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "KÄYTTÄJÄN %2$s KIRJAUTUMINEN PÄÄTTEELLÄ %1$s OSOITTEESTA %3$s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "KÄYTTÄJÄN %2$s KIRJAUTUMINEN PÄÄTTEELLÄ %1$s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "Sinulle on uutta postia.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "Sinulle on postia.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: virhe haarautettaessa: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY epäonnistui: %m"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() epäonnistui"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Ei hakemistoa %s!\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Kirjaudutaan käyttäen kotihakemistona \"/\".\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: ei muistia kuoriskriptille.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kuoriskriptiä ei voitu käynnistää: %s.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ei kuorta: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6486,62 +6545,62 @@ msgstr ""
 "\n"
 "%s, kirjautuminen: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "tunnus aivan liian pitkä.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "NIMI liian pitkä"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "tunnukset eivät voi alkaa merkillä \"-\".\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "liian monta peräkkäistä rivinvaihtoa.\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "LIIKAA rivinvaihtoja"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Kirjautuminen aikakatkaistiin %d sekunnin jälkeen\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Edellinen kirjautuminen: %.*s"
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "osoitteesta %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "päätteeltä %.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "EPÄONNISTUNUT KIRJAUTUMINEN OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "EPÄONNISTUNUT KIRJAUTUMINEN PÄÄTTEELTÄ %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA PÄÄTTEELTÄ %s, %s"
@@ -6845,7 +6904,7 @@ msgstr "Ohjelmaa umount ei voi k
 
 #: login-utils/shutdown.c:612
 msgid "Unmounting any remaining filesystems..."
-msgstr "Irroitetaan jäljellä olevat tiedostojärjestelmät..."
+msgstr "Irrotetaan jäljellä olevat tiedostojärjestelmät..."
 
 #: login-utils/shutdown.c:648
 #, c-format
@@ -6944,57 +7003,67 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: VIRHEELLINEN VIRHE"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
 msgstr "%s: salasanatiedosto on varattu.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
 msgstr "%s: ryhmätiedosto on varattu.\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: tiedosto %s on varattu (%s on olemassa)\n"
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: tiedostoa %s ei voi linkittää: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "Laitteelle %s ei voi hakea aikarajaa: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "Laitteelle %s ei voi hakea aikarajaa: %s\n"
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 "%s: tiedoston %s lukitusta ei voi poistaa: %s (muutoksesi ovat edelleen "
 "tiedostossa %s)\n"
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: Haarauttaminen ei onnistu\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s muuttumaton\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: muutoksia ei tehty\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr "Tässä järjestelmässä käytetään varjoryhmiä.\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr "Tässä järjestelmässä käytetään varjosalasanoja.\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "Haluatko muokata tiedostoa %s nyt [y/n]? "
@@ -7187,7 +7256,7 @@ msgstr "%s: uudelleennime
 msgid "call: %s from to files...\n"
 msgstr "käyttö: %s lähde kohde tiedostot...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7198,21 +7267,21 @@ msgstr ""
 "Käytä \"%s [valitsimet] %s\" jos todella haluat käyttää sitä.\n"
 "Skriptiä ei käynnistetty.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "käyttö: script [-a] [-f] [-q] [-t] [tiedosto]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skripti käynnistetty, tiedosto on %s\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "Skripti käynnistetty %s"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7221,16 +7290,16 @@ msgstr ""
 "\n"
 "Skripti suoritettu %s"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skripti suoritettu, tiedosto on %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "openpty epäonnistui\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "Pty:t lopussa\n"
 
@@ -7502,36 +7571,36 @@ msgstr ""
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr "lukkotiedostoa %s ei voi luoda: %s (käytä lippua -n ohittaaksesi)"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr "lukkotiedostoa %s ei voi linkittää: %s (käytä lippua -n ohittaaksesi)"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr "lukkotiedostoa %s ei voi avata: %s (käytä lippua -n ohittaaksesi)"
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Lukkotiedostoa %s ei voi lukita: %s\n"
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "lukkotiedostoa %s ei voi lukita: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "aikakatkaistu"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7540,189 +7609,122 @@ msgstr ""
 "Linkkiä %s ei voi luoda\n"
 "Ehkä jossakin on vanhentunut lukkotiedosto?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "hakemistoa %s ei voi avata (%s) - mtabia ei päivitetty"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "virhe kirjoitettaessa %s: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "virhe muutettaessa tiedoston %s tilaa: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "nimeäminen %s -> %s ei onnistu: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: laitetta %s ei voi avata: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: laitteen %s tietoja ei voi hakea: %s\n"
+msgid ", offset %lld"
+msgstr ", siirtymä %lld"
 
-#: mount/lomount.c:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) siirtymä %d, %s-salaus\n"
+#: mount/lomount.c:104
+#, c-format
+msgid ", sizelimit %lld"
+msgstr ", kokoraja %lld"
 
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: ei löytynyt yhtään laitetta /dev/loop#"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", salaus %s (tyyppi %d)"
 
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
-msgstr ""
-"mount: Yhtään loop-laitetta ei löytynyt.\n"
-"       Ehkä tiedostoilla /dev/loop# on väärä major-arvo?"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ", siirtymä %d"
 
-#: mount/lomount.c:253
+#: mount/lomount.c:129
 #, 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: Ei löytynyt yhtään loop-laitetta, ja tiedoston %s mukaan\n"
-"       tämä ydin ei ole tietoinen loop-laitteesta.\n"
-"       (Jos näin on, käännä uudelleen tai suorita \"insmod loop.o\".)"
+msgid ", encryption type %d\n"
+msgstr ", salaustyyppi %d\n"
 
-#: mount/lomount.c:259
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: laitteen %s tietoja ei voi hakea: %s\n"
+
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: ei löytynyt yhtään laitetta /dev/loop#"
+
+#: mount/lomount.c:192
 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?"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: Ei löytynyt yhtään loop-laitetta. Ehkä tämä ydin ei ole tietoinen\n"
-"       loop-laitteesta (käännä uudelleen tai \"insmod loop.o\"), tai\n"
-"       ehkä /dev/loop#:in major-arvo on väärä?"
+"mount: Ei löytynyt yhtään loop-laitetta, ja tiedoston %s mukaan\n"
+"       tämä ydin ei ole tietoinen loop-laitteesta?\n"
+"       (Jos näin on, käännä uudelleen tai suorita \"modprobe loop\".)"
 
-#: mount/lomount.c:263
+#: mount/lomount.c:197
 msgid "mount: could not find any free loop device"
 msgstr "mount: ei löytynyt yhtään vapaata loop-laitetta"
 
-#: mount/lomount.c:359
-#, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "laitetta %s ei voi avata lukua varten\n"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Syötä uusi salasana uudelleen: "
-
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "hakemiston avaaminen epäonnistui\n"
-
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "Salasanassa on oltava vähintään kuusi merkkiä, yritä uudelleen.\n"
-
-#: mount/lomount.c:472
-#, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Muistia ei voi varata enempää\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
-msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-msgstr ""
-
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
-
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Muistia ei voitu lukita, poistutaan.\n"
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Alkuarvo (korkeintaan 16 heksanumeroa): "
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): onnistui\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "Ei-heksanumero \"%c\".\n"
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: laitetta %s ei voi poistaa: %s\n"
 
-#: mount/lomount.c:764
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
-msgstr "Avaimen haku salausjärjestelmälle %d ei ole tuettu\n"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): onnistui\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): onnistui\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr "Tämä mount on käännetty ilman loop-tukea. Käännä uudelleen.\n"
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "muisti ei riitä"
-
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "laitetta %s ei voi avata lukua varten\n"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"käyttö:\n"
+"  %s loop-laite                                        # näytä tietoja\n"
+"  %s -d loop-laite                                     # poista\n"
+"  %s [ -e salaus ] [ -o siirtymä ] loop-laite tiedosto # aseta\n"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "muisti ei riitä"
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
+msgstr "Loop-tukea ei ollut käännöksen aikana. Käännä uudelleen.\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7738,41 +7740,41 @@ msgstr "[mntent]: rivi %d tiedostossa %s on virheellinen%s\n"
 msgid "; rest of file ignored"
 msgstr "; loput tiedostosta jätetään huomioimatta"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: tiedoston mtab mukaan %s on jo liitetty pisteeseen %s"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: tiedoston mtab mukaan %s on liitetty pisteeseen %s"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: tiedostoa %s ei voi avata kirjoittamista varten: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: virhe kirjoitettaessa %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: virhe muutettaessa tiedoston %s tilaa: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s vaikuttaa olevan sivutustilaa - ei liitetä"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "liittäminen epäonnistui"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: vain root voi liittää %s pisteeseen %s"
@@ -7794,105 +7796,109 @@ msgstr "mount: ohitetaan loop-laitteen asettaminen\n"
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: aiotaan käyttää loop-laitetta %s\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop-laitteen asettaminen epäonnistui\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop-laite asetettiin onnistuneesti\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: tiedostoa %s ei voi avata: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: argumentin valitsimelle -p tai --pass-fd on oltava luku"
+
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: tiedostoa %s ei voi avata nopeuden asetusta varten"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: nopeutta ei voi asettaa: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: haarauttaminen ei onnistu: %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr "mount: tämä versio on käännetty ilman tukea tyypille \"nfs\""
 
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: epäonnistui nfs mount -versiolla 4, yritetään versiolla 3..\n"
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: Tiedostojärjestelmän tyyppiä ei voitu määrittää, eikä tyyppiä ole "
 "annettu"
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: tiedostojärjestelmän tyyppi on annettava"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr "mount: liitos epäonnistui"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: liitospiste %s ei ole hakemisto"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: lupa evätty"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr "mount: mountin käyttöön vaaditaan pääkäyttäjän oikeudet"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s on varattu"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc on jo liitetty"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s on jo liitetty tai %s on varattu"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: liitospiste %s ei ole olemassa"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: liitospiste %s on symlinkki olemattomaan"
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: erikoislaite %s ei ole olemassa"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7901,12 +7907,12 @@ msgstr ""
 "mount: erikoislaite %s ei ole olemassa\n"
 "       (polun etuliite ei ole hakemisto)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ei ole vielä liitetty, tai virheellinen valitsin"
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7916,35 +7922,35 @@ msgstr ""
 "       superlohko laitteella %s, tai liian monta liitettyä \n"
 "       tiedostojärjestelmää"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "liitostaulukko täynnä"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superlohkoa ei voi lukea"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: tuntematon laite"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: ydin ei tue tiedostojärjestelmätyyppiä %s"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: tarkoitat todennäköisesti %s"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: ehkä tarkoitit iso9660?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -7952,12 +7958,12 @@ msgstr ""
 "ole tuettu"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s ei ole lohkolaite, ja tilan luku epäonnistuu?"
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7966,76 +7972,49 @@ msgstr ""
 "mount: ydin ei tunnista tiedostoa %s lohkolaitteeksi\n"
 "       (ehkä \"insmod ajuri\" auttaa?)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s ei ole lohkolaite (yritä \"-o loop\"?)"
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ei ole lohkolaite"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ei ole kelvollinen lohkolaite"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "lohkolaite "
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: ei voi liittää %s%s vain luku -tilassa"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s on kirjoitussuojattu, mutta \"-w\" -lippu on annettu"
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s on kirjoitussuojattu, liitetään vain luku -tilassa"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr "mount: nimiö %s esiintyy sekä paikassa %s että %s\n"
-
-#: mount/mount.c:1124
-#, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "mount: %s on kaksinkertainen - ei liitetä"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: liitetään %s %sn perusteella\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID:"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "nimiö"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: osiota ei löydy"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: tyyppiä ei annettu - kaksoispisteen perusteella sen oletetaan olevan "
 "nfs\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: tyyppiä ei annettu - //-alkuliitteen perusteella sen oletetaan olevan "
@@ -8044,23 +8023,23 @@ msgstr ""
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: siirretään taustalle \"%s\"\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: luovutetaan \"%s\"\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s on jo liitetty paikkaan %s\n"
 
-#: mount/mount.c:1386
-#, fuzzy
+# valitsin -p passwdfd, mitä se tekee???
+#: mount/mount.c:1362
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8081,7 +8060,7 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Käyttö: mount -V                 : näytä versio\n"
@@ -8103,43 +8082,42 @@ msgstr ""
 "        mount --move vanha_hak uusi_hak\n"
 "Laite voidaan antaa nimellä, esim. /dev/hda1 tai /dev/cdrom,\n"
 "tai nimiöllä, käyttäen  -L nimiö  tai uuid:lla, käyttäen  -U uuid .\n"
-"Muut valitsimet: [-nfFrsvw] [-o valitsimet].\n"
+"Muut valitsimet: [-nfFrsvw] [-o valitsimet] [-p passwdfd].\n"
 "Paljon lisätietoja komennolla:  man 8 mount .\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: vain root voi tehdä tuon"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ei löytynyt %s - luodaan se..\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr "mount: nimiö %s esiintyy sekä paikassa %s, että %s - ei liitetä\n"
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: osiota ei löydy"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: liitetään %s\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr "mitään ei liitetty"
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s ei löydy tiedostosta %s"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s ei löydy tiedostosta %s, eikä %s"
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8147,34 +8125,34 @@ msgstr ""
 "mount: laitetta %s ei voitu avata, joten UUID- ja LABEL-muunnosta ei voi "
 "tehdä.\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: virheellinen UUID"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: virhe arvattaessa tiedostojärjestelmän tyyppiä\n"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: et antanut tyyppiä tiedostojärjestelmälle %s\n"
 
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Kokeillaan kaikkia tiedostoissa %s ja %s mainittuja tyyppejä\n"
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr "       ja tämä näyttää olevan sivutustilaa\n"
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Kokeillaan tyyppiä %s\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "Kokeillaan %s\n"
@@ -8268,7 +8246,7 @@ msgstr "tuntematon nfs status -paluuarvo: %d"
 msgid "bug in xstrndup call"
 msgstr "ohjelmistovirhe xstrndup-kutsussa"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8281,7 +8259,7 @@ msgstr ""
 "        %s [-v] [-p prioriteetti] erikoistiedosto ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8292,100 +8270,33 @@ msgstr ""
 "        %s -a [-v]\n"
 "        %s [-v] erikoistiedosto ...\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "muisti lopussa"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s laitteella %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: tiedoston %s tilaa ei voi lukea: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: varoitus: tiedostolla %s on turvattomat oikeudet %04o, %04o "
 "suositellaan\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: Ohitetaan tiedosto %s - siinä vaikuttaa olevan reikiä.\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr "Et ole pääkäyttäjä.\n"
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s: virheellinen lohkolaite"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "Salaustyyppiä %s ei tueta\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: aiotaan käyttää loop-laitetta %s\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Tämä osio on jo käytössä"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "sivutuslaitteella ei voi siirtyä taaksepäin"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "laitetta /dev/urandom ei voitu avata"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "i-solmuja ei voi kirjoittaa"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "haarauttaminen epäonnistui\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Vaihdetaan käyttäjän %s salasana\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: tiedostoa %s ei voi avata: %s\n"
@@ -8450,37 +8361,37 @@ msgstr "umount: %s: lohkolaitteita ei sallita tiedostoj
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "ohjelmaa umount2 ei ole, kokeillaan ohjelmaa umount...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 "kohteen %s irrottaminen epäonnistui - yritetään sen sijaan irrottaa %s\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s on varattu - uudelleenliitettiin vain luku -tilassa\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 "umount: kohteen %s uudelleenliittäminen vain luku -tilassa epäonnistui\n"
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s irrotettu\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: irrotettavien tiedostojärjestelmien listaa ei löydy"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
@@ -8491,42 +8402,42 @@ msgstr ""
 "valitsimet]\n"
 "        umount [-f] [-r] [-n] [-v] erikoistied | solmu...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Yritetään irrottaa %s\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s ei löytynyt tiedostosta mtab\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ei ole liitetty (tiedoston mtab mukaan)"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s vaikuttaa olevan liitettynä useita kertoja"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s ei ole tiedostossa fstab (etkä ole root)"
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s on ristiriidassa tiedoston fstab kanssa"
 
-#: mount/umount.c:602
-#, c-format
-msgid "umount: only root can unmount %s from %s"
+#: mount/umount.c:616
+#, fuzzy, c-format
+msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: vain root voi irrottaa laitteen %s paikasta %s"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr "umount: vain root voi tehdä tämän"
 
@@ -8665,7 +8576,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec; %f rec (char/sec)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Käyttö: %s [-c] [-n taso] [-s puskurin_koko]\n"
@@ -8830,23 +8741,23 @@ msgstr "------ Shared Memory Limits --------\n"
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
 msgstr "max number of segments = %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "max seg size (kbytes) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "max total shared memory (kbytes) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "min seg size (bytes) = %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9362,9 +9273,13 @@ msgstr "      -R 1 liitt
 msgid "missing comma"
 msgstr "puuttuva pilkku"
 
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "muisti lopussa"
+
 # c-format
-#: sys-utils/readprofile.c:115
-#, c-format
+#: sys-utils/readprofile.c:118
+#, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9375,6 +9290,7 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
@@ -9392,33 +9308,33 @@ msgstr ""
 "\t -n              poistaa käytöstä tavujärjestyksen automaattitunnistuksen\n"
 "\t -V              näyttää version ja poistuu\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s versio %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): väärä kartan rivi\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: merkkijonoa \"_stext\" ei löydy tiedostosta %s\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 "%s: profiiliosoite sallitun välin ulkopuolella. Väärä karttatiedosto?\n"
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "yhteensä"
 
@@ -9942,28 +9858,60 @@ msgstr "Sy
 msgid "Out of memory when growing buffer.\n"
 msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: laitetta %s ei voi poistaa: %s\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: ei ole käännetty minix v2 -tuen kanssa\n"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): onnistui\n"
+#~ msgid "mount: the label %s occurs on both %s and %s\n"
+#~ msgstr "mount: nimiö %s esiintyy sekä paikassa %s että %s\n"
 
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
-#~ msgstr "Tämä mount on käännetty ilman loop-tukea. Käännä uudelleen.\n"
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "mount: %s on kaksinkertainen - ei liitetä"
+
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: liitetään %s %sn perusteella\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID:"
+
+#~ msgid "label"
+#~ msgstr "nimiö"
+
+#~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
+#~ msgstr "mount: nimiö %s esiintyy sekä paikassa %s, että %s - ei liitetä\n"
+
+#~ msgid "Boot (%02X)"
+#~ msgstr "Käynnistettävä (%02X)"
+
+#~ msgid "None (%02X)"
+#~ msgstr "Ei mitään (%02X)"
+
+#~ msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) siirtymä %d, %s-salaus\n"
+
+#~ msgid ""
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
+#~ msgstr ""
+#~ "mount: Yhtään loop-laitetta ei löytynyt.\n"
+#~ "       Ehkä tiedostoilla /dev/loop# on väärä major-arvo?"
 
 #~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+#~ "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 ""
-#~ "käyttö:\n"
-#~ "  %s loop-laite                                        # näytä tietoja\n"
-#~ "  %s -d loop-laite                                     # poista\n"
-#~ "  %s [ -e salaus ] [ -o siirtymä ] loop-laite tiedosto # aseta\n"
+#~ "mount: Ei löytynyt yhtään loop-laitetta. Ehkä tämä ydin ei ole tietoinen\n"
+#~ "       loop-laitteesta (käännä uudelleen tai \"insmod loop.o\"), tai\n"
+#~ "       ehkä /dev/loop#:in major-arvo on väärä?"
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Alkuarvo (korkeintaan 16 heksanumeroa): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Ei-heksanumero \"%c\".\n"
 
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
-#~ msgstr "Loop-tukea ei ollut käännöksen aikana. Käännä uudelleen.\n"
+#~ msgid "Don't know how to get key for encryption system %d\n"
+#~ msgstr "Avaimen haku salausjärjestelmälle %d ei ole tuettu\n"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Osion %i loppu ei ole sylinterin rajalla:\n"
diff --git a/po/fr.po b/po/fr.po
index 25ecc328..b71020d5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 # Messages français pour util-linux.
-# Copyright © 2001 Free Software Foundation, Inc.
+# Copyright © 2004 Free Software Foundation, Inc.
 # Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
 #
 # Permission is granted to freely copy and distribute
@@ -8,103 +8,109 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11z\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
-"PO-Revision-Date: 2003-02-05 17:00-0500\n"
+"Project-Id-Version: util-linux 2.12\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
+"PO-Revision-Date: 2004-05-10 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "initialiser le mode lecture-seulement"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "initialiser le mode lecture-écriture"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "savoir si le statut du périphérique est en mode lecture-seulement"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "obtenir la taille des secteurs"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr "obtenir la taille des blocs"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
 msgstr "initialiser la taille des blocs"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "obtenir la taille"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "initialiser la lecture avancée"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "obtenir la lecture avancée"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "vider les tampons"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "relire la table de partition"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
 msgstr "Usage:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr "  %s --report [périphériques]\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "  %s [-V] [-v|-q] commandes périphériques\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Commandes disponibles:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: commande inconnue: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s requiert un argument\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr "%s a réussi.\n"
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: ne peut ouvrir %s\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: erreur ioctl() sur %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   Début Sec    Taille  Périphérique\n"
 
@@ -147,12 +153,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "usage: %s [ -n ] périphérique\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s de %s\n"
@@ -295,50 +301,50 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: cramfs invalide -- décalage invalide des données du fichier\n"
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Usage: %s [-larvsmf] /dev/nom\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s est monté.\t "
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Désirez-vous réellement continuer?"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "vérification stoppée.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zone nr < valeur de PREMIÈRE_ZONE dans le fichier « %s »."
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zone nr >= valeur de ZONES dans le fichier « %s »."
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Enlever le bloc"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr ""
 "Erreur de lecture: incapable de repérer le bloc dans le fichier « %s »\n"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Erreur de lecture: bloc corrompu dans le fichier « %s »\n"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -346,122 +352,122 @@ msgstr ""
 "Erreur interne: tentative d'écriture d'un bloc corrompu\n"
 "Requête d'écriture ignorée\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "échec de repérage durant l'écriture d'un bloc"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Erreur d'écriture: bloc corrompu dans le fichier « %s »\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "échec de repérage durant l'écriture du super bloc"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "incapble d'écrire dans le super bloc"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "incapable d'écrire la table de projection des inodes"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "incapable d'écrire dans la table de projection de zones"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "incapable d'écrire des inodes"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "échec de repérage"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "incapable de lire le super bloc"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "numéro magique corrompu dans le super bloc"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Blocs de 1k/zones seulement supportés"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "champ s_imap_blocks corrompu dans le super bloc"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "champ s_zmap_blocks corrompu dans le super bloc"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "incapable d'allouer un tampon pour la table de projection des inodes"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "incapable d'allouer un tampon pour des inodes"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "incapable d'allouer un tampon pour le compteur d'inodes"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "incapable d'allouer un tampon pour le compteur de zones"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "incapable de lire la table de projection des inodes"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "incapable de lire la table de projection de zone"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "Incapable de lire les inodes"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "AVERTISSEMENT: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blocs\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Taille zone=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Taille maximale=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "État du système de fichiers=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -470,176 +476,176 @@ msgstr ""
 "longueur des noms=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inode %d marqué non utilisé, mais utilisé pour le fichier « %s »\n"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Marquage en cours"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Le fichier « %s » a pour mode %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "AVERTISSEMENT: compte d'inodes trop grand.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "inode de la racine (root) n'est pas un répertoire"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr ""
 "Bloc a été utilisé auparavant. Maintenant inclus dans le fichier « %s »."
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Libre"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Bloc %d dans le fichier « %s » est marqué non utilisé."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Correct"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "Le répertoire « %s » contient un numéro d'inode corrompu pour le fichier '%."
 "*s'."
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " Enlever"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr "« %s »: répertoire corrompu: « . » n'apparaît pas en premier\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr "« %s »: répertoire corrompu: « .. » n'apparaît pas en second\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: répertoire corrompu: « . » n'apparaît pas en premier\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: répertoire corrompu: « .. » n'apparaît pas en second\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "erreur interne"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: répertoire corrompu: taille < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "échec de repérage dans bad_zone"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Mode %d du inode pas réinitialisé."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "Inode %d non utilisé, marqué utilisé dans la table des bits."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "Inode %d utilisé, marqué inutilisé dans la table des bits."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (mode = %07o), i_nlinks=%d, décompte=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "Initilisation de i_nlinks pour décompte"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zone %d: marqué utilisé, aucun fichier l'utilise."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Non marqué"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Zone %d: en usage, décompte=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Zone %d: non utilisé, décompte=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Initialisé"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "taille d'inode corrompue"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "taille d'inode v2 corrompu"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr ""
 "nécessité d'utiliser un terminal pour des réparations en mode interactif"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "incapable d'ouvrir « %s »"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s est propre, aucune vérification.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Vérification forcée du système de fichiers sur %s.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr ""
 "Le système de fichiers de %s est corrompu, nécessité d'une vérification.\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -648,12 +654,12 @@ msgstr ""
 "\n"
 "%6ld inodes utilisés (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zones utilisés (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -676,7 +682,7 @@ msgstr ""
 "------\n"
 "%6d fichiers\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -767,7 +773,7 @@ msgstr "trop d'inodes - maximum est 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "pas suffisamment d'espace, a besoin au moinds de %lu blocs"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Périphérique: %s\n"
@@ -842,7 +848,7 @@ msgstr ""
 "Usage: mkfs [-V] [-t type-système-de-fichiers] [options] péridphérique "
 "[taille]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1009,63 +1015,63 @@ msgstr ""
 "que\n"
 "certains fichiers de périphériques seront erronés.\n"
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Usage: %s [-c | -l nom-de-fichier] [-nXX] [-iXX] /dev/name [blocs]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s est monté; ne peut faire un système de fichier ici!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "échec de repérage du bloc d'amorçage dans write_tables"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "incapable de libérer le secteur d'amorçage"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "échec de repérage dans write_tables"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "incapable d'écrire la table de projection des inodes"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "incapable d'écrire la table de projections des zones"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "incapable d'écrire les inodes"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "échec d'écriture dans write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "trop de blocs corrompus"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "pas assez de blocs en bon état"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "incapable d'allouer des tampons pour les tables de projection"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "incapable d'allouer un tampons pour les inodes"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1074,56 +1080,51 @@ msgstr ""
 "Taille maximum=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "éched de repérage durant l'examen des blocs"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valeur étranges dans do_check: probablement un bug\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "échec de repérage dans check_blocks"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
 "blocs corrompus avant la zone de données: ne peut fair un sys. de fichiers"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d blocc corrompus\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "un bloc corrompu\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "ne peut ouvrir un fichier de blocs corrompus"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s: n'a pas été compilé avec le soutien pour minix v2\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "erreur strtol(): numbre de blocs non spécifié"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "incapable d'ouvrir %s"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "incapable d'évaluer par stat() %s"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "n'essayera pas de créer un système de fichiers sur « %s »"
@@ -1163,48 +1164,48 @@ msgid "one bad page\n"
 msgstr "une page corrompue\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d pages corrompues\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: erreur: aucun endroit pour définir un espace d'échange (swap)?\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr ""
 "%s: erreur: taille %ld est plus grande que la taille du périphérique %d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: erreur: version inconnue %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr ""
 "%s: erreur: zone d'échange (swap) a besoin d'une taille d'au moins %ldkB\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: AVERTISSEMENT: truncation de la zone d'échange (swap) à %ldkB\n"
 
 # disk-utils/mkswap.c:566
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Ne tentera pas de créer un périphérique de type swap sur « %s »"
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "ERREUR FATALE: la première page est illisible"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1220,28 +1221,28 @@ msgstr ""
 "pour forcer sa création.\n"
 
 # disk-utils/mkswap.c:605
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Incapable de fixer l'espace de swap: illisible"
 
 # disk-utils/mkswap.c:606
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr ""
 "Initialisation de la version de l'espace de swap %d, taille = %llu kB\n"
 
 # disk-utils/mkswap.c:612
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "incapable de rembobiner le périphérique de swap"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "incapable d'écrire la page de signature"
 
 # disk-utils/mkswap.c:623
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "Échec de la synchronisation du système de fichiers par fsync"
 
@@ -1284,58 +1285,57 @@ msgstr "   %s [ -c | -y | -n | -d ] p
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] périphérique\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Inutilisable"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Espace libre"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "Disque a été changé.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Réamorcer le système pour s'assurer que la table de partition a été "
 "correctement mise à jour.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1347,785 +1347,788 @@ msgstr ""
 "partition DOS 6.x, svp consulter les pages du manuel\n"
 "de cfdisk pour de plus amples informations.\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "ERREUR FATALE"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Appuyer n'importe quelle clé pour quitter cfdisk"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "Ne peut effectuer de repérage sur l'unité de disque"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Ne peut lire à partir de l'unité de disque"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Ne peut lire de l'unité de disque"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Trop de partitions"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "La partition débute avant le secteur 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "La partition se termine avant le secteur 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "La partition débute après la fin du disque"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "La partition se termine après la fin du disque"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partition se termine dans le cylindre final"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "partitions logiques ne sont pas en ordre sur le disque"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "chevauchement des partitions logiques"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "chevauchement des partitions logiques qui ont été grossies"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Erreur interne créant un disque logique sans partition étendue !!!!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Ne peut créer un disque logique ici -- cela créerait 2 partitions étendues"
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Item de menu trop long. Le menu pourrait paraître erroné."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu sans direction. Mis en horizontal par défaut."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Clé illégale"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Appuyer sur une touche pour continuer"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primaire"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Créer une nouvelle partition primaire"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Logique"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Créer une nouvelle partition logique"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Annuler"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Ne pas créer une partition"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Erreur interne !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Taille (en MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Début"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Ajouter une partition au début de l'espace libre"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Fin"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Ajouter une partition à la fin de l'espace libre"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Pas d'espace pour créer une partition étendue"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr ""
 "Pas de table de partitions ou signature inconnue dans la table de partitions"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Voulez-vous débuter avec une table à zéro [o/N]"
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "Vous avez spécifié plus de cylindres que le disque ne peut contenir"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "Ne peut ouvrir l'unité de disque"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disque ouvert en mode lecture seulement - aucune permission d'écriture"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Ne peut obtenir la taille du disque"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Partition primaire erronée"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Partition logique erronnée"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "AVERTISSEMENT!!  Cela pourrait détruire les données sur votre disque!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Êtes-vous certain de vouloir écrire la table de partitions sur le disque? "
 "(oui ou non)"
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "non"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "N'a pas écrit la table de partitions sur le disque"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "oui"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "SVP répondre « yes » ou « no »"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Écriture de la table de partitions sur le disque..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Table de partitions écrite sur le disque"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Table de partitions écrite, échec de la relecture. Réamorcer pour mettre à "
 "jour la table."
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr "Aucune partition primaire marqué amorçable. DOS MBR ne peut amorcer."
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Plus d'une partition primaire marqué amorçable. DOS MBR ne peut amorcer."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Entrer le nom du fichier ou appuyer « RETURN » pour affichage à l'écran:"
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ne peut ouvrir le fichier « %s »"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unité de disque: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Secteur 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Secteur %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Aucun   "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Primaire"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Logique"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Amorce (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Amorce"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
+#: fdisk/cfdisk.c:2007
 #, c-format
-msgid "Unknown (%02X)"
-msgstr "Inconnu (%02X)"
+msgid "(%02X)"
+msgstr "%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Aucun (%02X)"
+#: fdisk/cfdisk.c:2009
+msgid "None"
+msgstr "Aucun"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Table de partitions de %s\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
-msgstr "            Premier  Dernier\n"
+#: fdisk/cfdisk.c:2046
+msgid "               First       Last\n"
+msgstr "               Premier     Dernier\n"
 
 # fdisk/cfdisk.c:1969
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
-" # Type     Secteur  Secteur  Offset  Longueur Sys.FichierType (ID)   "
+" # Type       Secteur     Secteur  Offset    Longueur Sys.FichierType (ID) "
 "Fanions\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
-msgstr "         --- Début  ---      ---- Fin  ----    No de départ de\n"
+#: fdisk/cfdisk.c:2131
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
+msgstr "         --- Début  ---      ---- Fin  ----    Début     Numéro de\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
-msgstr " # Fan.  Tête Sect Cyl   ID  Tête Sect Cyl    Secteur Secteurs\n"
+#: fdisk/cfdisk.c:2132
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr " # Fan.  Tête Sect Cyl   ID  Tête Sect Cyl     Secteur   Secteurs\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Brut"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Afficher le contenu de la table en format brut"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Secteurs"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Afficher le contenu de la table ordonné par secteurs"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Table"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Afficher juste le contenue de la table de partitions"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Ne pas afficher le contenu de la table"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Écran d'aide pour cfdisk"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk, est un programme de partionnement basé sur curses. cfdisk"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "permet de créer, détruire et modifier les partitions de votre unité de"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "disque dur."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Commande     Signification"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          basculer le fanion d'amorce sur la partition courante"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          détruire la partition courante"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          modifier les paramètres: cylindres, têtes, secteurs par piste"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             AVERTISSEMENT: cette option ne doit pas être utilisé par"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             des gens qui ne savent pas ce qu'ils font."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          afficher cet écran d'aide"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          maximiser l'usage du disque de la partition courante"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Note: cela peut rendre la partition incompatible avec"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          créer une nouvelle partition à partir de l'espace libre"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          afficher le contenu de la table de partitions à l'écran ou dans "
 "un fichier"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "             Il y a plusieurs formats différents pour la partition"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             que vous désirez:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - données brutes (exactement ce que vous écrivez sur le "
 "disque)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - table ordonnée par secteurs"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - table en format brut"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          quitter le programme sans écrire la table de partitions"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          modifier le type de système de fichiers"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr ""
 "  u          modifier les unités d'affichage de la taille des partition"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             faire la rotation avec MB, secteurs et cylindres"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          écrire la table de partitions sur le disque (taper W en "
 "majuscule)"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 "             Étant donné que cela peut détruire des données sur le disque, "
 "vous devez"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             confirmer ou annuler la commande par la réponse « yes » ou"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             « no »"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Flèche-haut  déplacer le curseur vers la partition précédente"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Flèche-bas   déplacer le curseur vers la partition suivante"
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       réafficher le contenu à l'écran"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          afficher cet écran d'aide"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Note: toutes les commandes peuvent être soumises en lettres"
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "majuscules ou minuscules (sauf pour les écritures)."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cylindres"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Modifier la géométrie des cylindres"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Têtes"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Modifier la géométrie de tête"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Modifier la géométrie de secteur"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Complété"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "Modification de la géométrie complété"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Entrer le nombre de cylindres: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Valeur illégale pour les cylindres"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Entrer le nombre de têtes: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Valeur illégale pour les têtes"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Entrer le nombre de secteurs par piste: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Valeur illégale pour les secteurs"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Entrer le type de système de fichiers:"
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "Ne peut modifier le type de SF pour aucun type"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "Ne peut modifier le type de SF à étendu"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Amorce"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Inconnu (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unité de disque: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, c-format
-msgid "Size: %lld bytes, %ld MB"
-msgstr "Taille: %lld octets,  %ld Mo"
+msgid "Size: %lld bytes, %lld MB"
+msgstr "Taille: %lld octets,  %lld Mo"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
-msgstr "Taille: %lld octets,  %ld.%ld Go"
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "Taille: %lld octets,  %lld.%lld Go"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2587
 #, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
-msgstr "Têtes: %d   Secteurs par piste: %d  Cylindres: %d"
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "Têtes: %d   Secteurs par piste: %d  Cylindres: %lld"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Nom"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Fanions"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Part Type"
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "Type SF"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Étiq.]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
-msgstr "  Secteurs"
+#: fdisk/cfdisk.c:2597
+msgid "    Sectors"
+msgstr "    Secteurs"
+
+#: fdisk/cfdisk.c:2599
+msgid "  Cylinders"
+msgstr "  Cylindres"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
-msgstr "Taille (MB)"
+#: fdisk/cfdisk.c:2601
+msgid "  Size (MB)"
+msgstr "  Taille (Mo)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
-msgstr "Taille (GB)"
+#: fdisk/cfdisk.c:2603
+msgid "  Size (GB)"
+msgstr "  Taille (Go)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Amorçable"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Basculer le fanion d'amorce pour la partition courante"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Détruire"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Détruire la partition courante"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Géométrie"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Modifier la géométrie du disque (pour expert seulement)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Aide"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Afficher l'écran d'aide"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Maximiser l'usage du disque de la partition courante (experts seulement)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Nouveau"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Créer une nouvelle partition à partir de l'espace libre"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Afficher"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr ""
 "Afficher le contenu de la table de partitions à l'écran (ou dans un fichier)"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Quitter"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Quitter le programme sans écrire la table de partitions"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Type"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Modifier le type de système de fichier (DOS, Linux, OS/2, etc)"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Unités"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Mofifier les unités d'affichage des taille des partitions (MB, sect, cyl)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Écrire"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "ÉCrire la table de partitions sur le dsique (cela peut détruire les données)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "Ne peut créer cette partition comme étant amorçable"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "Ne peut détruire une partition vide"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "Ne peut maaximiser cette partition"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Cette partition est inutilisable"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Cette partition est déjà en usage"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "Ne peut changer le type d'une partition vide"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "Pas de partition disponible"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Commande illégale"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright © 1994-2002 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2162,7 +2165,7 @@ msgstr ""
 "                le nombre de têtes et le nombre de secteurs par piste.\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2183,7 +2186,7 @@ msgstr ""
 "-u: donne le Début et la Fin en unités de secteurs (au lieu de cylindres)\n"
 "-b 2048: (pour certains disques MO) utilise 2048-octets par secteur\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2200,222 +2203,222 @@ msgstr ""
 "RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Incapable d'ouvrir %s\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Incapable de lire %s\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Incapable de repérage sur %s\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Incapable d'écrire %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "échec de BLKGETSIZE ioctl sur %s\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Incapable d'allouer de la mémoire additionnelle\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "ERREUR FATALE\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Commande action"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   basculer le fanion de lecture seulement"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b   éditer l'étiquette BSD du disque"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   basculer le fanion mount"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   détruire la partition"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   lister les types de partitions connues"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   afficher ce menu"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   ajouter une nouvelle partition"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   créer une nouvelle table vide de partitions DOS"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   afficher la table de partitions"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   quitter sans faire de sauvegarde"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   créer une nouvelle étiquette vide pour disque de type Sun"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   modifier l'identificateur de la partition système"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   modifier l'affichage et la saisie des unités"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   vérifier la table de partitions"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   écrire la table sur le disque et quitter"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   fonctionnalité additionnelle (pour experts seulement)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   sélectionner une partition amorçable"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b   éditier l'entrée du fichier d'amorce"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   sélectionner une partition swap ppour SGI"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a   bascule le fanion d'amorce"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   basculer le fanion de compatibilité DOS"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   modifier le nombre de cylindres alternatifs"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   modifier le nombre de cylindres"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   afficher les données brutes de la table de partition"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   modifier le nombre de secteurs additionnels par cylindre"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   modifier le nombre de têtes"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   changer le facteur d'inter-feuillage"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   modifier la vitesse de rotation en tour par minute (rpm)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   retourner au menu principal"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   modifier le nombre de secteurs par piste"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   modifier le nombre de cylindres physiques"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   déplacer le début des données dans une partition"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   lister les partitions étendues"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   créer une table de partitions de type IRIX (SGI)"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f   fixer l'ordonnancement des partitions"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "Vous devez initialiser"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "têtes"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "secteurs"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "cylindres"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2424,11 +2427,11 @@ msgstr ""
 "%s%s.\n"
 "Vous pouvez faire cela à partir du menu des fonctions additionnelles.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " et "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2441,7 +2444,7 @@ msgid ""
 msgstr ""
 "\n"
 "Le nombre de cylindres pour ce disque est initialisé à %d.\n"
-"Il n'y a rien d'incorrect avec cela, mais c'est plus grand que 1024,\n"
+"Il n'y a rien d''incorrect avec cela, mais c'est plus grand que 1024,\n"
 "et cela pourrait causer des problèmes en fonction pour certaines "
 "configurations:\n"
 "1) logiciels qui sont exécutés à l'amorçage (i.e., vieilles versions de "
@@ -2449,27 +2452,27 @@ msgstr ""
 "2) logiciels d'amorçage et de partitionnement pour d'autres SE\n"
 "   (i.e., DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Décalage erronée dans la partition primaire étendue\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "AVERTISSEMENT: destruction de partitions après %d\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "AVERTISSEMENT: pointeur additionnel dans la table de partitions %d\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "AVERTISSEMENT: données surperflues ignorées dans la table de partition %d\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2483,16 +2486,16 @@ msgstr ""
 "ne sera par récupérable.\n"
 "\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Note: taille de secteur est %d (et non pas %d)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr "Vous ne serez pas capable d'écrire la table de partitions.\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
@@ -2500,7 +2503,7 @@ msgstr ""
 "Ce disque a des nombres magiques à la fois DOS et BSD.\n"
 "Exécuter la commande 'b' pour passer en mode BSD.\n"
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
@@ -2508,16 +2511,16 @@ msgstr ""
 "Le périphérique ne contient ni une partition ni une étiquette DOS, Sun, SGI "
 "ou OSF\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Erreur interne\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Partition additionnelle étendue ignorée %d\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2526,7 +2529,7 @@ msgstr ""
 "AVERTISSEMENT: fanion 0x%04x invalide de la table de partitions %d sera "
 "corrigé par w(écriture)\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2534,78 +2537,78 @@ msgstr ""
 "\n"
 "a obtenu EOF 3 fois - fin du programme...\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Code Hex (taper L pour lister les codes): "
 
-#: fdisk/fdisk.c:1069
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1094
+#, c-format
 msgid "%s (%u-%u, default %u): "
-msgstr "%s (%d-%d, par défaut %d): "
+msgstr "%s (%u-%u, par défaut %u): "
 
-#: fdisk/fdisk.c:1136
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1161
+#, c-format
 msgid "Using default value %u\n"
-msgstr "Utilisation de la valeur par défaut %d\n"
+msgstr "Utilisation de la valeur par défaut %u\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
-msgstr "Valeur hors gamme.\n"
+msgstr "Valeur hors limites.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Numéro de partition"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "AVERTISSEMENT: partition %d a un type vide\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition sélectionnée %d\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 msgid "No partition is defined yet!\n"
 msgstr "Aucune partition n'est définie encore!\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr "Toutes les partitions primaires ont déjà été définies!\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "cylindre"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "secteur"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Modification des unités d'affichage/saisie à %s\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "AVERTISSEMENT: Partition %d est une partition étendue\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "Fanion de compatibilité DOS est initialisé\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Fanion de compatibilité DOS n'est initialisé\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d n'existe pas encore!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2617,7 +2620,7 @@ msgstr ""
 "type 0 n'est pas recommandé. Vous pouvez détruire\n"
 "la partition en utilisant la commande « d ».\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2625,7 +2628,7 @@ msgstr ""
 "Vous ne pouvez la modifier en partition étendue et vice versa.\n"
 "Vous devez la détruire d'abord.\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2635,7 +2638,7 @@ msgstr ""
 "tel que SunOS/Solaris l'exige et tel que qu'il est préférable  pour Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2645,52 +2648,52 @@ msgstr ""
 "et la partition 11 comme un volume entier (6) tel que IRIX l'exige.\n"
 "\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Type de partition système modifié de %d à %x (%s)\n"
 
-#: fdisk/fdisk.c:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Partition %d a des débuts différents physique/logique (non Linux?):\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logique=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d a des fins différentes physique/logique:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i ne débute pas sur une frontière de cylindre:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "devrait être (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "La partition %i ne se termine pas sur une frontière de cylindre.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "devrait être (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -2699,7 +2702,7 @@ msgstr ""
 "\n"
 "Disque %s: %ld Mo, %lld octets\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, c-format
 msgid ""
 "\n"
@@ -2708,17 +2711,17 @@ msgstr ""
 "\n"
 "Disque %s: %ld.%ld Go, %lld octets\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d têtes, %d secteurs/piste, %d cylindres"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
-msgstr ", total %lu secteurs"
+msgid ", total %llu sectors"
+msgstr ", total %llu secteurs"
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2727,7 +2730,7 @@ msgstr ""
 "Unités = %s de %d * %d = %d octets\n"
 "\n"
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2735,16 +2738,16 @@ msgstr ""
 "Rien à faire. L'ordonnancement est déjà correct.\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
+#: fdisk/fdisk.c:1704
 #, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
-msgstr "%*s Amorce  Début       Fin    Blocs    Id  Système\n"
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s Amorce    Début         Fin      Blocs    Id  Système\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Périphérique"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2752,7 +2755,7 @@ msgstr ""
 "\n"
 "Les entrées de la table de partitions ne sont pas dans l'ordre du disque\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2763,92 +2766,92 @@ msgstr ""
 "Disq %s: %d têtes, %d secteurs, %d cylindres\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
-msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Début     Tail.ID\n"
+#: fdisk/fdisk.c:1754
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Début      Tail.ID\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "AVERTISSEMENT: partition %d contient un secteur 0\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: tête %d plus grand que le maximum %d\n"
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: secteur %d plus grand que le maximum %d\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partitions %d: cylindre %d plus grand que le maximum %d\n"
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partition %d: secteurs précédents %d ne concorde pas avec le total %d\n"
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "AVERTISSEMENT: start-of-data erroné dans la partition %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "AVERTISSEMENT: la partition %d chevauche la partition %d.\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "AVERTISSEMENT: la partition %d est vide\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partition logique %d n'est pas entièrement dans la partition %d\n"
 
-#: fdisk/fdisk.c:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Nombre total de secteurs alloués %d plus grand que le maximum %d\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d secteurs non-alloués\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partition %d est déjà défini.  La détruire avant de la rajouter.\n"
 
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Premier %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Secteur %d est déjà alloué\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "Aucun secteur disponible\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Dernier %s ou +taille or +tailleM ou +tailleK"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2861,17 +2864,27 @@ msgstr ""
 "\tune nouvelle table de partition DOS vide. (Utiliser o.)\n"
 "\tAVERTISSEMENT: cela va détruire le contenu du disque présent.\n"
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "Le nombre maximum de partitions a été créé\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Vous devez détruire quelques partitions et ajouter une partition étendue "
 "d'abord\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "partitions logiques ne sont pas en ordre sur le disque"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Partition primaire erronée"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2882,20 +2895,20 @@ msgstr ""
 "   %s\n"
 "   p   partition primaire (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l   logique (5 ou plus)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e   étendue"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Numéro invalide de partition pour le type « %c »\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2903,11 +2916,11 @@ msgstr ""
 "La table de partitions a été altérée!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Appel de ioctl() pour relire la table de partitions.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2921,7 +2934,7 @@ msgstr ""
 "Le kernel va continuer d'utiliser l'ancienne table.\n"
 "La nouvelle table sera utilisé lors du prochain réamorçage.\n"
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2933,65 +2946,65 @@ msgstr ""
 "svp consulter les pages du manuel de fdisk pour des informations\n"
 "additionnelles.\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Synchronisation des disques.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d n'a pas de zone de données\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Nouveau début des données"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Commande pour experts (m pour de l'aide): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Numbre de cylindres"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Numbre de têtes"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Numbre de secteurs"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "AVERTISSEMENT: initialisation du décalage de secteur pour compatibilité DOS\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disque %s ne contient pas une table de partition valide\n"
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ne peut ouvrir %s\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "ne peut ouvrir %s\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: commande inconnue\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Ce kernel repère lui-même la taille des secteurs - -b option ignorée\n"
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -3000,18 +3013,18 @@ msgstr ""
 "utilisé avec le périphérique spécifié\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Détection d'une étiquette de disque pour OSF/1 sur %s, passage en mode "
 "d'édition d'étiquette.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Commande (m pour l'aide): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -3020,15 +3033,15 @@ msgstr ""
 "\n"
 "Le fichier courant d'amorçage est: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "SVP entrer le nom du nouveau fichier d'amorçage: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
-msgstr "Fichier d'amorçage inchangé\n"
+msgstr "Fichier d'amorçage n'a pas été modifié\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3039,7 +3052,7 @@ msgstr ""
 "type SGI.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3400,8 +3413,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux swap"
 
@@ -3588,9 +3600,9 @@ msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Les partitions %d et %d se chevauchent sur %d secteurs.\n"
 
 #: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Espace inutilisé de %8d secteurs - secteurs %8d-%d\n"
+msgstr "Espace inutilisé de %8u secteurs - secteurs %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:523
 msgid ""
@@ -3641,7 +3653,7 @@ msgstr ""
 "Taper OUI si vous êtes certain de l'étiquetage différent de cette "
 "partition.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -3704,6 +3716,10 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
+"AVERTISSEMENT: BLKGETSIZE ioctl a échoué sur %s. La valeur %d de la "
+"géométrie du cylindre\n"
+"sera utilisée. Cette valeur peut être tronquée pour les périphérique de plus "
+"de 33.8 Go.\n"
 
 #: fdisk/fdisksgilabel.c:738
 #, c-format
@@ -3816,15 +3832,15 @@ msgstr "Cylindres alternatifs"
 msgid "Physical cylinders"
 msgstr "Cylindres physiques"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Vitesse de rotation (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Facteur d'inter-feuillage"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Secteurs additionnels par cylindre"
 
@@ -3879,7 +3895,7 @@ msgstr ""
 "mais la valeur %d %s en couvre d'autres. Votre entrée a été modifiée\n"
 "à %d %s\n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3889,7 +3905,7 @@ msgstr ""
 "laisser cette\n"
 "partition comme disque entier (5), débutant à 0, avec les secteurs %u\n"
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3905,7 +3921,7 @@ msgstr ""
 "soit étiquetée 82 (Linux swap): "
 
 # fdisk/fdisksunlabel.c:656
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3924,7 +3940,7 @@ msgstr ""
 "Unités = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3937,16 +3953,16 @@ msgstr ""
 "Unités = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Fanions Début       Fin    Blocs    Id  Système\n"
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Nombre de cylindres alternatifs"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Nombre de cylindres physiques"
 
@@ -3997,21 +4013,21 @@ msgstr "OS/2 Boot Manager"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
-msgstr "Win95 FAT32"
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA)"
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA)"
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
-msgstr "Win95 Ext'd (LBA)"
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 Etendu (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -4042,16 +4058,16 @@ msgid "AST SmartSleep"
 msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
-msgstr "Hidden Win95 FAT32"
+msgid "Hidden W95 FAT32"
+msgstr "Hidden W95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
-msgstr "Hidden Win95 FAT32 (LBA)"
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "Hidden W95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
-msgstr "Hidden Win95 FAT16 (LBA)"
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "Hidden W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4159,6 +4175,12 @@ msgstr "Old Minix"
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux swap"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 hidden C: drive"
@@ -4313,92 +4335,92 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "erreur de repérage sur %s - ne peut repérer %lu\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "erreur de repérage: désiré 0x%08x%08x, obtenu 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "mémoire épuisée - abandon\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "erreur de lecture sur %s - ne peut lire le secteur %lu\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERREUR: secteur %lu n'a pas un signature MS-DOS\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "Erreur d'écriture sur %s - ne peut écrire le secteur %lu\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "Ne peut ouvrir le fichier de sauvegarde de secteur de partition (%s)\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "erreur d'écriture sur %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 "ne peut évaluer par stat() le fichier de recouvrement de partition (%s)\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "le fichier de recouvrement de partition a une taille erronée - pas de "
 "recouvrement\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "mémoire épuisée?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "ne peut ouvrir le fichier de recouvrement de partition (%s)\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "erreur de lecture %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "ne peut ouvrir le périphérique %s pour écriture\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "erreur d'écriture du secteur %lu sur %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disque %s: ne peut obtenir sa taille\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disque %s: ne peut obtenir la géométrie\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4409,23 +4431,23 @@ msgstr ""
 "un disque entier. Utiliser fdisk n'aurait probablement pas de sens.\n"
 "[Utiliser l'option --force si vous désirez faire cela]\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "AVERTISSEMENT: HDIO_GETGEO indique qu'il a %lu têtes\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "AVERTISSEMENT: HDIO_GETGEO indique qu'il y a %lu secteurs\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 "AVERTISSEMENT: BLKGETSIZE/HDIO_GETGEO indique qu'il y a %lu cylindres\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4435,7 +4457,7 @@ msgstr ""
 "Cela occasionnera des problèmes avec tous les logiciels qui utilisent un "
 "adressage C/H/S.\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4444,7 +4466,7 @@ msgstr ""
 "\n"
 "Disque %s: %lu cylindres, %lu têtes, %lu secteurs/piste\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4452,7 +4474,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour la tête: %lu (devrait "
 "être 0-%lu)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4461,7 +4483,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour le secteur: %lu (devrait "
 "être 1-%lu)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4470,7 +4492,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour les cylindres: %lu "
 "(devrait être 0-%lu)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4478,11 +4500,11 @@ msgstr ""
 "Id  Nom\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Relecture de la table de partitions ...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4490,31 +4512,31 @@ msgstr ""
 "La commande de relecture de la table de partitions a échouée.\n"
 "Ré-amorcer le système maintenant, avant d'utiliser mkfs\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Erreur de fermeture %s\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: pas de telle partition\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "format non reconnu - utilisation de secteurs\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# table de partitions de %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "format non implanté - using %s\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4524,11 +4546,11 @@ msgstr ""
 "d\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Périph Amor Début     Fin   #cyls    #blocs    Id  Système\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4537,11 +4559,11 @@ msgstr ""
 "Unités= secteurs de 512 octets, décompte à partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Périph Amorce  Début       Fin   #secteurs Id  Système\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4550,45 +4572,45 @@ msgstr ""
 "Unités= blocs de 1024 octets, décompte à partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Périph Amorce Début       Fin    #blocs    Id  Système\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unités= méagoctets de 1048576 octets, blocs de 1024 octets, décompte à "
+"Unités= mégaoctets de 1048576 octets, blocs de 1024 octets, décompte à "
 "partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Périph Amor Début   Fin     Mo    #blocs    Id  Système\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tdébut: (c,h,s) expecté (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tfin: (c,h,s) expecté (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "partition se termine sur le cylindre %ld, au delà de la fin du disque\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "Aucune partition repérée\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4599,54 +4621,54 @@ msgstr ""
 "  pour C/H/S=*/%ld/%ld (au lieu de %ld/%ld/%ld).\n"
 "Pour ce rapport, la géométrie suivante sera assumée.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "aucune table de partitions présente.\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "étrange, seulement %d partitions définies.\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "AVERTISSEMENT: partition %s a une taille 0 mais n'est pas marquée Empty\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "AVERTISSEMENT: partition %s a une taille 0 et est amorçable\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "AVERTISSEMENT: partition %s a une taille 0 et une adresse de début non à "
 "zéro\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "AVERTISSEMENT: partition %s "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "n'est par contenue dans la partition %s\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "AVERTISSEMENT: partitions %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "et %s se chevauchent\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4656,17 +4678,17 @@ msgstr ""
 "(secteur %lu),\n"
 "et cela la détruira lorsqu'elle se remplira\n"
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "AVERTISSEMENT: la partition %s débute au secteur 0\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "AVERTISSEMENT: la partition %s s'étend au delà de la fin du disque\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4674,20 +4696,20 @@ msgstr ""
 "Parmi les partitions primaires, au plus une seule peut être étendue\n"
 " (quoique cela ne soit pas un problème sous Linux)\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 "AVERTISSEMENT: la partition %s ne débute pas sur une frontière de cylindre\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 "AVERTISSMENT: la partition %s ne se termine pas sur une frontière de "
 "cylindre\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4696,7 +4718,7 @@ msgstr ""
 "Cela n'a pas d'importance pour LILO, mais en a pour DOS MBR qui n'amorcera "
 "ce disque.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4704,7 +4726,7 @@ msgstr ""
 "AVERTISSEMENT: habituellement une seule permet l'amorçage à partir d'une\n"
 "partition primaire LILO ne s'occupe pas du fanion d'amorçage.\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4713,33 +4735,33 @@ msgstr ""
 "Cela n'a pas d'importance pour LILO, mais en a pour DOS MBR qui n'amorcera "
 "pas ce disque.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 msgid "start"
 msgstr "début"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: début: (c,h,s) espéré (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 msgid "end"
 msgstr "fin"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "partition %s: fin: (c,h,s) espéré (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "partition %s se termine sur le cylindre %ld, au delà de la fin du disque\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4748,7 +4770,7 @@ msgstr ""
 "AVERTISSEMENT: début décalé de la partition étendue de %ld à %ld\n"
 "(pour fins d'affichage seulement. Ne modifier pas le contenu.)\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4756,134 +4778,134 @@ msgstr ""
 "AVERTISSEMENT: la partition étendue ne débute pas sur une frontière de.\n"
 "cylindres DOS et Linux interpréteront les contenus différemment.\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "top de partitions - celles au delà de nr (%d) sont ignorées\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "arbre de partitions?\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Gestionnaire de disque détecté - incapable de traiter cela\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "signature DM6 signature repéré - abandon\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "étrange..., une partition étendue de taille 0?\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "étrange..., une partition BSD de taille 0?\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " %s: une partition non reconnue\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n flag a été utilisé: rien n'a changé\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Échec de sauvegarde des vieux secteurs - abandon\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Échec de l'écriture de la partition sur %s\n"
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "ligne d'entrée longue ou incomplète - abandon\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "erreur d'entrée: « = » espéré après le champ %s\n"
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "erreur d'entrée: caractère inattendu %c après le champ %s\n"
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entrée non reconnu: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "numbre trop grand\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "rebut après le nombre\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "aucun espace pour le descripteur de partition\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "ne peut construire autour de la partition étendue\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr "trop de champs à l'entrée\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "Aucun espace pour en accepter d'avantage\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "Type illégal\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "AVERTISSEMENT: la taille donnée (%lu) excède la taille maximale allouable (%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "AVERTISSEMENT: partition vide\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "AVERTISSEMENT: début de partition corrompu (auparavant %lu)\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "fanion d'amorçage non reconnu - choisir « - » ou « * »\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "spécification partielle c,h,s?\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "Partition étendue par à l'endroit attendu\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "entrée erronée\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "trop de partitions\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 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"
@@ -4895,47 +4917,47 @@ msgstr ""
 "Habituellement vous n'avez besoin que de spécifier:\n"
 "<début> et <taille> (et parfois <type>).\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "version"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Usage: %s [options] périphérique ...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "périphérique: quelque chose comme /dev/hda ou /dev/sda"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "options utiles:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [ou --show-size]: lister la taille d'une partition"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [ou --id]:        afficher ou modifier l'identificateur de partition"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ou --list]:      lister les partitions de chaque périphérique"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [ou --dump]:      identique, mais dans un format utile pour une "
 "saisie ultérieure"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [ou --increment]: numbre de cylindres etc. de 1 au lieu de 0"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4943,59 +4965,59 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  accepter/reporter en unités de secteurs/blocs/"
 "cylindres/MB"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [ou --list-types]:lister les types de partitions connus"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [ou --DOS]:       pour la compatibilité DOS: perte d'un peu d'espace"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [ou --re-read]:   forcer le kernel à relire la table de partitions"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 "    -N# :                modifier seulement la partition ayant le numéro #"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ne pas écrire sur le disque"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fichier :         sauvegarder les secteurs qui seront écrasés dans le "
 "fichier"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fichier :         restaurer ces secteurs à nouveau"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ou --version]:   afficher la version"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ou --help]:      afficher l'aide mémoire"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "options dangereuses:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [ou --show-geometry]: afficher les données contenues dans le\n"
 "                             kernel de la géométrie"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5004,121 +5026,121 @@ msgstr ""
 "                             ou les descripteurs attendus à l'entrée pour "
 "ellest"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [ou --Linux]:      ne pas afficher de message qui ne concerne pas "
 "Linux"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ou --quiet]:      supprimer tous les messages d'avertissement"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "    Vous pouvez écraser la géométrie en utilisant:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C# [ou --cylinders #]:initialiser le nombre de cylindres à utiliser"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [ou --heads #]:    initialiser le nombre de têtes à utiliser"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 "    -S# [ou --sectors #]:  initialiser le numbre de secteurs à utiliser"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "Vous pouvez désactiver toutes les vérifications de consistence avec:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [ou --force]:      exécuter aveuglément la commande donnée"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Usage:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s périphérique\t\t lister les partitions actives du périphérique\n"
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s périphérique n1 n2 ... activer les partitions n1 ..., désactiver les "
 "autres\n"
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An préiphérique\t activer la partition n, désactiver les autres\n"
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "pas de commande?\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "total: %d blocs\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "usage: sfdisk --print-id périphérique numéro-de-partition\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "usage: sfdisk --change-id périphérique numéro-de-partition Id\n"
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "usage: sfdisk --id périphérique numéro-de-partition [Id]\n"
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 "vous ne pouvez spécifier seulement un périphérique (sauf avec -l ou -s)\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ne peut ouvrir %s en lecture-écriture\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ne peut ouvrir %s en lecture\n"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindres, %ld têtes, %ld secteurs/piste\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "Échec de BLKGETSIZE ioctl pour %s\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "octet actif erroné: 0x%x au lieu de 0x80\n"
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -5126,7 +5148,7 @@ msgstr ""
 "Complété\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5136,35 +5158,35 @@ msgstr ""
 "mais en a un pour DOS MBR qui ne pourra amorcer un disque qu'avec une seule "
 "partition active.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partition %s a un identificateur %x qui n'est pas caché\n"
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identifcateur erroné %lx\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Le disque est présentement en usage.\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erreur fatale: ne peut trouver %s\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "AVERTISSEMENT: %s n'est pas un périphérique fonctionnant par blocs\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Vérification qu'aucun autre n'utilise le disque en ce moment ...\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5178,28 +5200,28 @@ msgstr ""
 "partitions swap sur ce disque.\n"
 "Utiliser le fanion --no-reread pour supprimer cette vérification.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utiliser l'option --force pour annuler toutes les vérifications.\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Vieille situation:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partition %d n'existe pas, ne peut la modifer\n"
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Nouvelle situation:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5207,21 +5229,21 @@ msgstr ""
 "Ces partitions sont questionnables -- rien n'a changé.\n"
 "(Si vous désirez cela, utiliser l'option --force.)\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 "Cette situation n'est pas recommandable -- vous devriez probablement "
 "répondre Non\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Êtes-vous satisfait avec cela? [ynq] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Voulez-vous écrire cela sur le disque? [ynq] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5229,15 +5251,15 @@ msgstr ""
 "\n"
 "sfdisk: fin prématurée de l'entrée\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "Abandon - rien n'a changé\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "SVP fournir une réponse suivante: y,n,q\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5245,7 +5267,7 @@ msgstr ""
 "Succès d'écriture de la nouvelle table de partitions\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5892,7 +5914,7 @@ msgstr "Attente dans la boucle d'obtention d'un changement depuis KDGHWCLK\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "Échec de KDGHWCLK ioctl pour la lecture de l'heure"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr ""
 "Expiration de la minuterie lors de l'attente du changement de l'heure.\n"
@@ -5918,60 +5940,70 @@ msgstr "Ne peut ouvrir /dev/tty1 ou /dev/vc/1"
 msgid "KDGHWCLK ioctl failed"
 msgstr "Échec de KDGHWCLK ioctl"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "Échec de open() de %s"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "Échec ioctl() vers %s lors de la lecture de l'heure\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "Attente dans un boucle pour que le temps %s se modifie\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s n'a pas de fonction d'interruption"
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "Échec de read() de %s durant l'attente d'un tic d'horloge"
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "Échec de read() de %s durant l'attente d'un tic d'horloge"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "Échec de read() de %s durant l'attente d'un tic d'horloge"
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
 "Échec de ioctl() de %s durant l'arrêt des mises à jour par interruption"
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 "Échec de ioctl() de %s pour permettre les mises à jour par interruption de "
 "façon inattendue"
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "ioctl() de %s pour initialiser l'heure a échoué.\n"
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) a réussi.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "Ouverture de %s a échoué"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5982,17 +6014,17 @@ msgstr ""
 "pilote Linux du périphérique 'rtc. par le biais du fichier spécial %s. Ce "
 "fichier n'existe pas sur ce système.\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "Incapable d'ouvrir %s"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) de %s a échoué"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
@@ -6001,20 +6033,20 @@ msgstr ""
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr ""
 "La valeur de l'époque ne peut pas être plus petite que 1900. Vous avez "
 "demandé %ld\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr ""
 "initilisation de l'époque à %ld à l'aide de RTC_EPOCH_SET ioctl vers %s.\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
@@ -6022,7 +6054,7 @@ msgstr ""
 "Le pilote du périphérique dans le kernel pour %s n'a pas de fonction "
 "RTC_EPOCH_SET ioctl().\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "Échec de ioctl(RTC_EPOCH_SET) vers %s"
@@ -6196,52 +6228,68 @@ msgstr "Login sur %s de %s n'est pas permis par d
 msgid "Login on %s from %s denied.\n"
 msgstr "Login sur %s de %s n'est pas permis.\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: vous (usager %d) n'existez pas.\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: usager « %s » n'existe pas.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 "%s: on ne peut changer que les entrées locales; utiliser yp%s à la place.\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+#, fuzzy
+msgid "Unknown user context"
+msgstr "erreur inconnue dans la clé"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Modification de l'information de finger pour %s.\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Erreur de mot de passe"
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Mot de passe: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Mot de passe incorrect."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "L'information de finger n'a pas changé.\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Usage: %s [ -f nom-complet ] [ -o bureau ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6249,11 +6297,11 @@ msgstr ""
 "[ -p no-téléphone-au-bureau ]\n"
 "\t[ -h no-téléphone-à-la-maison ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6261,60 +6309,72 @@ msgstr ""
 "\n"
 "Abandon.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "le champ est trop long.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "« %c » n'est pas permis.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Caractères de contrôle ne sont pas permis.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 "L'information de finger *N'A PAS* changé. Essayer à nouveau plus tard.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "L'information de finger a changé.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "échec de malloc()"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: « %s » n'apparaît pas dans /etc/shells.\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
 "%s: votre shell n'est pas dans /etc/shells, modification de shell interdite\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "MOdification du shell pour %s.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Nouveau shell"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "Shell n'a pas été changé.\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Shell *N'A PAS* changé.  Essayer plus tard.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Shell a changé.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
@@ -6323,57 +6383,57 @@ msgstr ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ nom-usager ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: shell doit utiliser le nom du chemin d'accès complet.\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: « %s » n'existe pas.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: « %s » n'est pas exécutable.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: « %c » n'est pas permis.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: les caractères de contrôle ne sont par permis.\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "AVERTISSEMENT: « %s » n'apparaît pas dans /etc/shells\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: « %s » n'apparaît pas dans /etc/shells.\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: utiliser l'option -l option pour afficher la liste\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "AVERTISSEMENT: « %s » n'apparaît pas dans /etc/shells.\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Utiliser %s -l pour afficher la liste.\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "Aucun shell connu.\n"
 
@@ -6570,79 +6630,79 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Vous avez trop de processus actifs.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "APPEL à %s fait par %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN DE %s À PARTIR DE %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN SUR %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN SUR %s PAR %s À PARTIR DE %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN SUR %s PAR %s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "Vous avez du courrier.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "Vous avez du courrier.\n"
 
 # login-utils/login.c:1087too many bare linefeeds.\n"
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: échec d'établissement de relais par fork(): %s "
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "Éched de TIOCSCTTY: %m"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "échec de setuid()"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Pas de répertoire %s!\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Login avec un répertoire home = « / ».\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: mémoire épuisée pour le script du shell.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: ne peut exécuter le script du shell: %s.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: pas de shell: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6651,62 +6711,62 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "nom du compte usager login trop long.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "NOM trop long"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "noms de login ne peuvent débuter avec « - ».\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "trop de sauts de page (linefeeds)\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "Nombre escessif de sauts de page (linefeeds)"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Expiration du délai de grâce lors du login après %d secondes\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Dernier login: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "à partir de %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "sur %.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "Échec de login à partir de %s, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "Échec de login à partir de %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d login en échec à partir de %s, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d login en échec sur %s, %s"
@@ -7113,56 +7173,66 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: MAUVAISE EEREUR"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
 msgstr "%s: le fichier de mots de passe est occupé.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
 msgstr "%s: le fichier de groupes est occupé.\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: le fichier %s est occupé (%s présent)\n"
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: ne peut faire un lien %s: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "Ne peut obtenir la valeur du délai de grâce pour %s: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "Ne peut obtenir la valeur du délai de grâce pour %s: %s\n"
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 "%s: ne peut déverrouiller %s: %s (vos modifications sont encore dans %s)\n"
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: ne peut faire un relais par fork()\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
-msgstr "%s: %s inchangé\n"
+msgstr "%s: %s n'a pas changé\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: aucun changement n'a été fait\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr "Vous utilisez 'shadow groups» sur ce système.\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr "Vous utilisez 'shadow passwords» sur ce système.\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "Voulez-vous éditer %s maintenant [y/n]? "
@@ -7355,7 +7425,7 @@ msgstr "%s: changer le nom de %s vers %s a 
 msgid "call: %s from to files...\n"
 msgstr "call: %s vers les fichiers...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7366,21 +7436,21 @@ msgstr ""
 "Utiliser « %s [options] %s » si vous désirez réellement l'utiliser.\n"
 "Le script n'a pas été démarré.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "usage: script [-a] [-f] [-q] [-t] [fichier]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Le script a débuté, le fichier est %s\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "Le script a débuté sur %s"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7389,16 +7459,16 @@ msgstr ""
 "\n"
 "Script complété sur %s"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script complélé, le fichier est %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "échec de openpty\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "Manque de pty\n"
 
@@ -7667,40 +7737,40 @@ msgstr "mount: ne peut ouvrir %s - on utilise %s 
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "ne peut créer le fichier verrou %s: %s (utiliser l'option -n pour l'écraser)"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "ne peut lier le fichier verrou %s: %s (utiliser l'option  -n pour l'écraser)"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "ne peut ouvrir le fichier verrou %s : %s (utiliser l'option -n pour "
 "l'écraser)"
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Ne peut verrrouiller le fichier verrou %s: %s\n"
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "ne peut verrouiller le fichier verrou %s: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "expiration du délai"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7709,190 +7779,127 @@ msgstr ""
 "Ne peut créer le lien %s\n"
 "Peut-être y-a-t-il un fichier verrouillé en panne?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "ne peut ouvrir %s (%s) - mtab n'est pas à jour"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "erreur d'écriture %s: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "erreur de changement de mode de %s: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "ne peut renommer %s à %s: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: ne peut ouvrir le périphérique %s: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: ne peut obtenir les infos sur le périphérique %s: %s\n"
+msgid ", offset %lld"
+msgstr ", décalage %lld"
 
-#: mount/lomount.c:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) décalage %d, %s encryptage\n"
+#: mount/lomount.c:104
+#, c-format
+msgid ", sizelimit %lld"
+msgstr ", taille limite %lld"
 
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: ne peut trouver aucun périphérique /dev/loop#"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", encryptage %s (type %d)"
 
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
-msgstr ""
-"mount: ne peut trouver aucun périphérique de type loop.\n"
-"       peut-être que /dev/loop# a un nombre majeur erroné?"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ", décalage %d"
 
-#: mount/lomount.c:253
+#: mount/lomount.c:129
 #, 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: ne peut trouver aucun périphérique de type loop et selon %s,\n"
-"       le kernel ne connaît rien des périphériques de type loop.\n"
-"       (Si tel est le cas alors recompiler ou exécuter « insmod loop.o ».)"
+msgid ", encryption type %d\n"
+msgstr ", encryptage type %d\n"
 
-#: mount/lomount.c:259
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: ne peut obtenir les infos sur le périphérique %s: %s\n"
+
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: ne peut trouver aucun périphérique /dev/loop#"
+
+#: mount/lomount.c:192
 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?"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: ne peut trouver aucun périphérique de type loop. Peut-être que\n"
-"       le kernel ne connaît rien des périphériques de type loop.\n"
-"       (Si tel est le cas alors recompiler ou exécuter « insmod loop.o "
-"».)       Ou peut-être que /dev/loop# a un nombre majeur erroné?"
+"mount: ne peut trouver aucun périphérique de type loop. Peut-être que ce "
+"kernel\n"
+"       ne supporte pas ce type de périphérique loop.\n"
+"       (Si tel est le cas alors recompiler ou exécuter « modprobe loop ».)"
 
-#: mount/lomount.c:263
+#: mount/lomount.c:197
 msgid "mount: could not find any free loop device"
 msgstr "mount: ne peut repérer un périphérique de type loop disponible"
 
-#: mount/lomount.c:359
-#, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "ne peut ouvrir %s en lecture\n"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Re-taper le nouveau mot de passe: "
-
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "échec d'ouverture du répertoire\n"
-
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "Le mot de passe doit avoir au moins 6 caractères, essayer encore.\n"
-
-#: mount/lomount.c:472
-#, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Incapable d'allouer de la mémoire additionnelle\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
-msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-msgstr ""
-
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
-
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Ne peut verrouiller en mémoire, fin d'exécutio.\n"
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Init (jusqu'à 16 nombres hexadécimaux): "
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): succès\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "Nombre non hexadécimla « %c ».\n"
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: ne peut détruire le périphérique %s: %s\n"
 
-#: mount/lomount.c:764
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
-msgstr "Ne sait comment obtenir la clé pour l'encryptage système %d\n"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): succès\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): succès\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr ""
+"Cette version de mount a été compilée sans support de boucle. SVP "
+"recompiler.\n"
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "pas assez de mémoire"
-
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "ne peut ouvrir %s en lecture\n"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"usage:\n"
+"  %s périphérique_de_boucle                           # give info\n"
+"  %s -d périphérique_de_boucle                        # delete\n"
+"  %s [ -e encryption ] [ -o décalage ] périphérique_de_boucle # setup\n"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "pas assez de mémoire"
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
+"Aucun support de boucle n'était disponible au moment de la compilation. SVP "
+"recompiler.\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7908,41 +7915,41 @@ msgstr "[mntent]: ligne %d dans %s est erron
 msgid "; rest of file ignored"
 msgstr "; reste du fichier est ignoré"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: selon mtab %s est déjà monté sur %s"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: selon mtab %s est monté sur %s"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: ne peut ouvrir %s en écriture: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: erreur d'écriture %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: erreur lors du changement de mode de %s: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ressemble à un esapce de swap - n'a pas été monté"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "échec de mount"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: seul l'usager ROOT peut monter %s sur %s"
@@ -7964,107 +7971,111 @@ msgstr "mount: escamotage du setup du p
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: on se prépare à utiliser le périphérique de type loop %s\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: échec d'initialisation du périphérique de type loop\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: réussite d'initialisation du périphérique de type loop\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: ne peut ouvrir %s: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: argument à -p ou --pass-fd doit être un nombre"
+
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: ne peut ouvrir %s pour ajuster la vitesse"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ne peut initialiser la vitesse: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ne peut établir un relais fork(): %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr "mount: cette version a été compilé sans support pour le type « nfs »"
 
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: échec avec la version 4 de mount nfs, on tente la 3..\n"
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: je ne peux déterminer le type de système de fichiers et aucun n'a été "
 "spécifié"
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: vous devez spécifier le type de système de fichiers"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr "mount: échec de mount"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: le point de montage %s n'est pas un répertoire"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: permission refusée"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr "mount: doit être le super usager pour utiliser mount"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s est occupé"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc déjà monté"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s est déjà monté ou %s est occupé"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: le point de montage %s n'existe pas"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 "mount: le point de montage %s est un lien symbolique qui pointe vers nulle "
 "part"
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: périphérique spécial %s n'existe pas"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -8073,12 +8084,12 @@ msgstr ""
 "mount: le périphérique spécial %s n'existe pas\n"
 "       (un préfixe de chemin n'est pas un répertoire)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s n'est pas déjà monté ou option erronée"
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8088,35 +8099,35 @@ msgstr ""
 "sur %s,\n"
 "       ou trop de systèmes de fichiers montés"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "table de périphériques montés est pleine"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: ne peut lire le super bloc"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: périphérique inconnnu"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: type de syst. de fichiers %s n,est pas supporté par le kernel"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablement vous voulez dire %s"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: peut-être voulez-vous dire iso9660 ?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -8124,12 +8135,12 @@ msgstr ""
 "%s n'est pas supporté"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s n'est pas un périphérique de type bloc et stat() a échoué?"
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8138,76 +8149,49 @@ msgstr ""
 "mount: le kernel ne reconnaît pas %s comme un périphérique de type bloc\n"
 "       (peut-être un pilote « insmod »?)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s n'est pas un périphérique de type bloc (essayer « -o loop » ?)"
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s n'est pas un périphérique de type bloc"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s n'est pas un périphérique valide de type bloc"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "périphérique de type bloc"
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: ne peut monter %s%s en lecture seulement"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s est protégé en écriture mais l'option « -w » a été fournie"
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s est protégé en écriture, on le monte en lecture seulement"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr "mount: l'étiquette %s apparaît à la fois sur %s et %s\n"
-
-#: mount/mount.c:1124
-#, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "mount: %s en double - n'a pas été monté"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: on va monter %s par %s\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "étiquette"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: pas de telle partition repérée"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: aucun type n'a été donné - ja vais assumer nfs en raison du « : »\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: aucun type n'a été fourni - je vais assumer smbfs en raison du "
@@ -8216,24 +8200,23 @@ msgstr ""
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: mise en arrière plan de \"%s\"\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: abandon \"%s\"\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s est déjà monté sur %s\n"
 
 # mount/mount.c:1323
-#: mount/mount.c:1386
-#, fuzzy
+#: mount/mount.c:1362
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8254,7 +8237,7 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Usage: mount -V                 : afficher la version\n"
@@ -8280,43 +8263,42 @@ msgstr ""
 "cdrom,\n"
 "ou par une étiquette, en utilisant -L étiquette  ou par uuid, en utulisant  -"
 "U uuid .\n"
-"Autres options: [-nfFrsvw] [-o options].\n"
+"Autres options: [-nfFrsvw] [-o options] [-p mot_de_passe].\n"
 "Pour plus de détails exécuter:  man 8 mount .\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: seul l'usager ROOT peut faire cela"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s n'a pas été repéré - on le crée..\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr "mount: l'étiquette %s apparaît sur %s et %s - n'a pas été monté\n"
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: pas de telle partition repérée"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: on monte %s\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr "rien n'a été monté"
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: ne peut repérer %s dans %s"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: ne peut repérer %s dans %s ou %s"
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8324,36 +8306,36 @@ msgstr ""
 "mount: ne peut ouvrir %s, la conversion de UUID et LABEL ne peut être "
 "faite.\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: UUID erroné"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
 msgstr ""
 "mount: error lors de la tentative d'identification du système de fichiers\n"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 "mount: vous n'avez pas spécifier le type de système de fichiers pour %s\n"
 
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Je vais essayer tous les types mentionnés dans %s ou %s\n"
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr "       et il semble que c'est un espace de swap\n"
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Je vais essayer le type %s\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "On tente %s\n"
@@ -8448,7 +8430,7 @@ msgstr "valeur d'
 msgid "bug in xstrndup call"
 msgstr "problème dans l'appel de xstrndup"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8461,7 +8443,7 @@ msgstr ""
 "       %s [-v] [-p priorité] spécial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8472,101 +8454,33 @@ msgstr ""
 "       %s -a [-v]\n"
 "       %s [-v] spécial ...\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "mémoire épuisée"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s sur %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: ne peut évaluer pas stat() %s: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: AVERTISSEMENT: %s a des permissions non sécuritaires %04o, %04o est "
 "suggéré\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: escamotage du fichier %s - il semble avoir des trous.\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr "N'est pas super usager.\n"
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s: périphérique de type bloc invalide"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "Type d'encryptage non supporté %s\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: on se prépare à utiliser le périphérique de type loop %s\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Cette partition est déjà en usage"
-
-# disk-utils/mkswap.c:612
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "incapable de rembobiner le périphérique de swap"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "ne peut ouvrir /dev/urandom"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "incapable d'écrire les inodes"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "échec de fork()\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Changement du mot de passe pour %s\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: ne peut ouvrir %s: %s\n"
@@ -8632,35 +8546,35 @@ msgstr ""
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "pas de umount2, tentative avec umount...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "ne peut démonter %s - essayer %s à la place\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s est occupé - remonté en lecture seulement\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ne peut remonter %s en lecture seulement\n"
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s démonté\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ne peut repérer la liste des systèmes de fichiers à démonter"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
@@ -8670,42 +8584,42 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t type-vfs] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] spécial | noeud...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentative pour démonter %s\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Ne peut repérer %s dans mtab\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s n'est pas monté (selon mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: il semble que %s ait été monté plusieurs fois"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s n'est pas dans fstab (et vous n'êtes pas l'usager ROOT)"
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount est en désaccord avec fstab"
 
-#: mount/umount.c:602
+#: mount/umount.c:616
 #, c-format
-msgid "umount: only root can unmount %s from %s"
-msgstr "umount: seul l'usager ROOT peut démonter %s de %s"
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: seul %s peut démonter %s de %s"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr "umount: seul l'usager ROOT peut exécuter la commande"
 
@@ -8846,7 +8760,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec; %f rec (caractères/sec)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Usage: %s [-c] [-n niveau] [-s taille-de-tampon]\n"
@@ -9012,23 +8926,23 @@ msgstr "------ Limites de la m
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
 msgstr "nombre maximum de segments = %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "taille max seg (koctets) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "total max mémoire partagé (koctets) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "taille min seg (octets) = %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9551,8 +9465,12 @@ msgstr ""
 msgid "missing comma"
 msgstr "virgule manquante"
 
-#: sys-utils/readprofile.c:115
-#, c-format
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "mémoire épuisée"
+
+#: sys-utils/readprofile.c:118
+#, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9563,6 +9481,7 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
@@ -9584,32 +9503,32 @@ msgstr ""
 "octets\n"
 "\t -V                   afficher la version et quitter\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s Version %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): ligne de map erronée\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: ne peut repérer « _stext » dans %s\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
-msgstr "%s: adresse de profile hors gammes. Mauvais fichier map?\n"
+msgstr "%s: adresse de profile hors limites. Mauvais fichier map?\n"
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "total"
 
@@ -10139,32 +10058,64 @@ msgstr "Ligne d'entr
 msgid "Out of memory when growing buffer.\n"
 msgstr "Mémoire épuisée lors de l'accroissement du tampon.\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: ne peut détruire le périphérique %s: %s\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: n'a pas été compilé avec le soutien pour minix v2\n"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): succès\n"
+#~ msgid "mount: the label %s occurs on both %s and %s\n"
+#~ msgstr "mount: l'étiquette %s apparaît à la fois sur %s et %s\n"
 
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
-#~ msgstr ""
-#~ "Cette version de mount a été compilée sans support de boucle. SVP "
-#~ "recompiler.\n"
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "mount: %s en double - n'a pas été monté"
+
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: on va monter %s par %s\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "étiquette"
+
+#~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
+#~ msgstr "mount: l'étiquette %s apparaît sur %s et %s - n'a pas été monté\n"
+
+#~ msgid "umount: only root can unmount %s from %s"
+#~ msgstr "umount: seul l'usager ROOT peut démonter %s de %s"
+
+#~ msgid "Boot (%02X)"
+#~ msgstr "Amorce (%02X)"
+
+#~ msgid "None (%02X)"
+#~ msgstr "Aucun (%02X)"
+
+#~ msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) décalage %d, %s encryptage\n"
 
 #~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "usage:\n"
-#~ "  %s périphérique_de_boucle                           # give info\n"
-#~ "  %s -d périphérique_de_boucle                        # delete\n"
-#~ "  %s [ -e encryption ] [ -o décalage ] périphérique_de_boucle # setup\n"
+#~ "mount: ne peut trouver aucun périphérique de type loop.\n"
+#~ "       peut-être que /dev/loop# a un nombre majeur erroné?"
 
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ 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 ""
-#~ "Aucun support de boucle n'était disponible au moment de la compilation. "
-#~ "SVP recompiler.\n"
+#~ "mount: ne peut trouver aucun périphérique de type loop. Peut-être que\n"
+#~ "       le kernel ne connaît rien des périphériques de type loop.\n"
+#~ "       (Si tel est le cas alors recompiler ou exécuter « insmod loop.o "
+#~ "».)       Ou peut-être que /dev/loop# a un nombre majeur erroné?"
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Init (jusqu'à 16 nombres hexadécimaux): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Nombre non hexadécimla « %c ».\n"
+
+#~ msgid "Don't know how to get key for encryption system %d\n"
+#~ msgstr "Ne sait comment obtenir la clé pour l'encryptage système %d\n"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Partition %i ne se termine pas sur une frontière de cylindre:\n"
@@ -10201,9 +10152,6 @@ msgstr "M
 #~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
 #~ msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
 
-#~ msgid "umount: only %s can unmount %s from %s"
-#~ msgstr "umount: seul %s peut démonter %s de %s"
-
 #~ msgid "'."
 #~ msgstr "'."
 
diff --git a/po/it.po b/po/it.po
index e92cab14..441196ad 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.10f\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
 "PO-Revision-Date: 2000-04-04 21:52-0800\n"
 "Last-Translator: Beth Powell <bpowell@turbolinux.com>\n"
 "Language-Team: <support@turbolinux.com>\n"
@@ -12,97 +12,102 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "impostare sola lettura"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "impostare lettura-scrittura"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "visualizzare sola-lettura"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "visualizzare la dimensione del settore"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 #, fuzzy
 msgid "get blocksize"
 msgstr "visualizzare la dimensione"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 #, fuzzy
 msgid "set blocksize"
 msgstr "visualizzare la dimensione"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "visualizzare la dimensione"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "impostare readahead"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "visualizzare readahead"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "scaricamento buffer"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "rilettura della tabella delle partizioni"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 #, fuzzy
 msgid "Usage:\n"
 msgstr "Utilizzo:"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, fuzzy, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "Utilizzo: %s [-V] [-v|-q] dispositivi comandi\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Comandi disponibili:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: comando sconosciuto: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s richiede un argomento\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, fuzzy, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: impossibile aprire %s: %s\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, fuzzy, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "errore di scrittura su %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
@@ -146,12 +151,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "utilizzo: dispositivo %s [ -n ]\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s da %s\n"
@@ -283,49 +288,49 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Utilizzo: %s [-larvsmf] /dev/name\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s è montato.\t"
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Continuare?"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "controllo interrotto.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, fuzzy, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr " Zona n. < FIRSTZONE nel file `"
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, fuzzy, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "N. Zona >= ZONES nel file `"
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Rimuovere blocco"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, fuzzy, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Errore di lettura: ricerca del blocco nel file' impossibile"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, fuzzy, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Errore di lettura: blocco danneggiato nel file '"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -333,122 +338,122 @@ msgstr ""
 "Errore interno: nel tentativo di scrivere il blocco danneggiato\n"
 "ignorata la richiesta di scrittura\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "tentativo fallito in write_block "
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, fuzzy, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Errore di scrittura: blocco danneggiato nel file '"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "ricerca fallita in write_super_block"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "impossibile scrivere in super-block"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "Impossibile scrivere nella mappa di inode"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "Impossibile scrivere nella mappa di zona"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "Impossibile scrivere inode"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "ricerca non riuscita"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "impossibile leggere super block"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "numero magico danneggiato in super-block"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "È supportato solamente 1k blocchi/zone"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "campo s_imap_blocks danneggiato in super-block"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "campo s_zmap_blocks danneggiato in super-block"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "Impossibile allocare il buffer per la mappa inode"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "Impossibile allocare il buffer per gli inode"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "Impossibile allocare il buffer per il conteggio inode"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "Impossibile allocare il buffer per il conteggio zona"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "Impossibile leggere la mappa inode"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "Impossibile leggere la mappa di zona"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "Impossibile leggere gli inode"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Attenzione: prima zona != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "Inode %ld\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "blocchi %ld\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Prima zona dati=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Dimensione zona=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Dimensione massima=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Stato del filesystem=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -457,171 +462,171 @@ msgstr ""
 "lunghezzanom=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, fuzzy, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inode %d contrassegnato non utilizzato, ma utilizzato per il file '"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Segno in uso"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, fuzzy, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "ha modalità %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "Attenzione: conteggio inode troppo grande.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "l'inode di root non è una directory"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, fuzzy, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Il blocco è stato utilizzato in precedenza. Ora nel file  `"
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Cancella"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, fuzzy, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "' è marcato come non in uso."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Corretto"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, fuzzy, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "contiene un numero inode non corretto per il file '"
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr "Rimuovere"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, fuzzy, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr ": directory danneggiata: '.' non è la prima\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, fuzzy, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr ": directory danneggiata: '..' non è la seconda\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, fuzzy, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr ": directory danneggiata: '.' non è la prima\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, fuzzy, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr ": directory danneggiata: '..' non è la seconda\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "errore interno"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, fuzzy, c-format
 msgid "%s: bad directory: size < 32"
 msgstr ": directory danneggiata: dimensione < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "ricerca in bad_zone non riuscita"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Modalità dell'inode %d non cancellata."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "Inode %d non utilizzato, inode contrassegnato utilizzato in bitmap"
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "Inode %d utilizzato, inode contrassegnato non utilizzato in bitmap."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (modalità = %07o), i_nlinks=%d, conteggiati=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "Impostare i_nlinks da conteggiare"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zona %d: contrassegnata in uso, nessun file la utilizza."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Non contrassegnata"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, fuzzy, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Zona %d: %s utilizzati , conteggiati=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, fuzzy, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Zona %d: %s utilizzati , conteggiati=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Impostare"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "dimensione inode non corretta"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "dimensione inode v2 non corretta"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "terminale necessario per le riparazioni interattive"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "impossibile aprire '%s'"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "'%s' è corretto, non controllare.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Forzatura controllo filesystem su %s in corso.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Il filesystem su %s è danneggiato, controllo necessario.\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -630,12 +635,12 @@ msgstr ""
 "\n"
 "%6ld inode utilizzati (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zone utilizzate (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -658,7 +663,7 @@ msgstr ""
 "------\n"
 "%6d file\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -749,7 +754,7 @@ msgstr ""
 msgid "not enough space, need at least %lu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -829,7 +834,7 @@ 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:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -965,64 +970,64 @@ msgid ""
 "that some device files will be wrong.\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr " Utilizzo: %s [-c | -l nomefile] [-nXX] [-iXX] /dev/name [blocchi]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s è montata; qui non verrà creato un filesystem!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr ""
 "tentativo di effettuare il boot del blocco in write_tables non riuscito"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "impossibile cancellare il settore di boot"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "ricerca in write_tables non riuscita"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "impossibile scrivere nella mappa degli inode"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "impossibile scrivere nella mappa delle zone"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "impossibile scrivere inode"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "scrittura in write_block non riuscita"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "troppi blocchi danneggiati"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "numero insufficiente di blocchi corretti"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "impossibile allocare i buffer per le mappe"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "impossibile allocare il buffer per gli inode"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1031,55 +1036,50 @@ msgstr ""
 "Dimensione max=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "ricerca non riuscita durante il controllo dei blocchi"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valori strani in do_check: probabilmente sono presenti dei bug\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "ricerca in check_blocks non riuscita"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "blocchi danneggiati prima dell'area dati: impossibile creare fs"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "blocchi danneggiati %d\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "un blocco danneggiato\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "impossibile aprire il file dei blocchi danneggiati"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s: non e' stato compilato con il supporto per minix v2\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "errore strtol: numero di blocchi non specificato"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "impossibile aprire %s"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "impossibile avviare %s"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "non si tenterà di creare un filesystem su '%s'"
@@ -1120,47 +1120,47 @@ msgid "one bad page\n"
 msgstr "una pagina danneggiata\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d pagine danneggiate\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: errore: non è possibile impostare swap in nessuna posizione?\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr ""
 "%s: errore: la dimensione %ld è maggiore rispetto a quella del dispositivo %"
 "d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: errore: versione sconosciuta %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: errore: l'area di swap deve equivalere almeno a %ldkB\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: attenzione: troncamento area swap a %ldkB\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Non si cercherà di creare uno swapdevice su '%s'"
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "errore irreversibile: impossibile leggere la prima pagina"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1174,24 +1174,24 @@ msgstr ""
 "Nessuno swap creato. Se si desidera creare uno swap v0 su quel dispositivo,\n"
 "utilizzare l'opzione -f per forzare l'operazione.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Impossibile impostare lo spazio-swap: non leggibile"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Impostazione spazio di swap versione %d, dimensione = %ld byte\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "impossibile riavvolgere il dispositivo swap"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "impossibile scrivere sulla pagina di firma"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync non riuscito "
 
@@ -1232,61 +1232,60 @@ msgstr "       %s [ -c | -y | -n | -d ] dev\n"
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "       %s [ -c | -y | -n ] dev\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Inutilizzabile"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Spazio disponibile"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 #, fuzzy
 msgid "Linux ext3"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 #, fuzzy
 msgid "Linux XFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux ReiserFS"
 msgstr "Linux"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "Il disco è stato cambiato.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Riavviare il sistema per assicurarsi che la tabella delle partizioni sia "
 "aggiornata correttamente.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1298,227 +1297,227 @@ msgstr ""
 "partizione DOS 6.x, consultare la pagina del manuale cfdisk\n"
 "per ulteriori informazioni.\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "ERRORE IRREVERSIBILE"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Premere qualsiasi tasto per uscire da cfdisk"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "Ricerca sull'unità disco impossibile"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Impossibile leggere l'unità disco"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Impossibile scrivere sull'unità disco"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Troppe partizioni"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "La partizione inizia prima del settore 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "La partizione termina prima del settore 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "La partizione inizia dopo la fine del disco"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "La partizione termina dopo la fine del disco"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "le partizioni logiche non sono nell'ordine del disco"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "sovrapposizione delle partizioni logiche"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "sovrapposizione delle partizioni logiche ampliate"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Errore interno durante la creazione di un'unità logica con partizione "
 "non estesa !!!!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Impossibile creare un'unità logica in questo caso - si creerebbero due "
 "partizioni estese"
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Voce di menu troppo lunga. Il menu può apparire strano."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu senza direzione. È predefinita quella orizzontale."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Tasto non valido"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Premere un tasto per continuare"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primaria"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Creare una nuova partizione primaria"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Logica"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Creare una nuova partizione logica"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Annulla"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Non creare una partizione"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Errore interno !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Dimensione (in MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Inizio"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Aggiungere la partizione all'inizio dello spazio disponibile"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Fine"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Aggiungere la partizione alla fine dello spazio disponibile"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Non c'è spazio per creare una partizione estesa"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 #, fuzzy
 msgid "No partition table or unknown signature on partition table"
 msgstr "Firma danneggiata sulla tabella delle partizioni"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 "Si è specificato un numero di cilindri superiore a quelli contenuti su disco"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "Impossibile aprire l'unità disco"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disco aperto in sola lettura - scrittura non autorizzata"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Impossibile ottenere la dimensione del disco"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Partizione primaria danneggiata"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Partizione logica danneggiata"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Attenzione!!  I dati sul disco potrebbero venire eliminati!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Scrivere la tabella delle partizioni su disco? (si o no): "
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Scrittura tabella delle partizioni su disco non effettuata"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "si"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Inserire `si' (senza accento) o `no'"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Scrittura tabella delle partizioni su disco in corso..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Eseguita l'operazione di scrittura tabella delle partizioni su disco"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Eseguita l'operazione di scrittura tabella delle partizioni, ma non è "
 "riuscita la rilettura della tabella. Riavviare per aggiornare la tabella."
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 #, fuzzy
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Non è possibile avviare in modo preciso una partizione primaria. DOS MBR non "
 "può avviarla."
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 #, fuzzy
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
@@ -1526,570 +1525,584 @@ msgstr ""
 "Non è possibile avviare in modo preciso una partizione primaria. DOS MBR non "
 "può avviarla."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Inserire il nome del file o premere RETURN (INVIO) per visualizzare sullo "
 "schermo:"
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Impossibile aprire il file '%s'"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unità disco: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Settore 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Settore %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Nessuno   "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Primario"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Logico"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Avvio (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Avvio"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
-#, c-format
-msgid "Unknown (%02X)"
-msgstr "Sconosciuto (%02X)"
+#: fdisk/cfdisk.c:2007
+#, fuzzy, c-format
+msgid "(%02X)"
+msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Nessuno (%02X)"
+#: fdisk/cfdisk.c:2009
+#, fuzzy
+msgid "None"
+msgstr "Fine"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabella delle partizioni per %s\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
+#: fdisk/cfdisk.c:2046
+#, fuzzy
+msgid "               First       Last\n"
 msgstr "           Primo    Ultimo\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
+#, fuzzy
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
 " # Tipo     settore   settore   offset  lunghezza   tipo di filesystem  "
 "(ID)   flag\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
+#, fuzzy
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
+#: fdisk/cfdisk.c:2131
+#, fuzzy
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---Avvio---      ----Chiusura----    Numero avvio di\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
+#: fdisk/cfdisk.c:2132
+#, fuzzy
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr ""
 " # Flag testina sett. cil.   ID  testina sett. cil.    settore  settori\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+#, fuzzy
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Grezzo"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Stampare la tabella utilizzando il formato dati grezzi"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Settori"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Stampare la tabella ordinata per settori"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabella"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Stampare la tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Non stampare la tabella"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Schermata Guida per cfdisk"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 "Questo è cfdisk, un programma per la partizione dei dischi basato su curses"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 "consente di creare, cancellare e modificare le partizioni sul disco fisso"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "unità disco."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Comando     significato"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr " b          Cambia flag avviabile per la partizione corrente"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr " d          Elimina la partizione corrente"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr " g          cambio cilindri, testine, parametri settori-per-traccia"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 "            ATTENZIONE: questa opzione dovrebbe essere utilizzata solo da "
 "persone"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "            esperte."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr " h          Stampare questa schermata"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 " m          Massimizzare l'utilizzo del disco della partizione corrente"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "            Nota: questo può rendere la partizione incompatibile con"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "            DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr " n          Creazione di una nuova partizione nello spazio disponibile"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr " p          Stampa della tabella delle partizioni su schermo o su file"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "            Vi sono diversi altri formati per la partizione"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "            tra i quali scegliere:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "               r - dati grezzi (esattamente ciò che verrebbe scritto sul "
 "disco)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "               s - Tabella ordinata per settori"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "               t - Tabella in formato grezzo"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Esce dal programma senza scrivere nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr " t          Cambia il tipo di filesystem"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr ""
 " u          Modifica l'unità di visualizzazione della dimensione della "
 "partizione"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "            Ruota attraverso MB, settori e cilindri"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 " W          Scrittura della tabella di partizione sul disco (si deve "
 "inserire la W maiuscola)"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 "            Dato che in questo modo è possibile eliminare dati sul disco, si "
 "deve"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "            confermare o negare la scrittura inserendo `sì' o"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             `no'"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Freccia Su      sposta il cursore alla partizione precedente"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Freccia Giù   sposta il cursore alla partizione successiva"
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Ridisegna lo schermo"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Stampa questa schermata"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Nota: è possibile immettere tutti i comandi in maiuscolo o minuscolo"
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "lettere maiuscole/minuscole (fatta eccezione per Writes)."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cilindri"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Modifica la geometria dei cilindri"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Testine"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Modifica la geometria delle testine"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Modifica la geometria dei settori"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Fine"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "Modifica della geometria eseguita"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Immettere il numero di cilindri: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Valore cilindri non valido"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Immettere il numero delle testine: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Valore testine non valido"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Immettere il numero dei settori per traccia: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Valore settori non valido"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Immettere il tipo di filesystem: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "Impossibile cambiare il tipo FS in vuoto"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "Impossibile cambiare il tipo FS in espanso"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Avvio"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Sconosciuto (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unità disco: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, fuzzy, c-format
-msgid "Size: %lld bytes, %ld MB"
+msgid "Size: %lld bytes, %lld MB"
 msgstr "Dimensione: %lld byte"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, fuzzy, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
+msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Dimensione: %lld byte"
 
-#: fdisk/cfdisk.c:2600
-#, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
+#: fdisk/cfdisk.c:2587
+#, fuzzy, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Testine: %d   settori per traccia: %d   cilindri: %d"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Nome"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Flag"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Tipo di partiz."
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "Tipo FS"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Etichetta]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
+#: fdisk/cfdisk.c:2597
+#, fuzzy
+msgid "    Sectors"
 msgstr "  Settori"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
+#: fdisk/cfdisk.c:2599
+#, fuzzy
+msgid "  Cylinders"
+msgstr "Cilindri"
+
+#: fdisk/cfdisk.c:2601
+#, fuzzy
+msgid "  Size (MB)"
 msgstr "Dimensione (MB)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
+#: fdisk/cfdisk.c:2603
+#, fuzzy
+msgid "  Size (GB)"
 msgstr "Dimensione (GB)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Avviabile"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr " Cambia flag avviabile per la partizione corrente "
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Elimina"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Elimina la partizione corrente"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Modifica della geometria del disco (solo per esperti)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Guida"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Stampa della schermata della guida"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Massimi."
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Massimizzare l'utilizzo del disco della partizione corrente (solo per "
 "esperti)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Nuova"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Creazione di una nuova partizione nello spazio disponibile"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Stampa"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Stampa della tabella delle partizioni su schermo o su file"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Esci"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Esce dal programma senza scrivere nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Modificare il tipo di filesystem (DOS, Linux, OS/2 e così via)"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Unità"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Cambia l'unità di visualizzazione della dimensione della partizione (MB, "
 "sett., cil.)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Scrivi"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "Scrivere la tabella delle partizioni sul disco (i dati potrebbero venir "
 "eliminati)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "Impossibile rendere questa partizione avviabile"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "Impossibile cancellare una partizione vuota"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "Impossibile massimizzare questa partizione"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Questa partizione è utilizzabile"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Questa partizione è già in uso"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "Impossibile modificare il tipo di una partizione vuota"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "Nessun'altra partizione"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Comando non valido"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 #, fuzzy
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2126,7 +2139,7 @@ msgstr ""
 "                al numero di testine e di settori/traccia.\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 #, fuzzy
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
@@ -2149,7 +2162,7 @@ msgstr ""
 "-u: indica Inizio e Fine con unità di misura settore (invece di cilindro)\n"
 "-b 2048: (per alcune unità MO) utilizzare i settori a 2048 byte\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2165,224 +2178,224 @@ msgstr ""
 "  o: fdisk /dev/rd/c0d0  o: fdisk /dev/ida/c0d0  (per i dispositivi RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Impossibile leggere %s\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ricerca impossibile su %s\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Impossibile scrivere su %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl non riuscito su %s\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Impossibile allocare altra memoria\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Errore irreversibile\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Azione comando"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   attivazione/disattivazione di un flag di sola lettura"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b   modifica di bsd disklabel"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   attivazione/disattivazione del flag montabile"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   cancellazione di una partizione"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   elenco dei tipi di partizione conosciuti"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   stampa di questo menu"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   aggiunta di una nuova partizione"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   creazione di una nuova tabella delle partizioni DOS vuota"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   stampa della tabella delle partizioni"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   uscita senza salvataggio delle modifiche"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   creazione di una nuova disklabel Sun vuota"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   modifica dell'id di sistema di una partizione"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   modifica delle unità di visualizzazione/di immissione"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   verifica della tabella delle partizioni"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   scrittura della tabella su disco e uscita"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr " x   ulteriori funzioni (solo per esperti)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   selezione della partizione che è possibile avviare"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b   modifica della voce bootfile"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   selezione della partizione swap sgi"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a  Cambia bootable flag"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   cambia il flag compatibile con il dos"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   modifica del numero di cilindri alternativi"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   modifica del numero di cilindri"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   stampa dei dati grezzi nella tabella delle partizioni"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   modifica del numero dei settori supplementari per cilindro"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   modifica del numero di testine"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   modifica del fattore di interleave"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   modifica della velocità di rotazione (rpm)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   ritorno al menu principale"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   modifica del numero di settori/traccia"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   modifica del numero di cilindri fisici"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   spostamento dell'inizio di dati in una partizione"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   elenco delle partizioni estese"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 #, fuzzy
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   creazione di una tabella delle partizioni IRIX"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 #, fuzzy
 msgid "   f   fix partition order"
 msgstr "   p   stampa della tabella delle partizioni"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "Si devono impostare"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "testine"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "settori"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "cilindri"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2392,11 +2405,11 @@ msgstr ""
 "È possibile effettuare questa operazione dal menu delle funzioni "
 "supplementari.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " e "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2408,30 +2421,30 @@ msgid ""
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Offset errato nella partizione estesa primaria\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Attenzione: cancellazione delle partizioni dopo %d\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 "Attenzione: puntatore di collegamento supplementare nella tabella delle "
 "partizioni %d\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "Attenzione: i dati supplementari nella tabella delle partizioni %d vengono "
 "ignorati\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2443,22 +2456,22 @@ msgstr ""
 "contenuto precedente non potrà essere recuperato.\n"
 "\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Nota: la dimensione del settore è %d (non %d)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr "Impossibile scrivere la tabella delle partizioni.\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 #, fuzzy
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2467,16 +2480,16 @@ msgstr ""
 "Il dispositivo non contiene né una tabella delle partizioni DOS, né una "
 "disklabel Sun o SGI valide\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Errore interno\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "La partizione estesa supplementare viene ignorata %d\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2485,7 +2498,7 @@ msgstr ""
 "Attenzione: il flag 0x%04x non valido della tabella delle partizioni %d "
 "verrà corretto con w(rite)\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2493,79 +2506,79 @@ msgstr ""
 "\n"
 "ricevuto EOF tre volte - uscita in corso..\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Codice esadecimale (digitare L per elencare i codici): "
 
-#: fdisk/fdisk.c:1069
+#: fdisk/fdisk.c:1094
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, predefinito %d): "
 
-#: fdisk/fdisk.c:1136
+#: fdisk/fdisk.c:1161
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Utilizzo del valore predefinito %d\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "Valore fuori intervallo.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Numero della partizione"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Attenzione: la partizione %d ha tipo vuoto\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "La partizione estesa supplementare viene ignorata %d\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 #, fuzzy
 msgid "No partition is defined yet!\n"
 msgstr "Nessuna partizione definita\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "settore"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Modifica delle unità di visualizzazione/immissione su %s\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ATTENZIONE: la partizione %d è una partizione estesa\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "Impostato il flag compatibile con DOS\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Il flag compatibile con DOS non è impostato\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partizione %d non esiste ancora!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2577,7 +2590,7 @@ msgstr ""
 "tipo 0 probabilmente non è consigliabile. È possibile eliminare\n"
 "una partizione utilizzando il comando `d'.\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2585,7 +2598,7 @@ msgstr ""
 "Non è possibile trasformare una partizione in una estesa o viceversa\n"
 "Prima bisogna eliminarla.\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2595,7 +2608,7 @@ msgstr ""
 "poiché SunOS/Solaris lo prevede e ciò è gradito anche a Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2605,60 +2618,60 @@ msgstr ""
 "e la partizione 11 come volume intero (6) poiché IRIX lo prevede.\n"
 "\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Modificato il tipo di sistema della partizione %d in %x (%s)\n"
 
-#: fdisk/fdisk.c:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "La partizione %d ha diversi elementi iniziali fisici/logici (non Linux?):\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "    phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logico=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "La partizione %d ha diversi elementi finali fisici/logici:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "La partizione %i non inizia al limite del cilindro:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "dovrebbe essere (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "La partizione %d non termina al limite del cilindro.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "dovrebbe essere (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2668,7 +2681,7 @@ msgstr ""
 "Disco %s: %d testine, %d settori, %d cilindri\n"
 "\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -2676,41 +2689,41 @@ msgstr ""
 "Disco %s: %d testine, %d settori, %d cilindri\n"
 "\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
+msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1678
-#, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
+#: fdisk/fdisk.c:1704
+#, fuzzy, c-format
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Avvio    Inizio    Fine   Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 #, fuzzy
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr "le partizioni logiche non sono nell'ordine del disco"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2721,92 +2734,93 @@ msgstr ""
 "Disco %s: %d testine, %d settori, %d cilindri\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
+#: fdisk/fdisk.c:1754
+#, fuzzy
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr " Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Attenzione: la partizione %d contiene il settore 0\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partizione %d: testina %d più grande del massimo %d\n"
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partizione %d: settore %d più grande del massimo %d\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partizione %d: cilindro %d più grande del massimo %d\n"
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partizione %d: dissenso dei settori precedenti %d con il totale %d\n"
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Attenzione: inizio dati danneggiato nella partizione %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Attenzione: la partizione %d si sovrappone alla partizione %d.\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Attenzione: la partizione %d è vuota\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partizione logica %d non è interamente nella partizione %d\n"
 
-#: fdisk/fdisk.c:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Numero %d totale dei settori allocati superiore al massimo %d\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d settori non allocati\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "La partizione %d è già definita.  Cancellarla prima di riaggiungerla.\n"
 
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Primo %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Il settore %d è già allocato\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "Non ci sono settori liberi disponibili\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Ultimo %s o +size o +sizeM o +sizeK "
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2814,17 +2828,27 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "È stato creato il numero massimo di partizioni\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Si devono eliminare alcune partizioni e aggiungere anzitutto una partizione "
 "estesa\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "le partizioni logiche non sono nell'ordine del disco"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Partizione primaria danneggiata"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2835,20 +2859,20 @@ msgstr ""
 "   %s\n"
 "   p   partizione primaria (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l   logica (5 od oltre)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr " e   estesa"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Numero di partizioni non valido per il tipo `%c'\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2856,11 +2880,11 @@ msgstr ""
 "La tabella delle partizioni è stata alterata!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chiamata di ioctl() per rileggere la tabella delle partizioni.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2869,7 +2893,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2881,68 +2905,68 @@ msgstr ""
 "consultare la pagina del manuale fdisk per ulteriori\n"
 "informazioni.\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Sincronizzazione dei dischi in corso.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partizione %d non ha area dati\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Nuovo inizio dati"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Comando per esperti (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Numero di cilindri"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Numero di testine"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Numero di settori"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Attenzione: impostare l'offset di settore per assicurare compatibilità con "
 "DOS\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Il disco %s non contiene una tabella delle partizioni valida\n"
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, fuzzy, c-format
 msgid "%c: unknown command\n"
 msgstr "%s: comando sconosciuto: %s\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Questo kernel trova la dimensione del settore in maniera indipendente - - "
 "opzione b ignorata\n"
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2951,16 +2975,16 @@ msgstr ""
 "dovrebbe utilizzare con un dispositivo specificato\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Comando (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2969,15 +2993,15 @@ msgstr ""
 "\n"
 "Il file d'avvio corrente è: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Immettere il nome del nuovo file d'avvio:"
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "File d'avvio immutato\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2987,7 +3011,7 @@ msgstr ""
 "\tnessun menu per esperti disponibile per le tabelle delle partizioni SGI.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3353,8 +3377,7 @@ msgstr "SGI xlvol"
 msgid "SGI xvm"
 msgstr "SGI xlvol"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux swap"
 
@@ -3593,7 +3616,7 @@ msgstr ""
 "Digitare YES (sì) se si è certi di voler codificare questa partizione in "
 "modo differente.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr ""
 
@@ -3765,15 +3788,15 @@ msgstr "Cilindri alternativi"
 msgid "Physical cylinders"
 msgstr "Cilindri fisici"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Velocità di rotazione (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Fattore di interleave"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Settori supplementari per cilindro"
 
@@ -3828,7 +3851,7 @@ msgstr ""
 "%d %s copre alcune altre partizioni. La voce immessa è stata cambiata\n"
 "in %d %s\n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3838,7 +3861,7 @@ msgstr ""
 "in considerazione di lasciare questa partizione come disco intero (5), "
 "partendo da 0, con %u settori\n"
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3854,7 +3877,7 @@ msgstr ""
 "Digitare YES  (sì) se si è certi di volere che quella partizione\n"
 "venga codificata con 82 (swap Linux ): "
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3873,7 +3896,7 @@ msgstr ""
 "Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3886,16 +3909,16 @@ msgstr ""
 "Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Inizio       Fine    Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Numero di cilindri alternativi"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Numero dei cilindri fisici"
 
@@ -3946,20 +3969,24 @@ msgstr "OS/2 Boot Manager"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
+#, fuzzy
+msgid "W95 FAT32"
 msgstr "Win95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "W95 FAT16 (LBA)"
 msgstr "Win95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
+#, fuzzy
+msgid "W95 Ext'd (LBA)"
 msgstr "Win95 Ext'd (LBA)"
 
 #: fdisk/i386_sys_types.c:21
@@ -3991,15 +4018,18 @@ msgid "AST SmartSleep"
 msgstr ""
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
+#, fuzzy
+msgid "Hidden W95 FAT32"
 msgstr "Win95 FAT32 nascosto"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA) nascosto"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT16 (LBA)"
 msgstr "Win95 FAT16 (LBA) nascosto"
 
 #: fdisk/i386_sys_types.c:31
@@ -4108,6 +4138,12 @@ msgstr "Vecchio Minix"
 msgid "Minix / old Linux"
 msgstr "Minix / vecchio Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux swap"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "C nascosto OS/2: drive"
@@ -4265,91 +4301,91 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "errore di ricerca su %s - impossibile ricercare a %lu\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "errore di ricerca: si voleva 0x%08x%08x, si è ottenuto 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "memoria insufficiente - termina\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "errore in lettura su %s - impossibile leggere il settore %lu\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERRORE: il settore %lu non ha una firma msdos\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "errore di scrittura su %s - impossibile scrivere il settore %lu\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "impossibile aprire il file di salvataggio settore partizione (%s)\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "errore di scrittura su %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "impossibile eseguire stat del file di ripristino partizione (%s)\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "il file di ripristino partizione ha una dimensione errata - il ripristino "
 "non viene effettuato\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "memoria insufficiente?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "impossibile aprire il file di ripristino partizione (%s)\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "errore durante la lettura di %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "impossibile aprire il dispositivo %s per scrivere\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "errore durante la scrittura del settore %lu su %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, fuzzy, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disco %s: impossibile ottenere la geometria\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disco %s: impossibile ottenere la geometria\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, fuzzy, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4360,22 +4396,22 @@ msgstr ""
 "l'intero disco. Utilizzare fdisk su di esso probabilmente non ha senso.\n"
 "[Utilizzare l'opzione --force se lo si desidera davvero]\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, fuzzy, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d testine\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, fuzzy, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d testine\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, fuzzy, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d cilindri\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, fuzzy, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4386,7 +4422,7 @@ msgstr ""
 "Questo creerà problemi con tutto il software che utilizza l'indirizzamento C/"
 "H/S.\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4395,7 +4431,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindri, %lu testine, %lu settori/traccia\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, fuzzy, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4403,7 +4439,7 @@ msgstr ""
 "%s della partizione %s ha un valore impossibile per la testina: %d "
 "(dovrebbeessere compreso nell'intervallo 0-%d)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, fuzzy, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4412,7 +4448,7 @@ msgstr ""
 "%s della partizione %s ha un valore impossibile per il settore: %d "
 "(dovrebbeessere compreso nell'intervallo 1-%d)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, fuzzy, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4421,7 +4457,7 @@ msgstr ""
 "%s della partizione %s ha un valore impossibile per i cilindri: %d (dovrebbe "
 "essere compreso nell'intervallo 0-%d)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4429,11 +4465,11 @@ msgstr ""
 "Nome Id\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Rilettura della tabella delle partizioni in corso...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4441,31 +4477,31 @@ msgstr ""
 "Il comando per la rilettura della tabella delle partizioni non è riuscito\n"
 "Riavviare adesso il sistema prima di utilizzare mkfs\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Errore durante la chiusura di %s\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: nessuna partizione di questo tipo\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "formato non riconosciuto - utilizzo dei settori in corso\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabella delle partizioni di %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato non implementato - utilizzo di %s in corso\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4474,13 +4510,13 @@ msgstr ""
 "Unità = cilindri di %lu byte, blocchi di 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 #, fuzzy
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 "   Inizio Boot Dispositivo     Fine   #cilin.   #blocchi   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4489,12 +4525,12 @@ msgstr ""
 "Unità = settori di 512 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 #, fuzzy
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Boot Dispositivo    Inizio      Fine  #settori Id  Sistema\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4503,12 +4539,12 @@ msgstr ""
 "Unità = blocchi di 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 #, fuzzy
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Boot Dispositivo   Inizio       Fine  #blocchi  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4517,31 +4553,31 @@ msgstr ""
 "Unità = megabyte da 1048576 byte, blocchi da 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 #, fuzzy
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Inizio Boot Dispositivo   Fine    MB   #blocchi  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tinizio: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tendenza: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partizione termina sul cilindro %ld, oltre la fine del disco\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "Non si è trovata alcuna partizione\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, fuzzy, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4552,87 +4588,87 @@ msgstr ""
 "  per C/H/S=*/%ld/%ld (al posto di %ld/%ld/%ld).\n"
 "Per questo elenco viene presunta tale geometria.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "nessuna tabella delle partizioni presente.\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "strano, sono definite solo %d partizioni.\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Attenzione: la partizione %s ha dimensione 0 ma non è contrassegnata come "
 "vuota\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Attenzione: la partizione %s ha dimensione 0 ed è avviabile\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Attenzione: la partizione %s ha dimensione 0 e inizio non nullo\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Attenzione: la partizione %s "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "non è contenuta nella partizione %s\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Attenzione: le partizioni %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "e %s si sovrappongono\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Attenzione: la partizione %s inizia al settore 0\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Attenzione: la partizione %s si estende dopo la fine del disco\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 #, fuzzy
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr "Tra le partizioni primarie, al massimo una può essere estesa\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Attenzione: la partizione %s non inizia al limite di un cilindro\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Attenzione: la partizione %s non termina al limite di un cilindro\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4641,7 +4677,7 @@ msgstr ""
 "(attiva)\n"
 "Questo non ha importanza per LILO, ma MBR DOS non avvierà questo disco.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4650,7 +4686,7 @@ msgstr ""
 "primarie\n"
 "LILO non prende in considerazione il flag `bootable' (flag 'avviabile').\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4659,174 +4695,174 @@ msgstr ""
 "(attiva)\n"
 "Questo non ha importanza per LILO, ma MBR DOS non avvierà questo disco.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 #, fuzzy
 msgid "start"
 msgstr "stato"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partizione %s: inizio: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 #, fuzzy
 msgid "end"
 msgstr "invio"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 " partizione %s: fine: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partizione %s termina sul cilindro %ld, oltre la fine del disco\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, fuzzy, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr "Attenzione: inizio dati danneggiato nella partizione %d\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 #, fuzzy
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr "Attenzione: la partizione %s non inizia al limite di un cilindro\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "troppe partizioni - sto ignorando quei numeri passati (%d)\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "struttura delle partizioni?\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "rilevato l'amministratore del disco - impossibile da gestire\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "trovata firma DM6 - termina\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "strano..., una partizione estesa di dimensione 0?\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "strano..., una partizione BSD di dimensione 0?\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " %s: partizione non riconosciuta\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr "flag -n dato: nessuna modifica\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Salvataggio dei vecchi settori non riuscito - interruzione in corso\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "linea di input lunga o incompleta - uscita in corso\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "errore di input: `=' previsto dopo il campo %s\n"
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "errore di input: carattere non previsto %c dopo il campo %s\n"
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "input non riconosciuto: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "numero troppo grande\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "segni strani dopo il numero\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "non c'è spazio per il descrittore di partizione\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "impossibile costituire una partizione estesa adiacente\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr "troppi campi di input\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "Non c'è spazio per altri\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "Tipo non valido\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, fuzzy, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Attenzione: superiore alla dimensione massima consentita (%lu)\n"
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "Attenzione: partizione vuota\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Attenzione: inizio partizione non valido (%lu troppo anticipato)\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "flag avviabile non riconosciuto - scegliere - o *\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "Specificazione c,h,s parziale?\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "partizione estesa in posizione non prevista\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "input non valido\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "troppe partizioni\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 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"
@@ -4839,47 +4875,47 @@ msgstr ""
 "Solitamente è necessario specificare solamente <inizio> e <dimensione> ( e "
 "forse <tipo>).\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "versione"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Utilizzo: %s [opzioni] dispositivo...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: qualcosa come /dev/hda o /dev/sda"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "opzioni utili:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]: elenco dimensioni di una partizione"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [o --id]:        stampa o modifica dell'Id della partizione"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:      elenco delle partizioni di ciascun dispositivo"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [o --dump]:      idem, ma in un formato adatto per un successivo input"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [o --increment]: numero dei cilindri ecc. partendo da 1 invece che da "
 "0"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4887,56 +4923,56 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  accetta/riporta in unità di settori/blocchi/"
 "cilindri/MB"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]:elenca i tipi di partizione conosciuti"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [o --DOS]:       per la compatibilità con DOS: spreca un po' di spazio"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [o --re-read]:   fa rileggere al kernel la tabella delle partizioni"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                modifica solamente la partizione con numero #"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 non scrive realmente sul disco"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O file :            salva sul file i settori che verranno sovrascritti"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            ripristina questi settori nuovamente"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:   stampa versione"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:     stampa questo messaggio"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "opzioni pericolose:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [o --show-geometry]: stampa l'idea del kernel riguardo alla geometria"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4944,117 +4980,117 @@ msgstr ""
 "    -x [o --show-extended]: elenca anche le partizioni estese in output\n"
 "                             o prevede i rispettivi descrittori in input"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [o --Linux]:      non reclamare per cose che risultano irrilevanti "
 "per Linux"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:      elimina i messaggi di avvertimento"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "    È possibile non usare la geometria rilevata utilizzando:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [o --cylindres #]:imposta il numero di cilindri da utilizzare"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [o --heads #]:    imposta il numero di testine da utilizzare"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [o --sectors #]:  imposta il numero di settori da utilizzare"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "È possibile disattivare tutte le verifiche di coerenza con:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [o --force]:      fa ciò che dico, anche se è stupido"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Utilizzo:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s device\t\t elenca le partizioni attive sul dispositivo\n"
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s device n1 n2 ... attiva le partizioni n1 ..., disattiva il resto\n"
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An device\t attiva la partizione n, disattiva le altre\n"
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "nessun comando?\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "totale: %d blocchi\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "utilizzo: sfdisk --print-id numero partizione dispositivo\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr " utilizzo: sfdisk --change-id numero partizione dispositivo Id\n"
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "utilizzo: sfdisk --id numero partizione dispositivo [Id]\n"
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 "è possibile specificare solamente un dispositivo(eccetto con -l o -s)\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "impossibile aprire %s\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "impossibile aprire %s in lettura"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, fuzzy, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %d cilindri, %d testine, %d settori/traccia\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE ioctl non riuscito per %s\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte attivo non valido: 0x%x al posto di 0x80\n"
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -5062,7 +5098,7 @@ msgstr ""
 "Fine\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5071,37 +5107,37 @@ msgstr ""
 "Ci sono %d partizioni primarie attive. Questo è irrelevante per LILO,\n"
 "ma MBR DOS  avvierà solamente un disco con 1 partizione attiva.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "la partizione %s ha id %x e non è nascosta\n"
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, fuzzy, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id non valido %x\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Questo disco è attualmente in uso.\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Errore irreversibile: impossibile trovare %s\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Attenzione: %s non è un dispositivo di blocchi\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 "Verifica in corso che in questo momento nessuno stia utilizzando questo "
 "disco...\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 #, fuzzy
 msgid ""
 "\n"
@@ -5115,29 +5151,29 @@ msgstr ""
 "swapoff di tutte le partizioni swap su questo disco. Utilizzare il flag--no-"
 "reread per eliminare questo controllo.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilizzare il flag -force per oltrepassare tutti i controlli.\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 #, fuzzy
 msgid "OK\n"
 msgstr "OK"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Vecchia situazione:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partizione %d non esiste, non è possibile modificarla\n"
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Nuova situazione:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5145,19 +5181,19 @@ msgstr ""
 "Queste partizioni non mi piacciono - nessuna modifica\n"
 "(se questo è quanto si desidera, utilizzare l'opzione --force.)\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Questo non mi piace - probabilmente si dovrebbe rispondere no\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Soddisfatti di questo? [ynq] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Scrivere questo su disco? [ynq] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5165,15 +5201,15 @@ msgstr ""
 "\n"
 "sfdisk: fine prematura dell'input\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "Uscita in corso - nessuna modifica\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "Scegliere un'opzione per la risposta tra y,n,q\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5181,7 +5217,7 @@ msgstr ""
 "La nuova tabella delle partizioni è stata scritta con successo\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5811,7 +5847,7 @@ msgstr "Attesa in loop per il cambio ora da KDGHWCLK\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "Lettura dell'orario con KDGHWCLK ioctl non riuscita"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "Tempo d'attesa per il cambio ora esaurito.\n"
 
@@ -5838,61 +5874,71 @@ msgstr "Impossibile aprire /dev/tty1"
 msgid "KDGHWCLK ioctl failed"
 msgstr " KDGHWCLK ioctl non riuscito"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "open() di %s fallita"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "Lettura dell'orario attraverso ioctl() su %s non riuscita.\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "Attesa in loop per il cambio ora da %s\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s non ha funzioni di interrupt. "
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr " read() su %s per l'attesa del segnale dal clock fallita"
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr " read() su %s per l'attesa del segnale dal clock fallita"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr " read() su %s per l'attesa del segnale dal clock fallita"
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
 "Non riuscita la disattivazione degli interrupt d'aggiornamento attraverso "
 "ioctl() su %s"
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 "Non riuscita inaspettatamente l'attivazione degli interrupt d'aggiornametno "
 "attraverso ioctl() su %s "
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "Non riusciuta l'impostazione dell'ora attraverso ioctl() su %s.\n"
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr " ioctl(%s) ha funzionato.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "Non riuscita l'apertura di %s"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5903,17 +5949,17 @@ msgstr ""
 "periferica 'rtc' di Linux attraverso il file speciale della periferica %s.  "
 "Questo file non esiste su questo sistema.\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "Impossibile aprire %s"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr " Non riuscito ioctl(RTC_EPOCH_READ) su %s"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "lettura di epoch %ld da %s con RTC_EPOCH_READ ioctl.\n"
@@ -5921,24 +5967,24 @@ msgstr "lettura di epoch %ld da %s con RTC_EPOCH_READ ioctl.\n"
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "Il valore epoch non può essere inferiore a 1900. Si è richiesto %ld\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr "impostazione epoch su %ld con RTC_EPOCH_SET ioctl su %s in corso.\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr ""
 "Il driver di periferica per il kernel per %s non ha RTC_EPOCH_SET ioctl.\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "Non riuscito ioctl(RTC_EPOCH_SET) su %s"
@@ -6112,52 +6158,67 @@ msgstr "Login a %s da %s negato in base all'impostazione predefinita.\n"
 msgid "Login on %s from %s denied.\n"
 msgstr "Login a %s da %s negato.\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: non si esiste (come utente %d).\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: utente \"%s\" non esiste.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 "%s: è possibile modificare solo le voci locali; utilizzare invece yp%s.\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+msgid "Unknown user context"
+msgstr ""
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Modifica delle informazioni finger per %s in corso.\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Errore password."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Password: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Password non corretta."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "Le informazioni finger non sono state modificate.\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Utilizzo: %s [ -f nome intero ] [ -o ufficio ]"
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6165,11 +6226,11 @@ msgstr ""
 "[ -p tel. ufficio]\n"
 "\t[ -h tel. casa ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6177,117 +6238,129 @@ msgstr ""
 "\n"
 "interrotto.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "il campo è troppo lungo.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' non è consentito.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Non sono ammessi i caratteri di controllo.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 "Le informazioni finger *NON* sono state modificate. Riprovare "
 "successivamente.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "Le informazioni finger sono state modificate.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "malloc non riuscita"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" non è elencato in /etc/shells.\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr "%s: la shell non è in /etc/shells, modifica shell negata\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Modifica shell per %s in corso.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Nuova shell"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "Shell non modificata.\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Shell *NON* modificata.  Riprovare successivamente.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Shell modificata.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: la shell deve essere un nome percorso completo.\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" non esiste.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" non eseguibile.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' non è consentito.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Non sono ammessi i caratteri di controllo.\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Attenzione: \"%s\" non è elencato in /etc/shells\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" non è elencato in /etc/shells.\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: utilizzo opzione -l per consultare l'elenco\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Attenzione: \"%s\" non è elencato in /etc/shells.\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Utilizzare %s -l per consultare l'elenco.\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "Nessuna shell conosciuta.\n"
 
@@ -6482,80 +6555,80 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Ci sono troppi processi in esecuzione.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr " CONNESSIONE DI ACCESSO REMOTO A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN DI ROOT A %s DA %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN DI ROOT A %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN A %s ATTRAVERSO %s DA %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 #, fuzzy
 msgid "You have new mail.\n"
 msgstr "C'è %sposta.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 #, fuzzy
 msgid "You have mail.\n"
 msgstr "C'è %sposta.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: errore in esecuzione forking: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() non riuscito"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Nessuna directory %s!\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Connessione con home = \"/\".\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: nessuna memoria per lo script shell.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: exec dello script shell impossibile: %s.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: nessuna shell: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6564,62 +6637,62 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "il nome di login è troppo lungo.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "NOME troppo lungo"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "I nomi di login non possono iniziare con'-'.\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "troppi linefeed vuoti.\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "Linefeed ECCESSIVI"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login scaduto dopo %d secondi\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Ultimo login: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "da %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "su %.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ERRORE DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ERRORE DI LOGIN SU %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ERRORI DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ERRORI DI LOGIN SU %s, %s"
@@ -7025,57 +7098,67 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: BRUTTO ERRORE"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, fuzzy, c-format
 msgid "%s: the password file is busy.\n"
 msgstr "%s: il file %s è occupato.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, fuzzy, c-format
 msgid "%s: the group file is busy.\n"
 msgstr "%s: il file %s è occupato.\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: il file %s è occupato (%s presente)\n"
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: impossibile collegare %s: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "Impossibile ottenere il timeout per %s: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "Impossibile ottenere il timeout per %s: %s\n"
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 "%s: impossibile sbloccare %s: %s (le modifiche effettuate sono ancora in %"
 "s)\n"
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: impossibile effettuare il fork\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s immutato\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: nessuna modifica effettuata\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr ""
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr ""
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr ""
@@ -7270,7 +7353,7 @@ msgstr "impossibile rinominare %s in %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7278,22 +7361,22 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 #, fuzzy
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr " utilizzo: script [-a] [file]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniziato, il file è %s\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniziato su %s"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7302,16 +7385,16 @@ msgstr ""
 "\n"
 "Script effettuato su %s"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script effettuato, il file è %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "openpty non riuscita\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "esauriti tutti i pty disponibili\n"
 
@@ -7580,42 +7663,42 @@ msgstr "mount: impossibile aprire %s - si sta utilizzando al suo posto %s\n"
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "impossibile creare un file di blocco %s: %s (utilizzare il flag -n per "
 "tralasciare)"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "impossibile collegare il file di blocco %s: %s  (utilizzare il flag -n per "
 "tralasciare)"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "impossibile aprire il file di blocco %s: %s (utilizzare flag -n per "
 "tralasciare)"
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Impossibile bloccare il file di blocco %s: %s\n"
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Impossibile bloccare il file di blocco %s: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "scaduto"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7624,189 +7707,125 @@ msgstr ""
 "Impossibile creare il collegamento %s\n"
 "Forse c'è un vecchio file di blocco?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "impossibile aprire %s (%s) - mtab non aggiornato"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "errore durante la scrittura di %s: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "impossibile rinominare %s in %s: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: impossibile aprire il device %s: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: impossibile ottenere informazioni sul device %s: %s\n"
-
-#: mount/lomount.c:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) offset %d, criptazione %s\n"
-
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: impossibile trovare un qualsiasi device /dev/loop#"
-
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
+msgid ", offset %lld"
 msgstr ""
-"mount: impossibile trovare qualsiasi loop device.\n"
-"       Forse /dev/loop# ha un major number errato?"
 
-#: mount/lomount.c:253
+#: mount/lomount.c:104
 #, 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'.)"
+msgid ", sizelimit %lld"
 msgstr ""
-"mount: impossibile trovare qualsiasi loop device e, in base a %s,\n"
-"       questo kernel non è a conoscenza del loop device\n"
-"       (se è questo il caso, ricompilare o `insmod loop.o'.)"
 
-#: mount/lomount.c:259
-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?"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
 msgstr ""
-"mount: impossibile trovare qualsiasi loop device. Forse questo kernel\n"
-"       non è a conoscenza del loop device (allora ricompilare o \n"
-"       `insmod loop.o'), o forse /dev/loop# ha il major number errato?"
 
-#: mount/lomount.c:263
-msgid "mount: could not find any free loop device"
-msgstr "mount: impossibile trovare un qualsiasi loop device libero"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ""
 
-#: mount/lomount.c:359
+#: mount/lomount.c:129
 #, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "impossibile aprire %s in lettura"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Ridigitare la nuova password: "
+msgid ", encryption type %d\n"
+msgstr "Tipo di criptazione non supportata %s\n"
 
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "apertura file rc non riuscita\n"
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: impossibile ottenere informazioni sul device %s: %s\n"
 
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "La password deve avere almeno 6 caratteri, riprovare.\n"
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: impossibile trovare un qualsiasi device /dev/loop#"
 
-#: mount/lomount.c:472
+#: mount/lomount.c:192
 #, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Impossibile allocare altra memoria\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
 msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
+"mount: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
+"mount: impossibile trovare qualsiasi loop device e, in base a %s,\n"
+"       questo kernel non è a conoscenza del loop device\n"
+"       (se è questo il caso, ricompilare o `insmod loop.o'.)"
 
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
+#: mount/lomount.c:197
+msgid "mount: could not find any free loop device"
+msgstr "mount: impossibile trovare un qualsiasi loop device libero"
 
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Init (fino a 16 cifre esadecimali): "
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): riuscito\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "Cifra non esadec. '%c'.\n"
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: impossibile cancellare il device %s: %s\n"
 
-#: mount/lomount.c:764
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
-msgstr "Non so come ottenere la chiave del sistema di criptazione %d\n"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): riuscito\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): riuscito\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr "Questo montaggio è stato compilato senza supporto loop. Ricompilare.\n"
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "memoria insufficiente"
-
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "impossibile aprire %s in lettura"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"utilizzo:\n"
+"  %s loop_device                                      # da informazioni\n"
+"  %s -d loop_device                                   # elimina\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # imposta\n"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "memoria insufficiente"
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
+"Nessun supporto loop disponibile al momento della compilazione. "
+"Ricompilare.\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7824,41 +7843,41 @@ msgstr "[mntent]: la linea %d in %s non 
 msgid "; rest of file ignored"
 msgstr "; ignorato resto del file"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: in base a mtab, %s è già montato su %s"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: in base a mtab, %s è montato su %s"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: impossibile aprire %s in scrittura: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: errore durante la scrittura di %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: errore durante il cambio di modalità di %s: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s assomigla a swapspace - non montato"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "mount non riuscito"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: solamente root può montare %s su %s"
@@ -7880,106 +7899,110 @@ msgstr "mount: si ignora l'impostazione di un loop device\n"
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: si intende utilizzare il loop device %s\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: mancata impostazione del loop device\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: impostazione del loop device riuscita\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: impossibile aprire %s: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr ""
+
+#: mount/mount.c:687
 #, fuzzy, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: impossibile aprire %s in scrittura: %s"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, fuzzy, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: impossibile aprire %s: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: impossibile effettuare il fork: %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr ""
 "mount: questa versione è stata compilata senza supporto per il tipo `nfs'"
 
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: impossibile determinare il tipo di filesystem, e non è stato "
 "specificato nessuno"
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: si deve specificare il tipo di filesystem"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr "mount: mount non riuscito"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: il mount point di %s non è una directory"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: autorizzazione negata"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr "mount: bisogna essere superuser per utilizzare mount"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s è occupato"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc già montato"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s già montato o %s occupato"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: il mount point %s non esiste"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: il mount point %s è un link simbolico a nulla"
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: il device speciale %s non esiste"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7988,12 +8011,12 @@ msgstr ""
 "mount: il device speciale %s non esiste\n"
 "       (un prefisso di percorso non è una directory)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s non ancora montato, oppure l'opzione non è valida"
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8002,47 +8025,47 @@ msgstr ""
 "mount: tipo fs errato, opzione non valida, superblocco su %s danneggiato,\n"
 "       o troppi file system montati"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "mount table piena"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: impossibile leggere il superblocco"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, fuzzy, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: dispositivo di blocchi non valido"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: fs di tipo %s non supportato dal kernel"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probabilmente si intende %s"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: forse si intendeva iso9660 ?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s ha un numero device errato o il fs di tipo %s non è supportato"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s non è un dispositivo di blocchi e lo stat non è riuscito?"
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8051,77 +8074,50 @@ msgstr ""
 "mount: il kernel non riconosce %s come un dispositivo di blocchi\n"
 "       (forse `insmod driver'?)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s  non è un dispositivo di blocchi (magari tentare `-o loop'?)"
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s non è un dispositivo di blocchi"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s non un dispositivo di blocchi valido"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr " dispositivo di blocchi"
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, fuzzy, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "umount: impossibile rimontare %s di sola lettura\n"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, fuzzy, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s è protetto da scrittura, montaggio in sola lettura in corso"
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 "mount: %s%s è protetto da scrittura, montaggio in sola lettura in corso"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr ""
-
-#: mount/mount.c:1124
-#, fuzzy, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "umount: %s: non montato"
-
-#: mount/mount.c:1134
-#, fuzzy, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: considerare il montaggio di %s con %s\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "etichetta"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: non si è trovata tale partizione"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: non è stato dato il tipo - Si presume nfs perché ci sono i due punti\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 #, fuzzy
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr "mount: non è stato dato il tipo - Si presume smbfs perché xxx\n"
@@ -8129,22 +8125,22 @@ msgstr "mount: non 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: esecuzione in background di \"%s\"\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: termina \"%s\"\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s già montato su %s\n"
 
-#: mount/mount.c:1386
+#: mount/mount.c:1362
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8165,78 +8161,77 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: è possibile solo per root"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nessun %s trovato - creazione in corso..\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr ""
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: non si è trovata tale partizione"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: mount di %s in corso\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: impossibile trovare %s in %s"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: impossibile trovare %s in %s o %s"
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, fuzzy, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr "mount: impossibile aprire %s - si sta utilizzando al suo posto %s\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: UUID non valido"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 #, fuzzy
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: si deve specificare il tipo di filesystem"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: non si è specificato un tipo di filesystem per %s\n"
 
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "      Proverò tutti i tipi citati in %s o %s\n"
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr "      e sembra che questo sia swapspace\n"
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "      Proverò il tipo %s\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "Prova di %s in corso\n"
@@ -8330,7 +8325,7 @@ msgstr "valore riportato di stato nfs sconosciuto: %d"
 msgid "bug in xstrndup call"
 msgstr "bug in chiamata xstrndup"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8343,7 +8338,7 @@ msgstr ""
 "       %s [-v] [-p priority] special ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8355,102 +8350,34 @@ msgstr ""
 "       %s [-v] [-p priority] special ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-#, fuzzy
-msgid "out of memory"
-msgstr "memoria insufficiente?\n"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s su %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: impossibile effettuare stat di %s: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, fuzzy, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: attenzione: %s ha le autorizzazioni non sicure %04o, 0600 è "
 "suggerito\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: sto ignorando il file %s - sembra avere dei buchi.\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 #, fuzzy
 msgid "Not superuser.\n"
 msgstr "Non impostato\n"
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s: dispositivo di blocchi non valido"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "Tipo di criptazione non supportata %s\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: si intende utilizzare il loop device %s\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Questa partizione è già in uso"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "impossibile riavvolgere il dispositivo swap"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr " impossibile aprire /dev/urandom"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "impossibile scrivere inode"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "fork non riuscito\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Modifica password per %s\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: impossibile aprire %s: %s\n"
@@ -8515,37 +8442,37 @@ msgstr "umount: %s: i dispositivi di blocchi non sono permessi su fs"
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "nessun umount2, tentativo di umount in corso...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 "impossibile eseguire umount di %s - al suo posto è in corso un tentativo con "
 "%s\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s occupato - rimontato sola lettura\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: impossibile rimontare %s di sola lettura\n"
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "eseguito umount di %s\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: impossibile trovare l'elenco dei filesystem da smontare"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 #, fuzzy
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8556,42 +8483,42 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentativo di eseguire umount di %s in corso\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Impossibile trovare %s in mtab\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s non è montato (secondo mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: sembra che %s sia stato montato diverse volte"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s non si trova in fstab (e non si è root)"
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount non coerente con fstab"
 
-#: mount/umount.c:602
+#: mount/umount.c:616
 #, c-format
-msgid "umount: only root can unmount %s from %s"
-msgstr "umount: solamente root può smontare %s da %s"
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: solamente %s può smontare %s da %s"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr " umount: è possibile solo per root"
 
@@ -8731,7 +8658,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec; %f rec (car/sec)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr " Utilizzo: %s [-c] [-n level] [-s bufsize]\n"
@@ -8899,22 +8826,22 @@ msgstr "------ Limiti della memoria condivisa --------\n"
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, fuzzy, c-format
-msgid "max number of segments = %ld\n"
+msgid "max number of segments = %lu\n"
 msgstr "numero massimo di segmenti = %d\n"
 
 #: sys-utils/ipcs.c:280
 #, fuzzy, c-format
-msgid "max seg size (kbytes) = %ld\n"
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "dimensione max seg (kbyte) = %d\n"
 
 #: sys-utils/ipcs.c:282
 #, fuzzy, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "valore massimo totale di memoria condivisa (kbyte) = %d\n"
 
 #: sys-utils/ipcs.c:284
 #, fuzzy, c-format
-msgid "min seg size (bytes) = %ld\n"
+msgid "min seg size (bytes) = %lu\n"
 msgstr "dimensione min seg (byte) = %d\n"
 
 #: sys-utils/ipcs.c:289
@@ -9436,7 +9363,12 @@ msgstr ""
 msgid "missing comma"
 msgstr ""
 
-#: sys-utils/readprofile.c:115
+#: sys-utils/readprofile.c:72
+#, fuzzy
+msgid "out of memory"
+msgstr "memoria insufficiente?\n"
+
+#: sys-utils/readprofile.c:118
 #, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
@@ -9448,6 +9380,7 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
@@ -9462,32 +9395,32 @@ msgstr ""
 "\t -r            reimposta tutti i counter (solamente utente root)\n"
 "\t -V            stampa versione ed esci\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, fuzzy, c-format
 msgid "%s version %s\n"
 msgstr "%s Versione %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): linea mappa errata\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: impossibile trovare \"_stext\" in %s\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "totale"
 
@@ -9995,31 +9928,116 @@ msgstr "Linea di input troppo lunga.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: impossibile cancellare il device %s: %s\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: non e' stato compilato con il supporto per minix v2\n"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): riuscito\n"
+#~ msgid "Boot (%02X)"
+#~ msgstr "Avvio (%02X)"
 
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
-#~ msgstr ""
-#~ "Questo montaggio è stato compilato senza supporto loop. Ricompilare.\n"
+#~ msgid "None (%02X)"
+#~ msgstr "Nessuno (%02X)"
+
+#, fuzzy
+#~ msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) offset %d, criptazione %s\n"
 
 #~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "utilizzo:\n"
-#~ "  %s loop_device                                      # da informazioni\n"
-#~ "  %s -d loop_device                                   # elimina\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # imposta\n"
+#~ "mount: impossibile trovare qualsiasi loop device.\n"
+#~ "       Forse /dev/loop# ha un major number errato?"
 
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ 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 ""
-#~ "Nessun supporto loop disponibile al momento della compilazione. "
-#~ "Ricompilare.\n"
+#~ "mount: impossibile trovare qualsiasi loop device. Forse questo kernel\n"
+#~ "       non è a conoscenza del loop device (allora ricompilare o \n"
+#~ "       `insmod loop.o'), o forse /dev/loop# ha il major number errato?"
+
+#, fuzzy
+#~ msgid "Error: unable to open %s for reading\n"
+#~ msgstr "impossibile aprire %s in lettura"
+
+#, fuzzy
+#~ msgid "Retype password: "
+#~ msgstr "Ridigitare la nuova password: "
+
+#, fuzzy
+#~ msgid "Error: gpg key file decryption failed\n"
+#~ msgstr "apertura file rc non riuscita\n"
+
+#, fuzzy
+#~ msgid "Error: Password must be at least %d characters.\n"
+#~ msgstr "La password deve avere almeno 6 caratteri, riprovare.\n"
+
+#, fuzzy
+#~ msgid "Error: Unable to allocate memory\n"
+#~ msgstr "Impossibile allocare altra memoria\n"
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Init (fino a 16 cifre esadecimali): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Cifra non esadec. '%c'.\n"
+
+#~ msgid "Don't know how to get key for encryption system %d\n"
+#~ msgstr "Non so come ottenere la chiave del sistema di criptazione %d\n"
+
+#, fuzzy
+#~ msgid "Error: unable to open /etc/fstab for reading\n"
+#~ msgstr "impossibile aprire %s in lettura"
+
+#, fuzzy
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "umount: %s: non montato"
+
+#, fuzzy
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: considerare il montaggio di %s con %s\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "etichetta"
+
+#, fuzzy
+#~ msgid "swapon: invalid loop device name\n"
+#~ msgstr "umount: %s: dispositivo di blocchi non valido"
+
+#, fuzzy
+#~ msgid "swapon: unable to open loop device %s\n"
+#~ msgstr "mount: si intende utilizzare il loop device %s\n"
+
+#, fuzzy
+#~ msgid "swapon: loop device %s already in use\n"
+#~ msgstr "Questa partizione è già in uso"
+
+#, fuzzy
+#~ msgid "swapon: unable to open swap device %s\n"
+#~ msgstr "impossibile riavvolgere il dispositivo swap"
+
+#, fuzzy
+#~ msgid "swapon: unable to open /dev/urandom\n"
+#~ msgstr " impossibile aprire /dev/urandom"
+
+#, fuzzy
+#~ msgid "swapon: unable to create pipe\n"
+#~ msgstr "impossibile scrivere inode"
+
+#, fuzzy
+#~ msgid "swapon: fork failed\n"
+#~ msgstr "fork non riuscito\n"
+
+#, fuzzy
+#~ msgid "swapon: random password for %s is %s"
+#~ msgstr "Modifica password per %s\n"
+
+#~ msgid "umount: only root can unmount %s from %s"
+#~ msgstr "umount: solamente root può smontare %s da %s"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "La partizione %i non termina al limite del cilindro:\n"
@@ -10060,9 +10078,6 @@ msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 #~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
 #~ msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#~ msgid "umount: only %s can unmount %s from %s"
-#~ msgstr "umount: solamente %s può smontare %s da %s"
-
 #~ msgid "Block %d in file `"
 #~ msgstr "Blocco %d nel file `"
 
diff --git a/po/ja.po b/po/ja.po
index 4899e2ae..18e17e0b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11n\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
 "PO-Revision-Date: 2001-12-11 22:43+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -15,94 +15,99 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "Æɤ߹þ¤ßÀìÍѤËÀßÄê"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "Æɤ߽ñ¤­²Äǽ¤ËÀßÄê"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "Æɤ߽ñ¤­²Äǽ¤«¤É¤¦¤«¤ò¥Æ¥¹¥È"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "¥»¥¯¥¿¿ô¤ò¼èÆÀ"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr "¥Ö¥í¥Ã¥¯¥µ¥¤¥º¤ò¼èÆÀ"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
 msgstr "¥Ö¥í¥Ã¥¯¥µ¥¤¥º¤òÀßÄê"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "¥µ¥¤¥º¤ò¼èÆÀ"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "readahead ÃͤòÀßÄê"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "readahead Ãͤò¼èÆÀ"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "¥Ð¥Ã¥Õ¥¡¤ò¥Õ¥é¥Ã¥·¥å¤¹¤ë"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤òºÆÆɤ߹þ¤ß"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
 msgstr "»È¤¤Êý:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr "  %s --report [¥Ç¥Ð¥¤¥¹]\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "  %s [-v|-q] ¥³¥Þ¥ó¥É ¥Ç¥Ð¥¤¥¹\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "ÍøÍѲÄǽ¥³¥Þ¥ó¥É:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: ÉÔÌÀ¤Ê¥³¥Þ¥ó¥É: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr "%s ¤¬À®¸ù¤·¤Þ¤·¤¿¡£\n"
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: %s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: %s ¤Ç ioctl ¥¨¥é¡¼\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   ³«»ÏSec    ¥µ¥¤¥º   ¥Ç¥Ð¥¤¥¹\n"
 
@@ -145,12 +150,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "»È¤¤Êý: %s [ -n ] ¥Ç¥Ð¥¤¥¹\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s from %s\n"
@@ -282,49 +287,49 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "»È¤¤Êý: %s [ -larvsmf ] /dev/name\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s ¤Ï¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤¹\t "
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "ËÜÅö¤Ë³¤±¤Þ¤¹¤«"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "¥Á¥§¥Ã¥¯¤òÃæ»ß¤·¤Þ¤·¤¿\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "¥Õ¥¡¥¤¥ë `%s' Æâ¤Ç Zone nr < FIRSTZONE¡£"
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "¥Õ¥¡¥¤¥ë `%s' Æâ¤Ç Zone nr >= ZONES¡£"
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "¥Ö¥í¥Ã¥¯¤Îºï½ü"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Æɹþ¥¨¥é¡¼: ¥Õ¥¡¥¤¥ë '%s' Ãæ¤Î¥Ö¥í¥Ã¥¯¤Ø seek ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Æɹþ¥¨¥é¡¼: ¥Õ¥¡¥¤¥ë '%s' ¤ËÉÔÀµ¥Ö¥í¥Ã¥¯¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -332,122 +337,122 @@ msgstr ""
 "ÆâÉô¥¨¥é¡¼: ÉÔÀµ¥Ö¥í¥Ã¥¯¤Ø¤Î½ñ¤­¹þ¤ß\n"
 "½ñ¤­¹þ¤ßÍ×µá¤Ï̵»ë¤µ¤ì¤Þ¤¹\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "½ñ¤­¹þ¤ß¥Ö¥í¥Ã¥¯Æâ¤Î seek ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "½ñ¤­¹þ¤ß¥¨¥é¡¼: ¥Õ¥¡¥¤¥ë¤ÎÃæ '%s' ¤ËÉÔÀµ¥Ö¥í¥Ã¥¯¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯½ñ¹þ»þ¤Î¥Õ¥¡¥¤¥ë¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤ò½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "inode ¥Þ¥Ã¥×¤ò½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "¥¾¡¼¥ó¥Þ¥Ã¥×¤ò½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "inode ¤ò½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "¥·¡¼¥¯¤Ë¼ºÇÔ"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤ò½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤ËÉÔÀµ¤Ê¥Þ¥¸¥Ã¥¯¥Ê¥ó¥Ð¡¼¤¬¤¢¤ê¤Þ¤¹"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Only 1k blocks/zones supported"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "bad s_imap_blocks field in super-block"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "bad s_zmap_blocks field in super-block"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "inode ¥Þ¥Ã¥×ÍѥХåե¡¤Î³ÎÊݤ¬¤Ç¤­¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "inode ÍѥХåե¡¤Î³ÎÊݤ¬¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "inode ¥«¥¦¥ó¥¿ÍѥХåե¡¤Î³ÎÊݤ¬¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "¥¾¡¼¥ó¥«¥¦¥ó¥¿ÍѥХåե¡¤Î³ÎÊݤ¬¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "inode ¥Þ¥Ã¥×¤¬Æɹþ¤á¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "¥¾¡¼¥ó¥Þ¥Ã¥×¤¬Æɹþ¤á¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "inode ¤òÆɹþ¤á¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Warning: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "inode ¿ô %ld\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "¥Ö¥í¥Ã¥¯¿ô %ld\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zone ¥µ¥¤¥º=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "ºÇÂ祵¥¤¥º=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾õÂÖ=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -456,172 +461,172 @@ msgstr ""
 "̾Á°¤ÎŤµ=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 "Inode %d ¤ÏÉÔ»ÈÍÑ¥Þ¡¼¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥Õ¥¡¥¤¥ë '%s' ¤¬ÍøÍѤ·¤Æ¤¤¤Þ¤¹\n"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "»ÈÍÑ¥Þ¡¼¥¯"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "¥Õ¥¡¥¤¥ë `%s' ¤Ï¥â¡¼¥É %05o ¤Ç¤¹\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "·Ù¹ð: inode ¿ô¤¬Â礭¤¹¤®¤Þ¤¹¡£\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "root inode ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "¥Ö¥í¥Ã¥¯¤Ï°ÊÁ°¤«¤éÍøÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£¸½ºß¤Ï¥Õ¥¡¥¤¥ë `%s' Æâ¤Ç¤¹¡£"
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "¥¯¥ê¥¢"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "¥Õ¥¡¥¤¥ë `%2$s' ¤Î¥Ö¥í¥Ã¥¯ %1$d ¤Ï̤»ÈÍÑ¥Þ¡¼¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Àµ¤·¤¤"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê '%s' ¤Ï¥Õ¥¡¥¤¥ë '%.*s' ¤ÎÉÔÀµ inode ÈÖ¹æ¤ò´Þ¤ß¤Þ¤¹¡£"
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " ºï½ü"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr "`%s': ÉÔÀµ¤Ê¥Ç¥£¥ì¥¯¥È¥ê: '.' ¤¬ºÇ½é¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr "`%s': ÉÔÀµ¤Ê¥Ç¥£¥ì¥¯¥È¥ê: '..' ¤¬ 2 ÈÖÌܤǤϤ¢¤ê¤Þ¤»¤ó\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: ÉÔÀµ¤Ê¥Ç¥£¥ì¥¯¥È¥ê: '.' ¤¬ºÇ½é¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: ÉÔÀµ¤Ê¥Ç¥£¥ì¥¯¥È¥ê: '..' ¤¬ 2 ÈÖÌܤǤϤ¢¤ê¤Þ¤»¤ó\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "ÆâÉô¥¨¥é¡¼"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: ÉÔÀµ¤Ê¥Ç¥£¥ì¥¯¥È¥ê: ¥µ¥¤¥º¤¬ 32 ̤Ëþ"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "bad_zone ¤Ç¤Î seek ¤Ë¼ºÇÔ"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Inode %d ¤Î¥â¡¼¥É¤Ï¥¯¥ê¥¢¤µ¤ì¤º¡£"
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "inode %d ¤Ï»È¤ï¤ì¤Þ¤»¤ó¤¬¡¢¥Ó¥Ã¥È¥Þ¥Ã¥×¤Ç¤Ï»ÈÍÑ¥Þ¡¼¥¯¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤¹"
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "inode %d ¤¬»ÈÍѤµ¤ì¤Þ¤¹¤¬¡¢¥Ó¥Ã¥È¥Þ¥Ã¥×¤Ç¤ÏÉÔ»ÈÍÑ¥Þ¡¼¥¯¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤¹"
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "inode %d (¥â¡¼¥É = %07o), i_nlinks=%d, counted=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "i_nlinks ¤ÎÃͤò count ¤ËÀßÄꤷ¤Þ¤·¤¿"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zone %d: ÍøÍÑ¥Þ¡¼¥¯¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤¹¤¬¡¢¤É¤Î¥Õ¥¡¥¤¥ë¤â»È¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "¥Þ¡¼¥¯¤Ê¤·"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Zone %d: »ÈÍÑÃæ¡¢counted=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Zone %d: »ÈÍѤ·¤Æ¤¤¤Þ¤»¤ó¡¢counted=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "ÀßÄê"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "ÉÔÀµ¤Ê inode ¥µ¥¤¥º"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "ÉÔÀµ¤Ê v2 inode ¥µ¥¤¥º"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "ÂÐÏÃŪ¤Ê½¤Éü¤ò¹Ô¤Ê¤¦°ÙüËö¤¬É¬ÍפǤ¹"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "'%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s ¤Ï¥¯¥ê¡¼¥ó¤Ç¤¹¡¢¥Á¥§¥Ã¥¯¤·¤Þ¤»¤ó¡£\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "¶¯À©Åª¤Ë %s ¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¸¡ºº¤·¤Þ¤¹¡£\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "%s ¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ï±ø¤ì¤Æ¤ª¤ê¡¢¸¡ºº¤¬É¬ÍפǤ¹¡£\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -630,12 +635,12 @@ msgstr ""
 "\n"
 "%6ld i¥Î¡¼¥É¤¬»È¤ï¤ì¤¿ (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zone ¤¬»È¤ï¤ì¤¿ (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -658,7 +663,7 @@ msgstr ""
 "------\n"
 "%6d ¥Õ¥¡¥¤¥ë\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -749,7 +754,7 @@ msgstr "i-
 msgid "not enough space, need at least %lu blocks"
 msgstr "Îΰ褬ÉÔ½½Ê¬¤Ç¤¹¡£ºÇÄã¤Ç¤â %lu ¥Ö¥í¥Ã¥¯É¬ÍפǤ¹"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "¥Ç¥Ð¥¤¥¹: %s\n"
@@ -823,7 +828,7 @@ 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:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -959,63 +964,63 @@ msgid ""
 "that some device files will be wrong.\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "»È¤¤Êý: %s [-c | -l ¥Õ¥¡¥¤¥ë̾] [-nXX] [-iXX] /dev/name [¥Ö¥í¥Ã¥¯¿ô]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s ¤Ï¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤¹ -- ¤³¤³¤Ë¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¤Ä¤¯¤ì¤Þ¤»¤ó¡ª"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "write_tables ¤Ç¤Î¥Ö¡¼¥È¥Ö¥í¥Ã¥¯¤Ø¤Î¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "¥Ö¡¼¥È¥»¥¯¥¿¤ò¥¯¥ê¥¢¤Ç¤­¤Þ¤»¤ó"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "write_tables ¤Ç¤Î¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "inode ¥Þ¥Ã¥×¤Î½ñ¤­¹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "¥¾¡¼¥ó¥Þ¥Ã¥×¤Î½ñ¤­¹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "inode ¤Î½ñ¤­¹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "write_block ¤Ç¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "ÉÔÀµ¥Ö¥í¥Ã¥¯¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "Àµ¾ï¤Ê¥Ö¥í¥Ã¥¯¤¬ÉÔ½½Ê¬¤Ç¤¹"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "¥Þ¥Ã¥×¥Ð¥Ã¥Õ¥¡¤ò³ÎÊݤǤ­¤Þ¤»¤ó"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "inode ¥Ð¥Ã¥Õ¥¡¤Î³ÎÊݤ¬¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1024,55 +1029,50 @@ msgstr ""
 "ºÇÂ祵¥¤¥º=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "¥Ö¥í¥Ã¥¯¤Î¥Æ¥¹¥ÈÃæ¤Ë¥·¡¼¥¯¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check ¤ËÊѤÊÃͤ¬¤¢¤ê¤Þ¤¹: ¿ʬ¥Ð¥°¤Ç¤·¤ç¤¦\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "check_blocks ¤Ç¤Î¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "¥Ç¡¼¥¿Îΰè°ÊÁ°¤ËÉÔÀµ¥Ö¥í¥Ã¥¯: ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "ÉÔÀµ¥Ö¥í¥Ã¥¯¿ô %d\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "ÉÔÀµ¥Ö¥í¥Ã¥¯¿ô 1\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "ÉÔÀµ¥Ö¥í¥Ã¥¯¤Î¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s: minix v2 ¤Î¥µ¥Ý¡¼¥È¤Ä¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol ¥¨¥é¡¼: ¥Ö¥í¥Ã¥¯¤Î¿ô¤¬»ØÄꤵ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "%s ¤Î¾õÂÖ¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "'%s' ¾å¤Ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òºî¤é¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹"
@@ -1112,45 +1112,45 @@ msgid "one bad page\n"
 msgstr "ÉÔÀµ¤Ê¥Ú¡¼¥¸¿ô\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "ÉÔÀµ¤Ê¥Ú¡¼¥¸¿ô %d\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: ¥¨¥é¡¼: ¥¹¥ï¥Ã¥×¤òÍ­¸ú¤ËÀßÄꤹ¤ë¤¿¤á¤Î¾ì½ê¤¬¤Ê¤¤¡©\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: ¥¨¥é¡¼: ¥µ¥¤¥º %ld ¤¬¥Ç¥Ð¥¤¥¹¤Î¥µ¥¤¥º %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: ¥¨¥é¡¼: ÉÔÌÀ¤Ê¥Ð¡¼¥¸¥ç¥ó %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: ¥¨¥é¡¼: ¥¹¥ï¥Ã¥×Îΰè¤Ï¾¯¤Ê¤¯¤È¤â %ldkB ɬÍפǤ¹\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: ·Ù¹ð: ¥¹¥ï¥Ã¥×Îΰè¤ò %ldkB ¤ËÀÚ¤êµÍ¤á¤Þ¤·¤¿\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "'%s' ¤Ë¤Ï¥¹¥ï¥Ã¥×¥Ç¥ô¥¡¥¤¥¹¤òºî¤é¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹"
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "Ã×Ì¿¥¨¥é¡¼: ºÇ½é¤Î¥Ú¡¼¥¸¤òÆɹþ¤á¤Þ¤»¤ó"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1163,24 +1163,24 @@ msgstr ""
 "¤·¤Þ¤¦¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£¤â¤·¤¢¤Ê¤¿¤¬ËÜÅö¤Ë¤½¤Î¥Ç¥Ð¥¤¥¹¤Ë v0 ¥¹¥ï¥Ã¥×\n"
 "¤ò¤òºîÀ®¤·¤¿¤±¤ì¤Ð¡¢-f ¥ª¥×¥·¥ç¥ó¤Ç¶¯Íפ·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "¥¹¥ï¥Ã¥×¶õ´Ö¤òÀßÄê¤Ç¤­¤Þ¤»¤ó: Æɹþ¤á¤Þ¤»¤ó"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "¥¹¥ï¥Ã¥×¶õ´Ö¥Ð¡¼¥¸¥ç¥ó %d ¤òÀßÄꤷ¤Þ¤¹¡¢¥µ¥¤¥º = %ld ¥Ð¥¤¥È\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "¥¹¥ï¥Ã¥×¥Ç¥ô¥¡¥¤¥¹¤ò´¬¤­Ì᤻¤Þ¤»¤ó"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "½ð̾¥Ú¡¼¥¸¤ò½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync ¤Ë¼ºÇÔ"
 
@@ -1221,56 +1221,55 @@ msgstr "   %s [ -c | -y | -n | -d ] 
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] ¥Ç¥Ð¥¤¥¹\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "»ÈÍÑÉÔ²Ä"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "¶õ¤­Îΰè"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "¥Ç¥£¥¹¥¯¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr "Îΰè¾ðÊó¤òÀµ¤·¤¯¹¹¿·¤µ¤»¤ë¤Ë¤Ï¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1282,767 +1281,781 @@ msgstr ""
 "¤Þ¤Ã¤¿¾ì¹ç¤Ï¡¢cfdisk ¥Þ¥Ë¥å¥¢¥ë¤Ë¤¢¤ëÄɲþðÊó¥Ú¡¼¥¸\n"
 "¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "*Ã×̿Ū¤Ê¥¨¥é¡¼*"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "ÃæÃǤ¹¤ë¤Ë¤Ï²¿¤«¥­¡¼¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¾å¤Ç seek ¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤òÆɤ߹þ¤á¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Îΰ褬¿¤¹¤®¤Þ¤¹"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "Îΰ褬¥»¥¯¥¿ 0 ¤è¤ê¤Þ¤¨¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "Îΰ褬¥»¥¯¥¿ 0 ¤è¤êÁ°¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "Îΰ褬¥Ç¥£¥¹¥¯¤Î½ªÅÀ¤è¤ê¤â¸å¤í¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "Îΰ褬¥Ç¥£¥¹¥¯¤Î½ªÅÀ¤è¤ê¤â¸å¤í¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "ÏÀÍýÎΰ褬¥Ç¥£¥¹¥¯¤Î½ç½ø¤È°ìÃפ·¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "ÏÀÍýÎΰ褬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "³ÈÂ礵¤ì¤¿ÏÀÍýÎΰ褬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! ÆâÉô¥¨¥é¡¼¡£³ÈÄ¥Îΰè°Ê³°¤ËÏÀÍý¥É¥é¥¤¥Ö¤òºîÀ®¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹ !!!!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "¤³¤³¤Ë¤ÏÏÀÍý¥É¥é¥¤¥Ö¤òºîÀ®¤Ç¤­¤Þ¤»¤ó -- 2 ¤Ä¤Î³ÈÄ¥Îΰè¤Ç¤¢¤ì¤ÐºîÀ®¤·¤Þ¤¹"
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "¥á¥Ë¥å¡¼¹àÌÜ̾¤¬Ä¹¤¹¤®¤Þ¤¹¡£¥á¥Ë¥å¡¼É½¼¨¤¬Íð¤ì¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "¥á¥Ë¥å¡¼¤ËÊý¸þ¤¬¤¢¤ê¤Þ¤»¤ó¡£¿åÊ¿Êý¸þ¤ò½é´üÃͤȤ·¤Þ¤¹¡£"
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "ÉÔÀµ¤Ê¥­¡¼"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "³¤±¤ë¤Ë¤Ï²¿¤«¥­¡¼¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "´ðËÜÎΰè"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "¿·µ¬¤Ë´ðËÜÎΰè¤òºîÀ®¤·¤Þ¤¹"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "ÏÀÍýÎΰè"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "¿·µ¬¤ËÏÀÍýÎΰè¤òºîÀ®¤·¤Þ¤¹"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "̾ȧ"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Îΰè¤òºîÀ®¤·¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! ÆâÉô¥¨¥é¡¼ !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "¥µ¥¤¥º (MB ñ°Ì): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "ºÇ½é¤«¤é"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "¶õ¤­Îΰè¤ÎºÇ½é¤ËÎΰè¤òÄɲÃ"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "ºÇ¸å¤«¤é"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "¶õ¤­Îΰè¤ÎºÇ¸å¤ËÎΰè¤òÄɲÃ"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "³ÈÄ¥Îΰè¤òºîÀ®¤¹¤ë¤¿¤á¤Î¾ì½ê¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤¬Ìµ¤¤¤«Îΰè¥Æ¡¼¥Ö¥ë¤Î½ð̾¤¬ÉÔÀµ¤Ç¤¹"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "¥¼¥í¥Æ¡¼¥Ö¥ë¤Ç³«»Ï¤·¤Þ¤·¤ç¤¦¤« [y/N] ?"
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "¥Ç¥£¥¹¥¯¤Ë¤È¤Ã¤ÆŬÀڤʿô¤è¤ê¤â¿¤¯¤Î¥·¥ê¥ó¥À¿ô¤ò»ØÄꤵ¤ì¤Þ¤·¤¿"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤ò³«¤±¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "¥Ç¥£¥¹¥¯¤òÆɹþ¤ßÀìÍѤdz«¤­¤Þ¤·¤¿ -- ¤¢¤Ê¤¿¤Ë¤Ï½ñ¹þ¤ß¸¢¸Â¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "¥Ç¥£¥¹¥¯¥µ¥¤¥º¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "ÉÔÀµ¤Ê´ðËÜÎΰè"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "ÉÔÀµ¤ÊÏÀÍýÎΰè"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "·Ù¹ð¡ª ¤³¤ì¤Ï¤¢¤Ê¤¿¤Î¥Ç¥£¥¹¥¯¤Ë¤¢¤ë¥Ç¡¼¥¿¤òÇ˲õ¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Îΰè¾ðÊó¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ó¤Ç¤â¤è¤í¤·¤¤¤Ç¤¹¤«¡©(yes ¤Þ¤¿¤Ï no): "
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ß¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "yes"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "`yes' ¤« `no' ¤Î¤¤¤º¤ì¤«¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤ò½ñ¤­¹þ¤ßÃæ..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ß¤Þ¤·¤¿"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Îΰè¥Æ¡¼¥Ö¥ë¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¤¬¡¢ºÆÆɹþ¤ß¤Ë¼ºÇÔ¡£ºÆµ¯Æ°¤·¤Æ¹¹¿·¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "¥Ö¡¼¥È²Äǽ¥Þ¡¼¥¯ÉÕ¤­´ðËÜÎΰ褬¤¢¤ê¤Þ¤»¤ó¡£DOS MBR ¤Ï¤³¤ì¤ò¥Ö¡¼¥È¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "¥Ö¡¼¥È²Äǽ¥Þ¡¼¥¯ÉÕ¤­´ðËÜÎΰ褬ʣ¿ô¤¢¤ê¤Þ¤¹¡£DOS MBR ¤Ï¤³¤ì¤ò¥Ö¡¼¥È¤Ç¤­¤Þ¤»"
 "¤ó¡£"
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "¥Õ¥¡¥¤¥ë̾¤òÆþÎÏ¡¢²èÌ̤Ëɽ¼¨¤¹¤ë¾ì¹ç¤Ï¥ê¥¿¡¼¥ó¥­¡¼: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "¥Õ¥¡¥¤¥ë '%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "¥»¥¯¥¿ 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "¥»¥¯¥¿ %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   ̵¤·   "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   ´ðËÜ/ÏÀÍý"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   ´ðËÜÎΰè"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   ÏÀÍýÎΰè"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "ÉÔÌÀ"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "¥Ö¡¼¥È (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "¥Ö¡¼¥È"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
-#, c-format
-msgid "Unknown (%02X)"
-msgstr "ÉÔÌÀ (%02X)"
+#: fdisk/cfdisk.c:2007
+#, fuzzy, c-format
+msgid "(%02X)"
+msgstr "ÉÔÌÀ(%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "¤Ê¤· (%02X)"
+#: fdisk/cfdisk.c:2009
+#, fuzzy
+msgid "None"
+msgstr "½ªÎ»"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
+#: fdisk/cfdisk.c:2046
+#, fuzzy
+msgid "               First       Last\n"
 msgstr "            ºÇ½é¤Î   ºÇ¸å¤Î\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
+#, fuzzy
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
 " #  Î롏    ¥»¥¯¥¿   ¥»¥¯¥¿ ¥ª¥Õ¥»¥Ã¥È Â礭¤µ  Filesystem¥¿¥¤¥×(ID)   ¥Õ¥é"
 "¥°\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
+#, fuzzy
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
+#: fdisk/cfdisk.c:2131
+#, fuzzy
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ---ºÇ½é¤Î-----      ----ºÇ¸å¤Î---- ½é¤á¤Î¥»  \n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
+#: fdisk/cfdisk.c:2132
+#, fuzzy
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Flags Head Sect Cyl   ID  Head Sect Cyl  ¥¯¥¿ÈÖ¹æ ¥»¥¯¥¿¿ô\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+#, fuzzy
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "À¸¥Ç¡¼¥¿"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "À¸¥Ç¡¼¥¿¤Î·Á¼°¤Ç¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó¤ò½ÐÎÏ"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "¥»¥¯¥¿"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "¥»¥¯¥¿½ç¤Ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó¤ò½ÐÎÏ"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "¥Æ¡¼¥Ö¥ë"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "ñ¤ËÎΰè¾ðÊó¤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Îΰè¾ðÊó¤ò½ÐÎϤ·¤Ê¤¤"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk ¤Î¥Ø¥ë¥×²èÌÌ"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk ¤ÏüËö·¿¥Ç¥£¥¹¥¯ÎΰèºîÀ®¥×¥í¥°¥é¥à¤Ç¤¹¡£"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "¥Ï¡¼¥É¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤ÎÎΰè¤òºîÀ®¡¢ºï½ü¡¢Êѹ¹"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "¥³¥Þ¥ó¥É      ÀâÌÀ"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          ¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ö¡¼¥È¥Õ¥é¥°¤ÎÀÚÂØ"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          ¥«¡¼¥½¥ë¾å¤ÎÎΰè¤òºï½ü"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          ¥·¥ê¥ó¥À, ¥Ø¥Ã¥À, ¥È¥é¥Ã¥¯Åö¤¿¤ê¤Î¥»¥¯¥¿¿ô¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ·Ù¹ð: ¤³¤Î¥ª¥×¥·¥ç¥ó¤¬²¿¤ò¤¹¤ë¤â¤Î¤«Íý²ò¤·¤Æ¤¤¤Ê¤¤¿Í"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             ¤Ï»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Ê¤¤¡£"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          ¤³¤Î²èÌ̤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          ¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ç¥£¥¹¥¯»ÈÍÑÎ̤òºÇÂç¤Ë¤¹¤ë¡£"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Ãí°Õ: ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢DOS, OS/2 Åù¤È¸ß´¹À­¤Î¤Ê¤¤"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             Îΰè¤òºîÀ®¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          ¶õ¤­Îΰ褫¤é¿·µ¬¤ËÎΰè¤òºîÀ®"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Îΰè¾ðÊó¤ò²èÌ̤ޤ¿¤Ï¥Ç¥£¥¹¥¯¤Ë½ÐÎϤ¹¤ë"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "             Îΰè¤Î½ÐÎϤˤϼ¡¤Î¤è¤¦¤ÊÊ£¿ô¤Î·Á¼°¤«¤éÁªÂò"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             ¤Ç¤­¤ë:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - À¸¥Ç¡¼¥¿(¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤Þ¤ì¤ë¾ðÊ󤽤Τâ¤Î)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - ¥»¥¯¥¿½ç¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - À¸¤Î·Á¼°¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Îΰè¾ðÊó¤ò½ñ¤­¹þ¤Þ¤º¤Ë¥×¥í¥°¥é¥à¤ò½ªÎ»"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr "  u          ɽ¼¨¤¹¤ëÎΰ襵¥¤¥º¤Îñ°Ì¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, ¥»¥¯¥¿, ¥·¥ê¥ó¥À¤Î½ç¤Ë½Û´Ä¤¹¤ë"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Îΰè¾ðÊó¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤à(Âçʸ»ú W ¤ò"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             ÆþÎϤ·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤)¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥Ç¥£¥¹¥¯¾å¤Î"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             ¥Ç¡¼¥¿¤òÇ˲õ¤¹¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¡¢'yes'¤Þ¤¿¤Ï'no'¤ÎÆþ"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             ÎϤˤè¤ê¡¢½ñ¤­¹þ¤ß¤ò¹Ô¤¦¤«¤É¤¦¤«¤ò³Îǧ¤¹¤ë¡£"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "¾åÌð°õ¥­¡¼   ¾å¤ÎÎΰè¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "²¼Ìð°õ¥­¡¼   ²¼¤ÎÎΰè¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°"
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       ²èÌ̤òºÆÉÁ²è"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          ¤³¤Î²èÌ̤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Ãí°Õ: ¥³¥Þ¥ó¥É¤Ï¤¹¤Ù¤ÆÂçʸ»ú¡¢¾®Ê¸»ú¤É¤Á¤é¤Ç¤â»ÈÍѤǤ­¤Þ¤¹"
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "(½ñ¤­¹þ¤ß¤ò½ü¤¯)¡£"
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "¥·¥ê¥ó¥À"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "¥·¥ê¥ó¥À¤Î¥¸¥ª¥á¥È¥ê¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "¥Ø¥Ã¥É¿ô"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "¥Ø¥Ã¥É¤Î¥¸¥ª¥á¥È¥ê¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "¥»¥¯¥¿¤Î¥¸¥ª¥á¥È¥ê¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "½ªÎ»"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "¥¸¥ª¥á¥È¥ê¤òÊѹ¹¤·¤Æ½ªÎ»"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "¥·¥ê¥ó¥À¿ô¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "ÉÔÀµ¤Ê¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "¥Ø¥Ã¥À¿ô¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "ÉÔÀµ¤Ê¥Ø¥Ã¥É¿ô"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "¥È¥é¥Ã¥¯Åö¤¿¤ê¤Î¥»¥¯¥¿¿ô¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "ÉÔÀµ¤Ê¥»¥¯¥¿¿ô"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò¶õ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò³ÈÄ¥¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "¥Ö¡¼¥È"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "ÉÔÌÀ(%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "´ðËÜ/ÏÀÍý"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "ÉÔÌÀ (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, fuzzy, c-format
-msgid "Size: %lld bytes, %ld MB"
+msgid "Size: %lld bytes, %lld MB"
 msgstr "¥µ¥¤¥º: %lld ¥Ð¥¤¥È"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, fuzzy, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
+msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "¥µ¥¤¥º: %lld ¥Ð¥¤¥È"
 
-#: fdisk/cfdisk.c:2600
-#, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
+#: fdisk/cfdisk.c:2587
+#, fuzzy, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "¥Ø¥Ã¥É: %d   ¥È¥é¥Ã¥¯Åö¤¿¤ê¤Î¥»¥¯¥¿: %d   ¥·¥ê¥ó¥À: %d"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "̾Á°"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "¥Õ¥é¥°"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Îΰ西¥¤¥×"
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "FS¥¿¥¤¥×"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[¥é¥Ù¥ë]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
+#: fdisk/cfdisk.c:2597
+#, fuzzy
+msgid "    Sectors"
 msgstr "  ¥»¥¯¥¿"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
+#: fdisk/cfdisk.c:2599
+#, fuzzy
+msgid "  Cylinders"
+msgstr "¥·¥ê¥ó¥À"
+
+#: fdisk/cfdisk.c:2601
+#, fuzzy
+msgid "  Size (MB)"
 msgstr "¥µ¥¤¥º (MB)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
+#: fdisk/cfdisk.c:2603
+#, fuzzy
+msgid "  Size (GB)"
 msgstr "¥µ¥¤¥º (GB)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "¥Ö¡¼¥È²Ä"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ö¡¼¥È¥Õ¥é¥°¤òÀÚ¤êÂؤ¨¤ë"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "ºï½ü"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "¥«¡¼¥½¥ë¾å¤ÎÎΰè¤òºï½ü"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "¥¸¥ª¥á¥È¥ê"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "¥Ç¥£¥¹¥¯¥¸¥ª¥á¥È¥ê¤òÊѹ¹¤¹¤ë(¥¨¥­¥¹¥Ñ¡¼¥ÈÍÑ)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "¥Ø¥ë¥×²èÌ̤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "ºÇÂç²½"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ç¥£¥¹¥¯»ÈÍÑÎ̤òºÇÂç²½(¥¨¥­¥¹¥Ñ¡¼¥ÈÍÑ)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "¿·µ¬ºîÀ®"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "¶õ¤­Îΰ褫¤é¿·¤·¤¯Îΰè¤òºîÀ®"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "ɽ¼¨"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Îΰè¾ðÊó¤ò²èÌ̤ޤ¿¤Ï¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "½ªÎ»"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Îΰè¾ðÊó¤ò½ñ¤­¹þ¤Þ¤º¤Ë¥×¥í¥°¥é¥à¤ò½ªÎ»"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "FS¥¿¥¤¥×"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥¿¥¤¥×¤òÊѹ¹¤¹¤ë(DOS, Linux, OS/2 ¤Ê¤É)"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "ñ°Ì"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "ɽ¼¨¤¹¤ëÎΰ襵¥¤¥º¤Îñ°Ì(MB, ¥»¥¯¥¿, ¥·¥ê¥ó¥À)¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "½ñ¤­¹þ¤ß"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Îΰè¾ðÊó¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤à(¥Ç¡¼¥¿¤òÇ˲õ¤¹¤ë²ÄǽÀ­¤¢¤ê)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "¤³¤ÎÎΰè¤ò¥Ö¡¼¥È²Äǽ¤Ë¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "¶õ¤ÎÎΰè¤òºï½ü¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "¤³¤ÎÎΰè¤òºÇÂç²½¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "¤³¤ÎÎΰè¤Ï»ÈÍѤǤ­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "¤³¤Î¥Ç¥£¥¹¥¯¤Ï¸½ºß»ÈÍÑÃæ¤Ç¤¹¡£"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "¶õ¤ÎÎΰè¤Î¥¿¥¤¥×¤òÊѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "¤³¤ì°Ê¾å¤ÎÎΰè¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "ÉÔÀµ¤Ê¥³¥Þ¥ó¥É"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 #, fuzzy
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2077,7 +2090,7 @@ msgstr ""
 "                ¤òʤ¤¹\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2097,7 +2110,7 @@ msgstr ""
 "-u: (¥·¥ê¥ó¥À¤ÎÂå¤ï¤ê¤Ë)¥»¥¯¥¿¥æ¥Ë¥Ã¥È¤Î³«»Ï¡¢½ªÅÀ¤òÍ¿¤¨¤Þ¤¹\n"
 "-b 2048: (¤¢¤ë¼ï¤Î MO ¥É¥é¥¤¥ÖÍѤË) 2048 ¥Ð¥¤¥È¤Î¥»¥¯¥¿¥µ¥¤¥º¤ò»È¤¤¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2113,222 +2126,222 @@ msgstr ""
 " Ëô¤Ï: fdisk /dev/rd/c0d0  Ëô¤Ï: fdisk /dev/ida/c0d0  (RAID ¥Ç¥ô¥¡¥¤¥¹)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s ¤òÆɤá¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "%s ¤ò¥·¡¼¥¯¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s ¤Ø¤Î½ñ¤­¹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "%s ¤Ç¤Î BLKGETSIZE ioctl ¤Ë¼ºÇÔ\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "¤³¤ì°Ê¾å¤Î¥á¥â¥ê¤¬³ÎÊݤǤ­¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "¥³¥Þ¥ó¥É¤ÎÆ°ºî"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   Æɹþ¤ßÀìÍѥե饰¤ò¤Ä¤±¤ë"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤òÊÔ½¸¤¹¤ë"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   ¥Þ¥¦¥ó¥È²Äǽ¥Õ¥é¥°¤ò¤Ä¤±¤ë"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   Îΰè¤òºï½ü¤¹¤ë"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   ´ûÃΤÎÎΰ西¥¤¥×¤ò¥ê¥¹¥Èɽ¼¨¤¹¤ë"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   ¤³¤Î¥á¥Ë¥å¡¼¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   ¿·¤¿¤ËÎΰè¤òºîÀ®¤¹¤ë"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   ¿·¤¿¤Ë¶õ¤Î DOS Îΰè¥Æ¡¼¥Ö¥ë¤òºîÀ®¤¹¤ë"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   Îΰè¥Æ¡¼¥Ö¥ë¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   Êѹ¹¤òÊݸ¤»¤º¤Ë½ªÎ»¤¹¤ë"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   ¶õ¤Î Sun ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤òºîÀ®¤¹¤ë"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   Îΰè¤Î¥·¥¹¥Æ¥à ID ¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   ɽ¼¨/¹àÌÜ¥æ¥Ë¥Ã¥È¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   Îΰè¥Æ¡¼¥Ö¥ë¤ò¾È¹ç¤¹¤ë"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   ¥Æ¡¼¥Ö¥ë¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ß¡¢½ªÎ»¤¹¤ë"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   ÆÃÊ̤ʵ¡Ç½ (¥¨¥­¥¹¥Ñ¡¼¥ÈÀìÍÑ)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   ¥Ö¡¼¥È²ÄǽÎΰè¤òÁªÂò¤¹¤ë"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b   ¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¥¨¥ó¥È¥ê¤òÊÔ½¸¤¹¤ë"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi ¥¹¥ï¥Ã¥×Îΰè¤òÁªÂò¤¹¤ë"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a   ¥Ö¡¼¥È²Äǽ¥Õ¥é¥°¤ò¤Ä¤±¤ë"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   dos ¸ß´¹¥Õ¥é¥°¤ò¤Ä¤±¤ë"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   ÂåÂØ¥·¥ê¥ó¥À¿ô¤òÊѹ¹¤¹¤ë"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   ¥·¥ê¥ó¥À¿ô¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   Îΰè¥Æ¡¼¥Ö¥ëÆâ¤ÎÀ¸¥Ç¡¼¥¿¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   ¥·¥ê¥ó¥ÀËè¤Î;¾ê¥»¥¯¥¿¿ô¤òÊѹ¹¤¹¤ë"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   ¥Ø¥Ã¥É¿ô¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   ¥¤¥ó¥¿¡¼¥ê¡¼¥Ö¥Õ¥¡¥¯¥¿¤òÊѹ¹¤¹¤ë"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   ²óž¿ô¤òÊѹ¹¤¹¤ë (rpm)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   ¥á¥¤¥ó¥á¥Ë¥å¡¼¤ËÌá¤ë"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   ¥»¥¯¥¿¿ô/¥È¥é¥Ã¥¯¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ʪÍý¥·¥ê¥ó¥À¿ô¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   ÎΰèÆâ¤Î¥Ç¡¼¥¿¤ÎÀèƬ¤Ë°ÜÆ°¤¹¤ë"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   ³ÈÄ¥Îΰè¤ò¥ê¥¹¥Èɽ¼¨¤¹¤ë"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   IRIX (SGI) Îΰè¥Æ¡¼¥Ö¥ë¤òºîÀ®¤¹¤ë"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f   Îΰè¤Î½ç½ø¤òŬÀµ²½¤¹¤ë"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "ÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "¥Ø¥Ã¥É¿ô"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "¥»¥¯¥¿¿ô"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2337,11 +2350,11 @@ msgstr ""
 "%s%s.\n"
 "¤¢¤Ê¤¿¤ÏÆÃÊ̵¡Ç½¥á¥Ë¥å¡¼¤«¤é¤³¤ì¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " µÚ¤Ó "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2360,26 +2373,26 @@ msgstr ""
 "2) Ê̤ΠOS ¤Î¥Ö¡¼¥È¤ä¥Ñ¡¼¥Æ¥£¥·¥ç¥óºîÀ®¥½¥Õ¥È\n"
 "   (Îã. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "´ðËܳÈÄ¥Îΰè¤ËÉÔÀµ¤Ê¥ª¥Õ¥»¥Ã¥È¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "·Ù¹ð: %d °Ê¹ß¤ÎÎΰè¤òºï½ü¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "·Ù¹ð: Îΰè¥Æ¡¼¥Ö¥ë %d Æâ¤ÎÆÃÊ̤ʥê¥ó¥¯¥Ý¥¤¥ó¥¿¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "·Ù¹ð: Îΰè¥Æ¡¼¥Ö¥ë %d Æâ¤ÎÆÃÊ̤ʥǡ¼¥¿¤ò̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2390,22 +2403,22 @@ msgstr ""
 "¤Ï\n"
 "¥á¥â¥êÆâ¤À¤±¤Ë»Ä¤·¤Þ¤¹¡£¤½¤Î¸å¤Ï¤â¤Á¤í¤ó°ÊÁ°¤ÎÆâÍƤϽ¤ÉüÉÔ²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Ãí°Õ: ¥»¥¯¥¿¥µ¥¤¥º¤¬ %d ¤Ç¤¹ (%d ¤Ç¤Ï¤Ê¤¯)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤Î½ñ¤­¹þ¤ß¤ò¹Ô¤¨¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
@@ -2413,16 +2426,16 @@ msgstr ""
 "¥Ç¥Ð¥¤¥¹¤ÏÀµ¾ï¤Ê DOS Îΰè¥Æ¡¼¥Ö¥ë¤â¡¢Sun, SGI ¤ä OSF ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤â\n"
 "´Þ¤ó¤Ç¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "ÆâÉô¥¨¥é¡¼\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "ÆÃÊ̤ʳÈÄ¥Îΰè %d ¤ò̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2431,7 +2444,7 @@ msgstr ""
 "·Ù¹ð: Îΰè¥Æ¡¼¥Ö¥ë %2$d ¤ÎÉÔÀµ¤Ê¥Õ¥é¥° 0x%1$04x ¤Ï w(½ñ¤­¹þ¤ß)¤Ë¤è¤Ã¤Æ\n"
 "Àµ¾ï¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2439,79 +2452,79 @@ msgstr ""
 "\n"
 "EOF ¤ò 3 ²óÆɤߤޤ·¤¿ -- ½ªÎ»¤·¤Þ¤¹..\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "16¿Ê¿ô¥³¡¼¥É (L ¥³¥Þ¥ó¥É¤Ç¥³¡¼¥É¥ê¥¹¥Èɽ¼¨): "
 
-#: fdisk/fdisk.c:1069
+#: fdisk/fdisk.c:1094
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, ½é´üÃÍ %d): "
 
-#: fdisk/fdisk.c:1136
+#: fdisk/fdisk.c:1161
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "½é´üÃÍ %d ¤ò»È¤¤¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "Èϰϳ°¤ÎÃͤǤ¹¡£\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "ÎΰèÈÖ¹æ"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¶õ¤Î¥¿¥¤¥×¤Ç¤¹¡£\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "ÆÃÊ̤ʳÈÄ¥Îΰè %d ¤ò̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 #, fuzzy
 msgid "No partition is defined yet!\n"
 msgstr "Îΰ褬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "¥·¥ê¥ó¥À"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "¥»¥¯¥¿"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "%s ¤Îɽ¼¨/¹àÌÜ¥æ¥Ë¥Ã¥È¤òÊѹ¹¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï³ÈÄ¥Îΰè¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS ¸ß´¹¥Õ¥é¥°¤¬ÀßÄꤵ¤ì¤Þ¤·¤¿\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS ¸ß´¹¥Õ¥é¥°¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Îΰè %d ¤Ï¤Þ¤À¸ºß¤·¤Þ¤»¤ó¡ª\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2523,7 +2536,7 @@ msgstr ""
 "¿ʬÀõ¤Ï¤«¤Ê¤³¤È¤Ç¤¹¡£¤¢¤Ê¤¿¤Ï `d' ¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤³¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò\n"
 "ºï½ü¤Ç¤­¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2531,7 +2544,7 @@ msgstr ""
 "¤¢¤Ê¤¿¤ÏÎΰè¤ò³ÈÄ¥Îΰè¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó¤·¡¢¤½¤ÎµÕ¤â¤Þ¤¿\n"
 "¤Ç¤­¤Þ¤»¤ó¡£¤Þ¤ººï½ü¤ò¹Ô¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2540,7 +2553,7 @@ msgstr ""
 "Îΰè 3 ¤ò Whole disk (5) ¤È¤·¤Æ»Ä¤·¤Æ¤ª¤¯¤³¤È¤ò¹Íθ¤·¤Æ¤¯¤À¤µ¤¤¡¢\n"
 "SunOS/Solaris ¤Ï¤³¤ì¤ò´üÂÔ¤·¤Þ¤¹¤·¡¢Linux ¤Ç¤µ¤¨¤½¤ì¤¬Ë¾¤Þ¤·¤¤¤Ç¤¹¡£\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2549,59 +2562,59 @@ msgstr ""
 "Îΰè 9 ¤ò volume header (0) ¤È¤·¤Æ¡¢µÚ¤ÓÎΰè 11 ¤ò entire volume (6)\n"
 "¤È¤·¤Æ»Ä¤·¤Æ¤ª¤¯¤³¤È¤ò¹Íθ¤·¤Æ¤¯¤À¤µ¤¤¡£IRIX ¤Ï¤³¤ì¤òÁÛÄꤷ¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Îΰè¤Î¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò %d ¤«¤é %x (%s) ¤ËÊѹ¹¤·¤Þ¤·¤¿\n"
 
-#: fdisk/fdisk.c:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Îΰè %d ¤Ï°Û¤Ê¤Ã¤¿ÊªÍý/ÏÀÍý³«»Ï°ÌÃ֤ˤʤäƤ¤¤Þ¤¹(Linux ¤Ç¤Ï̵¤¤?):\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     ʪÍý=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "ÏÀÍý=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Îΰè %d ¤Ï°Û¤Ê¤Ã¤¿ÊªÍý/ÏÀÍý½ªÅÀ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Îΰè %i ¤Ï¥·¥ê¥ó¥À¶­³¦¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "(%d, %d, 1) ¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %d ¤Ï¡¢¥·¥ê¥ó¥À¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "(%d, %d, %d) ¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2611,7 +2624,7 @@ msgstr ""
 "¥Ç¥£¥¹¥¯ %s: ¥Ø¥Ã¥É %d, ¥»¥¯¥¿ %d, ¥·¥ê¥ó¥À %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -2619,19 +2632,19 @@ msgstr ""
 "¥Ç¥£¥¹¥¯ %s: ¥Ø¥Ã¥É %d, ¥»¥¯¥¿ %d, ¥·¥ê¥ó¥À %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
+msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2639,16 +2652,16 @@ msgstr ""
 "¹Ô¤¦¤Ù¤­¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£´û¤ËÀµ¾ï¤Ê½ç½ø¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
-#, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
+#: fdisk/fdisk.c:1704
+#, fuzzy, c-format
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s ¥Ö¡¼¥È   »ÏÅÀ      ½ªÅÀ  ¥Ö¥í¥Ã¥¯   ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "¥Ç¥Ð¥¤¥¹"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2656,7 +2669,7 @@ msgstr ""
 "\n"
 "Îΰè¥Æ¡¼¥Ö¥ë¹àÌܤ¬¥Ç¥£¥¹¥¯¤Î½ç½ø¤È°ìÃפ·¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2667,91 +2680,92 @@ msgstr ""
 "¥Ç¥£¥¹¥¯ %s: ¥Ø¥Ã¥É %d, ¥»¥¯¥¿ %d, ¥·¥ê¥ó¥À %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
+#: fdisk/fdisk.c:1754
+#, fuzzy
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    ³«»Ï    ¥µ¥¤¥º ID\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¥»¥¯¥¿ 0 ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Îΰè %d: ¥Ø¥Ã¥É %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Îΰè %d: ¥»¥¯¥¿ %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Îΰè %d: ¥·¥ê¥ó¥À %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Îΰè %d: Á°¤Î¥»¥¯¥¿ %d ¤Ï¹ç·× %d ¤È°ìÃפ·¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "·Ù¹ð: Îΰè %d ¤ËÉÔÀµ¤Ê¥Ç¡¼¥¿³«»Ï°ÌÃÖ¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¡¢Îΰè %d ¤È½Å¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¶õ¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "ÏÀÍýÎΰè %d ¤ÏÎΰè %d Á´ÂΤˤʤäƤ¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "¹ç·×³ÎÊÝ¥»¥¯¥¿ %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "³ÎÊݤµ¤ì¤Æ¤¤¤Ê¤¤¥»¥¯¥¿¤¬ %d ¤¢¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Îΰè %d ¤ÏÄêµÁºÑ¤Ç¤¹¡£¤Þ¤º¤Ïºï½ü¤ò¹Ô¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "ºÇ½é %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "¥»¥¯¥¿ %d ¤Ï´û¤Ë³ÎÊݺѤߤǤ¹\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "ÍøÍѲÄǽ¥Õ¥ê¡¼¥»¥¯¥¿¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "½ªÅÀ %s ¤Þ¤¿¤Ï +¥µ¥¤¥º ¤Þ¤¿¤Ï +¥µ¥¤¥ºM ¤Þ¤¿¤Ï +¥µ¥¤¥ºK"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2763,15 +2777,25 @@ msgstr ""
 "\t¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£(o ¤ò»È¤¦)\n"
 "\t·Ù¹ð: ¤³¤ì¤Ï¸½ºß¤Î¥Ç¥£¥¹¥¯ÆâÍƤòÇ˲õ¤·¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "ºÇÂçÎΰè¿ô¤ÏºîÀ®ºÑ¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "³ÈÄ¥Îΰè¤òÄɲ乤ëÁ°¤Ë¡¢¤Þ¤ºÎΰè¤òºï½ü¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "ÏÀÍýÎΰ褬¥Ç¥£¥¹¥¯¤Î½ç½ø¤È°ìÃפ·¤Þ¤»¤ó"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "ÉÔÀµ¤Ê´ðËÜÎΰè"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2782,20 +2806,20 @@ msgstr ""
 "   %s\n"
 "   p   ´ðËÜÎΰè (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l   ÏÀÍý (5 °Ê¾å)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e   ³ÈÄ¥"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "¥¿¥¤¥× `%c' ¤Ë¤È¤Ã¤Æ¤ÏÉÔÀµ¤ÊÎΰèÈÖ¹æ¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2803,11 +2827,11 @@ msgstr ""
 "Îΰè¥Æ¡¼¥Ö¥ë¤Ï¸ò´¹¤µ¤ì¤Þ¤·¤¿¡ª\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "ioctl() ¤ò¸Æ¤Ó½Ð¤·¤ÆÎΰè¥Æ¡¼¥Ö¥ë¤òºÆÆɹþ¤ß¤·¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2820,7 +2844,7 @@ msgstr ""
 "¥«¡¼¥Í¥ë¤Ï¤Þ¤À¸Å¤¤¥Æ¡¼¥Ö¥ë¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 "¿·¤·¤¤¥Æ¡¼¥Ö¥ë¤Ï¼¡²ó¥ê¥Ö¡¼¥È»þ¤Ë»È¤¨¤ë¤è¤¦¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£\n"
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2831,65 +2855,65 @@ msgstr ""
 "·Ù¹ð: DOS 6.x Îΰè¤òºîÀ®¡¢¤Þ¤¿¤ÏÊѹ¹¤·¤Æ¤·¤Þ¤Ã¤¿¾ì¹ç¤Ï¡¢\n"
 "fdisk ¥Þ¥Ë¥å¥¢¥ë¤ÎÄɲþðÊó¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "¥Ç¥£¥¹¥¯¤òƱ´ü¤µ¤»¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Îΰè %d ¤Ë¥Ç¡¼¥¿Îΰ褬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "¿·µ¬¥Ç¡¼¥¿³«»Ï°ÌÃÖ"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "¾åµé¼Ô¥³¥Þ¥ó¥É (m ¤Ç¥Ø¥ë¥×): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "¥Ø¥Ã¥É¿ô"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "¥»¥¯¥¿¿ô"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "·Ù¹ð: DOS ¸ß´¹¤Î¤¿¤á¤Î¥»¥¯¥¿¥ª¥Õ¥»¥Ã¥È¤òÀßÄꤷ¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "¥Ç¥£¥¹¥¯ %s ¤ÏÀµ¾ï¤ÊÎΰè¥Æ¡¼¥Ö¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ÉÔÌÀ¤Ê¥³¥Þ¥ó¥É\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "¤³¤Î¥«¡¼¥Í¥ë¤Ï¥»¥¯¥¿¥µ¥¤¥º¤ò¼«Ê¬Ç§¼±¤·¤Þ¤¹ -- -b ¥ª¥×¥·¥ç¥ó¤Ï̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2898,18 +2922,18 @@ msgstr ""
 "»ÈÍѤµ¤ì¤ë¤Ù¤­¤Ç¤¹\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "%s ¤ÇOSF/1 ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤ò¸¡½Ð¤·¤¿¤Î¤Ç¡¢¥Ç¥£¥¹¥¯¥é¥Ù¥ë¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Þ¤¹¡£\n"
 "DOS Îΰè¥Æ¡¼¥Ö¥ë¥â¡¼¥É¤ËÌá¤ë¤Ë¤Ï¡¢'r' ¥³¥Þ¥ó¥É¤ò»È¤¤¤Þ¤·¤ç¤¦¡£\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "¥³¥Þ¥ó¥É (m ¤Ç¥Ø¥ë¥×): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2918,15 +2942,15 @@ msgstr ""
 "\n"
 "¸½ºß¤Î¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤Ï: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "¿·¤¿¤Ê¥Ö¡¼¥È¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2936,7 +2960,7 @@ msgstr ""
 "\t»ÄÇ°¤Ê¤¬¤é SGI Îΰè¥Æ¡¼¥Ö¥ëÍѤΥ¨¥­¥¹¥Ñ¡¼¥È¥á¥Ë¥å¡¼¤Ï\n"
 "\tÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3297,8 +3321,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux ¥¹¥ï¥Ã¥×"
 
@@ -3532,7 +3555,7 @@ msgstr ""
 "¤À¤±¤¬¡¢¤³¤Î¤³¤È¤òÌȤì¤Þ¤¹¡£\n"
 "¤³¤ÎÎΰè¤Ë°Û¤Ê¤ë¥¿¥°ÉÕ¤±¤Ë¤Ä¤¤¤Æ¡¢¤è¤¯²ò¤Ã¤Æ¤¤¤ë¤Ê¤é YES ¤ÈÆþÎϤ·¤Æ²¼¤µ¤¤¡£\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -3693,15 +3716,15 @@ msgstr "
 msgid "Physical cylinders"
 msgstr "ʪÍý¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "²óž¿ô (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "¥¤¥ó¥¿¡¼¥ê¡¼¥Ö"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "¥·¥ê¥ó¥ÀËè¤ÎÆÃÊ̤ʥ»¥¯¥¿"
 
@@ -3756,7 +3779,7 @@ msgstr ""
 "¾¤Î¤¤¤¯¤Ä¤«¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òʤ¤Ã¤Æ¤¤¤Þ¤¹¡£¤¢¤Ê¤¿¤Î¹àÌÜ¤Ï %d %s ¤Ë\n"
 "Êѹ¹¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3766,7 +3789,7 @@ msgstr ""
 "Whole disk (5) ¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¯¤³¤È¤ò¹Íθ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "0 ¤«¤é»Ï¤Þ¤ë %u ¥»¥¯¥¿Ê¬¤Ç¤¹\n"
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3780,7 +3803,7 @@ msgstr ""
 "¤â¤·¡¢¤¢¤Ê¤¿¤¬ËÜÅö¤Ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ËÉä¹ç 82 (Linux swap) ¤ò¤Ä¤±¤¿¤±¤ì¤Ð\n"
 "YES ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3799,7 +3822,7 @@ msgstr ""
 "¥æ¥Ë¥Ã¥È = %s of %d * 512 ¥Ð¥¤¥È\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3812,16 +3835,16 @@ msgstr ""
 "¥æ¥Ë¥Ã¥È = %s of %d * 512 ¥Ð¥¤¥È\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s ¥Õ¥é¥°  »ÏÅÀ        ½ªÅÀ   ¥Ö¥í¥Ã¥¯ ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "ÂåÂØ¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "ʪÍý¥·¥ê¥ó¥À¿ô"
 
@@ -3872,20 +3895,24 @@ msgstr "OS/2 
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
+#, fuzzy
+msgid "W95 FAT32"
 msgstr "Win95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "W95 FAT32 (LBA)"
 msgstr "Win95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "W95 FAT16 (LBA)"
 msgstr "Win95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
+#, fuzzy
+msgid "W95 Ext'd (LBA)"
 msgstr "Win95 ³ÈÄ¥Îΰè (LBA)"
 
 #: fdisk/i386_sys_types.c:21
@@ -3917,15 +3944,18 @@ msgid "AST SmartSleep"
 msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
+#, fuzzy
+msgid "Hidden W95 FAT32"
 msgstr "±£¤· Win95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT32 (LBA)"
 msgstr "±£¤· Win95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT16 (LBA)"
 msgstr "±£¤· Win95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
@@ -4034,6 +4064,12 @@ msgstr "
 msgid "Minix / old Linux"
 msgstr "Minix / ¸Å¤¤ Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux ¥¹¥ï¥Ã¥×"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 ±£¤· C: ¥É¥é¥¤¥ô"
@@ -4188,90 +4224,90 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "%s ¤Î¥·¡¼¥¯¥¨¥é¡¼ -- %lu ¤ò¥·¡¼¥¯¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "¥·¡¼¥¯¥¨¥é¡¼: 0x%08x%08x ¤Î¤Ï¤º¤Ç¤·¤¿¤¬ 0x%08x%08x ¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó -- Äü¤á¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "%s ¤ÎÆɤ߼è¤ê¥¨¥é¡¼ -- ¥»¥¯¥¿ %lu ¤òÆɤá¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "¥¨¥é¡¼: ¥»¥¯¥¿ %lu ¤Ë¤Ï msdos ¥µ¥¤¥ó¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "%s ¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼ -- ¥»¥¯¥¿ %lu ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥»¥¯¥¿Êݸ¥Õ¥¡¥¤¥ë (%s) ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "%s ¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥óÉü¸µ¥Õ¥¡¥¤¥ë (%s) ¤Î¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥óÉü¸µ¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹ -- Éü¸µ¤ò¹Ô¤Ê¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "¥á¥â¥ê¤¬Â­¤ê¤Ê¤¤¡©\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥óÉü¸µ¥Õ¥¡¥¤¥ë (%s) ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "%s ¤ÎÆɤ߼è¤ê¥¨¥é¡¼\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "¥Ç¥Ð¥¤¥¹ %s ¤ò½ñ¤­¹þ¤ß¤è¤¦¤Ë¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "%2$s ¤Î¥»¥¯¥¿ %1$lu ¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "¥Ç¥£¥¹¥¯ %s: ¥µ¥¤¥º¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "¥Ç¥£¥¹¥¯ %s: ¥¸¥ª¥á¥È¥ê¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4283,22 +4319,22 @@ msgstr ""
 "¤³¤³¤Ë fdisk ¤òÍøÍѤ¹¤ë¤Î¤Ï¿ʬ°ÕÌ£¤¬¤Ê¤¤¤³¤È¤Ç¤¹¡£\n"
 "[ËÜÅö¤Ë¤³¤ì¤ò¹Ô¤Ê¤¤¤¿¤±¤ì¤Ð¡¢--force ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤]\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "·Ù¹ð: HDIO_GETGEO ¤Ë¤è¤ë¤È¡¢¥Ø¥Ã¥É¿ô¤Ï %lu ¤Ç¤¹\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "·Ù¹ð: HDIO_GETGEO ¤Ë¤è¤ë¤È¡¢¥»¥¯¥¿¿ô¤Ï %lu ¤Ç¤¹\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "·Ù¹ð: BLKGETSIZE/HDIO_GETGEO ¤Ë¤è¤ë¤È¡¢¥·¥ê¥ó¥À¿ô¤Ï %lu ¤Ç¤¹\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4308,7 +4344,7 @@ msgstr ""
 "¤³¤ì¤Ï¡¢C/H/S ¤ò¥¢¥É¥ì¥¹¼èÆÀ¤ËÍøÍѤ·¤Æ¤¤¤ëÁ´¤Æ¤Î¥½¥Õ¥È¥¦¥§¥¢¤Ç¡¢\n"
 "ÌäÂ꤬À¸¤º¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4317,7 +4353,7 @@ msgstr ""
 "\n"
 "¥Ç¥£¥¹¥¯ %s: ¥·¥ê¥ó¥À¿ô %lu¡¢¥Ø¥Ã¥É¿ô %lu¡¢%lu ¥»¥¯¥¿/¥È¥é¥Ã¥¯\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4325,7 +4361,7 @@ msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %2$s ¤Î¥Ø¥Ã¥É¿ô¤È¤·¤Æ %1$s ¤ÏÉÔ²Äǽ¤Ç¤¹: %3$lu (0-%4$lu ¤Ë¤·¤Æ"
 "¤¯¤À¤µ¤¤)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4334,7 +4370,7 @@ msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %2$s ¤Î¥»¥¯¥¿¿ô¤È¤·¤Æ %1$s ¤ÏÉÔ²Äǽ¤Ç¤¹: %3$lu (1-%4$lu ¤Ë¤·¤Æ"
 "¤¯¤À¤µ¤¤)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4343,7 +4379,7 @@ msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %2$s ¤Î¥·¥ê¥ó¥À¿ô¤È¤·¤Æ %1$s ¤ÏÉÔ²Äǽ¤Ç¤¹: %3$lu (0-%4$lu ¤Ë¤·"
 "¤Æ¤¯¤À¤µ¤¤)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4351,11 +4387,11 @@ msgstr ""
 "Id  ̾Á°\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¤òºÆÆɤ߹þ¤ßÃæ...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4363,31 +4399,31 @@ msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥óºÆÆɹþ¤ß¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤·¤Þ¤·¤¿\n"
 "mkfs ¤ò»È¤¦Á°¤Ë¡¢¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "%s ¤Î¥¯¥í¡¼¥º¥¨¥é¡¼\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ¤½¤Î¤è¤¦¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥Õ¥©¡¼¥Þ¥Ã¥È -- ¥»¥¯¥¿¿ô¤òÍøÍѤ·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s ¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "̤¼ÂÁõ¤Î¥Õ¥©¡¼¥Þ¥Ã¥È -- %s ¤òÍøÍѤ·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4396,12 +4432,12 @@ msgstr ""
 "¥æ¥Ë¥Ã¥È = %lu ¥Ð¥¤¥È¤Î¥·¥ê¥ó¥À¡¢1024 ¥Ð¥¤¥È¤Î¥Ö¥í¥Ã¥¯¡¢%d ¤«¤é¿ô¤¨¤Þ¤¹\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 #, fuzzy
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "¥Ç¥Ð¥¤¥¹ ¥Ö¡¼¥È »ÏÅÀ   ½ªÅÀ   #¥·¥ê¥ó¥À #¥Ö¥í¥Ã¥¯ ID   ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4410,12 +4446,12 @@ msgstr ""
 "¥æ¥Ë¥Ã¥È = 512 ¥Ð¥¤¥È¤Î¥»¥¯¥¿¡¢%d ¤«¤é¿ô¤¨¤Þ¤¹\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 #, fuzzy
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr " ¥Ç¥Ð¥¤¥¹ ¥Ö¡¼¥È  »ÏÅÀ      ½ªÅÀ   #¥»¥¯¥¿   ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4424,12 +4460,12 @@ msgstr ""
 "¥æ¥Ë¥Ã¥È = 1024 ¥Ð¥¤¥È¤Î¥Ö¥í¥Ã¥¯¡¢%d ¤«¤é¿ô¤¨¤Þ¤¹\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 #, fuzzy
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr " ¥Ç¥Ð¥¤¥¹ ¥Ö¡¼¥È »ÏÅÀ        ½ªÅÀ  #¥Ö¥í¥Ã¥¯ ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4438,31 +4474,31 @@ msgstr ""
 "Units = 1048576 ¥Ð¥¤¥È¤ò¥á¥¬¥Ð¥¤¥È¡¢1024 ¥Ð¥¤¥È¤Î¥Ö¥í¥Ã¥¯¡¢%d ¤«¤é¿ô¤¨¤Þ¤¹\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 #, fuzzy
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "¥Ç¥Ð¥¤¥¹ ¥Ö¡¼¥È »ÏÅÀ   ½ªÅÀ    MB   #¥Ö¥í¥Ã¥¯ ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t³«»Ï: (c,h,s) ´üÂÔÃÍ (%ld,%ld,%ld)  (%ld,%ld,%ld) ¤òȯ¸«\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t½ªÅÀ: (c,h,s) ´üÂÔÃÍ (%ld,%ld,%ld)  (%ld,%ld,%ld) ¤òȯ¸«\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "¥·¥ê¥ó¥À %ld ¤Ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î½ªÅÀ¡¢¥Ç¥£¥¹¥¯¤ÎºÇ¸å¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, fuzzy, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4473,52 +4509,52 @@ msgstr ""
 "  (%ld/%ld/%ld ¤Î¤«¤ï¤ê¤Ë)¡£\n"
 "¤³¤Î¥ê¥¹¥È¤Ï¡¢¤½¤Î¥¸¥ª¥á¥È¥ê¤È¸«¤Ê¤·¤Þ¤¹¡£\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "¸½ºß¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "ÊѤǤ¹¡¢%d ¤Ä¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤·¤«ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥µ¥¤¥º 0 ¤Ç¤¹¤¬¡¢¶õ¤È¤·¤Æ¥Þ¡¼¥¯¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥µ¥¤¥º 0 ¤Ê¤Î¤Ë¥Ö¡¼¥È²Äǽ¤Ç¤¹¡£\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥µ¥¤¥º 0 ¤Ç¡¢Èó¥¼¥í¤Î³«»Ï°ÌÃ֤Ǥ¹\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¡¢"
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "¤È %s ¤¬½Å¤Ê¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4527,17 +4563,17 @@ msgstr ""
 "·Ù¹ð: Îΰè %s ¤ÏÎΰè¥Æ¡¼¥Ö¥ë (¥»¥¯¥¿ %lu) ¤Î°ìÉô¤ò´Þ¤ó¤Ç¤ª¤ê¡¢\n"
 "¤½¤ì¤¬Ëä¤á¤é¤ì¤ë»þÅÀ¤ÇÇ˲õ¤µ¤ì¤ë»ö¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤¬¥»¥¯¥¿ 0 ¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥Ç¥£¥¹¥¯¤Î½ª¤ê¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4545,17 +4581,17 @@ msgstr ""
 "´ðËÜÎΰè¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ç¤Ï¡¢³ÈÄ¥¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò°ì¤Ä¤À¤±ºî¤ì¤Þ¤¹\n"
 " ¡ÊLinux ¤Ç¤ÏÌäÂê¤È¤Ï¤Ê¤ê¤Þ¤»¤ó¤±¤ì¤É¤â¡Ë\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥·¥ê¥ó¥À¶­³¦¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "·Ù¹ð: ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ï¥·¥ê¥ó¥À¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4564,7 +4600,7 @@ msgstr ""
 "LILO ¤Ë¤È¤Ã¤Æ¤ÏÌäÂꤢ¤ê¤Þ¤»¤ó¤¬¡¢DOS ¤Î MBR ¤Ï¤³¤Î¥Ç¥£¥¹¥¯¤ò¥Ö¡¼¥È¤Ç¤­¤Ê¤¯\n"
 "¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4572,7 +4608,7 @@ msgstr ""
 "·Ù¹ð: ÉáÄ̤ϥץ饤¥Þ¥ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó°ì¤Ä¤ò¥Ö¡¼¥È¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£\n"
 "LILO ¤Ï `¥Ö¡¼¥È²Äǽ' ¥Õ¥é¥°¤ò̵»ë¤·¤Þ¤¹¤±¤É¤â¡£\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4581,37 +4617,37 @@ msgstr ""
 "LILO ¤Ë¤È¤Ã¤Æ¤ÏÌäÂꤢ¤ê¤Þ¤»¤ó¤¬¡¢DOS MBR ¤Ï¤³¤Î¥Ç¥£¥¹¥¯¤ò¥Ö¡¼¥È¤Ç¤­¤Ê¤¯\n"
 "¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 #, fuzzy
 msgid "start"
 msgstr "¾õÂÖ"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s: »ÏÅÀ: (c,h,s) ´üÂÔÃÍ (%ld,%ld,%ld)  (%ld,%ld,%ld) ¤òȯ¸«\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 #, fuzzy
 msgid "end"
 msgstr "Á÷¿®"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s: ½ªÅÀ: (c,h,s) ´üÂÔÃÍ (%ld,%ld,%ld)  (%ld,%ld,%ld) ¤òȯ¸«\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "¥·¥ê¥ó¥À %2$ld ¤Ë¤¢¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %1$s ¤Î½ªÅÀ¤Ï¥Ç¥£¥¹¥¯¤ÎºÇ¸å¤ò±Û¤¨¤Æ¤¤¤Þ"
 "¤¹\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4620,7 +4656,7 @@ msgstr ""
 "·Ù¹ð: ³ÈÄ¥Îΰè¤Î³«»Ï°ÌÃÖ¤¬ %ld ¤«¤é %ld ¤Ë°Ü¤µ¤ì¤Þ¤·¤¿\n"
 "¡Ê¥ê¥¹¥Èɽ¼¨¤Î°Ù¤À¤±¤Ç¤¹¡£¤½¤ÎÆâÍƤËÊѹ¹¤Ï¤¢¤ê¤Þ¤»¤ó¡£¡Ë\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4628,133 +4664,133 @@ msgstr ""
 "·Ù¹ð: ³ÈÄ¥Îΰ褬¥·¥ê¥ó¥À¶­³¦¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 "DOS ¤È Linux ¤ÏÃæ¿È¤ò°Û¤Ê¤Ã¤Æ²ò¼á¤¹¤ë¤Ç¤·¤ç¤¦¡£\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬Â¿¤¹¤®¤Þ¤¹ -- nr (%d) °Ê¹ß¤ò̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥Ä¥ê¡¼¡©\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager ¤ò¸¡½Ð -- ¤³¤ì¤òÊ᪤Ǥ­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6 ½ð̾¤òȯ¸« -- Äü¤á¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "ÊѤǤ¹..., ¥µ¥¤¥º 0 ¤Î³ÈÄ¥¥Ñ¡¼¥Æ¥£¥·¥ç¥ó ¡©\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "ÊѤǤ¹..., ¥µ¥¤¥º 0 ¤Î BSD ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¡©\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " %s: ǧ¼±¤Ç¤­¤Ê¤¤¥Ñ¡¼¥Æ¥£¥·¥ç¥ó\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n ¥Õ¥é¥°¤¬Í¿¤¨¤é¤ì¤Þ¤·¤¿: ²¿¤âÊѹ¹¤·¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "¸Å¤¤¥»¥¯¥¿¤ÎÊݸ¤Ë¼ºÇÔ -- ÃæÃǤ·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "%s ¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó½ñ¤­¹þ¤ß¤Ë¼ºÇÔ\n"
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "Ť¤¤«ÉÔ´°Á´¤Ê¹Ô¤ÎÆþÎÏ -- Ãæ»ß¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "ÆþÎÏ¥¨¥é¡¼: `=' ¤Ï %s ¥Õ¥£¡¼¥ë¥É¤Î¸å¤Ë¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "ÆþÎÏ¥¨¥é¡¼: %2$s ¥Õ¥£¡¼¥ë¥É¤Î¸å¤Îͽ´ü¤·¤Ê¤¤Ê¸»ú `%1$c'\n"
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤ÆþÎÏ: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "¿ô»ú¤¬Â礭¤¹¤®¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "¿ô»ú¤Î¸å¤í¤Ë¥´¥ß¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥óµ­½Ò»Ò¤Î¶õ¤­¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "³ÈÄ¥¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î°Ï¤¤¤ò¹½ÃۤǤ­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr "ÆþÎÏ¥Õ¥£¡¼¥ë¥É¤¬Â¿¤¹¤®¤Þ¤¹\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "¤³¤ì°Ê¾å¤Î¶õ¤­¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "ÉÔÀµ¤Ê¥¿¥¤¥×\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "·Ù¹ð: Í¿¤¨¤é¤ì¤¿¥µ¥¤¥º (%lu) ¤Ï¡¢µöÍƤǤ­¤ëºÇÂ祵¥¤¥º (%lu) ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "·Ù¹ð: ¶õ¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "·Ù¹ð: ÉÔÀµ¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹ (°ìÈֺǽé %lu)\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥Ö¡¼¥È²Äǽ¥Õ¥é¥° -- - ¤« * ¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s ¤Î°ìÉô¤ò»ØÄê¡©\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "³ÈÄ¥¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬Í½´ü¤·¤¿¾ì½ê¤Ë¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "ÉÔÀµ¤ÊÆþÎÏ\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬Â¿¤¹¤®¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 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"
@@ -4765,96 +4801,96 @@ msgstr ""
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "ÉáÄÌ¤Ï <start> ¤È <size> (¤½¤·¤Æ¶²¤é¤¯ <type>)¤ò»ØÄꤹ¤ë¤À¤±¤Ç¹½¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "¥Ð¡¼¥¸¥ç¥ó"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó] ¥Ç¥Ð¥¤¥¹Ì¾...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "¥Ç¥Ð¥¤¥¹: /dev/hda ¤ä /dev/sda ¤ÎÍͤʲ¿¤«"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "Í­±×¤Ê¥ª¥×¥·¥ç¥ó:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [or --show-size]: Îΰ襵¥¤¥º¤Î¥ê¥¹¥È"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [or --id]:        Îΰè ID ¤Îɽ¼¨¤Þ¤¿¤ÏÊѹ¹"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [or --list]:      ¥Ç¥Ð¥¤¥¹Ëè¤ÎÎΰè¥ê¥¹¥È"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr "    -d [or --dump]:      Á°¤ËƱ¤¸¤À¤¬¡¢¸å¤ÎÆþÎϽñ¼°¤Ë±è¤¦¤è¤¦¤Ë¤¹¤ë"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [or --increment]: ¥·¥ê¥ó¥À¿ô¤Ê¤É¡£0 ¤Ç¤Ï¤Ê¤¯ 1 ¤«¤é"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:  ¥»¥¯¥¿/¥Ö¥í¥Ã¥¯/¥·¥ê¥ó¥À/MB ¤Î¥æ¥Ë¥Ã¥È¤Î¼õÍý/Êó¹ð"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [or --list-types]:´ûÃΤÎÎΰ西¥¤¥×¤Î¥ê¥¹¥È"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [or --DOS]:       DOS ¸ß´¹¥â¡¼¥É -- ¶õ´Ö¤¬¾¯¤·ÌµÂ̤ˤʤê¤Þ¤¹"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [or --re-read]:   ¥«¡¼¥Í¥ë¤ËÎΰè¥Æ¡¼¥Ö¥ë¤òºÆÆɹþ¤ß¤µ¤»¤ë"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                »ØÄêÈÖ¹æ# ¤ÎÎΰè¤Î¤ßÊѹ¹¤¹¤ë"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ¥Ç¥£¥¹¥¯¤Ø¤Î¼ÂºÝ¤Î½ñ¹þ¤ß¤ò¹Ô¤ï¤Ê¤¤"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O file :            ¾å½ñ¤­¤µ¤ì¤ë¥»¥¯¥¿¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ë"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            ¥»¥¯¥¿¤ò¥Õ¥¡¥¤¥ë¤«¤éÉü¸µ¤¹¤ë"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [or --version]:   ¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [or --help]:      ¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "´í¸±¤Ê¥ª¥×¥·¥ç¥ó:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [or --show-geometry]: ¥«¡¼¥Í¥ë¤Î¥¸¥ª¥á¥È¥ê¾ðÊó¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4862,115 +4898,115 @@ msgstr ""
 "    -x [or --show-extended]: ³ÈÄ¥Îΰè¥ê¥¹¥È¤âɽ¼¨¤¹¤ë\n"
 "                             ¤Þ¤¿¤Ï¤½¤ì¤é¤Îµ­½Ò»Ò¤ÎÆþÎϤòÆÀ¤ë"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [or --Linux]:      Linux ¤Ë¤½¤°¤ï¤Ê¤¯¤Æ¤âʸ¶ç¤ò±¾¤ï¤Ê¤¤"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [or --quiet]:      ·Ù¹ð¥á¥Ã¥»¡¼¥¸¤òÍÞÀ©¤¹¤ë"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "    ¥¸¥ª¥á¥È¥ê¸¡½Ð¤ò¶¯À©»ØÄê¤Ç¤­¤Þ¤¹:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [or --cylinders #]:»ÈÍѤ¹¤ë¥·¥ê¥ó¥À¿ô¤òÀßÄꤹ¤ë"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [or --heads #]:    »ÈÍѤ¹¤ë¥Ø¥Ã¥É¿ô¤òÀßÄꤹ¤ë"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [or --sectors #]:  »ÈÍѤ¹¤ë¥»¥¯¥¿¿ô¤òÀßÄꤹ¤ë"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "Ì·½â¤Î¥Á¥§¥Ã¥¯¤ò¹Ô¤ï¤Ê¤¤¤è¤¦¤Ë¤Ç¤­¤Þ¤¹:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [or --force]:      ¤ª¤«¤·¤Ê»ØÄê¤ò¹Ô¤Ã¤Æ¤â¡¢¤½¤Î¤Þ¤Þ¼Â¹Ô¤·¤Þ¤¹"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "»È¤¤Êý:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s ¥Ç¥Ð¥¤¥¹\t\t ¥Ç¥Ð¥¤¥¹¾å¤Î¥¢¥¯¥Æ¥£¥ôÎΰè¤ò¥ê¥¹¥È¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s ¥Ç¥Ð¥¤¥¹ n1 n2 ... n1 ¤ò¥¢¥¯¥Æ¥£¥ô¤Ë¤·¤Æ..., »Ä¤ê¤òÈó¥¢¥¯¥Æ¥£¥ô¤Ë¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An ¥Ç¥Ð¥¤¥¹\t n ¤ò¥¢¥¯¥Æ¥£¥ô¤Ë¤·¡¢¤½¤ì°Ê³°¤òÈó¥¢¥¯¥Æ¥£¥ô¤Ë¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "¥³¥Þ¥ó¥É¤Ê¤·¡©\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "¹ç·×: %d ¥Ö¥í¥Ã¥¯\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "»È¤¤Êý: sfdisk --print-id ¥Ç¥Ð¥¤¥¹ ¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "»È¤¤Êý: sfdisk --change-id ¥Ç¥Ð¥¤¥¹ ¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ ID\n"
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "»È¤¤Êý: sfdisk --id ¥Ç¥Ð¥¤¥¹ ¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ [ID]\n"
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "°ì¤Ä¤Î¥Ç¥Ð¥¤¥¹¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹ (-l ¤ä -s ¤ò½ü¤¯)\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s ¤òÆɹþ¤ßÍѤ˳«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: ¥·¥ê¥ó¥À¿ô %ld¡¢¥Ø¥Ã¥É¿ô %ld¡¢%ld ¥»¥¯¥¿/¥È¥é¥Ã¥¯\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "%s ¤Ø¤Î BLKGETSIZE ioctl ¤Ë¼ºÇÔ\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "ÉÔÀµ¤Ê¥Ö¡¼¥È¥Õ¥é¥°: 0x80 ¤Ç¤Ê¤¯ 0x%x ¤Ç¤¹\n"
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -4978,7 +5014,7 @@ msgstr ""
 "½ªÎ»\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -4988,35 +5024,35 @@ msgstr ""
 "LILO ¤Ç¤ÏÌäÂꤢ¤ê¤Þ¤»¤ó¤¬¡¢DOS MBR ¤Ï 1 ¤Ä¤Î¥¢¥¯¥Æ¥£¥Ö¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤·¤«\n"
 "¥Ö¡¼¥È¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ë¤Ï ID %x ¤¬¤¢¤ê¡¢±£¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "ÉÔÀµ¤Ê ID %lx\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "¤³¤Î¥Ç¥£¥¹¥¯¤Ï¸½ºß»ÈÍÑÃæ¤Ç¤¹¡£\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼: %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "·Ù¹ð: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "¸½ºß¡¢Ã¯¤â¤³¤Î¥Ç¥£¥¹¥¯¤ò»È¤Ã¤Æ¤¤¤Ê¤¤¤«¤òÄ´¤Ù¤Þ¤¹...\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5030,28 +5066,28 @@ msgstr ""
 "   ¤¬¤¢¤ì¤Ð swapoff ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "   ¤Á¤Ê¤ß¤Ë --no-reread ¥Õ¥é¥°¤Ç¤³¤Î¥Á¥§¥Ã¥¯¤òÍÞÀ©¤Ç¤­¤Þ¤¹¡£\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Á´¤Æ¤Î¥Á¥§¥Ã¥¯¤òĶ±Û¤µ¤»¤ë¤Ë¤Ï --force ¥Õ¥é¥°¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "¸Å¤¤¾ìÌÌ:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %d ¤Ï¸ºß¤·¤Þ¤»¤ó¤Î¤Ç¡¢Êѹ¹¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "¿·¤¿¤Ê¾ìÌÌ:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5059,19 +5095,19 @@ msgstr ""
 "»ä¤Ï¤³¤ì¤é¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë´ØÍ¿¤·¤¿¤¯¤¢¤ê¤Þ¤»¤ó -- Êѹ¹¤·¤Þ¤»¤ó¡£\n"
 "(ËÜÅö¤Ë¤³¤ì¤ò¹Ô¤Ê¤¤¤¿¤±¤ì¤Ð¡¢--force ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤)\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr "»ä¤Ï¤³¤ì¤Ë´ØÍ¿¤·¤¿¤¯¤¢¤ê¤Þ¤»¤ó -- ¶²¤é¤¯ No ¤ÈÅú¤¨¤ë¤Ù¤­¤Ç¤·¤ç¤¦\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "¤³¤ì¤Ç¤¢¤Ê¤¿¤ÎÍ×µá¤ÏËþ¤¿¤µ¤ì¤Þ¤¹¤«¡© [ynq] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "¥Ç¥£¥¹¥¯¤Ø¤Î½ñ¤­¹þ¤ß¤ò¹Ô¤Ê¤¤¤Þ¤¹¤«¡© [ynq] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5079,15 +5115,15 @@ msgstr ""
 "\n"
 "sfdisk: ÆþÎϤ¬Ã»¤¹¤®¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "ÃæÃÇ -- ²¿¤âÊѹ¹¤·¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "y,n,q ¤Î¤¤¤º¤ì¤«¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5095,7 +5131,7 @@ msgstr ""
 "¿·¤¿¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î½ñ¤­¹þ¤ß¤ËÀ®¸ù\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5696,7 +5732,7 @@ msgstr "KDGHWCLK 
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK ¤Î»þ¹ïÆɤ߼è¤ê¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "»þ¹ïÊѹ¹ÂÔ¤Á¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿¡£\n"
 
@@ -5721,58 +5757,68 @@ msgstr "/dev/tty1 
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK ioctl ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "%s ¤Ø¤Î open() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "»þ¹ïÆɤ߹þ¤ß¤Î¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "%s ¤«¤é»þ¹ï¤òÊѹ¹¤¹¤ë¤¿¤á¤Î¥ë¡¼¥×Ãæ¤Ç¤¹\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s ¤Ï³ä¤ê¹þ¤ßµ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó¡£ "
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "¥¯¥í¥Ã¥¯¥Á¥Ã¥¯¤òÂԤĤ¿¤á¤Î %s ¤Ø¤Î read() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "¥¯¥í¥Ã¥¯¥Á¥Ã¥¯¤òÂԤĤ¿¤á¤Î %s ¤Ø¤Î read() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "¥¯¥í¥Ã¥¯¥Á¥Ã¥¯¤òÂԤĤ¿¤á¤Î %s ¤Ø¤Î read() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "³ä¤ê¹þ¤ß¹¹¿·¤ò¥ª¥Õ¤Ë¤¹¤ë¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 "³ä¤ê¹þ¤ß¹¹¿·¤ò¥ª¥ó¤Ë¤¹¤ë¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤¬Í½´ü¤»¤Ì¼ºÇԤ˽ª¤ï¤ê¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "»þ¹ïÀßÄê¤Î¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) ¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5783,17 +5829,17 @@ msgstr ""
 "Linux ¤Î 'rtc' ¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤Ë¥¢¥¯¥»¥¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤·¤«¤·¡¢¤³¤Î\n"
 "¥Õ¥¡¥¤¥ë¤¬¥·¥¹¥Æ¥à¤Ë¸ºß¤·¤Þ¤»¤ó¡£\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "%s ¤Ø¤Î ioctl(RTC_EPOCH_READ) ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
@@ -5802,25 +5848,25 @@ msgstr ""
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr ""
 "¥¨¥Ý¥Ã¥¯ÃÍ¤Ï 1900 ǯ°ÊÁ°¤Ç¤Ï¤¢¤êÆÀ¤Þ¤»¤ó¡£¤¢¤Ê¤¿¤Ï %ld ¤òÍ׵ᤷ¤Þ¤·¤¿\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr ""
 "%2$s ¤«¤é RTC_EPOCH_READ ioctl ¤Ë¤è¤Ã¤Æ¥¨¥Ý¥Ã¥¯ %1$ld ¤òÆɤ߼è¤ê¤Þ¤·¤¿¡£\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "%s ¤Î¥«¡¼¥Í¥ë¥É¥é¥¤¥Ð¤Ï RTC_EPOCH_SET ioctl ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "%s ¤Ø¤Î ioctl(RTC_EPOCH_SET) ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
@@ -5994,52 +6040,67 @@ msgstr "%2$s 
 msgid "Login on %s from %s denied.\n"
 msgstr "%2$s ¤«¤é %1$s ¤Ø¤Î¥í¥°¥¤¥ó¤ÏÈÝÄꤵ¤ì¤Þ¤·¤¿¡£\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: ¤¢¤Ê¤¿ (¥æ¡¼¥¶ %d) ¤Ï¸ºß¤·¤Þ¤»¤ó¡£\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: ¥æ¡¼¥¶ \"%s\" ¤Ï¸ºß¤·¤Þ¤»¤ó¡£\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 "%s: ¥í¡¼¥«¥ë¤Î¹àÌܤ·¤«Êѹ¹¤Ç¤­¤Þ¤»¤ó -- ¤«¤ï¤ê¤Ë yp%s ¤ò»È¤¤¤Þ¤·¤ç¤¦¡£\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+msgid "Unknown user context"
+msgstr ""
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "%s ¤Î finger ¾ðÊó¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "¥Ñ¥¹¥ï¡¼¥É¥¨¥é¡¼¡£"
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "¥Ñ¥¹¥ï¡¼¥É: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "´Ö°ã¤Ã¤¿¥Ñ¥¹¥ï¡¼¥É¤Ç¤¹¡£"
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "finger ¾ðÊó¤ÏÊѹ¹¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "»È¤¤Êý: %s [ -f ¥Õ¥ë¥Í¡¼¥à ] [ -o ¥ª¥Õ¥£¥¹ ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6047,11 +6108,11 @@ msgstr ""
 "[ -p ¥ª¥Õ¥£¥¹ÅÅÏÃÈÖ¹æ ]\n"
 "\t[ -h ¼«ÂðÅÅÏÃÈÖ¹æ ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6059,60 +6120,72 @@ msgstr ""
 "\n"
 "ÃæÃÇ¡£\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "¥Õ¥£¡¼¥ë¥É¤¬Ä¹¤¹¤®¤Þ¤¹¡£\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' ¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó¡£\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "¥³¥ó¥È¥í¡¼¥ëʸ»ú¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó¡£\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr "finger ¾ðÊó¤ÏÊѹ¹ *¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿*¡£¤Þ¤¿¤¢¤È¤Ç»î¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "finger ¾ðÊó¤òÊѹ¹¤·¤Þ¤·¤¿¡£\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "malloc ¤Ë¼ºÇÔ"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" ¤Ï /etc/shells ¥ê¥¹¥È¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó¡£\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
 "%s: ¤¢¤Ê¤¿¤Î¥·¥§¥ë¤Ï /etc/shells ¤Ë¤¢¤ê¤Þ¤»¤ó¤Î¤Ç¡¢¥·¥§¥ë¤ÎÊѹ¹¤¬µñÈݤµ¤ì¤Þ¤·"
 "¤¿\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "%s ¤Î¥·¥§¥ë¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "¿·¤·¤¤¥·¥§¥ë"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "¥·¥§¥ë¤òÊѹ¹¤·¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "¥·¥§¥ë¤ÏÊѹ¹ *¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿*¡£¤¢¤È¤Ç¤Þ¤¿»î¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "¥·¥§¥ë¤òÊѹ¹¤·¤Þ¤·¤¿¡£\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
@@ -6121,57 +6194,57 @@ msgstr ""
 "»È¤¤Êý: %s [ -s ¥·¥§¥ë ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ ¥æ¡¼¥¶Ì¾ ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: ¥·¥§¥ë¤Ï¥Õ¥ë¥Ñ¥¹¤Ç̵¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" ¤Ï¸ºß¤·¤Þ¤»¤ó¡£\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" ¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' ¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó¡£\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: ¥³¥ó¥È¥í¡¼¥ëʸ»ú¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó¡£\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "·Ù¹ð: \"%s\" ¤Ï /etc/shells ¥ê¥¹¥È¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" ¤Ï /etc/shells ¥ê¥¹¥È¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: ¥ê¥¹¥È¤ò¸«¤ë¤Ë¤Ï -l ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "·Ù¹ð: \"%s\" ¤Ï /etc/shells ¥ê¥¹¥È¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "¥ê¥¹¥È¤ò¸«¤ë¤Ë¤Ï¡¢%s -l ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "ÃΤé¤Ê¤¤¥·¥§¥ë¤Ç¤¹¡£\n"
 
@@ -6367,78 +6440,78 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "¤¢¤Ê¤¿¤¬¼Â¹Ô¤·¤Æ¤¤¤ë¥×¥í¥»¥¹¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "¥À¥¤¥¢¥ë¥¢¥Ã¥×¤Ç %s ¤Ë¡¢%s ¤Ë¤è¤ë"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "%s ¤Ë ROOT ¤¬¥í¥°¥¤¥ó¡¢%s ¤«¤é"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "%s ¤Ë ROOT ¤¬¥í¥°¥¤¥ó"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "%s ¤Ë %s ¤¬¥í¥°¥¤¥ó¡¢%s ¤«¤é"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "%s ¤Ë %s ¤¬¥í¥°¥¤¥ó"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "¿·¤·¤¤¥á¥¤¥ë¤¬ÆϤ¤¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "¥á¥¤¥ë¤¬ÆϤ¤¤Æ¤¤¤Þ¤¹¡£\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: fork ¤Ë¼ºÇÔ: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() ¤Ë¼ºÇÔ"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤¬¤¢¤ê¤Þ¤»¤ó¡ª\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê \"/\" ¤Ç¥í¥°¥¤¥ó¤·¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: ¥·¥§¥ë¥¹¥¯¥ê¥×¥ÈÍѤΥá¥â¥ê¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: ¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ¥·¥§¥ë¤¬¤¢¤ê¤Þ¤»¤ó: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6447,62 +6520,62 @@ msgstr ""
 "\n"
 "%s ¥í¥°¥¤¥ó: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "¥í¥°¥¤¥ó̾¤¬Ä¹¤¹¤®¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "̾Á°¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "¥í¥°¥¤¥ó̾¤Ï '-' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "¹ÔÁ÷¤ê(linefeed) ¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "²áÂç¤Ê¹ÔÁ÷¤ê(linefeed)"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "%d Éøå¤Ë¥í¥°¥¤¥ó¤Î»þ´ÖÀÚ¤ì\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "ºÇ½ª¥í¥°¥¤¥ó: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr " %.*s ¤«¤é\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr " %.*s ¾å\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s ¤«¤é¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s ¤Ç¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ²ó %s ¤«¤é¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ²ó %s ¤Ç¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
@@ -6904,55 +6977,65 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: *ÉÔÀµ¤Ê¥¨¥é¡¼*"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
 msgstr "%s: ¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤Ï»ÈÍÑÃæ¤Ç¤¹¡£\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
 msgstr "%s: ¥°¥ë¡¼¥×¥Õ¥¡¥¤¥ë¤Ï»ÈÍÑÃæ¤Ç¤¹¡£\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: ¤½¤Î¥Õ¥¡¥¤¥ë %s ¤Ï»ÈÍÑÃæ¤Ç¤¹ (¸½ºß¤Ï %s)\n"
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: %s ¤ò¥ê¥ó¥¯¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "%s ¤Ø¤Î¥¿¥¤¥à¥¢¥¦¥È¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "%s ¤Ø¤Î¥¿¥¤¥à¥¢¥¦¥È¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó: %s\n"
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: %s ¤Î¥í¥Ã¥¯¤ò²ò½ü¤Ç¤­¤Þ¤»¤ó: %s (Êѹ¹¤Ï %s ¤Î¤Þ¤Þ¤Ç¤¹)\n"
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: »Ò¥×¥í¥»¥¹¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s ¤ÏÊѹ¹¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: Êѹ¹¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr "¤³¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¥·¥ã¥É¥¦¥°¥ë¡¼¥×¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr "¤³¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¥·¥ã¥É¥¦¥Ñ¥¹¥ï¡¼¥É¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "º£¤¹¤° %s ¤òÊÔ½¸¤·¤Þ¤¹¤« [y/n]? "
@@ -7146,7 +7229,7 @@ msgstr "%s: %s 
 msgid "call: %s from to files...\n"
 msgstr "call: %s from to files...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, fuzzy, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7157,21 +7240,21 @@ msgstr ""
 "ËÜÅö¤Ë¤½¤ì¤ò»È¤¤¤¿¤¤¤Ê¤é `%s [¥ª¥×¥·¥ç¥ó] %s' ¤ò»È¤¤¤Þ¤·¤ç¤¦\n"
 "script ¤Ï³«»Ï¤·¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "»È¤¤Êý: script [-a] [-f] [-q] [-t] [¥Õ¥¡¥¤¥ë]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤ò³«»Ï¤·¤Þ¤·¤¿¡¢¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "¥¹¥¯¥ê¥×¥È¤Ï %s ¤Ë³«»Ï¤·¤Þ¤·¤¿"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7180,16 +7263,16 @@ msgstr ""
 "\n"
 "¥¹¥¯¥ê¥×¥È¤Ï %s ¤Ë½ªÎ»¤·¤Þ¤·¤¿"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤ò½ªÎ»¤·¤Þ¤·¤¿¡¢¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "openpty ¤¬¼ºÇÔ\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "ÍøÍѤǤ­¤ë pty ¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
@@ -7458,36 +7541,36 @@ msgstr "mount: %s 
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s (-n ¥Õ¥é¥°¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤)"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤ò¥ê¥ó¥¯¤Ç¤­¤Þ¤»¤ó: %s (-n ¥Õ¥é¥°¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤)"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤ò³«¤±¤Þ¤»¤ó: %s (-n ¥Õ¥é¥°¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤)"
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "¥¿¥¤¥à¥¢¥¦¥È"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7496,191 +7579,127 @@ msgstr ""
 "¥ê¥ó¥¯ %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó\n"
 "¿ʬ¡¢¥´¥ß¤È²½¤·¤¿¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤Î¤Ç¤Ï ?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó (%s) -- mtab ¤Ï¹¹¿·¤µ¤ì¤Þ¤»¤ó"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "%s ¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "%s ¤Î¥â¡¼¥ÉÊѹ¹¥¨¥é¡¼: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s ¤Î̾Á°¤ò %s ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: ¥Ç¥Ð¥¤¥¹ %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: ¥Ç¥Ð¥¤¥¹ %s ¤Î¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó: %s\n"
-
-#: mount/lomount.c:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) ¥ª¥Õ¥»¥Ã¥È %d, %s encryption\n"
-
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: /dev/loop# ¤¬Á´¤¯¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
+msgid ", offset %lld"
 msgstr ""
-"mount: /dev/loop# ¤¬Á´¤¯¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
-"       ¿ʬ /dev/loop# ¤Î¥á¥¸¥ã¡¼Èֹ椬´Ö°ã¤Ã¤Æ¤¤¤ë¤Î¤Ç¤Ï¡©"
 
-#: mount/lomount.c:253
+#: mount/lomount.c:104
 #, 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'.)"
+msgid ", sizelimit %lld"
 msgstr ""
-"mount: loop ¥Ç¥Ð¥¤¥¹¤¬Á´¤¯¸«¤Ä¤«¤ê¤Þ¤»¤ó¤·¡¢%s ¤Ë¤â¤¢¤ê¤Þ¤»¤ó¡£\n"
-"       ¤Ç¤¹¤«¤é¡¢¤³¤Î¥«¡¼¥Í¥ë¤Ï loop ¥Ç¥Ð¥¤¥¹¤ò°·¤¨¤Þ¤»¤ó¡£\n"
-"       (¤½¤¦¤À¤È¤¹¤ì¤Ð¡¢ºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤« `insmod loop.o' ¤·¤Æ²¼¤µ¤¤¡£)"
 
-#: mount/lomount.c:259
-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?"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
 msgstr ""
-"mount: loop ¥Ç¥Ð¥¤¥¹¤¬Á´¤¯¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£Â¿Ê¬¤³¤Î¥«¡¼¥Í¥ë¤Ï loop ¥Ç¥Ð¥¤¥¹"
-"¤ò\n"
-"       °·¤¨¤Þ¤»¤ó(¤½¤¦¤À¤È¤·¤¿¤é¡¢ºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤« `insmod loop.o'¤·¤Æ\n"
-"       ¤¯¤À¤µ¤¤)¡£¤¢¤ë¤¤¤Ï¡¢/dev/loop# ¤Î¥á¥¸¥ã¡¼Èֹ椬´Ö°ã¤Ã¤Æ¤¤¤ë¤Î¤«¤â\n"
-"       ÃΤì¤Þ¤»¤ó¡£"
 
-#: mount/lomount.c:263
-msgid "mount: could not find any free loop device"
-msgstr "mount: ¶õ¤¤¤Æ¤¤¤ë loop ¥Ç¥Ð¥¤¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ""
 
-#: mount/lomount.c:359
+#: mount/lomount.c:129
 #, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "%s ¤òÆɹþ¤ßÍѤ˳«¤±¤Þ¤»¤ó\n"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "¿·¥Ñ¥¹¥ï¡¼¥É¤ò¤â¤¦°ìÅÙÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
+msgid ", encryption type %d\n"
+msgstr "%s ¥¿¥¤¥×¤Î°Å¹æ²½¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ª¡¼¥×¥ó¤¬¼ºÇÔ¤·¤Þ¤·¤¿\n"
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: ¥Ç¥Ð¥¤¥¹ %s ¤Î¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏºÇÄã 6 ʸ»úɬÍפǤ¹¡£¤â¤¦°ìÅÙ¤ä¤êľ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: /dev/loop# ¤¬Á´¤¯¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: mount/lomount.c:472
+#: mount/lomount.c:192
 #, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "¤³¤ì°Ê¾å¤Î¥á¥â¥ê¤¬³ÎÊݤǤ­¤Þ¤»¤ó\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
 msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
+"mount: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
+"mount: loop ¥Ç¥Ð¥¤¥¹¤¬Á´¤¯¸«¤Ä¤«¤ê¤Þ¤»¤ó¤·¡¢%s ¤Ë¤â¤¢¤ê¤Þ¤»¤ó¡£\n"
+"       ¤Ç¤¹¤«¤é¡¢¤³¤Î¥«¡¼¥Í¥ë¤Ï loop ¥Ç¥Ð¥¤¥¹¤ò°·¤¨¤Þ¤»¤ó¡£\n"
+"       (¤½¤¦¤À¤È¤¹¤ì¤Ð¡¢ºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤« `insmod loop.o' ¤·¤Æ²¼¤µ¤¤¡£)"
 
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
+#: mount/lomount.c:197
+msgid "mount: could not find any free loop device"
+msgstr "mount: ¶õ¤¤¤Æ¤¤¤ë loop ¥Ç¥Ð¥¤¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "¥á¥â¥ê¤Ë³ÊǼ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¤Î¤Ç¡¢½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "½é´ü²½ (16 ¿Ê¿ô¤ÇºÇÂç 16 ʸ»ú¤Þ¤Ç): "
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): À®¸ù\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "16 ¿Ê¿ô¤Ç¤Ï¤Ê¤¤Ê¸»ú '%c'¡£\n"
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: ¥Ç¥Ð¥¤¥¹ %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/lomount.c:764
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
-msgstr "°Å¹æ²½¥·¥¹¥Æ¥à %d ¤Î¸°¼èÆÀÊýË¡¤¬²ò¤ê¤Þ¤»¤ó\n"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): À®¸ù\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): À®¸ù\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr ""
+"¤³¤Î mount ¤Ï loop ¤Î¥µ¥Ý¡¼¥È¤Ê¤·¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿¡£\n"
+"ºÆ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "¥á¥â¥ê¤¬ÉÔ½½Ê¬¤Ç¤¹"
-
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "%s ¤òÆɹþ¤ßÍѤ˳«¤±¤Þ¤»¤ó\n"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"»È¤¤Êý:\n"
+"  %s loop¥Ç¥Ð¥¤¥¹                                          # ¾ðÊó¤ò¤ß¤ë\n"
+"  %s -d loop¥Ç¥Ð¥¤¥¹                                       # ºï½ü\n"
+"  %s [ -e °Å¹æ²½ ] [ -o ¥ª¥Õ¥»¥Ã¥È ] loop¥Ç¥Ð¥¤¥¹ ¥Õ¥¡¥¤¥ë # ÀßÄê\n"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "¥á¥â¥ê¤¬ÉÔ½½Ê¬¤Ç¤¹"
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
+"¥³¥ó¥Ñ¥¤¥ë»þ¤Ë loop ¥µ¥Ý¡¼¥È¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó¡£ºÆ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ"
+"¤¤¡£\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7696,41 +7715,41 @@ msgstr "[mntent]: %2$s 
 msgid "; rest of file ignored"
 msgstr "-- ̵»ë¤·¤Þ¤¹"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: mtab ¤Ë¤è¤ë¤È¡¢%s ¤Ï %s ¤Ë¥Þ¥¦¥ó¥ÈºÑ¤Ç¤¹"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: mtab ¤Ë¤è¤ë¤È¡¢%s ¤Ï %s ¤Ë¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s ¤ò½ñ¤­¹þ¤ßÍѤ˥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: %s ¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: %s ¤Î¥â¡¼¥ÉÊѹ¹¥¨¥é¡¼: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ¤Ï¥¹¥ï¥Ã¥×¶õ´Ö¤Î¤è¤¦¤Ç¤¹¤Í -- ¥Þ¥¦¥ó¥È¤·¤Þ¤»¤ó"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "¥Þ¥¦¥ó¥È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: root ¤À¤±¤¬ %s ¤ò %s ¤Ë¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤¹"
@@ -7752,104 +7771,108 @@ msgstr "mount: loop 
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: loop ¥Ç¥Ð¥¤¥¹ %s ¤ò»È¤¤¤Þ¤¹\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop ¥Ç¥Ð¥¤¥¹¤ÎÀßÄê¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop ¥Ç¥Ð¥¤¥¹¤ÎÀßÄê¤ËÀ®¸ù¤·¤Þ¤·¤¿\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s ¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr ""
+
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: %s ¤ò®ÅÙÀßÄêÍѤ˥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ®ÅÙ¤ÎÀßÄ꤬¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: fork ¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr ""
 "mount: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï 'nfs' ¥¿¥¤¥×¤Î¥µ¥Ý¡¼¥È¤Ê¤·¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: nfs mount version 4 ¤Ç¤Ï¼ºÇÔ¤·¤Þ¤·¤¿¡£3 ¤ò»î¤·¤Þ¤¹..\n"
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: none ¤¬»ØÄꤵ¤ì¤Þ¤·¤¿¤¬¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò·èÄê¤Ç¤­¤Þ¤»¤ó"
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr "mount: ¥Þ¥¦¥ó¥È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: µö²Ä¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr "mount: mount ¤ò»È¤¦¤Ë¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s ¤Ï»ÈÍÑÃæ¤Ç¤¹"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc ¤Ï¥Þ¥¦¥ó¥ÈºÑ¤Ç¤¹"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ¤Ï ¥Þ¥¦¥ó¥ÈºÑ¤« %s ¤¬»ÈÍÑÃæ¤Ç¤¹"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤¬Â¸ºß¤·¤Þ¤»¤ó"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤Ï¤É¤³¤â¤µ¤·¤Æ¤¤¤Ê¤¤¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤Ç¤¹"
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: ¥¹¥Ú¥·¥ã¥ë¥Ç¥Ð¥¤¥¹ %s ¤¬Â¸ºß¤·¤Þ¤»¤ó"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7858,12 +7881,12 @@ msgstr ""
 "mount: ¥¹¥Ú¥·¥ã¥ë¥Ç¥Ð¥¤¥¹ %s ¤¬Â¸ºß¤·¤Þ¤»¤ó\n"
 "       (¥Ñ¥¹¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ¤Ï¤Þ¤À¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹"
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7873,35 +7896,35 @@ msgstr ""
 "       %s ¤Î¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤¬ÉÔÀµ¡¢°¿¤¤¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Þ¥¦¥ó¥È\n"
 "       ¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "¥Þ¥¦¥ó¥È¥Æ¡¼¥Ö¥ë¤¬¤¤¤Ã¤Ñ¤¤¤Ç¤¹"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: ¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤òÆɤá¤Þ¤»¤ó"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ÉÔÌÀ¤Ê¥Ç¥Ð¥¤¥¹¤Ç¤¹"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥× %s ¤Ï¥«¡¼¥Í¥ë¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: ¤ª¤½¤é¤¯¤¢¤Ê¤¿¤Ï %s ¤ò»ØÄꤷ¤¿¤«¤Ã¤¿¤Î¤Ç¤·¤ç¤¦"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: ¿ʬ¤¢¤Ê¤¿¤Ï iso9660 ¤ò»ØÄꤷ¤¿¤«¤Ã¤¿¤Î¤Ç¤Ï¡©"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -7909,12 +7932,12 @@ msgstr ""
 "       %s ¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¢¤À¤«¤é stat ¤¬¼ºÇÔ¡©"
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7923,75 +7946,48 @@ msgstr ""
 "mount: ¤³¤Î¥«¡¼¥Í¥ë¤Ï %s ¤ò¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤È¤·¤Æǧ¼±¤·¤Þ¤»¤ó\n"
 "       (¿ʬ¡¢`insmod ¥É¥é¥¤¥Ð' ¤·¤Ê¤¤¤È¤¤¤±¤Ê¤¤¤Î¤Ç¤Ï¡©)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó (¿ʬ `-o loop' ¤È¤ä¤Ã¤Æ¤ß¤¿¤é¡©)"
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ¤ÏÀµ¾ï¤Ê¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹ "
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s ¤òÆɹþ¤ßÀìÍѤǥޥ¦¥ó¥È¤Ç¤­¤Þ¤»¤ó"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s ¤Ï½ñ¤­¹þ¤ß¶Ø»ß¤Ç¤¹¤¬¡¢`-w' ¥Õ¥é¥°¤¬ÌÀ¼¨Åª¤ËÍ¿¤¨¤é¤ì¤Þ¤·¤¿"
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s ¤Ï½ñ¤­¹þ¤ß¶Ø»ß¤Ç¤¹¡¢Æɹþ¤ßÀìÍѤǥޥ¦¥ó¥È¤·¤Þ¤¹"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr ""
-
-#: mount/mount.c:1124
-#, fuzzy, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "umount: %s: ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: %s ¤ò %s ¤Ç¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "¥é¥Ù¥ë"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: ¤½¤Î¤è¤¦¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: ¥¿¥¤¥×¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó -- ¥³¥í¥ó¤¬¤¢¤ë¤Î¤Ç nfs ¤ÎÍͤǤ¹¤¬\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 #, fuzzy
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
@@ -8000,22 +7996,22 @@ msgstr ""
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É \"%s\"\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: Äü¤á¤Þ¤·¤¿ \"%s\"\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ¤Ï %s ¤Ë¥Þ¥¦¥ó¥ÈºÑ¤Ç¤¹\n"
 
-#: mount/mount.c:1386
+#: mount/mount.c:1362
 #, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8037,7 +8033,7 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "»È¤¤Êý: mount -V                : ¥Ð¡¼¥¸¥ç¥ó¤Îɽ¼¨\n"
@@ -8060,74 +8056,73 @@ msgstr ""
 "¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó: [-nfFrsvw] [-o ¥ª¥×¥·¥ç¥ó]\n"
 "¤â¤Ã¤È¾Ü¤·¤¤¤³¤È¤òÃΤꤿ¤±¤ì¤Ð¡¢man 8 mount ¤È¾§¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: root ¤À¤±¤¬¤½¤ì¤ò¹Ô¤Ê¤¨¤Þ¤¹"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó -- ºîÀ®¤·¤Þ¤¹..\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr ""
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: ¤½¤Î¤è¤¦¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: %s ¤ò¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr "²¿¤â¥Þ¥¦¥ó¥È¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %2$s Æâ¤Ë %1$s ¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %2$s ¤ä %3$s Æâ¤Ë %1$s ¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
 "mount: %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤«¤Ã¤¿¤Î¤Ç¡¢UUID ¤È LABEL ¤ÎÊÑ´¹¤â¹Ô¤¨¤Þ¤»¤ó¡£\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: ÉÔÀµ¤Ê UUID"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à·¿¿äÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸\n"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: %s ¤Ø¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤Î»ØÄ꤬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       %s Ëô¤Ï %s ¤Î¥¿¥¤¥×¤ò»î¤·¤Æ¤ß¤Þ¤¹\n"
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr "       ¤½¤·¤Æ¡¢¤½¤ì¤Ï¥¹¥ï¥Ã¥×¶õ´Ö¤ÎÍͤǤ¹¡£\n"
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       ¥¿¥¤¥× %s ¤ò»î¤·¤Æ¤ß¤Þ¤¹\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "%s ¤ò»î¤·¤Þ¤¹\n"
@@ -8222,7 +8217,7 @@ msgstr "
 msgid "bug in xstrndup call"
 msgstr "xstrndup ¸Æ¤Ó½Ð¤·¤Î¥Ð¥°"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8235,7 +8230,7 @@ msgstr ""
 "        %s [-v] [-p Í¥ÀèÅÙ] ¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8247,100 +8242,33 @@ msgstr ""
 "        %s [-v] [-p Í¥ÀèÅÙ] ¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%2$s ¤Ë %1$s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: %s ¤Î¾õÂÖ¼èÆÀ¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: ·Ù¹ð: %s ¤Ï°ÂÁ´¤Ç¤Ê¤¤¸¢¸Â %04o ¤ò»ý¤Á¤Þ¤¹¡£ %04o ¤¬¤ª´«¤á¤Ç¤¹\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: ¥Õ¥¡¥¤¥ë %s ¤ò¥¹¥­¥Ã¥× -- ¥Û¡¼¥ë¤ò¸¡½Ð¡£\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 #, fuzzy
 msgid "Not superuser.\n"
 msgstr "¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s ¤ÏÉÔÀµ¤Ê¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤¹"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "%s ¥¿¥¤¥×¤Î°Å¹æ²½¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: loop ¥Ç¥Ð¥¤¥¹ %s ¤ò»È¤¤¤Þ¤¹\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "¤³¤Î¥Ç¥£¥¹¥¯¤Ï¸½ºß»ÈÍÑÃæ¤Ç¤¹¡£"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "¥¹¥ï¥Ã¥×¥Ç¥ô¥¡¥¤¥¹¤ò´¬¤­Ì᤻¤Þ¤»¤ó"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "/dev/urandom ¤ò³«¤±¤Þ¤»¤ó"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "inode ¤Î½ñ¤­¹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "fork ¤¬¼ºÇÔ\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "%s ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤·¤Þ¤¹\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
@@ -8405,35 +8333,35 @@ msgstr "umount: %s: 
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 ¤¬¤¢¤ê¤Þ¤»¤ó¡¢umount ¤·¤Æ¤ß¤Þ¤¹...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "%s ¤ò¥¢¥ó¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿ -- Âå¤ê¤Ë %s ¤ò»È¤Ã¤Æ¤ß¤Þ¤¹\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ¤Ï»ÈÍÑÃæ¤Ç¤¹ -- Æɹþ¤ßÀìÍѤȤ·¤ÆºÆ¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s ¤òÆɹþ¤ßÀìÍѤǺƥޥ¦¥ó¥È¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ¤Ï¥¢¥ó¥Þ¥¦¥ó¥È¤µ¤ì¤Þ¤·¤¿\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ¥¢¥ó¥Þ¥¦¥ó¥È¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥ê¥¹¥È¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 #, fuzzy
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8444,43 +8372,43 @@ msgstr ""
 "        umount -a [-f] [-r] [-n] [-v] [-t ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×]\n"
 "        umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s ¤ò¥¢¥ó¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab ¤Ë %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (mtab ¤Ë¤è¤ë¤È)"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s ¤ÏÊ£¿ô¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ç¤¹"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 "umount: %s ¤Ï fstab ¤Ë¤¢¤ê¤Þ¤»¤ó (¤µ¤é¤Ë¡¢¤¢¤Ê¤¿¤Ï root ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)"
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s ¤Ï fstab ¤È°ìÃפ·¤Ê¤¤¥Þ¥¦¥ó¥È¤Ç¤¹"
 
-#: mount/umount.c:602
+#: mount/umount.c:616
 #, c-format
-msgid "umount: only root can unmount %s from %s"
-msgstr "umount: root ¤À¤±¤¬ %s ¤ò %s ¤«¤é¥¢¥ó¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤¹"
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: %s ¤À¤±¤¬ %s ¤ò %s ¤«¤é¥¢¥ó¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤¹"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr "umount: root ¤À¤±¤¬¤½¤ì¤ò¹Ô¤Ê¤¨¤Þ¤¹"
 
@@ -8621,7 +8549,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f À°¿ô/Éà -- %f µ­Ï¿ (¥­¥ã¥é¥¯¥¿/ÉÃ)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "»È¤¤Êý: %s [-c] [-n ¥ì¥Ù¥ë] [-s ¥Ð¥Ã¥Õ¥¡¥µ¥¤¥º]\n"
@@ -8788,23 +8716,23 @@ msgstr "------ 
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
 msgstr "¥»¥°¥á¥ó¥È¿ô¤ÎºÇÂçÃÍ = %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "¥»¥°¥á¥ó¥È¥µ¥¤¥º¤ÎºÇÂç (ñ°Ì:KB) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "¹ç·×¶¦Í­¥á¥â¥ê¤ÎºÇÂç (ñ°Ì:KB) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "ºÇ¾®¥»¥°¥á¥ó¥È¥µ¥¤¥º (ñ°Ì:KB) = %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9321,7 +9249,11 @@ msgstr ""
 msgid "missing comma"
 msgstr "¥«¥ó¥Þ¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: sys-utils/readprofile.c:115
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó"
+
+#: sys-utils/readprofile.c:118
 #, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
@@ -9333,6 +9265,7 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
@@ -9348,32 +9281,32 @@ msgstr ""
 "\t -n                   ¥Ð¥¤¥È¥ª¡¼¥À¤Î¼«Æ°¸¡ÃΤò̵¸ú²½¤¹¤ë\n"
 "\t -V                   ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, fuzzy, c-format
 msgid "%s version %s\n"
 msgstr "%s ¥Ð¡¼¥¸¥ç¥ó %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "¥µ¥ó¥×¥ê¥ó¥°¥¹¥Æ¥Ã¥×: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): ´Ö°ã¤Ã¤¿¥Þ¥Ã¥×¹Ô\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: %s ¤Ë \"_stext\" ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: ¥×¥í¥Õ¥¡¥¤¥ë¥¢¥É¥ì¥¹¤¬Èϰϳ°¤Ç¤¹¡£´Ö°ã¤Ã¤¿ map ¥Õ¥¡¥¤¥ë?\n"
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "¹ç·×"
 
@@ -9902,32 +9835,118 @@ msgstr "
 msgid "Out of memory when growing buffer.\n"
 msgstr "¥Ð¥Ã¥Õ¥¡¤ò³ÈÂ礹¤ë¤È¤­¤Ë¥á¥â¥ê¤¬Â­¤ê¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: ¥Ç¥Ð¥¤¥¹ %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó: %s\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: minix v2 ¤Î¥µ¥Ý¡¼¥È¤Ä¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): À®¸ù\n"
+#~ msgid "Boot (%02X)"
+#~ msgstr "¥Ö¡¼¥È (%02X)"
 
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
-#~ msgstr ""
-#~ "¤³¤Î mount ¤Ï loop ¤Î¥µ¥Ý¡¼¥È¤Ê¤·¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿¡£\n"
-#~ "ºÆ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+#~ msgid "None (%02X)"
+#~ msgstr "¤Ê¤· (%02X)"
+
+#, fuzzy
+#~ msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) ¥ª¥Õ¥»¥Ã¥È %d, %s encryption\n"
 
 #~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "»È¤¤Êý:\n"
-#~ "  %s loop¥Ç¥Ð¥¤¥¹                                          # ¾ðÊó¤ò¤ß¤ë\n"
-#~ "  %s -d loop¥Ç¥Ð¥¤¥¹                                       # ºï½ü\n"
-#~ "  %s [ -e °Å¹æ²½ ] [ -o ¥ª¥Õ¥»¥Ã¥È ] loop¥Ç¥Ð¥¤¥¹ ¥Õ¥¡¥¤¥ë # ÀßÄê\n"
+#~ "mount: /dev/loop# ¤¬Á´¤¯¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
+#~ "       ¿ʬ /dev/loop# ¤Î¥á¥¸¥ã¡¼Èֹ椬´Ö°ã¤Ã¤Æ¤¤¤ë¤Î¤Ç¤Ï¡©"
 
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ 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 ""
-#~ "¥³¥ó¥Ñ¥¤¥ë»þ¤Ë loop ¥µ¥Ý¡¼¥È¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó¡£ºÆ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ"
-#~ "¤¤¡£\n"
+#~ "mount: loop ¥Ç¥Ð¥¤¥¹¤¬Á´¤¯¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£Â¿Ê¬¤³¤Î¥«¡¼¥Í¥ë¤Ï loop ¥Ç¥Ð¥¤¥¹"
+#~ "¤ò\n"
+#~ "       °·¤¨¤Þ¤»¤ó(¤½¤¦¤À¤È¤·¤¿¤é¡¢ºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤« `insmod loop.o'¤·¤Æ\n"
+#~ "       ¤¯¤À¤µ¤¤)¡£¤¢¤ë¤¤¤Ï¡¢/dev/loop# ¤Î¥á¥¸¥ã¡¼Èֹ椬´Ö°ã¤Ã¤Æ¤¤¤ë¤Î¤«"
+#~ "¤â\n"
+#~ "       ÃΤì¤Þ¤»¤ó¡£"
+
+#, fuzzy
+#~ msgid "Error: unable to open %s for reading\n"
+#~ msgstr "%s ¤òÆɹþ¤ßÍѤ˳«¤±¤Þ¤»¤ó\n"
+
+#, fuzzy
+#~ msgid "Retype password: "
+#~ msgstr "¿·¥Ñ¥¹¥ï¡¼¥É¤ò¤â¤¦°ìÅÙÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
+
+#, fuzzy
+#~ msgid "Error: gpg key file decryption failed\n"
+#~ msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ª¡¼¥×¥ó¤¬¼ºÇÔ¤·¤Þ¤·¤¿\n"
+
+#, fuzzy
+#~ msgid "Error: Password must be at least %d characters.\n"
+#~ msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏºÇÄã 6 ʸ»úɬÍפǤ¹¡£¤â¤¦°ìÅÙ¤ä¤êľ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#, fuzzy
+#~ msgid "Error: Unable to allocate memory\n"
+#~ msgstr "¤³¤ì°Ê¾å¤Î¥á¥â¥ê¤¬³ÎÊݤǤ­¤Þ¤»¤ó\n"
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "½é´ü²½ (16 ¿Ê¿ô¤ÇºÇÂç 16 ʸ»ú¤Þ¤Ç): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "16 ¿Ê¿ô¤Ç¤Ï¤Ê¤¤Ê¸»ú '%c'¡£\n"
+
+#~ msgid "Don't know how to get key for encryption system %d\n"
+#~ msgstr "°Å¹æ²½¥·¥¹¥Æ¥à %d ¤Î¸°¼èÆÀÊýË¡¤¬²ò¤ê¤Þ¤»¤ó\n"
+
+#, fuzzy
+#~ msgid "Error: unable to open /etc/fstab for reading\n"
+#~ msgstr "%s ¤òÆɹþ¤ßÍѤ˳«¤±¤Þ¤»¤ó\n"
+
+#, fuzzy
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "umount: %s: ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: %s ¤ò %s ¤Ç¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "¥é¥Ù¥ë"
+
+#, fuzzy
+#~ msgid "swapon: invalid loop device name\n"
+#~ msgstr "umount: %s ¤ÏÉÔÀµ¤Ê¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤¹"
+
+#, fuzzy
+#~ msgid "swapon: unable to open loop device %s\n"
+#~ msgstr "mount: loop ¥Ç¥Ð¥¤¥¹ %s ¤ò»È¤¤¤Þ¤¹\n"
+
+#, fuzzy
+#~ msgid "swapon: loop device %s already in use\n"
+#~ msgstr "¤³¤Î¥Ç¥£¥¹¥¯¤Ï¸½ºß»ÈÍÑÃæ¤Ç¤¹¡£"
+
+#, fuzzy
+#~ msgid "swapon: unable to open swap device %s\n"
+#~ msgstr "¥¹¥ï¥Ã¥×¥Ç¥ô¥¡¥¤¥¹¤ò´¬¤­Ì᤻¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "swapon: unable to open /dev/urandom\n"
+#~ msgstr "/dev/urandom ¤ò³«¤±¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "swapon: unable to create pipe\n"
+#~ msgstr "inode ¤Î½ñ¤­¹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "swapon: fork failed\n"
+#~ msgstr "fork ¤¬¼ºÇÔ\n"
+
+#, fuzzy
+#~ msgid "swapon: random password for %s is %s"
+#~ msgstr "%s ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤·¤Þ¤¹\n"
+
+#~ msgid "umount: only root can unmount %s from %s"
+#~ msgstr "umount: root ¤À¤±¤¬ %s ¤ò %s ¤«¤é¥¢¥ó¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤¹"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Îΰè %i ¤Ï¥·¥ê¥ó¥À¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó:\n"
@@ -9964,9 +9983,6 @@ msgstr "
 #~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
 #~ msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
 
-#~ msgid "umount: only %s can unmount %s from %s"
-#~ msgstr "umount: %s ¤À¤±¤¬ %s ¤ò %s ¤«¤é¥¢¥ó¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤¹"
-
 #~ msgid "'."
 #~ msgstr "'."
 
diff --git a/po/nl.po b/po/nl.po
index 54f9da00..b77fe150 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,6 +1,6 @@
 # Dutch translation of util-linux.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Taco Witte <T.C.Witte@phys.uu.nl>, 2002.
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Taco Witte <T.C.Witte@phys.uu.nl>, 2002, 2003.
 #
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided that this
@@ -18,103 +18,108 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11z\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
-"PO-Revision-Date: 2003-02-05 13:12+02\n"
+"Project-Id-Version: util-linux 2.12\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
+"PO-Revision-Date: 2003-07-29 22:55+0100\n"
 "Last-Translator: Taco Witte <T.C.Witte@phys.uu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "alleen-lezen instellen"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "lezen-schrijven instellen"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "alleen-lezen opvragen"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "sectorgrootte opvragen"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr "blokgrootte opvragen"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
 msgstr "blokgrootte instellen"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "grootte opvragen"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "vooruit lezen instellen"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "vooruit lezen opvragen"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "buffers doorspoelen"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "partitie-tabel opnieuw inlezen"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
 msgstr "Gebruik:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr "  %s --report [apparaten]\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "  %s [-v|-q] opdrachten apparaten\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Beschikbare opdrachten:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: Onbekende opdracht: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s vereist een argument\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr "%s voltooid.\n"
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: kan %s niet openen\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: ioctl fout bij %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   StartSec     Grootte Apparaat\n"
 
@@ -157,12 +162,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "gebruik: %s [ -n ] apparaat\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s van %s\n"
@@ -301,49 +306,49 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: onjuist cramfs--onjuiste bestandsgegevens plaats\n"
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Gebruik: %s [-larvsmf] /dev/naam\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s is aangekoppeld.\t "
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Wilt u echt doorgaan?"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "controle afgebroken.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zone nr < EERSTEZONE in bestand `%s'."
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zone nr >= ZONES in bestand `%s'."
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Blok verwijderen"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Leesfout: kon niet zoeken naar blok in bestand '%s'\n"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Leesfout: slecht blok in bestand '%s'\n"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -351,122 +356,122 @@ msgstr ""
 "Interne fout: proberen schrijven slecht blok\n"
 "Schrijfverzoek genegeerd\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "zoeken mislukt in write_block"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Schrijffout: slecht blok in bestand '%s'\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "zoeken mislukt in write_super_block"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "kon superblok niet schrijven"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "Kon inode afbeelding niet schrijven"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "Kon zone afbeelding niet schrijven"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "Kon inodes niet schrijven"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "zoeken mislukt"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "kon superblok niet lezen"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "slecht soort-aanduidingsnummer in superblok"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Alleen 1k blokken/zones worden ondersteund"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "slecht s_imap_blocks veld in superblok"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "slecht s_zmap_blocks veld in superblok"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "Kon geen buffer reserveren voor inode afbeelding"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "Kon geen buffer reserveren voor inodes"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "Kon geen buffer reserveren voor inode aantal"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "Kon geen buffer reserveren voor zone aantal"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "Kon inode afbeelding niet lezen"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "Kon zone afbeelding niet lezen"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "Kon inodes niet lezen"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Waarschuwing: EersteZone != NormEersteZone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blokken\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "EersteGegevensZone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "ZoneGrootte=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "MaxGrootte=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Bestandssysteem status=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -475,171 +480,171 @@ msgstr ""
 "naamlengte=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inode %d gemarkeerd als ongebruikt, maar gebruikt door bestand '%s'\n"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Aangeven als gebruikt"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Het bestand `%s' heeft modus %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "Waarschuwing: het aantal inodes is te groot.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "root inode is geen map"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Blok is al eerder gebruikt. Nu in bestand `%s'."
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Wissen"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Blok %d in bestand `%s' is gemarkeerd als ongebruikt."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Corrigeren"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "De map '%s' bevat een slecht inode nummer voor bestand '%.*s'."
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " Verwijderen"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr "`%s': slechte map: '.' is niet eerste\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr "`%s': slechte map: '..' is niet tweede\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: slechte map: '.' is niet eerste\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: slechte map: '..' is niet tweede\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "interne fout"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: slechte map: grootte < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "zoeken mislukt in bad_zone"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Inode %d modus niet gewist."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "Inode %d ongebruikt, gemarkeerd als gebruikt in de bit-afbeelding."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "Inode %d gebruikt, gemarkeerd als ongebruikt in de bit-afbeelding."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (modus = %07o), i_nlinks=%d, geteld=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "i_nlinks op aantal instellen"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zone %d: gemarkeerd als in gebruik, geen bestand gebruikt het."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Markering verwijderen"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Zone %d: in gebruik, geteld=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Zone %d: niet in gebruik, geteld=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Instellen"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "slechte inode grootte"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "slechte v2 inode grootte"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "terminal vereist voor interactieve reparaties"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "kon '%s' niet openen"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s is schoon, geen controle.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Forceren bestandssysteem controle %s.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Bestandssysteem op %s is vies, controle nodig.\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -648,12 +653,12 @@ msgstr ""
 "\n"
 "%6ld inodes gebruikt (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zones gebruikt (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -676,7 +681,7 @@ msgstr ""
 "------\n"
 "%6d bestanden\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -767,7 +772,7 @@ msgstr "te veel inodes - maximum: 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "niet genoeg ruimte, tenminste %lu blokken nodig"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Apparaat: %s\n"
@@ -842,7 +847,7 @@ msgstr ""
 "Gebruik: mkfs [-V] [-t soort bestandssysteem] [opties bestandssysteem] "
 "apparaat [grootte]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1007,63 +1012,63 @@ msgstr ""
 "WAARSCHUWING: apparaatnummers afgekapt tot %u bits.  Dit betekent zeer\n"
 "waarschijnlijk dat sommige apparaatbestanden niet goed zullen zijn.\n"
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Gebruik: %s [-c | -l bestandsnaam] [-nXX] [-iXX] /dev/naam [blokken]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s is aangekoppeld; zal hier geen bestandssysteem maken!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "zoeken naar opstartblok mislukt in write_tables"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "wissen opstartsector mislukt"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "zoeken mislukt in write_tables"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "schrijven inode afbeelding mislukt"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "schrijven zone afbeelding mislukt"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "schrijven inodes mislukt"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "schrijven mislukt in write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "teveel slechte blokken"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "onvoldoende goede blokken"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "reserveren buffers voor afbeeldingen mislukt"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "reserveren buffer voor inodes mislukt"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1072,55 +1077,50 @@ msgstr ""
 "MaxGrootte=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "zoeken mislukt tijdens testen van blokken"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Vreemde waarden in do_check: waarschijnlijk programmeerfouten\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "zoeken mislukt in check_blocks"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "slechte blokken voor gegevens-gebied: kan geen bestandssysteem maken"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d slechte blokken\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "één slecht blok\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "kan geen bestand met slechte blokken openen"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s: niet gecompileerd met minix v2 ondersteuning\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol fout: aantal blokken niet aangegeven"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "openen %s mislukt"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "vinden %s mislukt"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "zal niet proberen een bestandssysteem te maken op '%s'"
@@ -1161,45 +1161,45 @@ msgid "one bad page\n"
 msgstr "één slechte pagina\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d slechte pagina's\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fout: Nergens om wisselgeheugen op in te stellen?\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: fout: grootte %ld is groter dan apparaatgrootte %d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: fout: onbekende versie %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: fout: wisselgeheugen moet tenminste %ldkB zijn\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: waarschuwing: afkappen wisselgeheugen tot %ldkB\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Zal niet proberen wisselgeheugen in te stellen op '%s'"
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "fataal: eerste pagina onleesbaar"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1213,24 +1213,24 @@ msgstr ""
 "wisselgeheugen op dat apparaat wilt maken, kunt u de -f optie gebruiken\n"
 "om het te forceren.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Instellen wisselgeheugen mislukt: onleesbaar"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Instellen wisselgeheugen versie %d, grootte = %llu kB\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "terugwinden wisselapparaat mislukt"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "schrijven ondertekeningspagina mislukt"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync mislukt"
 
@@ -1272,58 +1272,57 @@ msgstr "   %s [ -c | -y | -n | -d ] apparaat\n"
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] apparaat\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Onbruikbaar"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Vrije ruimte"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "De schijf is veranderd.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Start het systeem opnieuw op om er zeker van te zijn dat de partitietabel "
 "juist wordt bijgewerkt.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1334,775 +1333,778 @@ msgstr ""
 "WAARSCHUWING: U heeft DOS 6.x partities gemaakt of gewijzigd.\n"
 "Kijk alstublieft in het cfdisk handboek voor meer informatie.\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "FATALE FOUT"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Druk op een toets om cfdisk af te sluiten"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "Kan niet zoeken op schijf"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Kan schijf niet lezen"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Kan niet schrijven naar schijf"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Teveel partities"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "Partitie begint vóór sector 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "Partitie eindigt vóór sector 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "Partitie begint na einde schijf"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "Partitie eindigt na einde schijf"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partitie eindigt in de laatste gedeeltelijke cylinder"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "logische partities niet in schijfvolgorde"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "logische partities overlappen"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "vergrootte logische partities overlappen"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Interne fout bij maken logische schijf zonder uitgebreide partitie !!!!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Kan hier geen logische schijf maken -- zou twee uitgebreide partities maken"
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menu item te lang. Menu ziet er misschien raar uit."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu zonder richting. Gebruik standaard: horizontaal."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Onjuiste toets"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Druk op een toets om door te gaan"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primair"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Een nieuwe primaire partitie maken"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Logisch"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Een nieuwe logische partitie maken"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Geen partitie maken"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Interne fout !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Grootte (in MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Begin"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Partitie toevoegen aan begin vrije ruimte"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Einde"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Partitie toevoegen aan einde vrije ruimte"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Geen ruimte om de uitgebreide partitie te maken"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr "Geen partitietabel of onbekende ondertekening op partitietabel"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Wilt u met een lege tabel beginnen [j/N] ?"
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "U heeft meer cylinders aangegeven dan er op de schijf passen"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "Kan schijf niet openen"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 "Schijf alleen-lezen geopend -- u heeft geen toegangsrechten om te schrijven"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Kan schijfgrootte niet opvragen"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Slechte primaire partitie"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Slechte logische partitie"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Waarschuwing!!  Dit kan gegevens op uw schijf wissen!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Weet u zeker dat u de partitietabel naar de schijf wilt schrijven? (ja of "
 "nee): "
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "nee"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Partitietabel niet naar schijf geschreven"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Antwoord alstublieft `ja' of `nee'"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Schrijven partitietabel naar schijf..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "De partitietabel is weggeschreven naar de schijf"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Partitietabel geschreven, maar opnieuw inlezen mislukt.  Start opnieuw op om "
 "de tabel bij te werken."
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Geen primaire partities aangegeven als opstartbaar. DOS MBR kan dit niet "
 "opstarten."
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Meer dan één primaire partitie is aangegeven als opstartbaar. DOS MBR kan "
 "dit niet opstarten."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Geef een bestandsnaam of druk op ENTER om op het scherm weer te geven: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan bestand '%s' niet openen"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Schijf: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Geen   "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Primair"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Logisch"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Opstartbaar (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Opstartbaar"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
+#: fdisk/cfdisk.c:2007
 #, c-format
-msgid "Unknown (%02X)"
-msgstr "Onbekend (%02X)"
+msgid "(%02X)"
+msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Geen (%02X)"
+#: fdisk/cfdisk.c:2009
+msgid "None"
+msgstr "Geen"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitietabel voor %s\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
-msgstr "            Eerste   Laatste\n"
+#: fdisk/cfdisk.c:2046
+msgid "               First       Last\n"
+msgstr "               Eerste      Laatste\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
-" # Soort    Sector   Sector   Plaats  Lengte   Soort bestandssysteem  "
-"Opties\n"
+" # Soort      Sector      Sector   Plaats    Lengte   Bestandssysteem (ID) "
+"Optie\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
-msgstr "         ---Start---         ----Einde----     Startnummer van\n"
+#: fdisk/cfdisk.c:2131
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
+msgstr "         ---Begin---         ----Einde----     Start     Aantal\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
-msgstr " # OptiesKop  Sect Cyl   ID  Kop  Sect Cyl    Sector  Sectoren\n"
+#: fdisk/cfdisk.c:2132
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr " # OptiesKop  Sect Cyl   ID  Kop  Sect Cyl     Sector    Sectoren\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Ruw"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Deze tabel weergeven met ruwe gegevens formaat"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Sectoren"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Deze tabel weergeven, geordend op sectoren"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Gewoon de partitietabel weergeven"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Tabel niet weergeven"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Hulpscherm voor cfdisk"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dit is cfdisk, een schijfpartitioneringsprogramma gebaseerd op"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "cursus, waarmee u partities kunt maken, verwijderen of wijzigen"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "op uw harde schijf."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Opdracht     Betekenis"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "--------     -------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          `Opstartbaar'-optie voor huidige partitie aan/uitzetten"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          Huidige partitie verwijderen"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Cylinders, koppen, sectoren-per-spoor wijzigen"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             WAARSCHUWING: Deze optie dient alleen te worden gebruikt"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             door mensen die weten wat ze doen."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          Dit scherm weergeven"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Schijf gebruik maximaliseren voor huidige partitie"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Let op: Dit kan een partitie incompatibel maken met"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          Nieuwe partitie maken van vrije ruimte"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Partitietabel weergeven op scherm of naar bestand"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "             Er zijn verschillende formaten voor de partitie"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             waaruit u kunt kiezen:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - Ruwe gegevens (exact wat naar de schijf zou worden "
 "geschreven)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabel geordend op sectoren"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel in ruw formaat"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Programma afsluiten zonder partitietabel te schrijven"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          Soort bestandssysteem wijzigen"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Eenheden partitiegrootte weergave wijzigen"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Roteert door MB, sectoren en cylinders"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Partitietabel naar schijf wegschrijven (moet met hoofdletter)"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Omdat dit mogelijk gegevens op de schijf wist, moet"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             u bevestigen of weigeren door te antwoorden met `ja' of"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             `nee'"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pijl omhoog  Aanwijzer naar vorige partitie verplaatsen"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pijl omlaag  Aanwijzer naar volgende partitie verplaatsen"
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Het scherm opnieuw tekenen"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Dit scherm weergeven"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Let op: Alle opdrachten kunnen zowel met hoofd- als kleine letter"
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "worden ingevoerd (behalve W)."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cylinders"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Cylinder geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Koppen"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Koppen geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Sector geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Klaar"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "Klaar met wijzigen geometrie"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Geef het aantal cylinders: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Onjuiste waarde cylinders"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Geef het aantal koppen: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Onjuiste waarde koppen"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Geef het aantal sectoren per spoor: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Onjuiste waarde sectoren"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Geef het soort bestandssysteem: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "Kan bestandsysteem soort niet veranderen tot leeg"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "Kan bestandssysteem soort niet veranderen tot uitgebreid"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Opstartbaar"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Onbekend(%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Onbekend (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Schijf: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, c-format
-msgid "Size: %lld bytes, %ld MB"
-msgstr "Grootte: %lld bytes, %ld MB"
+msgid "Size: %lld bytes, %lld MB"
+msgstr "Grootte: %lld bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
-msgstr "Grootte: %lld bytes, %ld.%ld GB"
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "Grootte: %lld bytes, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2587
 #, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
-msgstr "Koppen: %d   Sectoren per spoor: %d   Cylinders: %d"
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "Koppen: %d   Sectoren per spoor: %d   Cylinders: %lld"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Naam"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Opties"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Part soort"
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "Bestandssysteem"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Label]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
-msgstr "  Sectoren"
+#: fdisk/cfdisk.c:2597
+msgid "    Sectors"
+msgstr "    Sectoren"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
-msgstr "Grootte (MB)"
+#: fdisk/cfdisk.c:2599
+msgid "  Cylinders"
+msgstr "  Cylinders"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
-msgstr "Grootte (GB)"
+#: fdisk/cfdisk.c:2601
+msgid "  Size (MB)"
+msgstr "  Grootte (MB)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2603
+msgid "  Size (GB)"
+msgstr "  Grootte (GB)"
+
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Opstartbaar"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Huidige partitie wel/niet op opstartbaar zetten"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "De huidige partitie verwijderen"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Schijf geometrie wijzigen (alleen experts)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Hulp"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Hulpscherm weergeven"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Maximaliseren"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Schijfgebruik maximaliseren voor huidige partitie (alleen experts)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Nieuw"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Nieuwe partitie maken van vrije ruimte"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Weergeven"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Partitietabel weergeven op scherm of naar een bestand"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Programma afsluiten zonder partitietabel te schrijven"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Soort"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Bestandssysteem soort wijzigen (DOS, Linux, OS/2 enz.)"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Eenheden"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "De gebruikte eenheden in weergave wijzigen (MB, sect, cyl)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Schrijven"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Partitietabel naar schijf schrijven (kan gegevens wissen)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "Kan deze partitie niet opstartbaar maken"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "Kan geen lege partitie verwijderen"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "Kan deze partitie niet maximaliseren"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Deze partitie is onbruikbaar"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Deze partitie is al in gebruik"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan niet de soort van een lege partitie wijzigen"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "Niet meer partities"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Onjuiste opdracht"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2138,7 +2140,7 @@ msgstr ""
 "                sectoren/spoor dan de kernel geeft.\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2159,7 +2161,7 @@ msgstr ""
 "-u: geef Start en Einde in sector (in plaats van cylinder) eenheden\n"
 "-b 2048: (voor sommige MO schijven) gebruik 2048-byte sectoren\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2175,222 +2177,222 @@ msgstr ""
 "   of: fdisk /dev/rd/c0d0  of: fdisk /dev/ida/c0d0  (voor RAID apparaten)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kan %s niet openen\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kan %s niet lezen\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kan niet zoeken op %s\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kan niet schrijven naar %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl mislukt op %s\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Kan niet meer geheugen reserveren\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Fatale fout\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Opdracht actie"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   wel/niet alleen-lezen instellen"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd schijflabel bewerken"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   wel/niet aankoppelbaar instellen"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   een partitie verwijderen"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   bekende partitiesoorten opsommen"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   dit menu weergeven"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   een nieuwe partitie toevoegen"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   een nieuwe, lege DOS partitietabel maken"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   de partitietabel weergeven"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   afsluiten zonder wijzigingen op te slaan"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   een nieuwe, lege Sun schijflabel maken"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   systeem id van partitie wijzigen"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   weergave/invoer eenheden wijzigen"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   de partitietabel controleren"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   tabel naar schijf schrijven en afsluiten"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   extra functionaliteit (alleen experts)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   opstarbare partitie selecteren"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b   opstartbestand ingang bewerken"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi wisselpartitie selecteren"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a   wel/niet opstartbaar instellen"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   wel/niet dos compatibel instellen"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   aantal alternatieve cylinders wijzigen"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   aantal cylinders wijzigen"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   ruwe gegevens in partitietabel weergeven"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   aantal extra sectoren per cylinder wijzigen"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   aantal koppen wijzigen"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   tussenruimte factor wijzigen"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   rotatiesnelheid wijzigen (rpm)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   terug naar hoofdmenu"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   aantal sectoren/spoor wijzigen"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   aantal fysieke cylinders wijzigen"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   begin gegevens verplaatsen in een partitie"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   uitgebreide partities opsommen"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   een IRIX (SGI) partitietabel maken"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f   partitie volgorde repareren"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "U moet instellen:"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "koppen"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "sectoren"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "cylinders"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2399,11 +2401,11 @@ msgstr ""
 "%s%s.\n"
 "U kunt dit doen vanuit het menu met extra functies.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " en "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2422,26 +2424,26 @@ msgstr ""
 "2) opstart- en partitioneringssoftware van andere besturings-\n"
 "   systemen, zoals DOS FDISK en OS/2 FDISK\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Slechte plaats in primaire uitgebreide partitie\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Waarschuwing: partities na %d worden verwijderd\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Waarschuwing: extra koppelingsverwijzer in partitietabel %d\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Waarschuwing: extra gegevens in partitietabel %d worden genegeerd\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2453,16 +2455,16 @@ msgstr ""
 "dat moment is de vorige inhoud uiteraard niet meer herstelbaar.\n"
 "\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Let op: sectorgrootte is %d (niet %d)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr "U zult geen partitietabel kunnen wegschrijven.\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
@@ -2470,22 +2472,22 @@ msgstr ""
 "Deze schijf heeft zowel DOS als BSD identificatienummers.\n"
 "Geef de opdracht 'b' om naar BSD modus te gaan.\n"
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr "Apparaat bevat geen geldige DOS, Sun, SGI of OSF schijflabel\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Interne fout\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Extra uitgebreide partitie %d wordt genegeerd\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2494,7 +2496,7 @@ msgstr ""
 "Waarschuwing: onjuiste optie 0x%04x van partitietabel %d zal worden "
 "gecorrigeerd bij schrijven\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2502,78 +2504,78 @@ msgstr ""
 "\n"
 "driemaal EOF ontvangen - afsluiten..\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Hex code (typ L om codes op te sommen): "
 
-#: fdisk/fdisk.c:1069
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1094
+#, c-format
 msgid "%s (%u-%u, default %u): "
-msgstr "%s (%d-%d, standaard %d): "
+msgstr "%s (%u-%u, standaard %u): "
 
-#: fdisk/fdisk.c:1136
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1161
+#, c-format
 msgid "Using default value %u\n"
-msgstr "Standaardwaarde %d wordt gebruikt\n"
+msgstr "Standaardwaarde %u wordt gebruikt\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "Waarde buiten bereik.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Partitienummer"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Waarschuwing: partitie %d heeft lege soortaanduiding\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Geselecteerde partitie %d\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 msgid "No partition is defined yet!\n"
 msgstr "Er zijn nog geen partities gedefinieerd!\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle primaire partities zijn al gedefinieerd!\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Weergave/invoer eenheden worden veranderd naar %s\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "WAARSCHUWING: Partitie %d is een uitgebreide partitie\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS compatibaliteit is aan gezet\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS compatibaliteit is uit gezet\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partitie %d bestaat nog niet!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2585,7 +2587,7 @@ msgstr ""
 "om partities te hebben van soort 0. U kunt een par-\n"
 "titie verwijderen met de `-d' opdracht.\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2593,7 +2595,7 @@ msgstr ""
 "U kunt een partitie niet veranderen in een uitgebreide of andersom.\n"
 "Verwijder de partitie eerst.\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2603,7 +2605,7 @@ msgstr ""
 "SunOS/Solaris het verwacht en zelfs Linux het liefst heeft.\n"
 "\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2613,53 +2615,53 @@ msgstr ""
 "partitie 11 als geheel volume (6) zoals IRIX het verwacht.\n"
 "\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Systeemsoort van partitie %d veranderd naar %x (%s)\n"
 
-#: fdisk/fdisk.c:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "Partitie %d heeft verschillende fysieke/logische beginpunten (niet-Linux?):\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisch=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partitie %d heeft verschillende fysieke/logische eindpunten:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partitie %i begint niet op de cylinder grens:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "moet zijn (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partitie %i eindigt niet op een cylinder grens.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "moet zijn (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -2668,7 +2670,7 @@ msgstr ""
 "\n"
 "Schijf %s: %ld MB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, c-format
 msgid ""
 "\n"
@@ -2677,17 +2679,17 @@ msgstr ""
 "\n"
 "Schijf %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d koppen, %d sectoren/spoor, %d cylinders"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
-msgstr ", totaal %lu sectoren"
+msgid ", total %llu sectors"
+msgstr ", totaal %llu sectoren"
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2696,7 +2698,7 @@ msgstr ""
 "Eenheden = %s van %d * %d = %d bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2704,16 +2706,16 @@ msgstr ""
 "Niets te doen. De ordening is al goed.\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
+#: fdisk/fdisk.c:1704
 #, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
-msgstr "%*s Opstart Start       Einde  Blokken  Id  Systeem\n"
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s Boot      Start         Einde    Blokken  Id  Systeem\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Apparaat"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2721,7 +2723,7 @@ msgstr ""
 "\n"
 "Partitietabel ingangen zijn niet in schijfvolgorde\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2732,93 +2734,93 @@ msgstr ""
 "Schijf %s: %d koppen, %d sectoren, %d cylinders\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
-msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Grootte ID\n"
+#: fdisk/fdisk.c:1754
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Grootte ID\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Waarschuwing: partitie %d bevat sector 0\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partitie %d: kop %d groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partitie %d: sector %d groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partities %d: cylinder %d groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partitie %d: vorige sectoren %d stemt niet overeen met totaal %d\n"
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Waarschuwing: slechte start-van-gegevens in partitie %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Waarschuwing: partitie %d overlapt partitie %d.\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Waarschuwing: partitie %d is leeg\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logische partitie %d niet geheel in partitie %d\n"
 
-#: fdisk/fdisk.c:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Totaal gereserveerde sectoren %d groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d niet-gereserveerde sectoren\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "Partitie %d is al gedefinieerd.  Verwijder haar alvorens haar opnieuw toe te "
 "voegen.\n"
 
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Eerste %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sector %d is al gereserveerd\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "Geen vrije sectoren beschikbaar\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Laatste %s of +size of +sizeM of +sizeK"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2830,16 +2832,26 @@ msgstr ""
 "\tnieuwe, lege DOS partitietabel. (Gebruik o.)\n"
 "\tWAARSCHUWING: Dit zal de huidige schijfinhoud wissen.\n"
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "Het maximum aantal partities is gemaakt\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "U moet een partitie verwijderen en eerst een uitgebreide partitie toevoegen\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "logische partities niet in schijfvolgorde"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Slechte primaire partitie"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2850,20 +2862,20 @@ msgstr ""
 "   %s\n"
 "   p   primaire partitie (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l   logische (5 of hoger)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e   uitgebreid"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Onjuist partitienummer voor soort `%c'\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2871,11 +2883,11 @@ msgstr ""
 "De partitietabel is gewijzigd!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Aanroepen ioctl() om partitietabel opnieuw in te lezen.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2888,7 +2900,7 @@ msgstr ""
 "De kernel gebruikt nog de oude tabel.\n"
 "De nieuwe tabel wordt na opnieuw opstarten gebruikt.\n"
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2900,64 +2912,64 @@ msgstr ""
 "of gewijzigd, kunt u het best meer informatie opzoeken\n"
 "in het fdisk handboek.\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Synchroniseren schijven.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitie %d heeft geen gegevens-plaats\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Nieuw begin van gegevens"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Expert opdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Aantal cylinders"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Aantal koppen"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Aantal sectoren"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Waarschuwing: sector plaats wordt ingesteld voor DOS compatibaliteit\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Schijf %s bevat geen geldige partitietabel\n"
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: onbekende opdracht\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Deze kernel vind de sectorgrootte zelf - -b optie genegeerd\n"
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2966,16 +2978,16 @@ msgstr ""
 "apparaat worden gebruikt\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "OSF/1 schijflabel gevonden op %s, ga in schijflabel modus.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Opdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2984,15 +2996,15 @@ msgstr ""
 "\n"
 "Het huidige opstartbestand is: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Geef alstublieft de naam van het nieuwe opstartbestand: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "Opstartbestand ongewijzigd\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3002,7 +3014,7 @@ msgstr ""
 "\tSorry, het experts menu is niet beschikbaar voor SGI partitietabellen.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3177,15 +3189,15 @@ msgstr "tussenruimte: %d\n"
 
 # let op: komt vaker voor
 #: fdisk/fdiskbsdlabel.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "trackskew: %d\n"
-msgstr "trackskew: %d\n"
+msgstr ""
 
 # let op: komt vaker voor
 #: fdisk/fdiskbsdlabel.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "cylinderskew: %d\n"
-msgstr "cylinderskew: %d\n"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:342
 #, c-format
@@ -3365,8 +3377,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux wisselgeheugen"
 
@@ -3550,9 +3561,9 @@ msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "De partities %d en %d overlappen elkaar %d sectoren.\n"
 
 #: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Ongebruikt gat van %8d sectoren - sectoren %8d-%d\n"
+msgstr "Ongebruikt gat van %8u sectoren - sectoren %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:523
 msgid ""
@@ -3584,9 +3595,8 @@ msgstr "\tU heeft een ongebruikelijke naam gekozen voor het opstartbestand.\n"
 
 #. caught already before, ...
 #: fdisk/fdisksgilabel.c:542
-#, fuzzy
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Sorry, u kunt de tag van niet-lege partities wijzigen.\n"
+msgstr "Sorry, u kunt niet de tag van niet-lege partities wijzigen.\n"
 
 #: fdisk/fdisksgilabel.c:548
 msgid ""
@@ -3602,7 +3612,7 @@ msgstr ""
 "Alleen het gehele schijf deel \"SGI volume\" mag dit overtreden.\n"
 "Typ JA als u zeker wilt dat u deze partitie anders wilt noemen.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "JA\n"
 
@@ -3659,6 +3669,9 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
+"Waarschuwing:  BLKGETSIZE ioctl mislukt op %s.  Nu wordt cylinder geometrie\n"
+"waarde %d gebruikt.\n"
+"Deze waarde kan voor apparaten > 33.8 GB worden afgekapt.\n"
 
 #: fdisk/fdisksgilabel.c:738
 #, c-format
@@ -3766,15 +3779,15 @@ msgstr "Afwisselende cylinders"
 msgid "Physical cylinders"
 msgstr "Fysieke cylinders"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Rotatiesnelheid (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Tussenruimte factor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Extra sectoren per cylinder"
 
@@ -3829,7 +3842,7 @@ msgstr ""
 "waarde %d %s bedekt al een andere partitie. Uw invoer is gewijzigd\n"
 "tot %d %s\n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3838,7 +3851,7 @@ msgstr ""
 "Als u SunOS/Solaris compatibiliteit wilt houden, kunt u deze partitie beter\n"
 "als gehele schijf (5) laten, startend bij 0, met %u sectoren\n"
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3853,7 +3866,7 @@ msgstr ""
 "Typ JA als u erg zeker bent dat u die partitie van soort 82\n"
 "(Linux wisselgeheugen) wilt laten zijn: "
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3872,7 +3885,7 @@ msgstr ""
 "Eenheden = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3885,16 +3898,16 @@ msgstr ""
 "Eenheden = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Optie   Start       Eind   Blokken  Id  Systeem\n"
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Aantal alternatieve cylinders"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Aantal fysieke cylinders"
 
@@ -3945,21 +3958,21 @@ msgstr "OS/2 Boot Manager"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
-msgstr "Win95 FAT32"
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA)"
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA)"
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
-msgstr "Win95 Ext'd (LBA)"
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 Ext'd (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -3990,16 +4003,16 @@ msgid "AST SmartSleep"
 msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
-msgstr "Verborgen Win95 FAT32"
+msgid "Hidden W95 FAT32"
+msgstr "Verborgen W95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
-msgstr "Verborgen Win95 FAT32 (LBA)"
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "Verborgen W95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
-msgstr "Verborgen Win95 FAT16 (LBA)"
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "Verborgen W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4107,6 +4120,12 @@ msgstr "Oude Minix"
 msgid "Minix / old Linux"
 msgstr "Minix / oude Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux wisselgeheugen"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 verborgen C: schijf"
@@ -4261,89 +4280,89 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "zoekfout op %s - kan niet zoeken naar %lu\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "zoekfout: verwacht 0x%08x%08x, gekregen 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "geheugentekort - opgeven\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "leesfout op %s - kan sector %lu niet lezen\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "FOUT: sector %lu heeft geen msdos ondertekening\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "schrijffout op %s - kan sector %lu niet schrijven\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "kan bestand over sectoren van partitie (%s) niet openen\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "schrijffout op %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "kan partitie herstelbestand niet vinden (%s)\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "partitie herstelbestand heeft onjuiste grootte - niet herstellen\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "geheugentekort?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "kan partitie herstelbestand (%s) niet openen\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "fout bij lezen %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "kan apparaat %s niet openen voor schrijven\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "fout bij schrijven sector %lu op %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Schijf %s: kan grootte niet opvragen\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Schijf %s: kan geometrie niet opvragen\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4355,22 +4374,22 @@ msgstr ""
 "waarschijnlijk zinloos.\n"
 "[Gebruik de --force optie als u dit echt wilt doen]\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Waarschuwing: HDIO_GETGEO zegt dat er %lu koppen zijn\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Waarschuwing: HDIO_GETGEO zegt dat er %lu sectoren zijn\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Waarschuwing: BLKGETSIZE/HDIO_GETGEO zegt dat er %lu cylinders zijn\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4379,7 +4398,7 @@ msgstr ""
 "Waarschuwing: onwaarschijnlijk aantal sectoren (%lu) - meestal hoogstens 63\n"
 "Dit zal problemen geven met alle software die C/H/S adressering gebruikt.\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4388,7 +4407,7 @@ msgstr ""
 "\n"
 "Schijf %s: %lu cylinders, %lu koppen, %lu sectoren/spoor\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4396,7 +4415,7 @@ msgstr ""
 "%s van partitie %s heeft een onmogelijke waarde voor kop: %lu (moet zijn "
 "tussen 0-%lu)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4405,7 +4424,7 @@ msgstr ""
 "%s van partitie %s heeft onmogelijke waarde voor sector: %lu (moet zijn "
 "tussen 1-%lu)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4414,7 +4433,7 @@ msgstr ""
 "%s van partitie %s heeft onmogelijke waarde voor cylinders: %lu (moet zijn "
 "tussen 0-%lu)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4422,11 +4441,11 @@ msgstr ""
 "Id  Naam\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Opnieuw inlezen partitietabel ...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4434,31 +4453,31 @@ msgstr ""
 "Het opnieuw lezen van de partitietabel is mislukt\n"
 "Herstart het systeem nu, vóór mkfs te gebruiken\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fout bij sluiten %s\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: die partitie bestaat niet\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "onbekend formaat - nu sectoren worden gebruikt\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# partitietabel van %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "niet-geïmplementeerd formaat - nu wordt %s gebruikt\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4468,11 +4487,11 @@ msgstr ""
 "d\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   ApparaatOpstart Start Eind  #cyls    #blokken  Id  Systeem\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4481,11 +4500,11 @@ msgstr ""
 "Eenheden = sectoren van 512 bytes, te tellen vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Apparaat Opstart Start     Eind  #sectoren Id  Systeem\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4494,11 +4513,11 @@ msgstr ""
 "Eenheden = blokken van 1024 bytes, te tellen vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Apparaat Opstart Start    Eind   #blokken  Id  Systeem\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4508,30 +4527,30 @@ msgstr ""
 "vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Apparaat Opstart Start Eind MiB   #blokken  Id  Systeem\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tstart: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\teind: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitie eindigt op cylinder %ld, na het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "Geen partities gevonden\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4542,52 +4561,52 @@ msgstr ""
 "  is voor C/H/S=*/%ld/%ld (in plaats van %ld/%ld/%ld).\n"
 "Voor deze opsomming neem ik die geometrie aan.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "geen partitietabel aanwezig.\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "vreemd, slechts %d partities gedefinieerd.\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Waarschuwing: partitie %s heeft grootte 0, maar is niet aangegeven als Leeg\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Waarschuwing: partitie %s heeft grootte 0 en is opstartbaar\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Waarschuwing: partitie %s heeft grootte 0 en een niet-nul start\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Waarschuwing: partitie %s "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "valt niet binnen partitie %s\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Waarschuwing: partities %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "en %s overlappen\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4596,17 +4615,17 @@ msgstr ""
 "Waarschuwing: partitie %s bevat een deel van de partitietabel (sector %lu),\n"
 "en zal die vernielen als zij wordt gevuld\n"
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Waarschuwing: partitie %s start op sector 0\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Waarschuwing: partitie %s loopt tot na het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4614,17 +4633,17 @@ msgstr ""
 "Van de primaire partities kan er ten hoogste één uitgebreid\n"
 "zijn (hoewel dit geen probleem is onder Linux)\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Waarschuwing: partitie %s start niet op een cylinder grens\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Waarschuwing: partitie %s eindigt niet op een cylinder grens\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4634,7 +4653,7 @@ msgstr ""
 "Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf "
 "opstarten.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4642,7 +4661,7 @@ msgstr ""
 "Waarschuwing: normaal gesproken kan men alleen van primaire\n"
 "partities opstarten. LILO negeert de `opstartbaar' optie.\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4652,33 +4671,33 @@ msgstr ""
 "Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf "
 "opstarten.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 msgid "start"
 msgstr "start"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partitie %s: start: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 msgid "end"
 msgstr "eind"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partitie %s: eind: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitie %s eindigt op cylinder %ld, na het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4687,7 +4706,7 @@ msgstr ""
 "Waarschuwing: start van uitgebreide partitie verschoven van %ld naar %ld\n"
 "(Alleen voor weergave. De inhoud wordt niet gewijzigd.)\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4695,134 +4714,134 @@ msgstr ""
 "Waarschuwing: uitgebreide partitie start niet op een cylinder grens.\n"
 "DOS en Linux zullen de inhoud anders interpreteren.\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "teveel partities - die na nr (%d) worden genegeerd\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "boom van partities?\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager gevonden - daar kan ik niet mee werken\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6 ondertekening gevonden - ik geef het op\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "vreemd..., een uitgebreide partitie met grootte 0?\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "vreemd..., een BSD partitie met grootte 0?\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " %s: partitie niet herkend\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n optie is gegeven: Niets gewijzigd\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Opslaan oude sectoren mislukt - afbreken\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Partitie schrijven op %s mislukt\n"
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "lange of incomplete invoerregel - afsluiten\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "invoerfout: `=' verwacht na %s veld\n"
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "invoerfout: onverwacht teken %c na %s veld\n"
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "invoer niet herkend: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "getal te groot\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "rotzooi na getal\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "geen ruimte voor partitie beschrijver\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan omgevende uitgebreide partitie niet maken\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr "teveel invoervelden\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "Geen ruimte voor meer\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "Onjuiste soort\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Waarschuwing: gegeven groote (%lu) is groter dan maximaal toegelaten grootte "
 "(%lu)\n"
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "Waarschuwing: lege partitie\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Waarschuwing: slechte partitie start (eerste %lu)\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "opstartbaar optie niet herkend - kies - of *\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "gedeeltelijke c,h,s specificatie?\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "Uitgebreide partitie niet waar die verwacht was\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "slechte invoer\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "teveel partities\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 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"
@@ -4834,46 +4853,46 @@ msgstr ""
 "Meestal hoeft u alleen <start> en <grootte> te gebruiken (en mogelijk "
 "<soort>).\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "versie"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Gebruik: %s [opties] apparaat ...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "apparaat: zoiets als /dev/hda of /dev/sda"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "nuttige opties:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [of --show-size]: grootte van een partitie weergeven"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [of --id]:        partitie Id weergeven of wijzigen"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [of --list]:      partities van elk apparaat opsommen"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [of --dump]:      hetzelfde, maar in een formaat geschikt voor latere "
 "invoer"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [of --increment]: aantal cylinders etc. van 1 in plaats van 0"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4881,57 +4900,57 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  accepteren/weergeven in eenheden van sectoren/"
 "blokken/cylinders/MB"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [of --list-types]:bekende partitiesoorten opsommen"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [of --DOS]:       voor DOS-compatibiliteit: verspil een beetje ruimte"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [of --re-read]:   laat de kernel de partitietabel opnieuw inlezen"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                alleen partitie met nummer # wijzigen"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 niet echt naar de schijf schrijven"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O bestand :         de sectoren die overschreven zullen worden, opslaan "
 "in bestand"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I bestand :         deze sectoren weer herstellen"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [of --version]:   versienummer weergeven"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [of --help]:      dit bericht weergeven"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "gevaarlijke opties:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [of --show-geometry]: weergeven hoe de kernel denkt over de geometrie"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4939,117 +4958,117 @@ msgstr ""
 "    -x [of --show-extended]: ook uitgebreide partities opnemen in uitvoer\n"
 "                             of, verwacht beschrijvers voor ze in invoer"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [of --Linux]:      niet klagen over dingen die niet relevant zijn "
 "voor Linux"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [of --quiet]:      waarschuwingen onderdrukken"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "    U kunt zo een andere geometrie dan de gevonden forceren:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [of --cylinders #]:het aantal te gebruiken cylinders instellen"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [of --heads #]:    het aantal te gebruiken koppen instellen"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [of --sectors #]:  het aantal te gebruiken sectoren instellen"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "U kunt alle consistentie controles uit zetten met:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [of --force]:      doe wat ik zeg, ook al is het dom"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s apparaat\t\t actieve partities op apparaat weergeven\n"
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s apparaat n1 n2 ... partities n1 ... activeren, de rest de-activeren\n"
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An apparaat\t partitie n activeren, alle andere de-activeren\n"
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "geen opdracht?\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "totaal: %d blokken\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "gebruik: sfdisk --print-id apparaat partitie-nummer\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "gebruik: sfdisk --change-id apparaat partitie-nummer Id\n"
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "gebruik: sfdisk --id apparaat partitie-nummer [Id]\n"
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "kan slechts één apparaat aangeven (behalve met -l of -s)\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan %s niet lezen-schrijven openen\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan %s niet openen om te lezen\n"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylinders, %ld koppen, %ld sectoren/spoor\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE ioctl mislukt voor %s\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "slechte actieve byte: 0x%x in plaats van 0x80\n"
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -5057,7 +5076,7 @@ msgstr ""
 "Klaar\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5066,35 +5085,35 @@ msgstr ""
 "U heeft %d actieve, primaire partities. Dit maakt niets uit voor LILO,\n"
 "maar DOS MBR start alleen op van een schijf met 1 actieve partitie.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partitie %s heeft id %x en is niet verborgen\n"
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Slechte Id %lx\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Deze schijf is op dit moment in gebruik.\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatale fout: kan %s niet vinden\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Waarschuwing: %s is geen blok-apparaat\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Even controleren of niemand deze schijf nu gebruikt ...\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5108,28 +5127,28 @@ msgstr ""
 "deze schijf uit.\n"
 "Gebruik --no-reread om deze controle te onderdrukken.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Gebruik --force om alle controles te negeren.\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Oude situatie:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partitie %d bestaat niet, kan haar niet veranderen!\n"
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Nieuwe situatie:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5137,19 +5156,19 @@ msgstr ""
 "Deze partities bevallen mij niet echt - er is niets veranderd.\n"
 "(Als u dit echt wilt, kunt u --force gebruiken.)\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Mij bevalt niet niet echt - misschien moet u Nee antwoorden\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bent u hiermee tevreden? [ynq] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Wilt u dit naar de schijf schrijven? [ynq] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5157,15 +5176,15 @@ msgstr ""
 "\n"
 "sfdisk: vroegtijdig einde van invoer\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "Afsluiten - niets veranderd\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "Antwoord alstublieft een van y,n,q\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5173,7 +5192,7 @@ msgstr ""
 "Nieuwe partitietabel succesvol weggeschreven\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5793,7 +5812,7 @@ msgstr "Wachten in lus totdat de tijd van KDGHWCLK verandert\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK ioctl om tijd te lezen, mislukt"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "Time-out bij wachten totdat tijd verandert.\n"
 
@@ -5818,59 +5837,69 @@ msgstr "Openen /dev/tty1 of /dev/vc/1 mislukt"
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK ioctl mislukt"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "open() van %s mislukt"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "ioctl() naar %s om tijd te lezen, mislukt.\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "Wachten in lus totdat de tijd van %s verandert\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s heeft geen onderbrekingsfuncties. "
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "read() naar %s om te wachten op kloktik, mislukt"
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "read() naar %s om te wachten op kloktik, mislukt"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "read() naar %s om te wachten op kloktik, mislukt"
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "ioctl() naar %s om bijwerkingsonderbrekingen uit te zetten, mislukt"
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 "ioctl() naar %s om bijwerkingsonderbrekingen aan te zetten, onverwacht "
 "mislukt"
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "ioctl() naar %s om tijd in te stellen, mislukt.\n"
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) succesvol.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "Openen van %s mislukt"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5881,17 +5910,17 @@ msgstr ""
 "stuurprogramma van Linux nodig via het speciale apparaatbestand %s.  Dit "
 "bestand bestaat niet op dit systeem.\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "Openen %s mislukt"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) naar %s mislukt"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "de tijdperk-waarde %ld is gelezen van %s met RTC_EPOCH_READ ioctl.\n"
@@ -5899,23 +5928,23 @@ msgstr "de tijdperk-waarde %ld is gelezen van %s met RTC_EPOCH_READ ioctl.\n"
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "De tijdperk-waarde mag niet minder zijn dan 1900.  U vroeg om %ld\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr "tijdperk instellen op %ld met RTC_EPOCH_SET ioctl naar %s.\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "Het kernel stuurprogramma voor %s heeft geen RTC_EPOCH_SET ioctl.\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) naar %s mislukt"
@@ -6018,9 +6047,8 @@ msgstr "%s: niet open voor lezen/schrijven"
 
 #. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
-#, fuzzy
 msgid "duping\n"
-msgstr "dubbel instellen\n"
+msgstr "dubbel doen\n"
 
 #. set up stdout and stderr
 #: login-utils/agetty.c:678
@@ -6090,51 +6118,67 @@ msgstr "Inloggen op %s van %s standaard geweigerd.\n"
 msgid "Login on %s from %s denied.\n"
 msgstr "Inloggen op %s van %s geweigerd.\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: u (gebruiker %d) bestaat niet.\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: gebruiker \"%s\" bestaat niet.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr "%s: kan alleen lokale ingangen wijzigen; gebruik yp%s in plaats.\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+#, fuzzy
+msgid "Unknown user context"
+msgstr "onbekende fout in sleutel"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Wijzigen finger informatie voor %s.\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Wachtwoord fout."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Wachtwoord: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Onjuist wachtwoord."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "Finger informatie niet gewijzigd.\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Gebruik: %s [ -f volledige-naam ] [ -o kantoor ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6142,11 +6186,11 @@ msgstr ""
 "[ -p kantoor-telefoon ]\n"
 "\t[ -h thuis-telefoon ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6154,58 +6198,70 @@ msgstr ""
 "\n"
 "Afgebroken.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "veld is te lang.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' is niet toegestaan.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Stuurtekens zijn niet toegestaan.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr "Finger informatie *NIET* gewijzigd.  Probeer het later opnieuw.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "Finger informatie gewijzigd.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "malloc mislukt"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" staat niet in /etc/shells.\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr "%s: Uw shell is niet in /etc/shells, shellwijziging geweigerd\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Wijzigen shell voor %s.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Nieuwe shell"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "Shell niet gewijzigd.\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Shell *NIET* gewijzigd.  Probeer het later opnieuw.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Shell gewijzigd.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
@@ -6214,57 +6270,57 @@ msgstr ""
 "Gebruik: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ gebruikersnaam ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: shell moet de volledige padnaam zijn.\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" bestaat niet.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" is niet uitvoerbaar.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' is niet toegestaan.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Stuurtekens zijn niet toegestaan.\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Waarschuwing: \"%s\" staat niet in /etc/shells\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" staat niet in /etc/shells.\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: gebruik -l om de lijst te zien\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Waarschuwing: \"%s\" staat niet in /etc/shells.\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Gebruik %s -l om de lijst te zien.\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "Geen bekende shells.\n"
 
@@ -6461,78 +6517,78 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "U heeft teveel processen draaien.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "INBELLEN BIJ %s DOOR %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN OP %s VAN %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN OP %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN OP %s DOOR %s VAN %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN OP %s DOOR %s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "U heeft nieuwe e-mail.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "U heeft e-mail.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: fork() mislukt: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY mislukt: %m"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() mislukt"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Geen map %s!\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Inloggen met home = \"/\".\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: geen geheugen voor shell script.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kon shell script niet uitvoeren: %s.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: geen shell: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6541,62 +6597,62 @@ msgstr ""
 "\n"
 "%s inlognaam: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "inlognaam veel te lang.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "NAAM te lang"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "inlognamen mogen niet beginnen met '-'.\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "teveel losse witregels.\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "EXCESSIEVE witregels"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Inloggen is na %d seconden afgebroken vanwege een time-out\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Laatste keer inloggen: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "van %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "op %.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "INLOGGEN MISLUKT VAN %s, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "INLOGGEN MISLUKT OP %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d INLOG MISLUKKINGEN VAN %s, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d INLOG MISLUKKINGEN OP %s, %s"
@@ -6783,9 +6839,8 @@ msgid "That must be tomorrow, can't you wait till then?\n"
 msgstr "Dat moet morgen zijn; kunt u niet tot dan wachten?\n"
 
 #: login-utils/shutdown.c:307
-#, fuzzy
 msgid "for maintenance; bounce, bounce"
-msgstr "voor onderhoud; bounce, bounce"
+msgstr "voor onderhoud; bons, bons"
 
 #: login-utils/shutdown.c:311
 #, c-format
@@ -7002,55 +7057,65 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: SLECHTE FOUT"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
 msgstr "%s: het bestand passwd is bezig.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
 msgstr "%s: het bestand group is bezig.\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: het bestand %s is bezig (%s aanwezig)\n"
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: kan %s niet koppelen: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "Kan time-out niet verkrijgen voor %s: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "Kan time-out niet verkrijgen voor %s: %s\n"
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: kan %s niet de-blokkeren: %s (uw wijzigingen zijn nog in %s)\n"
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: Kan niet fork()\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s ongewijzigd\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: geen wijzigingen gemaakt\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr "U gebruik schaduwgroepen op dit systeem.\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr "U gebruik schaduwwachtwoorden op dit systeem.\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "Wilt u nu %s bewerken [j/n]? "
@@ -7243,7 +7308,7 @@ msgstr "%s: hernoemen %s tot %s mislukt: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "gebruik: %s van naar bestanden...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7254,21 +7319,21 @@ msgstr ""
 "Gebruik `%s [opties] %s' als u het echt wilt gebruiken.\n"
 "Script niet gestart.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "gebruik: script [-a] [-f] [-q] [-t] [bestand]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script gestart, bestand is %s\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "Script gestart op %s"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7277,16 +7342,16 @@ msgstr ""
 "\n"
 "Script gedaan op %s"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script gedaan, bestand is %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "openpty mislukt\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "Tekort aan pty's\n"
 
@@ -7555,39 +7620,39 @@ msgstr "mount: kon %s niet openen - gebruik %s in plaats daarvan\n"
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "kan het blokkeerbestand %s niet maken: %s (gebruik -n optie om te forceren)"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "kan blokkeerbestand %s niet koppelen: %s (gebruik -n optie om te forceren)"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "kan blokkeerbestand %s niet openen: %s (gebruik -n optie om te forceren)"
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Kan blokkeerbestand %s niet blokkeren: %s\n"
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "kan blokkeerbestand %s niet blokkeren: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "time-out"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7596,189 +7661,127 @@ msgstr ""
 "Kan koppeling %s niet maken\n"
 "Mogelijk is er een oud blokkeerbestand?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "kan %s niet openen (%s) - mtab niet bijgewerkt"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "fout bij schrijven %s: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "fout bij wijzigen modus van %s: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "kan %s niet hernoemen tot %s: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kan apparaat %s niet openen: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: kan geen informatie verkrijgen over apparaat %s: %s\n"
+msgid ", offset %lld"
+msgstr ", plaats %lld"
 
-#: mount/lomount.c:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) plaats %d, %s codering\n"
+#: mount/lomount.c:104
+#, c-format
+msgid ", sizelimit %lld"
+msgstr ", grens grootte %lld"
 
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: kon geen /dev/loop# apparaat vinden"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", codering %s (soort %d)"
 
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
-msgstr ""
-"mount: Kon geen enkel lus-apparaat vinden.\n"
-"       Mogelijk heeft /dev/loop# een verkeerd major nummer?"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ", plaats %d"
 
-#: mount/lomount.c:253
+#: mount/lomount.c:129
 #, 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: Kon geen enkel lus-apparaat vinden, en volgens %s\n"
-"       weet deze kernel niets over het lus-apparaat.\n"
-"       (Hercompileer de kernel als dat zo is, of typ `insmod loop.o'.)"
+msgid ", encryption type %d\n"
+msgstr ", coderingssoort %d\n"
+
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: kan geen informatie verkrijgen over apparaat %s: %s\n"
+
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: kon geen /dev/loop# apparaat vinden"
 
-#: mount/lomount.c:259
+#: mount/lomount.c:192
 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?"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: Kon geen enkel lus-apparaat vinden. Mogelijk weet deze kernel niets\n"
-"       over het lus-apparaat (hercompileer dan, of typ `insmod loop.o'), of\n"
-"       heeft misschien /dev/loop# een verkeerd major nummer?"
+"mount: Kon geen enkel lus-apparaat vinden. Misschien weet deze kernel niets\n"
+"       over het lus-apparaat? (Als dat zo is kunt u die opnieuw compileren "
+"of een\n"
+"        `modprobe loop' doen.)"
 
-#: mount/lomount.c:263
+#: mount/lomount.c:197
 msgid "mount: could not find any free loop device"
 msgstr "mount: kon geen enkel vrij lus-apparaat vinden"
 
-#: mount/lomount.c:359
-#, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "kan %s niet openen om te lezen\n"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Geef opnieuw het nieuwe wachtwoord: "
-
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "openen van map mislukt\n"
-
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "Het wachtwoord moet tenminste 6 tekens lang zijn. Probeer opnieuw.\n"
-
-#: mount/lomount.c:472
-#, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Kan niet meer geheugen reserveren\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
-msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-msgstr ""
-
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
-
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kan niet blokkeren in geheugen, afsluiten.\n"
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Init (tot 16 hex cijfers): "
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): succes\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "Niet-hex cijfer '%c'.\n"
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: kan apparaat %s niet verwijderen: %s\n"
 
-#: mount/lomount.c:764
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
-msgstr "Weet niet hoe sleutel te verkrijgen voor coderingssysteem %d\n"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): succes\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): succes\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr ""
+"Deze versie van mount is gecompileerd zonder lus ondersteuning. Hercompileer "
+"alstublieft.\n"
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "niet voldoende geheugen"
-
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "kan %s niet openen om te lezen\n"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"gebruik:\n"
+"  %s loop_apparaat                                       # info geven\n"
+"  %s -d loop_apparaat                                    # verwijderen\n"
+"  %s [ -e codering ] [ -o plaats ] loop_apparaat bestand # instellen\n"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "niet voldoende geheugen"
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
+"Er was geen lus-ondersteuning beschikbaar bij het compileren. Hercompileer "
+"alstublieft.\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7794,41 +7797,41 @@ msgstr "[mntent]: regel %d in %s is slecht%s\n"
 msgid "; rest of file ignored"
 msgstr "; rest van bestand genegeerd"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: volgens mtab, is %s al aangekoppeld op %s"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: volgens mtab, is %s al aangekoppeld op %s"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kan %s niet openen om te schrijven: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fout bij schrijven %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: fout bij wijzigen modus van %s: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ziet er uit al wisselgeheugen - niet aangekoppeld"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "aankoppelen mislukt"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: alleen root kan %s aankoppelen op %s"
@@ -7850,106 +7853,110 @@ msgstr "mount: instellen van lus-apparaat wordt overgeslagen\n"
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: het lus-apparaat %s wordt gebruikt\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: instellen lus-apparaat mislukt\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: instellen lus-apparaat succesvol\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kan %s niet openen: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: argument voor -p of --pass-fd moet een getal zijn"
+
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: kan %s niet openen om snelheid in te stellen"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kan snelheid niet instellen: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: fork() mislukt: %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr ""
 "mount: deze versie is gecompileerd zonder ondersteuning voor de soort `nfs'"
 
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: mislukt met nfs mount versie 4, probeer nu 3..\n"
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Kon bestandssysteemsoort niet bepalen, en geen aangegeven"
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: u moet de bestandssysteem soort aangeven"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr "mount: aankoppelen mislukt"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: aankoppelingspunt %s is geen map"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: toegang geweigerd"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr "mount: moet supergebruiker zijn om mount te gebruiken"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s is bezig"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc al aangekoppeld"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s al aangekoppeld of %s bezig"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: aankoppelingspunt %s bestaat niet"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 "mount: aankoppelingspunt %s is een symbolische koppeling die nergens naar "
 "wijst"
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: speciale apparaat %s bestaat niet"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7958,12 +7965,12 @@ msgstr ""
 "mount: speciale apparaat %s bestaat niet\n"
 "       (een pad voorvoegsel is geen map)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s nog niet aangekoppeld, of slechte optie"
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7973,35 +7980,35 @@ msgstr ""
 "s,\n"
 "       of teveel aangekoppelde bestandssystemen"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "aankoppelingstabel vol"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kan superblok niet lezen"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: onbekend apparaat"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: bestandssysteem soort %s niet ondersteund door kernel"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: waarschijnlijk bedoelde u %s"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: mogelijk bedoelde u iso9660 ?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -8009,12 +8016,12 @@ msgstr ""
 "ondersteund"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s is geen blok-apparaat, en stat mislukt?"
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8023,98 +8030,70 @@ msgstr ""
 "mount: de kernel herkent %s niet als een blok-apparaat\n"
 "       (misschien `insmod stuurprogramma'?)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s is geen blok-apparaat (misschien `-o loop' proberen?)"
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s is geen blok-apparaat"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s is geen geldig blok-apparaat"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "blok-apparaat "
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kan %s%s niet alleen-lezen aankoppelen"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s is schrijf-beveiligd maar expliciete `-w' optie gegeven"
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s is schrijf-beveiligd, alleen-lezen aankoppelen"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr "mount: het label %s komt voor op zowel %s als %s\n"
-
-#: mount/mount.c:1124
-#, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "mount: %s dubbel - niet aangekoppeld"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: %s wordt aangekoppeld door %s\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "label"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: die partitie is niet gevonden"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: geen soort gegeven - Ik neem aan nfs, vanwege de dubbele punt\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
-"mount: geen soort gegeven - Ik neem aan smbfs, vanwege het voorvoegsel //\n"
+"mount: geen soort gegeven - Ik neem aan smbfs, vanwege het // voorvoegsel\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: op de achtergrond \"%s\"\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: ik geef het op voor \"%s\"\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s al aangekoppeld op %s\n"
 
-#: mount/mount.c:1386
-#, fuzzy
+#: mount/mount.c:1362
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8135,70 +8114,65 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Gebruik: mount -V              : versie weergeven\n"
 "         mount -h              : deze hulp weergeven\n"
 "         mount                 : aangekoppelde bestandssystemen weergeven\n"
 "         mount -l              : zelfde, inclusief volume labels\n"
-"\n"
 "Voor zover het deel dat informatie weergeeft. Nu het aankoppelen.\n"
 "De opdracht is `mount [-t bestandssysteemsoort] iets ergens'.\n"
 "Details die in /etc/fstab staan kunnen weg worden gelaten.\n"
-"\n"
 "         mount -a [-t|-O] ...  : alles uit /etc/fstab aankoppelen\n"
-"         mount apparaat        : apparaat aankoppelen op een bekende plaats\n"
+"         mount apparaat        : apparaat aankoppelen op de bekende plaats\n"
 "         mount map             : bekend apparaat hier aankoppelen\n"
 "         mount -t soort apparaat map : standaard mount opdracht\n"
-"\n"
 "Let op dat men niet echt een apparaat aankoppeld, maar eigenlijk een\n"
 "bestandssysteem (van gegeven soort) dat op dat apparaat kan worden "
 "gevonden.\n"
-"Men kan ook een reeds zichtbare mappen boom ergens anders aankoppelen:\n"
+"Men kan ook een reeds zichtbare mappenboom ergens anders aankoppelen:\n"
 "       mount --bind oudemap nieuwemap\n"
 "of een subboom verplaatsen:\n"
 "       mount --move oudemap nieuwemap\n"
-"\n"
 "Een apparaat kan worden gegeven via de naam, zeg /dev/hda1 of /dev/cdrom,\n"
 "of via het label, met  -L label  of via de uuid, met  -U uuid .\n"
-"Andere opties: [-nfFrsvw] [-o opties].\n"
+"Andere opties: [-nfFrsvw] [-o opties] [-p wachtwoordfd].\n"
 "Voor meer informatie, zie  man 8 mount .\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: alleen root kan dat doen"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: geen %s gevonden - nu aanmaken..\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr "mount: het label %s komt voor op zowel %s als %s - niet aangekoppeld\n"
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: die partitie is niet gevonden"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: aankoppelen %s\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr "niets aangekoppeld"
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: kan %s niet vinden in %s"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kan %s niet vinden in %s of %s"
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8206,34 +8180,34 @@ msgstr ""
 "mount: kon %s niet openen; UUID en LABEL conversie kon dus niet worden "
 "gedaan.\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: slechte UUID"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: fout bij raden bestandssysteem soort\n"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: u gaf geen bestandssysteem soort aan voor %s\n"
 
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Ik zal alle soorten proberen die worden genoemd in %s of %s\n"
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr "       en het ziet er uit dat dit wisselgeheugen is\n"
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Ik zal soort %s proberen\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "Proberen %s\n"
@@ -8327,7 +8301,7 @@ msgstr "onbekende nfs status resultaatwaarde: %d"
 msgid "bug in xstrndup call"
 msgstr "programmeerfout in aanroep xstrndup"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8340,7 +8314,7 @@ msgstr ""
 "         %s [-v] [-p prioriteit] speciaal ...\n"
 "         %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8351,100 +8325,33 @@ msgstr ""
 "         %s -a [-v]\n"
 "         %s [-v] speciaal ...\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "geheugentekort"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s op %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: kan %s niet vinden: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: waarschuwing: %s heeft onveilige toegangsrechten %04o, %04o "
 "aangeraden\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: Overslaan bestand %s - het lijkt gaten te hebben.\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr "Geen supergebruiker.\n"
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s: ongeldig blok-apparaat"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "Niet-ondersteunde coderingssoort %s\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: het lus-apparaat %s wordt gebruikt\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Deze partitie is al in gebruik"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "terugwinden wisselapparaat mislukt"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "kon /dev/urandom niet openen"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "schrijven inodes mislukt"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "fork() mislukt\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Het wachtwoord van %s wordt gewijzigd\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: niet %s niet openen: %s\n"
@@ -8509,35 +8416,35 @@ msgstr "umount: %s: blok-apparaten niet toegestaan op bestandssysteem"
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "geen umount2, proberen umount...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "kon %s niet ontkoppelen - proberen %s in plaats daarvan\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s bezig - alleen-lezen her-aangekoppeld\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kon %s niet alleen-lezen her-aankoppelen\n"
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ontkoppeld\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan geen lijst vinden met bestandssystemen om te ontkoppelen"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
@@ -8548,42 +8455,42 @@ msgstr ""
 "opties]\n"
 "         umount [-f] [-r] [-n] [-v] speciaal | node...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Proberen te ontkoppelen %s\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kon %s niet vinden in mtab\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s is niet aangekoppeld (volgens mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: het lijkt erop dat %s meerdere keren is aangekoppeld"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s staat niet in fstab (en u bent niet root)"
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s aankoppeling komt niet overeen met fstab"
 
-#: mount/umount.c:602
-#, c-format
-msgid "umount: only root can unmount %s from %s"
+#: mount/umount.c:616
+#, fuzzy, c-format
+msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: alleen root kan %s ontkoppelen van %s"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr "umount: alleen root kan dat doen"
 
@@ -8723,7 +8630,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec; %f ontvangen (tekens/sec)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Gebruik: %s [-c] [-n niveau] [-s bufgrootte]\n"
@@ -8888,23 +8795,23 @@ msgstr "------ Grenzen gedeeld geheugen --------\n"
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
 msgstr "max aantal segmenten = %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "max segmentgrootte (kbytes) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "max totale gedeelde geheugen (kbytes) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "min segmentgrootte (bytes) = %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9425,8 +9332,12 @@ msgstr ""
 msgid "missing comma"
 msgstr "komma ontbreekt"
 
-#: sys-utils/readprofile.c:115
-#, c-format
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "geheugentekort"
+
+#: sys-utils/readprofile.c:118
+#, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9437,6 +9348,7 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
@@ -9454,32 +9366,32 @@ msgstr ""
 "\t -n            byte volgorde auto-detectie uit zetten\n"
 "\t -V            versie weergeven en afsluiten\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s versie %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Bemonsterstap: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): foutieve afbeelding regel\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: kan \"_stext\" niet vinden in %s\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: profiel adres buiten bereik. Fout afbeeldingsbestand?\n"
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "totaal"
 
@@ -10006,35 +9918,24 @@ msgstr "Invoerregel te lang.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Geheugentekort bij groeiende buffer.\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: kan apparaat %s niet verwijderen: %s\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: niet gecompileerd met minix v2 ondersteuning\n"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): succes\n"
+#~ msgid "mount: the label %s occurs on both %s and %s\n"
+#~ msgstr "mount: het label %s komt voor op zowel %s als %s\n"
 
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
-#~ msgstr ""
-#~ "Deze versie van mount is gecompileerd zonder lus ondersteuning. "
-#~ "Hercompileer alstublieft.\n"
-
-#~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
-#~ msgstr ""
-#~ "gebruik:\n"
-#~ "  %s loop_apparaat                                       # info geven\n"
-#~ "  %s -d loop_apparaat                                    # verwijderen\n"
-#~ "  %s [ -e codering ] [ -o plaats ] loop_apparaat bestand # instellen\n"
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "mount: %s dubbel - niet aangekoppeld"
 
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
-#~ msgstr ""
-#~ "Er was geen lus-ondersteuning beschikbaar bij het compileren. "
-#~ "Hercompileer alstublieft.\n"
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: %s wordt aangekoppeld door %s\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
 
-#~ msgid "Partition %i does not end on cylinder boundary:\n"
-#~ msgstr "Partitie %i eindigt niet op een cylinder grens:\n"
+#~ msgid "label"
+#~ msgstr "label"
 
-#~ msgid "Can't open help file"
-#~ msgstr "Kan hulpbestand niet openen"
+#~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
+#~ msgstr ""
+#~ "mount: het label %s komt voor op zowel %s als %s - niet aangekoppeld\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fd3e478a..5af3315d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11b\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
 "PO-Revision-Date: 2001-05-24 16:03-03:00\n"
 "Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -22,97 +22,102 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "configurar somente leitura"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "configurar leitura/gravação"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "obter somente leitura"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "obter tamanho de setor"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 #, fuzzy
 msgid "get blocksize"
 msgstr "obter tamanho"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 #, fuzzy
 msgid "set blocksize"
 msgstr "obter tamanho"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "obter tamanho"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "configurar readahead"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "obter readahead"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "descarregar buffers"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "ler novamente tabela de partições"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 #, fuzzy
 msgid "Usage:\n"
 msgstr "Uso:"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, fuzzy, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "Uso: %s [-V] [-v|-q] comandos dispositivos\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Comandos disponíveis:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: comando desconhecido: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s exige um argumento\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, fuzzy, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: não foi possível abrir %s: %s\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, fuzzy, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: erro de leitura em %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
@@ -155,12 +160,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Uso: %s [ -n ] dispositivo\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s de %s\n"
@@ -292,49 +297,49 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Uso: %s [ -larvsmf] dispositivo\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s está montado.\t"
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Você realmente deseja continuar?"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "verificação anulada.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, fuzzy, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Número de zona menor que FIRSTZONE no arquivo `"
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, fuzzy, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Número de zona maior ou igual a ZONES no arquivo `"
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Remover bloco"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, fuzzy, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Erro de leitura: não foi possível buscar bloco no arquivo '"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, fuzzy, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Erro de leitura: bloco defeituoso no arquivo '"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -342,122 +347,122 @@ msgstr ""
 "Erro interno: tentando gravar bloco defeituoso.\n"
 "Solicitação de gravação ignorada.\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "busca falhou em write_block"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, fuzzy, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Erro de gravação: bloco defeituoso no arquivo '"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "busca falhou em write_super_block"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "não foi possível gravar superbloco"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "Não foi possível gravar mapa de inode"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "Não foi possível gravar mapa de zona"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "Não foi possível gravar inodes"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "busca falhou"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "não foi possível ler superbloco"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "número mágico inválido no superbloco"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Somente 1K blocos/zonas suportados"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "campo s_imap_blocks inválido no superbloco"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "campo s_zmap_blocks inválido no superbloco"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "Não foi possível alocar buffer para mapa de inodes"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "Não foi possível alocar buffer para inodes"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "Não foi possível alocar buffer para contagem de inodes"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "Não foi possível alocar buffer para contagem de zonas"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "Não foi possível ler mapa de inodes"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "Não foi possível ler mapa de zonas"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "Não foi possível ler inodes"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Aviso: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blocos\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Primeira zona de dados = %ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Tamanho da zona = %d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Tamanho máximo = %ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Estado do sistema de arquivos = %d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -466,173 +471,173 @@ msgstr ""
 "Comprimento do nome = %d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, fuzzy, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inode %d marcado como não utilizado, mas usado pelo arquivo '"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Marca em uso"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, fuzzy, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr " tem modo %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "Aviso: contagem de inodes grande demais.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "inode raiz não é um diretório"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, fuzzy, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "O bloco já foi usado. Agora no arquivo `"
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Limpar"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, fuzzy, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "' está marcado como não utilizado."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Correto"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, fuzzy, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr " contém um número de inode inválido para o arquivo '"
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " Remover"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, fuzzy, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr ": diretório inválido: '.' não é o primeiro\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, fuzzy, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr ": diretório inválido: '..' não é o segundo\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, fuzzy, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr ": diretório inválido: '.' não é o primeiro\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, fuzzy, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr ": diretório inválido: '..' não é o segundo\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "erro interno"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, fuzzy, c-format
 msgid "%s: bad directory: size < 32"
 msgstr ": diretório inválido: tamanho < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "busca falhou em bad_zone"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "O modo do inode %d não foi limpo."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr ""
 "O inode %d não está sendo usado, mas está marcado como em uso no bitmap."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr ""
 "O inode %d está sendo usado, mas está marcado como não utilizado no bitmap."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (modo = %07o), i_nlinks = %d, contados = %d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "Configurar i_nlinks para contagem"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zona %d marcada em uso, mas nenhum arquivo a usa."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Desmarcar"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, fuzzy, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Zona %d: %s em uso, contados = %d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, fuzzy, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Zona %d: %s em uso, contados = %d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Configurar"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "tamanho de inode inválido"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "tamanho de inode v2 inválido"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "é necessário um terminal para reparos interativos"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "não foi possível abrir '%s'"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s está limpo; sem verificação.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Forçando verificação do sistema de arquivos em %s.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "O sistema de arquivos em %s está sujo: precisa de verificação\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -641,12 +646,12 @@ msgstr ""
 "\n"
 "%6ld inodes usados (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zonas usadas (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -669,7 +674,7 @@ msgstr ""
 "------\n"
 "%6d arquivos\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -760,7 +765,7 @@ msgstr "muitos inodes - m
 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:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -834,7 +839,7 @@ msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "Uso: mkfs [-V] [-t tipoSistArq] [opções-sistArq] dispositivo [tamanho]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -970,63 +975,63 @@ msgid ""
 "that some device files will be wrong.\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c | -l NomeArquivo] [-nXX] [-iXX] dispositivo [blocos]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s está montado; não criará um sistema de arquivos aqui!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "busca de bloco de boot falhou em write_tables"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "não foi possível limpar o setor de boot"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "busca falhou em write_tables"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "não foi possível gravar mapa de inodes"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "não foi possível gravar mapa de zonas"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "não foi possível gravar inodes"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "gravação falhou em write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "número excessivo de blocos defeituosos"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "não há blocos sem problemas suficientes"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "não foi possível alocar buffers para mapas"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "não foi possível alocar buffers para inodes"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1035,57 +1040,52 @@ msgstr ""
 "Tamanho máximo = %ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "busca falhou durante teste de blocos"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores estranhos em do_check: provavelmente erros\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "busca falhou em check_blocks"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
 "blocos defeituosos antes da área de dados: não é possível criar sistema de "
 "arquivos"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d blocos defeituosos\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "um bloco defeituoso\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "não foi possível abrir arquivo de blocos defeituosos"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s: não compilado com suporte a minix v2\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "erro de strtol: número de blocos não especificado"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "não foi possível abrir %s"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "não foi possível stat %s"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "não será tentado criar sistema de arquivos em '%s'"
@@ -1126,45 +1126,45 @@ msgid "one bad page\n"
 msgstr "uma página inválida\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d páginas inválidas\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, 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:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: erro - tamanho %ld é maior do que o tamanho do dispositivo %d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s - erro: versão %d desconhecida\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, 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:562
+#: disk-utils/mkswap.c:563
 #, 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:576
+#: disk-utils/mkswap.c:577
 #, 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:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "fatal: primeira página ilegível"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1179,24 +1179,24 @@ msgstr ""
 "dispositivo, use\n"
 "a opção -f para forçar a criação.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 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:616
+#: disk-utils/mkswap.c:617
 #, fuzzy, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Configurando espaço de permuta (swap) versão %d, tamanho = %ld bytes\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "Não foi possível rebobinar o dispositivo de permuta (swap)"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "Não foi possível gravar a página de assinatura"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync falhou"
 
@@ -1238,61 +1238,60 @@ 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:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Inutilizável"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Espaço livre"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 #, fuzzy
 msgid "Linux ext3"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 #, fuzzy
 msgid "Linux XFS"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 #, fuzzy
 msgid "Linux ReiserFS"
 msgstr "Linux"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "HPFS do OS/2"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "IFS do OS/2"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "O disco foi alterado.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 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:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1304,781 +1303,795 @@ msgstr ""
 "partição DOS 6.x, consulte a página de manual\n"
 "do cfdisk para obter informações adicionais.\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "ERRO FATAL"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Pressione qualquer tecla para sair do cfdisk"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "Não foi possível realizar busca na unidade de disco"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Não foi possível ler a unidade de disco"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Não foi possível gravar na unidade de disco"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Número excessivo de partições"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "A partição começa antes do setor 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "A partição termina antes do setor 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "A partição começa depois do fim do disco"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "A partição se estende até depois do fim do disco"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "partições lógicas fora da ordem do disco"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "partições lógicas sobrepostas"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "partições lógicas aumentadas sobrepostas"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 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:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 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:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Item de menu longo demais. O menu pode ficar com aspecto estranho."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu sem direção. Assumindo horizontal como padrão."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Tecla ilegal"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Pressione uma tecla para continuar"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primária"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Cria uma nova partição primária"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Lógica"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Cria uma nova partição lógica"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Não criar uma partição"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Erro interno !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Tamanho (em MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Início"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Adicionar partição no início do espaço livre"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Fim"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Adicionar partição no final do espaço livre"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Espaço insuficiente para criação de partição estendida"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 #, fuzzy
 msgid "No partition table or unknown signature on partition table"
 msgstr "Assinatura inválida na tabela de partições"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 "Foram especificados mais cilindros do que a quantidade que cabe no disco"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "Não foi possível abrir a unidade de disco"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disco aberto somente para leitura - você não tem permissão para gravar"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Não foi possível obter o tamanho do disco"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Partição primária inválida"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Partição lógica inválida"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Aviso!! Isto pode destruir dados existentes no disco!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 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:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "nao"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "A tabela de partições NÃO foi gravada no disco"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "sim"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Responda `sim' ou `nao'"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Gravando tabela de partições no disco..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "A tabela de partições foi gravada no disco"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 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:1861
+#: fdisk/cfdisk.c:1846
 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:1863
+#: fdisk/cfdisk.c:1848
 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:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 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:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Não foi possível abrir o arquivo '%s'"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unidade de disco: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Setor 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Setor %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "  Nenhum  "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/lóg"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Primária"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Lógica"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Boot (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Inicializar"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
-#, c-format
-msgid "Unknown (%02X)"
-msgstr "Desconhecido (%02X)"
+#: fdisk/cfdisk.c:2007
+#, fuzzy, c-format
+msgid "(%02X)"
+msgstr "Desc (%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Nenhum (%02X)"
+#: fdisk/cfdisk.c:2009
+#, fuzzy
+msgid "None"
+msgstr "Concluído"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabela de partições de %s\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
+#: fdisk/cfdisk.c:2046
+#, fuzzy
+msgid "               First       Last\n"
 msgstr "            Prim.    Últ.\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
+#, fuzzy
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
 " # Tipo     Setor    Setor    Desloc. Compr.   Tipo sist. arqs. (ID)  "
 "Opções\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
+#, fuzzy
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
+#: fdisk/cfdisk.c:2131
+#, fuzzy
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         --- Início ---       ---- Fim ----       Núm. inicial de\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
+#: fdisk/cfdisk.c:2132
+#, fuzzy
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " # Ops.  Cab. Set. Cil.  ID  Cab. Set. Cil.   Setor   Setores\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+#, fuzzy
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Brutos"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Mostrar a tabela usando formato de dados brutos"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Setores"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Mostrar a tabela ordenada por setores"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabela"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Mostrar somente a tabela de partições"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Não mostrar a tabela"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Tela de ajuda do cfdisk"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 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:2215
+#: fdisk/cfdisk.c:2200
 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:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "de disco rígido."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Comando      Significado"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 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:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          Exclui a partição atual."
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Altera parâmetros de cilindros, cabeças, setores por trilha"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 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:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             saibam exatamente o que estão fazendo."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximiza o uso de disco da partição atual."
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Isto pode tornar a partição incompatível com"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2 ..."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          Cria uma nova partição a partir do espaço livre."
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 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:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "             Pode-se selecionar diversos formatos diferentes para"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             uma partição:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 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:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabela ordenada por setores."
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - Tabela em formato bruto."
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Sai do programa sem gravar a tabela de partições."
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          Altera o tipo de sistema de arquivos."
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Altera unidades de exibição do tamanho das partições."
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, setores e cilindros."
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 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:2243
+#: fdisk/cfdisk.c:2228
 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:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             confirmar ou cancelar a gravação indicando `sim' ou"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             `não'"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Seta p/ cima  Move o cursor para a partição anterior."
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 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:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Redesenha a tela."
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 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:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "minúsculas (exceto W)."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Alterar geometria dos cilindros"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Cabeças"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Alterar geometria das cabeças"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Alterar geometria dos setores"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Concluído"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "A alteração da geometria foi concluída"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Digite o número de cilindros: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Valor de cilindros inválido"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Digite o número de cabeças: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Valor de cabeças inválido"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Digite o número de setores por trilha: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Valor de setores inválido"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Digite o tipo do sistema de arquivos: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 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:2459
+#: fdisk/cfdisk.c:2444
 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:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Inicializar"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc (%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Pri/lóg"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Desconhecido (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disco: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, fuzzy, c-format
-msgid "Size: %lld bytes, %ld MB"
+msgid "Size: %lld bytes, %lld MB"
 msgstr "Tamanho: %lld bytes"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, fuzzy, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
+msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Tamanho: %lld bytes"
 
-#: fdisk/cfdisk.c:2600
-#, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
+#: fdisk/cfdisk.c:2587
+#, fuzzy, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Cabeças: %d  Setores por Trilha: %d  Cilindros: %d"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Nome"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Opções"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Tipo Part."
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "Tipo SA"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Rótulo]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
+#: fdisk/cfdisk.c:2597
+#, fuzzy
+msgid "    Sectors"
 msgstr "  Setores"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
+#: fdisk/cfdisk.c:2599
+#, fuzzy
+msgid "  Cylinders"
+msgstr "Cilindros"
+
+#: fdisk/cfdisk.c:2601
+#, fuzzy
+msgid "  Size (MB)"
 msgstr "Tam. (Mb)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
+#: fdisk/cfdisk.c:2603
+#, fuzzy
+msgid "  Size (GB)"
 msgstr "Tam. (Gb)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Iniciali."
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Alterna a opção da partição atual como inicializável"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Excluir"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Excluir a partição atual"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Alterar a geometria do disco (somente para usuários avançados)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Ajuda"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Mostrar tela de ajuda"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Maximize"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 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:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Criar nova partição a partir do espaço livre"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Mostre"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 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:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Sair"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Sair do programa sem gravar a tabela de partições"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 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:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Unidades"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 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:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Gravar"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 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:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "Não foi possível tornar esta partição inicializável."
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "Não foi possível excluir uma partição vazia"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "Não foi possível maximizar esta partição"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Esta partição é inutilizável"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Esta partição já está sendo usada"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 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:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "Sem mais partições"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Comando inválido"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 #, fuzzy
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2115,7 +2128,7 @@ msgstr ""
 "                número de cabeças e número de setores/trilha.\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 #, fuzzy
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
@@ -2137,7 +2150,7 @@ msgstr ""
 "-u: dá Início e Fim em unidades de setor (em vez de cilindro).\n"
 "-b 2048: (para certas unidades MO) usar setores de  2048 bytes.\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2154,223 +2167,223 @@ msgstr ""
 "RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Não foi possível abrir %s\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Não foi possível ler %s\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Não foi possível realizar busca em %s\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Não foi possível gravar em %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE  falhou em %s\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Não foi possível alocar mais qualquer memória\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Erro fatal\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Comando - ação"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   alterna uma opção de somente leitura"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b   edita rótulo BSD no disco"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   alterna a opção \"montável\""
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   exclui uma partição"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   lista os tipos de partição conhecidos"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   mostra este menu"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   cria uma nova partição"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   cria uma nova tabela de partições DOS vazia"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   mostra a tabela de partições"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   sai sem salvar as alterações"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   cria um novo rótulo de disco Sun vazio"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   altera a identificação da partição para o sistema"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   altera as unidades das entradas mostradas"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   verifica a tabela de partições"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   grava a tabela no disco e sai"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   funcionalidade adicional (somente para usuários avançados)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   torna a partição inicializável"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b   edita uma entrada de arquivo de inicialização"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   seleciona uma partição de permuta (swap) sgi"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a   alterna a opção \"inicializável\""
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   alterna a opção \"compatibilidade\""
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   alterar número de cilindros alternativos"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   alterar número de cilindros"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 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:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   alterar número de setores extras por cilindro"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   alterar número de cabeças"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   alterar fator de \"interleave\""
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   alterar velocidade de rotação (RPM)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   voltar ao menu principal"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   alterar número de setores/trilha"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   alterar número de cilindros físicos"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   mover início dos dados em uma partição"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   listar partições estendidas"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 #, fuzzy
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   criar uma tabela de partições IRIX"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f   corrige ordem de partição"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "Você precisa configurar"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "cabeças"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "setores"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "cilindros"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2379,11 +2392,11 @@ msgstr ""
 "%s%s.\n"
 "Você pode fazer isto a partir do menu de funções extras.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " e "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2403,26 +2416,26 @@ msgstr ""
 "2) inicialização e programas de particionamento de outros OSs\n"
 "   (p.ex., DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Deslocamento inválido em uma partição primária estendida\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Aviso: excluindo partições após %d\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, 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:666
+#: fdisk/fdisk.c:658
 #, 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:711
+#: fdisk/fdisk.c:703
 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"
@@ -2434,22 +2447,22 @@ msgstr ""
 "o conteúdo anterior não poderá mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, 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:888
+#: fdisk/fdisk.c:912
 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:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
@@ -2457,16 +2470,16 @@ 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:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Erro interno\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorando partição estendida extra %d\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2475,7 +2488,7 @@ msgstr ""
 "Aviso: a opção inválida 0x%04x da tabela de partições %d será corrigida por "
 "gravação (w)\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2483,79 +2496,79 @@ msgstr ""
 "\n"
 "EOF (fim de arquivo) recebido três vezes - saindo...\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Código hexadecimal (digite L para listar os códigos): "
 
-#: fdisk/fdisk.c:1069
+#: fdisk/fdisk.c:1094
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, padrão %d):"
 
-#: fdisk/fdisk.c:1136
+#: fdisk/fdisk.c:1161
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Usando valor padrão %d\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "Valor fora do intervalo.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Número da partição"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Aviso: a partição %d possui tipo vazio\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Ignorando partição estendida extra %d\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 #, fuzzy
 msgid "No partition is defined yet!\n"
 msgstr "Nenhuma partição definida\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "setor"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Mudando as unidades das entradas mostradas para %s\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, 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:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "A opção de compatibilidade DOS está ativada\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "A opção de compatibilidade DOS não está ativada\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "A partição %d ainda não existe!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2567,7 +2580,7 @@ msgstr ""
 "tipo 0 não é recomendável. Você pode excluir\n"
 "uma partição usando o comando `d'.\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2575,7 +2588,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:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2585,7 +2598,7 @@ msgstr ""
 "uma vez que o SunOS/Solaris espera isto e até mesmo o Linux gosta disto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2595,59 +2608,59 @@ msgstr ""
 "e a partição 11 como um volume inteiro (6), uma vez que o IRIX espera isto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, 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:1453
+#: fdisk/fdisk.c:1479
 #, 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:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fís. = (%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lógico = (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, 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:1470
+#: fdisk/fdisk.c:1496
 #, 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:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "deveria ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "A partição %d não termina em um limite de cilindro.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "deveria ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2657,7 +2670,7 @@ msgstr ""
 "Disco %s: %d cabeças, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -2665,19 +2678,19 @@ msgstr ""
 "Disco %s: %d cabeças, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
+msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2685,16 +2698,16 @@ msgstr ""
 "Nada a fazer. Ordem já está correta\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
-#, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
+#: fdisk/fdisk.c:1704
+#, fuzzy, c-format
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot    Início      Fim    Blocos   Id  Sistema\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2702,7 +2715,7 @@ msgstr ""
 "\n"
 "Partições lógicas fora da ordem do disco\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2713,94 +2726,95 @@ msgstr ""
 "Disco %s: %d cabeças, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
+#: fdisk/fdisk.c:1754
+#, fuzzy
+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:1772
+#: fdisk/fdisk.c:1799
 #, 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:1775
+#: fdisk/fdisk.c:1802
 #, 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:1778
+#: fdisk/fdisk.c:1805
 #, 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:1781
+#: fdisk/fdisk.c:1808
 #, 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:1785
+#: fdisk/fdisk.c:1812
 #, 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:1817
+#: fdisk/fdisk.c:1844
 #, 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:1825
+#: fdisk/fdisk.c:1852
 #, 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:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Aviso: a partição %d está vazia\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, 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:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "O total de setores alocados, %d, é maior do que o máximo: %d\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d setores não alocados\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 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:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Primeiro %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "O setor %d já está alocado\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "Não há setores livres disponíveis\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, 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:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2808,17 +2822,27 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 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:2041
+#: fdisk/fdisk.c:2073
 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:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "partições lógicas fora da ordem do disco"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Partição primária inválida"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2829,20 +2853,20 @@ msgstr ""
 "   %s\n"
 "   p   partição primária (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l   lógica (5 ou superior)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e   estendida"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, 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:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2850,11 +2874,11 @@ msgstr ""
 "A tabela de partições foi alterada!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chamando ioctl() para reler tabela de partições.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2863,7 +2887,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2875,67 +2899,67 @@ msgstr ""
 "partição DOS 6.x, consulte a página de manual\n"
 "do fdisk para obter informações adicionais.\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Sincronizando discos.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, 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:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Novo início dos dados"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Comando avançado (m para ajuda): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Número de cilindros"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Número de cabeças"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Número de setores"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Aviso: configurando o deslocamento de setor para compatibilidade com DOS\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, 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:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Não foi possível abrir %s\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "não foi possível abrir %s\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: comando desconhecido:\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 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:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2944,18 +2968,18 @@ msgstr ""
 "dispositivo especificado\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Detectado um rótulo OSF/1 em %s, entrando em modo de rótulo.\n"
 "Para retornar ao modo de tabela de partições do DOS, use o comando 'r'.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Comando (m para ajuda): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2964,15 +2988,15 @@ msgstr ""
 "\n"
 "O arquivo de boot atual é: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Informe o nome do novo arquivo de boot: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "Arquivo de boot inalterado\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2983,7 +3007,7 @@ msgstr ""
 "SGI.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3343,8 +3367,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux swap"
 
@@ -3582,7 +3605,7 @@ msgstr ""
 "Digite SIM se tiver certeza de que deseja etiquetar esta partição de modo "
 "diferente.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr ""
 
@@ -3746,15 +3769,15 @@ msgstr "Cilindros Alternativos"
 msgid "Physical cylinders"
 msgstr "Cilindros físicos"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Velocidade de rotação (RPM)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Fator de \"Interleave\""
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Setores extras por cilindro: "
 
@@ -3809,7 +3832,7 @@ msgstr ""
 "%d %s cobre alguma outra partição. Sua entrada foi alterada\n"
 "para %d %s\n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3818,7 +3841,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:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3833,7 +3856,7 @@ msgstr ""
 "Digite SIM se tiver certeza de que deseja rotular esta partição como 82 "
 "(permuta do Linux): "
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3852,7 +3875,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3865,16 +3888,16 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, 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:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Número de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Número de cilindros físicos"
 
@@ -3925,20 +3948,24 @@ msgstr "Gerenc. Inicializ. OS/2"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
+#, fuzzy
+msgid "W95 FAT32"
 msgstr "FAT32 Win95"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "W95 FAT32 (LBA)"
 msgstr "FAT32 Win95 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "W95 FAT16 (LBA)"
 msgstr "FAT16 Win95 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
+#, fuzzy
+msgid "W95 Ext'd (LBA)"
 msgstr "Estendida Win95 (LBA)"
 
 #: fdisk/i386_sys_types.c:21
@@ -3970,15 +3997,18 @@ msgid "AST SmartSleep"
 msgstr ""
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
+#, fuzzy
+msgid "Hidden W95 FAT32"
 msgstr "FAT32 Win 95 Escondida"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT32 (LBA)"
 msgstr "FAT32 Win95 Escondida (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
+#, fuzzy
+msgid "Hidden W95 FAT16 (LBA)"
 msgstr "FAT16 Win95 Escondida (LBA)"
 
 #: fdisk/i386_sys_types.c:31
@@ -4087,6 +4117,12 @@ msgstr "Minix antigo"
 msgid "Minix / old Linux"
 msgstr "Linux antigo/Minix"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux swap"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "Unidade C: OS/2 oculta"
@@ -4243,92 +4279,92 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "erro de busca em %s - não foi possível buscar até %lu\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "erro de busca: desejado 0x%08x%08x, obtido 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "memória insuficiente - desistindo\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "erro de leitura em %s - não foi possível ler o setor %lu\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERRO: o setor %lu não possui uma assinatura MS-DOS\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "erro de gravação em %s - não foi possível gravar no setor %lu\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 "não foi possível abrir o arquivo de salvamento de setor da partição (%s)\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "erro de gravação em %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "não foi possível stat arquivo de restauração de partição (%s)\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "o arquivo de restauração da partição possui tamanho incorreto - não "
 "restaurando\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "memória insuficiente?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "não foi possível abrir o arquivo de restauração de partição (%s)\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "erro na leitura de %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "não foi possível abrir o dispositivo %s para gravação\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "erro na gravação do setor %lu em %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disco %s: não foi possível obter o tamanho\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disco %s: não foi possível obter a geometria\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4339,22 +4375,22 @@ msgstr ""
 "inteiro. Usar fdisk nela provavelmente não trará qualquer resultado\n"
 "(use a opção --force se realmente quiser realizar esta operação).\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Aviso: HDIO_GETGEO informa que há %lu cabeças\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Aviso: HDIO_GETGEO informa que há %lu setores\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Aviso: BLKGETSIZE/HDIO_GETGEO informa que há %lu cilindros\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4364,7 +4400,7 @@ msgstr ""
 "Isto causará problemas a todo software que usar endereçamento Cil/Cab/"
 "Setor.\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4373,7 +4409,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindros, %lu cabeças, %lu setores/trilha\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4381,7 +4417,7 @@ msgstr ""
 "%s da partição %s possui valor impossível para cabeça: %lu (deveria estar "
 "entre 0 e %lu)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4390,7 +4426,7 @@ msgstr ""
 "%s da partição %s possui valor impossível para setor: %lu (deveria estar "
 "entre 1 e %lu)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4399,7 +4435,7 @@ msgstr ""
 "%s da partição %s possui valor impossível para o cilindro: %lu (deveria "
 "estar entre 0 e %lu)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4407,11 +4443,11 @@ msgstr ""
 "Nome Id\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Relendo a tabela de partições...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4419,31 +4455,31 @@ msgstr ""
 "O comando para reler a tabela de partições falhou.\n"
 "Reinicialize o sistema agora, antes de usar o mkfs.\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Erro no fechamento de %s\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: partição inexistente\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "formato não reconhecido - usando setores\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabela de partição de %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato não implementado - usando %s\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4453,12 +4489,12 @@ msgstr ""
 "de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 #, fuzzy
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Disp   Boot Início    Fim   Cils    Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4467,12 +4503,12 @@ msgstr ""
 "Unidades = setores de 512 bytes, contando a partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 #, fuzzy
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Disp   Boot    Início      Fim  Setores   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4481,12 +4517,12 @@ msgstr ""
 "Unidades = blocos de 1024 bytes, contando a partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 #, fuzzy
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Disp   Boot   Início      Fim   Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4496,33 +4532,33 @@ msgstr ""
 "partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 #, fuzzy
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Disp   Boot Início  Fim     MB   Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tinício: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tfim: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a partição termina no cilindro %ld, além do final do disco\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "Nenhuma partição encontrada\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, fuzzy, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4533,86 +4569,86 @@ msgstr ""
 " para Cil/Cab/Set = */%ld/%ld (em vez de %ld/%ld/%ld).\n"
 "Para esta listagem será assumida aquela geometria.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "nenhuma tabela de partições presente.\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "estranho, somente %d partições estão definidas.\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Aviso: a partição %s possui tamanho 0, mas não está marcada como vazia\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Aviso: a partição %s possui tamanho 0 e é inicializável\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Aviso: a partição %s possui tamanho 0 e início diferente de zero\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Aviso: a partição %s "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "não está contida na partição %s\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Aviso: as partições %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "e %s se sobrepõem\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Aviso: a partição %s começa no setor 0\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Aviso: a partição %s se estende além do fim do disco\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 #, fuzzy
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr "Dentre as partições primárias, pelo menos uma pode ser estendida\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Aviso: a partição %s não inicia em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Aviso: a partição %s não termina em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4622,7 +4658,7 @@ msgstr ""
 "Isto não faz diferença para o LILO, mas o MBR DOS não inicializará este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4630,7 +4666,7 @@ msgstr ""
 "Aviso: normalmente o boot pode ser dado somente de partições primárias.\n"
 "O LILO desconsidera o flag `inicializável'.\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4639,12 +4675,12 @@ msgstr ""
 "Isto não faz diferença para o LILO, mas o MBR DOS não inicializará este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 #, fuzzy
 msgid "start"
 msgstr "status"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4652,163 +4688,163 @@ msgstr ""
 "partição %s - início: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado (%ld,"
 "%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 #, fuzzy
 msgid "end"
 msgstr "envio"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partição %s - fim: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado (%ld,%"
 "ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a partição %s termina no cilindro %ld, além do fim do disco\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, fuzzy, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr "Aviso: deslocamento inicia na partição extd de  %ld para %ld\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 #, fuzzy
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr "Aviso: a partição extendida não inicia em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "número excessivo de partições - ignorando aquelas além do nº %d\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "árvore de partições?\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Gerenciador de disco detectado - não é possível tratar\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "Assinatura DM6 encontrada - desistindo\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "estranho... uma partição estendida de tamanho 0?\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "estranho... uma partição BSD de tamanho 0?\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " %s: partição não reconhecida\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr "a opção -n foi fornecida: nada foi alterado\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Não foi possível salvar os setores antigos - abortando\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Não foi possível gravar a partição em %s\n"
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "linha de entrada longa demais ou incompleta - encerrando\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "erro de entrada: `=' esperado após o campo %s\n"
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "erro de entrada: caractere inesperado %c após o campo %s\n"
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entrada não reconhecida: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "número grande demais\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "lixo após o número\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "sem espaço para o descritor da partição\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "não foi possível criar a partição estendida envoltória\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr "número excessivo de campos de entrada\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "Não há espaço para mais\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "Tipo inválido\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Aviso: tamanho dado (%lu) excede o tamanho máximo permitido (%lu)\n"
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "Atenção: partição vazia\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Aviso: início de partição inválido (mais adiantado %lu)\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "opção de inicialização não reconhecida: selecione - ou *\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "especificação cil,cab,set parcial?\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "Partição estendida não está no lugar esperado\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "entrada inválida\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "Número excessivo de partições\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 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"
@@ -4820,47 +4856,47 @@ msgstr ""
 "Normalmente só é necessário especificar <início> e <tamanho> (e, talvez, "
 "<tipo>).\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "versão"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [opções] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: algo como /dev/hda ou /dev/sda"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "opções úteis:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [ou --show-size]: lista o tamanho de uma partição"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [ou --id]:        mostra ou altera a ID da partição"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ou --list]:      lista as partições de cada dispositivo"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [ou --dump]:      idem, mas em um formato adequado para entrada "
 "posterior"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [ou --increment]: numera os cilindros, etc. a partir de 1, em vez de 0"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4868,56 +4904,56 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  aceita/informa em unidades de setores/blocos/"
 "cilindros/MB"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [ou --list-types]:lista os tipos de partição conhecidos"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [ou --DOS]:       para compatibilidade com DOS: desperdiça um pouco "
 "de espaço"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [ou --re-read]:   faz o kernel reler a tabela de partições"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                altera somente a partição de número #"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 não grava no disco, realmente"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O arquivo :          salva os setores que serão sobrescritos em arquivo"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I arquivo :         restaura os setores gravados em arquivo"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ou --version]:   mostra a versão"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ou --help]:      mostra esta mensagem"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "opções perigosas:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [ou --show-geometry]: mostra a suposição do kernel sobre a geometria"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4925,119 +4961,119 @@ msgstr ""
 "    -x [ou --show-extended]: também lista partições estendidas na saída\n"
 "                             ou espera descritores para elas na entrada"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [ou --Linux]:      não reclama de coisas irrelevantes para o Linux"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ou --quiet]:      suprime mensagens de aviso"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "    Você pode anular a geometria detectada usando:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [ou --cylinders #]:define o número de cilindros a usar"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [ou --heads #]:    define o número de cabeças a usar"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [ou --sectors #]:  define o número de setores a usar"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "Você pode desativar todas as verificações de consistência com:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [ou --force]:      faça o que eu mandar, mesmo que seja idiota"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositivo\t\tlista partições as ativas no dispositivo\n"
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s dispositivo n1 n2... ativa as partições n1..., deixando inativas as "
 "demais\n"
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 "%s -An dispositivo\n"
 " ativa a partição n, desativa as demais\n"
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "nenhum comando?\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "total: %d blocos\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Uso: sfdisk --print-id dispositivo número-partição\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Uso: sfdisk --change-id dispositivo número-partição ID\n"
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Uso: sfdisk --id dispositivo número-partição [ID]\n"
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "pode especificar somente um dispositivo (exceto com -l ou -s)\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "não foi possível abrir %s\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "não foi possível abrir %s para leitura"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilindros, %ld cabeças, %ld setores/trilha\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "ioctl BLKGETSIZE falhou para %s\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte ativo inválido: 0x%x em vez de 0x80\n"
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -5045,7 +5081,7 @@ msgstr ""
 "Concluído\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5054,35 +5090,35 @@ msgstr ""
 "Você possui %d partições primárias ativas. Isto não faz diferença para o\n"
 "LILO, mas o MBR DOS só inicializará em discos com uma partição ativa.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "a partição %s possui ID %x e não está escondida\n"
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "ID inválida: %lx\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Este disco está atualmente sendo usado.\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erro fatal: não foi possível encontrar %s\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Aviso: %s não é um dispositivo de blocos\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Verificando se ninguém está usando este disco no momento...\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5095,28 +5131,28 @@ msgstr ""
 "todas as partições de permuta deste disco. Use a opção --no-reread para "
 "suprimir esta verificação.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Use a opção --force para cancelar todas as verificações.\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Situação antiga:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "A partição %d não existe; não é possível alterá-la.\n"
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Situação nova:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5124,19 +5160,19 @@ msgstr ""
 "Eu não gosto destas partições: nada foi alterado\n"
 "(se você realmente quiser usá-las, use a opção --force).\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Eu não gosto disto - provavelmente você deveria responder Não\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Você está satisfeito com isto? [ynq] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Deseja gravar isto no disco? [ynq] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5144,15 +5180,15 @@ msgstr ""
 "\n"
 "sfdisk: final de entrada prematuro\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "Saindo - nada foi alterado\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda y, n ou q\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5160,7 +5196,7 @@ msgstr ""
 "Nova tabela de partições gravada com sucesso\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5792,7 +5828,7 @@ msgstr "Aguardando em la
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "ioctl KDGHWCLK para ler a hora falhou"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "Tempo esgotado enquanto aguardava a hora mudar.\n"
 
@@ -5818,58 +5854,68 @@ msgstr "N
 msgid "KDGHWCLK ioctl failed"
 msgstr "ioctl KDGHWCLK falhou"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "open() de %s falhou"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, 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:170
+#: hwclock/rtc.c:171
 #, 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:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s não possui funções de interrupção. "
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, 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:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "read() para %s para aguardar tique do relógio falhou"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "read() para %s para aguardar tique do relógio falhou"
+
+#: hwclock/rtc.c:267
 #, 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:246
+#: hwclock/rtc.c:270
 #, 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:305
+#: hwclock/rtc.c:329
 #, 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:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) teve êxito.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "A abertura de %s falhou"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5880,17 +5926,17 @@ msgstr ""
 "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:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "Não foi possível abrir %s"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) para %s falhou"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, 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"
@@ -5898,24 +5944,24 @@ 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:396
+#: hwclock/rtc.c:420
 #, 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:414
+#: hwclock/rtc.c:438
 #, 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:419
+#: hwclock/rtc.c:443
 #, 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:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) para %s falhou"
@@ -6089,51 +6135,66 @@ msgstr "Login em %s de %s negado como padr
 msgid "Login on %s from %s denied.\n"
 msgstr "Login em %s de %s negado.\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, 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:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: usuário \"%s\" não existe.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr "%s: só pode alterar entradas locais; use yp%s, em vez disso.\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+msgid "Unknown user context"
+msgstr ""
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Alterando informações de finger de %s.\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Erro de senha."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Senha:"
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Senha incorreta."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "Informações de finger não alteradas.\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Uso: %s [ -f nome_completo ] [ -o local_de_trabalho ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6141,11 +6202,11 @@ msgstr ""
 "[ -p telefone_comercial ]\n"
 "\t[ -h telefone_residencial ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6153,120 +6214,132 @@ msgstr ""
 "\n"
 "Abortado.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "campo longo demais.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' não é permitido.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Caracteres de controle não são permitidos.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 "As informações de finger *NÃO* foram alteradas. Tente novamente mais tarde.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "As informações de finger foram alteradas.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "malloc falhou"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" não está listado em /etc/shells\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
 "%s: Seu interpretador de comandos não está em /etc/shells; mudança de "
 "interpretador de comandos negada.\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Alterando o interpretador de comandos para o usuário %s.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Novo interpretador de comandos"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "O interpretador de comandos NÃO foi alterado.\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr ""
 "O interpretador de comandos *NÃO* foi alterado. Tente novamente mais tarde.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Interpretador de comandos alterado.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr ""
 "%s: o interpretador de comandos precisa ser um nome de caminho completo.\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" não existe.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" não é executável.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' não é permitido.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: caracteres de controle não são permitidos.\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Aviso:  \"%s\" não está listado em /etc/shells\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" não está listado em /etc/shells\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: use a opção -l para ver a lista\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Aviso:  \"%s\" não está listado em /etc/shells.\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Use %s -l para ver a lista.\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "Nenhum interpretador de comandos conhecido.\n"
 
@@ -6462,81 +6535,81 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Número excessivo de processos em execução.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DISCAGEM EM %s POR %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN COMO ROOT EM %s A PARTIR DE %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN COMO ROOT EM %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN EM %s POR %s A PARTIR DE %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN EM %s POR %s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 #, fuzzy
 msgid "You have new mail.\n"
 msgstr "Você tem mensagens %s na caixa de correio.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 #, fuzzy
 msgid "You have mail.\n"
 msgstr "Você tem mensagens %s na caixa de correio.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: falha em fork: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() falhou"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "O diretório %s não existe!\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Fazendo login com home = \"/\".\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 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:1200
+#: login-utils/login.c:1199
 #, 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:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: não existe interpretador de comandos: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6545,62 +6618,62 @@ msgstr ""
 "\n"
 "%s usuário: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "nome de login longo demais.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "NOME longo demais"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "nomes de login não podem iniciar com '-'.\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "Número excessivo de saltos de linha.\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "Saltos de linha EXCESSIVOS"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Tempo de login esgotado após %d segundos\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Último login: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "a partir de %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "em: %.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "FALHA DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "FALHA DE LOGIN EM %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d FALHAS DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d FALHAS DE LOGIN EM %s, %s"
@@ -6999,56 +7072,66 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: ERRO GRAVE"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, fuzzy, c-format
 msgid "%s: the password file is busy.\n"
 msgstr "%s: o arquivo %s está ocupado.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, fuzzy, c-format
 msgid "%s: the group file is busy.\n"
 msgstr "%s: o arquivo %s está ocupado.\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, 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:164
+#: login-utils/vipw.c:168
 #, 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:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "Não foi possível obter o tempo-limite para %s: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "Não foi possível obter o tempo-limite para %s: %s\n"
+
+#: login-utils/vipw.c:217
 #, 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:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: não foi possível realizar fork\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s inalterado\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: nenhuma alteração realizada\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr "Você está usando grupos sombra (shadow) neste sistema\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr "Você está usando senhas sombra (shadow) neste sistema\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "Você gostaria de editar %s agora [s/n]"
@@ -7243,7 +7326,7 @@ msgstr "%s: n
 msgid "call: %s from to files...\n"
 msgstr "chamada: %s de para arquivos...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, fuzzy, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7254,22 +7337,22 @@ msgstr ""
 "Use `%s [opções] %s' se você realmente quer usar isto.\n"
 "Script não iniciado.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 #, fuzzy
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "Uso: script [-a] [-f] [-q] [arquivo]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado, o arquivo é %s\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado em %s"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7278,16 +7361,16 @@ msgstr ""
 "\n"
 "Script concluído em %s"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script concluído, o arquivo é %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "openpty falhou\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "ptys esgotados\n"
 
@@ -7556,42 +7639,42 @@ msgstr "mount: n
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, 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:427
+#: mount/fstab.c:466
 #, 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:439
+#: mount/fstab.c:478
 #, 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:454
+#: mount/fstab.c:493
 #, 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:467
+#: mount/fstab.c:505
 #, 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:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "tempo esgotado"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7600,193 +7683,127 @@ msgstr ""
 "Não foi possível criar o vínculo %s\n"
 "Talvez haja um arquivo de bloqueio vencido?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, 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:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "erro ao gravar %s: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "erro ao alterar o modo de %s: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, 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:173
+#: mount/lomount.c:85
 #, 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:179
+#: mount/lomount.c:101
 #, 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:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) deslocamento %d, criptografia %s\n"
-
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: não foi possível localizar qualquer dispositivo /dev/loop#"
-
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
+msgid ", offset %lld"
 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:253
+#: mount/lomount.c:104
 #, 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'.)"
+msgid ", sizelimit %lld"
 msgstr ""
-"mount: Não foi possível localizar nenhum dispositivo de laço e, de acordo "
-"com %s,\n"
-"       este kernel não conhece o dispositivo de laço\n"
-"       (se for este o caso, recompile ou use `insmod loop.o')."
 
-#: mount/lomount.c:259
-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?"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
 msgstr ""
-"mount: Não foi possível localizar nenhum dispositivo de laço. Talvez este "
-"kernel\n"
-"       não conheça o dispositivo de laço (se for este o caso, recompile ou "
-"use `insmod loop.o')\n"
-"       ou talvez dev/loop# tenha um número principal incorreto?"
 
-#: mount/lomount.c:263
-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:126
+#, c-format
+msgid ", offset %d"
+msgstr ""
 
-#: mount/lomount.c:359
+#: mount/lomount.c:129
 #, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "não foi possível abrir %s para leitura"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Redigite a nova senha: "
+msgid ", encryption type %d\n"
+msgstr "Tipo de criptografia não suportado: %s\n"
 
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "abertura do diretório falhou\n"
+#: mount/lomount.c:138
+#, 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:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "A senha deve ter pelo menos 6 caracteres; tente novamente.\n"
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: não foi possível localizar qualquer dispositivo /dev/loop#"
 
-#: mount/lomount.c:472
+#: mount/lomount.c:192
 #, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Não foi possível alocar mais qualquer memória\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
 msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
+"mount: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
+"mount: Não foi possível localizar nenhum dispositivo de laço e, de acordo "
+"com %s,\n"
+"       este kernel não conhece o dispositivo de laço\n"
+"       (se for este o caso, recompile ou use `insmod loop.o')."
 
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
+#: mount/lomount.c:197
+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:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Não é possível bloquear (lock) na memória, saindo\n"
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Inicialização (até 16 dígitos hexadecimais):"
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): sucesso\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "Digito não hexadecimal '%c'.\n"
+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:764
+#: mount/lomount.c:366
 #, 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"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): sucesso\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): sucesso\n"
+#: mount/lomount.c:374
+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:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+msgstr ""
+"usage:\n"
+"  %s dispositivo_laço                                                 # dá "
+"informações\n"
+"  %s -d dispositivo_laço                                              # "
+"exclui\n"
+"  %s [ -e criptografia ] [ -o deslocamento ] dispositivo_laço arquivo # "
+"configuração\n"
+
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
 msgid "not enough memory"
 msgstr "não há memória suficiente"
 
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "não foi possível abrir %s para leitura"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
-msgstr ""
-
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
-
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
+msgstr "Não havia suporte a laço disponível quando da compilação. Recompile.\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7802,41 +7819,41 @@ msgstr "[mntent]: linha %d em %s tem %s inv
 msgid "; rest of file ignored"
 msgstr "; resto do arquivo ignorado"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, 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:400
+#: mount/mount.c:399
 #, 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:421
+#: mount/mount.c:420
 #, 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:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: erro ao gravar %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: erro ao alterar modo de %s: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s parece espaço de permuta - não montado"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "mount falhou"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: somente o root pode montar %s em %s"
@@ -7858,107 +7875,111 @@ msgstr "mount: ignorando a configura
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: será usado o dispositivo de laço %s\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: falha ao configurar dispositivo de laço\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configuração de dispositivo de laço realizada com sucesso\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: não foi possível abrir %s: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr ""
+
+#: mount/mount.c:687
 #, fuzzy, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: não foi possível abrir %s para configuração da velocidade"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: não foi possível configurar velocidade: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: não foi possível realizar fork: %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 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:854
+#: mount/mount.c:864
 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:865
+#: mount/mount.c:875
 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:868
+#: mount/mount.c:878
 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:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr "mount: a montagem falhou"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, 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:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: permissão negada"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 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:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s está ocupado"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc já montado"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s já montado ou %s ocupado"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: o ponto de montagem %s não existe"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, 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:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: o dispositivo especial %s não existe"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7967,12 +7988,12 @@ msgstr ""
 "mount: o dispositivo especial %s não existe\n"
 "       (um prefixo de caminho não é um diretório)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, 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:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7982,35 +8003,35 @@ msgstr ""
 "inválido em %s,\n"
 "       ou número excessivo de sistemas de arquivos montados"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "tabela de montagem cheia"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: não foi possível ler o superbloco"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: dispositivo de blocos desconhecido"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, 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:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: provavelmente você queria dizer %s"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: talvez você quisesse dizer iso9660?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -8018,12 +8039,12 @@ msgstr ""
 "arquivos %s não é suportado"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, 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:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8032,75 +8053,48 @@ msgstr ""
 "mount: o kernel não reconhece %s como dispositivo de blocos\n"
 "       (talvez `insmod driver'?)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, 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:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s não é um dispositivo de blocos"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, 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:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "dispositivo de blocos "
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, 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:1017
+#: mount/mount.c:1027
 #, 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:1033
+#: mount/mount.c:1043
 #, 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:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr ""
-
-#: mount/mount.c:1124
-#, fuzzy, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "umount: %s: não montado"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: montando %s por %s\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "rótulo"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: tal partição não foi encontrada"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: nenhum tipo foi fornecido - supondo nfs por causa dos dois-pontos\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 #, fuzzy
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr "mount: nenhum tipo foi fornecido - supondo smbfs por causa xxx\n"
@@ -8108,22 +8102,22 @@ msgstr "mount: nenhum tipo foi fornecido - supondo smbfs por causa xxx\n"
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: tentando montar em segundo plano \"%s\"\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: desistindo de \"%s\"\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s já montado em %s\n"
 
-#: mount/mount.c:1386
+#: mount/mount.c:1362
 #, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8145,7 +8139,7 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Uso:   mount -V                 : mostra versão\n"
@@ -8170,40 +8164,39 @@ msgstr ""
 "Outras opções: [-nfFrsvw] [-o opções].\n"
 "Para mais detalhes, consulte `man 8 mount'.\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: operação exclusiva de root"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nenhum %s encontrado - criando-o...\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr ""
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: tal partição não foi encontrada"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: montando %s\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: não foi possível localizar %s em %s"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, 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:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8211,35 +8204,35 @@ 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:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: UUID inválida"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 #, fuzzy
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: você precisa especificar o tipo do sistema de arquivos"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, 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:495
+#: mount/mount_guess_fstype.c:523
 #, 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:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr "       e parece ser um espaço de permuta\n"
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       experimentarei o tipo %s\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "Experimentando %s\n"
@@ -8333,7 +8326,7 @@ msgstr "valor de retorno de status de nfs desconhecido: %d"
 msgid "bug in xstrndup call"
 msgstr "erro na chamada a xstrndup"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8346,7 +8339,7 @@ msgstr ""
 "       %s [-v] [-p prioridade] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8358,99 +8351,31 @@ msgstr ""
 "       %s [-v] [-p prioridade] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-#, fuzzy
-msgid "out of memory"
-msgstr "memória insuficiente?\n"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s em %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: não foi possível stat %s: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, fuzzy, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr "swapon: aviso: %s possui permissões inseguras %04o; sugere-se 0600\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: ignorando arquivo %s - ele parece ter buracos.\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s: dispositivo de blocos inválido"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "Tipo de criptografia não suportado: %s\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: será usado o dispositivo de laço %s\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Esta partição já está sendo usada"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "Não foi possível rebobinar o dispositivo de permuta (swap)"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "não foi possível abrir /dev/urandom"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "não foi possível gravar inodes"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "o fork falhou\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Alterando a senha para o usuário %s\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: não foi possível abrir %s: %s\n"
@@ -8516,37 +8441,37 @@ msgstr ""
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "não existe umount2, tentando umount...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, 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:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s está ocupado - remontado somente para leitura\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, 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:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmontado\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 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:457
+#: mount/umount.c:467
 #, fuzzy
 msgid ""
 "Usage: umount [-hV]\n"
@@ -8557,42 +8482,42 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t tipos_sist_arq_virt]\n"
 "       umount [-f] [-r] [-n] [-v] especial | nó...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentando desmontar %s\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Não foi possível localizar %s em mtab\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s não está montado (de acordo com mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s está montado múltiplas vezes"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, 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:566
+#: mount/umount.c:582
 #, 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:602
+#: mount/umount.c:616
 #, c-format
-msgid "umount: only root can unmount %s from %s"
-msgstr "umount: somente root pode desmontar %s de %s"
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: somente %s pode desmontar %s de %s"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr "umount: operação exclusiva de root"
 
@@ -8735,7 +8660,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/s; %f recebidos (char/s)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Uso: %s [-c] [-n nível] [-s tamanho_buffer]\n"
@@ -8901,23 +8826,23 @@ msgstr "- Limites da mem
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
 msgstr "número máximo de segmentos: %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "tamanho máximo do segmento (Kb): %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "memória compartilhada total máxima (Kb): %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "tamanho mínimo do segmento (bytes): %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9444,7 +9369,12 @@ msgstr ""
 msgid "missing comma"
 msgstr ""
 
-#: sys-utils/readprofile.c:115
+#: sys-utils/readprofile.c:72
+#, fuzzy
+msgid "out of memory"
+msgstr "memória insuficiente?\n"
+
+#: sys-utils/readprofile.c:118
 #, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
@@ -9456,6 +9386,7 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
@@ -9470,32 +9401,32 @@ msgstr ""
 "\t -r            reinicializa todos os contadores (somente root)\n"
 "\t -V            mostra a versão e sai\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, fuzzy, c-format
 msgid "%s version %s\n"
 msgstr "%s versão %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Passo de amostragem: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): linha de mapa incorreta\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, 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:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "total"
 
@@ -10002,32 +9933,119 @@ msgstr "Linha de entrada longa demais.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Falta memória quando o buffer cresce.\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: não foi possível excluir o dispositivo %s: %s\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: não compilado com suporte a minix v2\n"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): sucesso\n"
+#~ msgid "Boot (%02X)"
+#~ msgstr "Boot (%02X)"
 
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
-#~ msgstr "Este mount foi compilado sem suporte a laços. Recompile-o.\n"
+#~ msgid "None (%02X)"
+#~ msgstr "Nenhum (%02X)"
+
+#, fuzzy
+#~ msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) deslocamento %d, criptografia %s\n"
 
 #~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "usage:\n"
-#~ "  %s dispositivo_laço                                                 # "
-#~ "dá informações\n"
-#~ "  %s -d dispositivo_laço                                              # "
-#~ "exclui\n"
-#~ "  %s [ -e criptografia ] [ -o deslocamento ] dispositivo_laço arquivo # "
-#~ "configuração\n"
-
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ "mount: Não foi possível localizar nenhum dispositivo de laço.\n"
+#~ "       Talvez dev/loop# tenha um número principal incorreto?"
+
+#~ msgid ""
+#~ "mount: Could not find any loop device. Maybe this kernel does not know\n"
+#~ "       about the loop device (then recompile or `insmod loop.o'), or\n"
+#~ "       maybe /dev/loop# has the wrong major number?"
+#~ msgstr ""
+#~ "mount: Não foi possível localizar nenhum dispositivo de laço. Talvez este "
+#~ "kernel\n"
+#~ "       não conheça o dispositivo de laço (se for este o caso, recompile "
+#~ "ou use `insmod loop.o')\n"
+#~ "       ou talvez dev/loop# tenha um número principal incorreto?"
+
+#, fuzzy
+#~ msgid "Error: unable to open %s for reading\n"
+#~ msgstr "não foi possível abrir %s para leitura"
+
+#, fuzzy
+#~ msgid "Retype password: "
+#~ msgstr "Redigite a nova senha: "
+
+#, fuzzy
+#~ msgid "Error: gpg key file decryption failed\n"
+#~ msgstr "abertura do diretório falhou\n"
+
+#, fuzzy
+#~ msgid "Error: Password must be at least %d characters.\n"
+#~ msgstr "A senha deve ter pelo menos 6 caracteres; tente novamente.\n"
+
+#, fuzzy
+#~ msgid "Error: Unable to allocate memory\n"
+#~ msgstr "Não foi possível alocar mais qualquer memória\n"
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Inicialização (até 16 dígitos hexadecimais):"
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Digito não hexadecimal '%c'.\n"
+
+#~ msgid "Don't know how to get key for encryption system %d\n"
 #~ msgstr ""
-#~ "Não havia suporte a laço disponível quando da compilação. Recompile.\n"
+#~ "O modo de obter a chave para o sistema de criptografia %d não é "
+#~ "conhecido\n"
+
+#, fuzzy
+#~ msgid "Error: unable to open /etc/fstab for reading\n"
+#~ msgstr "não foi possível abrir %s para leitura"
+
+#, fuzzy
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "umount: %s: não montado"
+
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: montando %s por %s\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "rótulo"
+
+#, fuzzy
+#~ msgid "swapon: invalid loop device name\n"
+#~ msgstr "umount: %s: dispositivo de blocos inválido"
+
+#, fuzzy
+#~ msgid "swapon: unable to open loop device %s\n"
+#~ msgstr "mount: será usado o dispositivo de laço %s\n"
+
+#, fuzzy
+#~ msgid "swapon: loop device %s already in use\n"
+#~ msgstr "Esta partição já está sendo usada"
+
+#, fuzzy
+#~ msgid "swapon: unable to open swap device %s\n"
+#~ msgstr "Não foi possível rebobinar o dispositivo de permuta (swap)"
+
+#, fuzzy
+#~ msgid "swapon: unable to open /dev/urandom\n"
+#~ msgstr "não foi possível abrir /dev/urandom"
+
+#, fuzzy
+#~ msgid "swapon: unable to create pipe\n"
+#~ msgstr "não foi possível gravar inodes"
+
+#, fuzzy
+#~ msgid "swapon: fork failed\n"
+#~ msgstr "o fork falhou\n"
+
+#, fuzzy
+#~ msgid "swapon: random password for %s is %s"
+#~ msgstr "Alterando a senha para o usuário %s\n"
+
+#~ msgid "umount: only root can unmount %s from %s"
+#~ msgstr "umount: somente root pode desmontar %s de %s"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "A partição %i não termina em um limite de cilindro:\n"
@@ -10068,9 +10086,6 @@ msgstr "Falta mem
 #~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
 #~ msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#~ msgid "umount: only %s can unmount %s from %s"
-#~ msgstr "umount: somente %s pode desmontar %s de %s"
-
 #~ msgid "Block %d in file `"
 #~ msgstr "O bloco %d no arquivo `"
 
diff --git a/po/ru.po b/po/ru.po
index 377e2060..4624d4e6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,339 +1,455 @@
-# Russian translation of util-linux messages
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of util-linux-2.12.po to Russian.
+# Copyright (C) 2003 Free Software Foundation Inc.
+# This file is put in the public domain.
+# Pavel Maryanov <acid_jack@ukr.net>, 2003.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-08-27 14:34+0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: util-linux 2.12\n"
+"POT-Creation-Date: 2003-07-29 14:02-0400\n"
+"PO-Revision-Date: 2003-10-22 23:45+0200\n"
+"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:60
 msgid "set read-only"
-msgstr ""
+msgstr "ÕÓÔÁÎÏ×ÉÔØ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
 
-#: disk-utils/blockdev.c:62
+#: disk-utils/blockdev.c:61
 msgid "set read-write"
-msgstr ""
+msgstr "ÕÓÔÁÎÏ×ÉÔØ ÞÔÅÎÉÅ-ÚÁÐÉÓØ"
 
-#: disk-utils/blockdev.c:65
+#: disk-utils/blockdev.c:64
 msgid "get read-only"
-msgstr ""
+msgstr "ÐÏÌÕÞÉÔØ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
 
-#: disk-utils/blockdev.c:68
+#: disk-utils/blockdev.c:67
 msgid "get sectorsize"
-msgstr ""
+msgstr "ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ ÓÅËÔÏÒÁ"
 
-#: disk-utils/blockdev.c:71
+#: disk-utils/blockdev.c:70
 msgid "get blocksize"
-msgstr ""
+msgstr "ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ ÂÌÏËÁ"
 
-#: disk-utils/blockdev.c:74
+#: disk-utils/blockdev.c:73
 msgid "set blocksize"
-msgstr ""
+msgstr "ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÂÌÏËÁ"
 
-#: disk-utils/blockdev.c:77
+#: disk-utils/blockdev.c:76
 msgid "get size"
-msgstr ""
+msgstr "ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ"
 
-#: disk-utils/blockdev.c:80
+#: disk-utils/blockdev.c:79
 msgid "set readahead"
-msgstr ""
+msgstr "ÕÓÔÁÎÏ×ÉÔØ ÕÐÒÅÖÄÁÀÝÅÅ ÞÔÅÎÉÅ"
 
-#: disk-utils/blockdev.c:83
+#: disk-utils/blockdev.c:82
 msgid "get readahead"
-msgstr ""
+msgstr "ÐÏÌÕÞÉÔØ ÕÐÒÅÖÄÁÀÝÅÅ ÞÔÅÎÉÅ"
 
-#: disk-utils/blockdev.c:86
+#: disk-utils/blockdev.c:85
 msgid "flush buffers"
-msgstr ""
+msgstr "ÏÞÉÓÔÉÔØ ÂÕÆÅÒÙ"
 
-#: disk-utils/blockdev.c:90
+#: disk-utils/blockdev.c:89
 msgid "reread partition table"
-msgstr ""
+msgstr "ÐÅÒÅÞÉÔÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ×"
 
-#: disk-utils/blockdev.c:99
+#: disk-utils/blockdev.c:98
 msgid "Usage:\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:100
 #, c-format
 msgid "  %s --report [devices]\n"
-msgstr ""
+msgstr "  %s --report [ÕÓÔÒÏÊÓÔ×Á]\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:101
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
-msgstr ""
+msgstr "  %s [-v|-q] ËÏÍÁÎÄÙ ÕÓÔÒÏÊÓÔ×ÁÍ\n"
 
-#: disk-utils/blockdev.c:103
+#: disk-utils/blockdev.c:102
 msgid "Available commands:\n"
-msgstr ""
+msgstr "äÏÓÔÕÐÎÙÅ ËÏÍÁÎÄÙ:\n"
 
-#: disk-utils/blockdev.c:220
+#: disk-utils/blockdev.c:219
 #, c-format
 msgid "%s: Unknown command: %s\n"
-msgstr ""
+msgstr "%s: îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ: %s\n"
 
-#: disk-utils/blockdev.c:232 disk-utils/blockdev.c:241
+#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
 #, c-format
 msgid "%s requires an argument\n"
-msgstr ""
+msgstr "äÌÑ %s ÔÒÅÂÕÅÔÓÑ ÁÒÇÕÍÅÎÔ\n"
 
-#: disk-utils/blockdev.c:279
+#: disk-utils/blockdev.c:278
 #, c-format
 msgid "%s succeeded.\n"
-msgstr ""
+msgstr "%s ÚÁ×ÅÒÛÅÎ ÕÓÐÅÛÎÏ.\n"
 
-#: disk-utils/blockdev.c:297 disk-utils/blockdev.c:322
+#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: cannot open %s\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s\n"
 
-#: disk-utils/blockdev.c:339
+#: disk-utils/blockdev.c:338
 #, c-format
 msgid "%s: ioctl error on %s\n"
-msgstr ""
+msgstr "%s: ÏÛÉÂËÁ ÕÐÒÁ×ÌÅÎÉÑ ××ÏÄÏÍ-×Ù×ÏÄÏÍ ÎÁ %s\n"
 
-#: disk-utils/blockdev.c:346
+#: disk-utils/blockdev.c:345
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
-msgstr ""
+msgstr "þÔ    úÐ   óËÔ   âÌË   îÁÞóÅËÔ     òÁÚÍÅÒ    õÓÔÒÏÊÓÔ×Ï\n"
 
 #: disk-utils/elvtune.c:46 disk-utils/setfdprm.c:100
 msgid "usage:\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ:\n"
 
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
 msgid "Formatting ... "
-msgstr ""
+msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÆÏÒÍÁÔÉÒÏ×ÁÎÉÅ ... "
 
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
 msgid "done\n"
-msgstr ""
+msgstr "ÇÏÔÏ×Ï\n"
 
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
 msgid "Verifying ... "
-msgstr ""
+msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÐÒÏ×ÅÒËÁ ... "
 
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
 msgid "Read: "
-msgstr ""
+msgstr "þÔÅÎÉÅ:"
 
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÃÉÌÉÎÄÒÁ %d, ÏÖÉÄÁÌÏÓØ %d, ÐÒÏÞÉÔÁÎÏ %d\n"
 
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
 #, c-format
 msgid ""
 "bad data in cyl %d\n"
 "Continuing ... "
 msgstr ""
+"ÐÌÏÈÉÅ ÄÁÎÎÙÅ × ÃÉÌÉÎÄÒÅ %d\n"
+"ðÒÏÄÏÌÖÅÎÉÅ ... "
 
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
 #, c-format
 msgid "usage: %s [ -n ] device\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ -n ] ÕÓÔÒÏÊÓÔ×Ï\n"
 
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:452
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:243 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
+#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:133
 #, c-format
 msgid "%s from %s\n"
-msgstr ""
+msgstr "%s ÉÚ %s\n"
 
-#: disk-utils/fdformat.c:134
+#: disk-utils/fdformat.c:130
 #, c-format
-msgid "%s: not a floppy device\n"
-msgstr ""
+msgid "%s: not a block device\n"
+msgstr "%s: ÎÅ ÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï\n"
 
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÂÙÌÏ ÏÐÒÅÄÅÌÉÔØ ÔÅËÕÝÉÊ ÔÉÐ ÆÏÒÍÁÔÁ"
 
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
-msgstr ""
+msgstr "%s-ÓÔÏÒÏÎÎÉÊ, %d ÄÏÒÏÖÅË, %d ÓÅËÔ/ÄÏÒÏÖË. ïÂÝÁÑ ÅÍËÏÓÔØ %d Ëâ.\n"
 
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
 msgid "Double"
-msgstr ""
+msgstr "ä×ÏÊÎÏÊ"
 
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
 msgid "Single"
+msgstr "ïÄÉÎÁÒÎÙÊ"
+
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h         print this help\n"
+" -x dir     extract into dir\n"
+" -v         be more verbose\n"
+" file       file to test\n"
 msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-hv] [-x ËÁÔÁÌÏÇ] ÆÁÊÌ\n"
+" -h         ×Ù×ÏÄ ÜÔÏÊ ÓÐÒÁ×ËÉ\n"
+" -x ËÁÔÁÌÏÇ ÉÚ×ÌÅÞÅÎÉÅ × ËÁÔÁÌÏÇ\n"
+" -v         ÐÏÄÒÏÂÎÙÊ ÒÅÖÉÍ\n"
+" ÆÁÊÌ       ÆÁÊÌ ÄÌÑ ÐÒÏ×ÅÒËÉ\n"
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr "%s: ÏÛÉÂËÁ %d ÐÒÉ ÒÁÓÐÁËÏ×ËÅ! %p(%d)\n"
+
+#: disk-utils/fsck.cramfs.c:243
+#, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: ÏÛÉÂËÁ ÒÁÚÍÅÒÁ × ÓÉÍ×ÏÌÉÞÅÓËÏÊ ÓÓÙÌËÅ `%s'\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid "  uncompressing block at %ld to %ld (%ld)\n"
+msgstr "  ÒÁÓÐÁËÏ×Ù×ÁÅÔÓÑ ÂÌÏË %ld × %ld (%ld)\n"
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr "%s: ÆÉËÔÉ×ÎÙÊ ÒÅÖÉÍ ÎÁ `%s' (%o)\n"
+
+#: disk-utils/fsck.cramfs.c:319
+#, c-format
+msgid "  hole at %ld (%d)\n"
+msgstr "  'ÄÙÒÁ' × %ld (%d)\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr "%s: îÅÂÌÏÞÎÙÅ (%ld) ÂÁÊÔÙ\n"
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr "%s: âÅÚÒÁÚÍÅÒÎÙÅ (%ld ÐÒÏÔÉ× %ld) ÂÁÊÔÙ\n"
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÏÛÉÂÏÞÎÁÑ ÄÌÉÎÁ ÐÕÔÉ\n"
+
+#: disk-utils/fsck.cramfs.c:472
+#, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s: ÏÔËÏÍÐÉÌÉÒÏ×ÁÎ ÂÅÚ ÐÏÄÄÅÒÖËÉ -x\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ - ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÒÁÚÍÅÒ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ\n"
+
+#: disk-utils/fsck.cramfs.c:508
+#, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ ÉÌÉ ÆÁÊÌÏÍ\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÒÁÚÍÅÒ ÆÁÊÌÁ ÓÌÉÛËÏÍ ÍÁÌ\n"
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÏÛÉÂÏÞÎÙÊ magic\n"
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ - ÒÁÚÍÅÒ ÆÁÊÌÁ ÓÌÉÛËÏÍ ×ÅÌÉË. ÒÁÚÄÕ×ÛÉÊÓÑ ÏÂÒÁÚ?\n"
+
+#: disk-utils/fsck.cramfs.c:564
+#, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÏÛÉÂËÁ crc\n"
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ - ÓÔÁÒÙÊ ÏÂÒÁÚ cramfs, ÎÅÔ CRC\n"
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÏÛÉÂÏÞÎÙÊ ÓÕÐÅÒÂÌÏË\n"
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ËÏÎÅà ÄÁÎÎÙÈ ËÁÔÁÌÏÇÁ (%ld) != ÎÁÞÁÌÏ ÄÁÎÎÙÈ ÆÁÊÌÁ (%ld)\n"
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr "%s: ÎÅ×ÅÒÎÙÊ cramfs - ÏÛÉÂÏÞÎÏÅ ÓÍÅÝÅÎÉÅ ÄÁÎÎÙÈ ÆÁÊÌÁ\n"
 
 #: disk-utils/fsck.minix.c:200
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-larvsmf] /dev/ÉÍÑ\n"
 
 #: disk-utils/fsck.minix.c:307
 #, c-format
 msgid "%s is mounted.\t "
-msgstr ""
+msgstr "%s ÐÒÉÍÏÎÔÉÒÏ×ÁÎ.\t "
 
 #: disk-utils/fsck.minix.c:309
 msgid "Do you really want to continue"
-msgstr ""
+msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ"
 
 #: disk-utils/fsck.minix.c:313
 msgid "check aborted.\n"
-msgstr ""
+msgstr "ÐÒÏ×ÅÒËÁ ÐÒÅÒ×ÁÎÁ.\n"
 
 #: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
-msgstr ""
+msgstr "úÏÎÁ nr < FIRSTZONE × ÆÁÊÌÅ `%s'."
 
 #: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
-msgstr ""
+msgstr "úÏÎÁ nr >= ZONES × ÆÁÊÌÅ `%s'."
 
 #: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
 msgid "Remove block"
-msgstr ""
+msgstr "õÄÁÌÉÔØ ÂÌÏË"
 
 #: disk-utils/fsck.minix.c:384
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÂÌÏË × ÆÁÊÌÅ '%s'\n"
 
 #: disk-utils/fsck.minix.c:390
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ: ÏÛÉÂÏÞÎÙÊ ÂÌÏË × ÆÁÊÌÅ '%s'\n"
 
 #: disk-utils/fsck.minix.c:405
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
 msgstr ""
+"÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: ÐÏÐÙÔËÁ ÚÁÐÉÓÁÔØ ÏÛÉÂÏÞÎÙÊ ÂÌÏË\n"
+"úÁÐÒÏÓ ÎÁ ÚÁÐÉÓØ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:285
+#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
 msgid "seek failed in write_block"
-msgstr ""
+msgstr "ÐÏÉÓË × write_block ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
 #: disk-utils/fsck.minix.c:414
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ: ÎÅ×ÅÒÎÙÊ ÂÌÏË × ÆÁÊÌÅ '%s'\n"
 
 #: disk-utils/fsck.minix.c:532
 msgid "seek failed in write_super_block"
-msgstr ""
+msgstr "ÐÏÉÓË × write_super_block ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:272
+#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
 msgid "unable to write super-block"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÕÐÅÒÂÌÏË"
 
 #: disk-utils/fsck.minix.c:544
 msgid "Unable to write inode map"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ËÁÒÔÕ inode"
 
 #: disk-utils/fsck.minix.c:546
 msgid "Unable to write zone map"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ËÁÒÔÕ zone"
 
 #: disk-utils/fsck.minix.c:548
 msgid "Unable to write inodes"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ inode'Ù"
 
 #: disk-utils/fsck.minix.c:577
 msgid "seek failed"
-msgstr ""
+msgstr "ÐÏÉÓË ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
 #: disk-utils/fsck.minix.c:579
 msgid "unable to read super block"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÕÐÅÒÂÌÏË"
 
 #: disk-utils/fsck.minix.c:599
 msgid "bad magic number in super-block"
-msgstr ""
+msgstr "ÎÅ×ÅÒÎÏÅ ÍÁÇÉÞÅÓËÏÅ ÞÉÓÌÏ × ÓÕÐÅÒÂÌÏËÅ"
 
 #: disk-utils/fsck.minix.c:601
 msgid "Only 1k blocks/zones supported"
-msgstr ""
+msgstr "ðÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÔÏÌØËÏ 1k ÂÌÏËÉ/ÚÏÎÙ"
 
 #: disk-utils/fsck.minix.c:603
 msgid "bad s_imap_blocks field in super-block"
-msgstr ""
+msgstr "ÎÅ×ÅÒÎÏÅ ÐÏÌÅ s_imap_blocks × ÓÕÐÅÒÂÌÏËÅ"
 
 #: disk-utils/fsck.minix.c:605
 msgid "bad s_zmap_blocks field in super-block"
-msgstr ""
+msgstr "ÎÅ×ÅÒÎÏÅ ÐÏÌÅ s_zmap_blocks × ÓÕÐÅÒÂÌÏËÅ"
 
 #: disk-utils/fsck.minix.c:612
 msgid "Unable to allocate buffer for inode map"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÚÍÅÓÔÉÔØ ÂÕÆÅÒ ÄÌÑ ËÁÒÔÙ inode"
 
 #: disk-utils/fsck.minix.c:620
 msgid "Unable to allocate buffer for inodes"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÚÍÅÓÔÉÔØ ÂÕÆÅÒ ÄÌÑ inode'Ï×"
 
 #: disk-utils/fsck.minix.c:623
 msgid "Unable to allocate buffer for inode count"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÂÕÆÅÒ ÄÌÑ ÞÉÓÌÁ inode"
 
 #: disk-utils/fsck.minix.c:626
 msgid "Unable to allocate buffer for zone count"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÂÕÆÅÒ ÄÌÑ ÞÉÓÌÁ ÚÏÎ"
 
 #: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ËÁÒÔÕ inode"
 
 #: disk-utils/fsck.minix.c:630
 msgid "Unable to read zone map"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ËÁÒÔÕ ÚÏÎ"
 
 #: disk-utils/fsck.minix.c:632
 msgid "Unable to read inodes"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ inode'Ù"
 
 #: disk-utils/fsck.minix.c:634
 msgid "Warning: Firstzone != Norm_firstzone\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ðÅÒ×ÁÑ ÚÏÎÁ != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:526
+#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
 #, c-format
 msgid "%ld inodes\n"
-msgstr ""
+msgstr "%ld inode'Ï×\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:527
+#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
 #, c-format
 msgid "%ld blocks\n"
-msgstr ""
+msgstr "%ld ÂÌÏËÏ×\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:528
+#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
-msgstr ""
+msgstr "ðÅÒ×ÁÑ ÚÏÎÁ ÄÁÎÎÙÈ=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:529
+#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
 #, c-format
 msgid "Zonesize=%d\n"
-msgstr ""
+msgstr "òÁÚÍÅÒ ÚÏÎÙ=%d\n"
 
 #: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "Maxsize=%ld\n"
-msgstr ""
+msgstr "íÁËÓ. ÒÁÚÍÅÒ=%ld\n"
 
 #: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "Filesystem state=%d\n"
-msgstr ""
+msgstr "óÏÓÔÏÑÎÉÅ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ=%d\n"
 
 #: disk-utils/fsck.minix.c:645
 #, c-format
@@ -341,180 +457,186 @@ msgid ""
 "namelen=%d\n"
 "\n"
 msgstr ""
+"ÄÌÉÎÁ ÉÍÅÎÉ=%d\n"
+"\n"
 
 #: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
-msgstr ""
+msgstr "Inode %d ÐÏÍÅÞÅÎ ËÁË ÎÅÉÓÐÏÌØÚÕÅÍÙÊ, ÎÏ ÉÓÐÏÌØÚÕÅÔÓÑ ÆÁÊÌÏÍ '%s'\n"
 
 #: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
 msgid "Mark in use"
-msgstr ""
+msgstr "ðÏÍÅÔÉÔØ, ËÁË ÉÓÐÏÌØÚÕÅÍÙÊ"
 
 #: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
 #, c-format
 msgid "The file `%s' has mode %05o\n"
-msgstr ""
+msgstr "æÁÊÌ `%s' ÎÁÈÏÄÉÔÓÑ × ÒÅÖÉÍÅ %05o\n"
 
 #: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
 msgid "Warning: inode count too big.\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÞÉÓÌÏ inode ÓÌÉÛËÏÍ ×ÅÌÉËÏ.\n"
 
 #: disk-utils/fsck.minix.c:755
 msgid "root inode isn't a directory"
-msgstr ""
+msgstr "ËÏÒÎÅ×ÏÊ inode ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ"
 
 #: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
-msgstr ""
+msgstr "âÌÏË ÂÙÌ ÉÓÐÏÌØÚÏ×ÁÎ ÒÁÎÅÅ. ôÅÐÅÒØ × ÆÁÊÌÅ `%s'."
 
 #: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
 #: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
 #: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
 msgid "Clear"
-msgstr ""
+msgstr "ïÞÉÓÔÉÔØ"
 
 #: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
-msgstr ""
+msgstr "âÌÏË %d × ÆÁÊÌÅ `%s' ÐÏÍÅÞÅÎ ËÁË ÎÅÉÓÐÏÌØÚÕÅÍÙÊ."
 
 #: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
 msgid "Correct"
-msgstr ""
+msgstr "éÓÐÒÁ×ÉÔØ"
 
 #: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
-msgstr ""
+msgstr "ëÁÔÁÌÏÇ '%s' ÓÏÄÅÒÖÉÔ ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ inode ÄÌÑ ÆÁÊÌÁ '%.*s'."
 
 #: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
 msgid " Remove"
-msgstr ""
+msgstr " õÄÁÌÉÔØ"
 
 #: disk-utils/fsck.minix.c:990
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
-msgstr ""
+msgstr "`%s': ÎÅ×ÅÒÎÙÊ ËÁÔÁÌÏÇ: '.' ÎÅ ÐÅÒ×ÙÊ\n"
 
 #: disk-utils/fsck.minix.c:998
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
-msgstr ""
+msgstr "`%s': ÎÅ×ÅÒÎÙÊ ËÁÔÁÌÏÇ: '..' ÎÅ ×ÔÏÒÏÊ\n"
 
 #: disk-utils/fsck.minix.c:1058
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÁÔÁÌÏÇ: '.' ÎÅ ÐÅÒ×ÙÊ\n"
 
 #: disk-utils/fsck.minix.c:1067
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÁÔÁÌÏÇ: '..' ÎÅ ×ÔÏÒÏÊ\n"
 
 #: disk-utils/fsck.minix.c:1102
 msgid "internal error"
-msgstr ""
+msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ"
 
 #: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
 #, c-format
 msgid "%s: bad directory: size < 32"
-msgstr ""
+msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÁÔÁÌÏÇ: ÒÁÚÍÅÒ < 32"
 
 #: disk-utils/fsck.minix.c:1138
 msgid "seek failed in bad_zone"
-msgstr ""
+msgstr "ÐÏÉÓË × bad_zone ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
 #: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
 #, c-format
 msgid "Inode %d mode not cleared."
-msgstr ""
+msgstr "òÅÖÉÍ inode %d ÎÅ ÏÞÉÝÅÎ."
 
 #: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
-msgstr ""
+msgstr "Inode %d ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ, ÐÏÍÅÞÅÎ ËÁË ÉÓÐÏÌØÚÕÅÍÙÊ × bitmap'Å."
 
 #: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
-msgstr ""
+msgstr "Inode %d ÉÓÐÏÌØÚÕÅÔÓÑ, ÐÏÍÅÞÅÎ ËÁË ÎÅÉÓÐÏÌØÚÕÅÍÙÊ × bitmap'Å."
 
 #: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
-msgstr ""
+msgstr "Inode %d (ÒÅÖÉÍ = %07o), i_nlinks=%d, counted=%d."
 
 #: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
 msgid "Set i_nlinks to count"
-msgstr ""
+msgstr "ðÒÉÓ×ÏÉÔØ i_nlinks'Õ ÞÉÓÌÏ"
 
 #: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
-msgstr ""
+msgstr "úÏÎÁ %d: ÐÏÍÅÞÅÎÁ ËÁË ÉÓÐÏÌØÚÕÅÍÁÑ, ÎÏ ÉÓÐÏÌØÚÕÀÝÉÈ ÅÅ ÆÁÊÌÏ× ÎÅÔ."
 
 #: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
 msgid "Unmark"
-msgstr ""
+msgstr "óÎÑÔØ ÍÅÔËÕ"
 
 #: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
-msgstr ""
+msgstr "úÏÎÁ %d: ÉÓÐÏÌØÚÕÅÔÓÑ, counted=%d\n"
 
 #: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
-msgstr ""
+msgstr "úÏÎÁ %d: ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ, counted=%d\n"
 
 #: disk-utils/fsck.minix.c:1220
 msgid "Set"
-msgstr ""
+msgstr "ðÒÉÓ×ÏÉÔØ"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:649
-#: disk-utils/mkfs.minix.c:652
+#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
+#: disk-utils/mkfs.minix.c:646
 msgid "bad inode size"
-msgstr ""
+msgstr "ÎÅ×ÅÒÎÙÊ ÒÁÚÍÅÒ inode"
 
 #: disk-utils/fsck.minix.c:1299
 msgid "bad v2 inode size"
-msgstr ""
+msgstr "ÎÅ×ÅÒÎÙÊ ÒÁÚÍÅÒ v2 inode"
 
 #: disk-utils/fsck.minix.c:1325
 msgid "need terminal for interactive repairs"
-msgstr ""
+msgstr "ÎÕÖÅÎ ÔÅÒÍÉÎÁÌ ÄÌÑ ÉÎÔÅÒÁËÔÉ×ÎÏÇÏ ÉÓÐÒÁ×ÌÅÎÉÑ"
 
 #: disk-utils/fsck.minix.c:1329
 #, c-format
 msgid "unable to open '%s'"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ '%s'"
 
 #: disk-utils/fsck.minix.c:1344
 #, c-format
 msgid "%s is clean, no check.\n"
-msgstr ""
+msgstr "%s ÞÉÓÔ, ÐÒÏ×ÅÒËÁ ÎÅ ÎÕÖÎÁ.\n"
 
 #: disk-utils/fsck.minix.c:1348
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
-msgstr ""
+msgstr "úÁÐÕÓËÁÅÔÓÑ ÐÒÏ×ÅÒËÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ ÎÁ %s.\n"
 
 #: disk-utils/fsck.minix.c:1350
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
-msgstr ""
+msgstr "æÁÊÌÏ×ÁÑ ÓÉÓÔÅÍÁ ÎÁ %s ÐÏ×ÒÅÖÄÅÎÁ, ÎÕÖÎÁ ÐÒÏ×ÅÒËÁ.\n"
 
 #: disk-utils/fsck.minix.c:1379
+#, c-format
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
+"\n"
+"éÓÐÏÌØÚÕÀÔÓÑ %6ld inodes (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1384
+#, c-format
 msgid "%6ld zones used (%ld%%)\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÕÀÔÓÑ %6ld ÚÏÎ (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1386
 #, c-format
@@ -529,6 +651,15 @@ msgid ""
 "------\n"
 "%6d files\n"
 msgstr ""
+"\n"
+"%6d ÏÂÙÞÎÙÈ ÆÁÊÌÏ×\n"
+"%6d ËÁÔÁÌÏÇÏ×\n"
+"%6d ÆÁÊÌÏ× ÓÉÍ×ÏÌØÎÙÈ ÕÓÔÒÏÊÓÔ×\n"
+"%6d ÆÁÊÌÏ× ÂÌÏÞÎÙÈ ÕÓÔÒÏÊÓÔ×\n"
+"%6d ÓÓÙÌÏË\n"
+"%6d ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË\n"
+"------\n"
+"%6d ÆÁÊÌÏ×\n"
 
 #: disk-utils/fsck.minix.c:1399
 msgid ""
@@ -536,36 +667,39 @@ msgid ""
 "FILE SYSTEM HAS BEEN CHANGED\n"
 "----------------------------\n"
 msgstr ""
+"----------------------------\n"
+"æáêìï÷áñ óéóéôåíá âùìá éúíåîåîá\n"
+"----------------------------\n"
 
 #: disk-utils/isosize.c:129
 #, c-format
 msgid "%s: failed to open: %s\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ : %s\n"
 
 #: disk-utils/isosize.c:135
 #, c-format
 msgid "%s: seek error on %s\n"
-msgstr ""
+msgstr "%s: ÏÛÉÂËÁ ÐÏÉÓËÁ ÎÁ %s\n"
 
 #: disk-utils/isosize.c:141
 #, c-format
 msgid "%s: read error on %s\n"
-msgstr ""
+msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÎÁ %s\n"
 
 #: disk-utils/isosize.c:150
 #, c-format
 msgid "sector count: %d, sector size: %d\n"
-msgstr ""
+msgstr "ÞÉÓÌÏ ÓÅËÔÏÒÏ×: %d, ÒÁÚÍÅÒ ÓÅËÔÏÒÁ: %d\n"
 
 #: disk-utils/isosize.c:198
 #, c-format
 msgid "%s: option parse error\n"
-msgstr ""
+msgstr "%s: ÏÛÉÂËÁ ÐÁÒÓÉÎÇÁ ÏÐÃÉÊ\n"
 
 #: disk-utils/isosize.c:206
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-x] [-d <ÎÏÍÅÒ>] iso9660-ÏÂÒÁÚ\n"
 
 #: disk-utils/mkfs.bfs.c:88
 #, c-format
@@ -573,322 +707,461 @@ msgid ""
 "Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
 "       [-F fsname] device [block-count]\n"
 msgstr ""
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-v] [-N ËÏÌ-×Ï_inode'Ï×] [-V ÉÍÑ_ÔÏÍÁ]\n"
+"       [-F ÉÍÑ_ÆÓ] ÕÓÔÒÏÊÓÔ×Ï [ÞÉÓÌÏ_ÂÌÏËÏ×]\n"
 
 #: disk-utils/mkfs.bfs.c:135
 msgid "volume name too long"
-msgstr ""
+msgstr "ÉÍÑ ÔÏÍÁ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
 
 #: disk-utils/mkfs.bfs.c:142
 msgid "fsname name too long"
-msgstr ""
+msgstr "ÉÍÑ ÆÁÊÌ. ÓÉÓÔÅÍÙ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
 
 #: disk-utils/mkfs.bfs.c:167
 #, c-format
 msgid "cannot stat device %s"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ ÕÓÔÒÏÊÓÔ×Á %s"
 
 #: disk-utils/mkfs.bfs.c:171
 #, c-format
 msgid "%s is not a block special device"
-msgstr ""
+msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÏÓÏÂÙÍ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ"
 
 #: disk-utils/mkfs.bfs.c:176
 #, c-format
 msgid "cannot open %s"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s"
 
 #: disk-utils/mkfs.bfs.c:187
 #, c-format
 msgid "cannot get size of %s"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ %s"
 
 #: disk-utils/mkfs.bfs.c:192
 #, c-format
 msgid "blocks argument too large, max is %lu"
-msgstr ""
+msgstr "ÁÒÇÕÍÅÎÔ ÂÌÏËÏ× ÓÌÉÛËÏÍ ×ÅÌÉË, ÍÁËÓÉÍÕÍ - %lu"
 
 #: disk-utils/mkfs.bfs.c:207
 msgid "too many inodes - max is 512"
-msgstr ""
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ inode'Ï×, ÍÁËÓÉÍÕÍ - 512"
 
 #: disk-utils/mkfs.bfs.c:216
 #, c-format
 msgid "not enough space, need at least %lu blocks"
-msgstr ""
+msgstr "ÎÅ È×ÁÔÁÅÔ ÍÅÓÔÁ, ÎÕÖÎÏ ËÁË ÍÉÎÉÍÕÍ %lu ÂÌÏËÏ×"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2025
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2181
 #, c-format
 msgid "Device: %s\n"
-msgstr ""
+msgstr "õÓÔÒÏÊÓÔ×Ï: %s\n"
 
 #: disk-utils/mkfs.bfs.c:229
 #, c-format
 msgid "Volume: <%-6s>\n"
-msgstr ""
+msgstr "ôÏÍ: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:230
 #, c-format
 msgid "FSname: <%-6s>\n"
-msgstr ""
+msgstr "éÍÑ ÆÁÊÌ. ÓÉÓÔÅÍÙ: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:231
 #, c-format
 msgid "BlockSize: %d\n"
-msgstr ""
+msgstr "òÁÚÍÅÒ ÂÌÏËÁ: %d\n"
 
 #: disk-utils/mkfs.bfs.c:233
 #, c-format
 msgid "Inodes: %d (in 1 block)\n"
-msgstr ""
+msgstr "Inode'Ù: %d (× 1 ÂÌÏËÅ)\n"
 
 #: disk-utils/mkfs.bfs.c:236
 #, c-format
 msgid "Inodes: %d (in %ld blocks)\n"
-msgstr ""
+msgstr "Inode'Ù: %d (× %ld ÂÌÏËÁÈ)\n"
 
 #: disk-utils/mkfs.bfs.c:238
 #, c-format
 msgid "Blocks: %ld\n"
-msgstr ""
+msgstr "âÌÏËÉ: %ld\n"
 
 #: disk-utils/mkfs.bfs.c:239
 #, c-format
 msgid "Inode end: %d, Data end: %d\n"
-msgstr ""
+msgstr "ëÏÎÅà inode: %d, ËÏÎÅà ÄÁÎÎÙÈ: %d\n"
 
 #: disk-utils/mkfs.bfs.c:244
 msgid "error writing superblock"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÓÕÐÅÒÂÌÏËÁ"
 
 #: disk-utils/mkfs.bfs.c:264
 msgid "error writing root inode"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ËÏÒÎÅ×ÏÇÏ inode"
 
 #: disk-utils/mkfs.bfs.c:269
 msgid "error writing inode"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ inode"
 
 #: disk-utils/mkfs.bfs.c:272
 msgid "seek error"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÐÏÉÓËÁ"
 
 #: disk-utils/mkfs.bfs.c:278
 msgid "error writing . entry"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ . ÜÌÅÍÅÎÔÁ"
 
 #: disk-utils/mkfs.bfs.c:282
 msgid "error writing .. entry"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ .. ÜÌÅÍÅÎÔÁ"
 
 #: disk-utils/mkfs.bfs.c:286
 #, c-format
 msgid "error closing %s"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÚÁËÒÙÔÉÑ %s"
 
 #: disk-utils/mkfs.c:76
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: mkfs [-V] [-t ÔÉÐ_ÆÓ] [ÏÐÃÉÉ_ÆÓ] ÕÓÔÒÏÊÓÔ×Ï [ÒÁÚÍÅÒ]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:373 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:367 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
-msgstr "%s: îÅÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ!\n"
+msgstr "%s: îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ!\n"
 
 #: disk-utils/mkfs.c:99
 #, c-format
 msgid "mkfs version %s (%s)\n"
+msgstr "mkfs ×ÅÒÓÉÉ %s (%s)\n"
+
+#: disk-utils/mkfs.cramfs.c:124
+#, c-format
+msgid ""
+"usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h         print this help\n"
+" -v         be verbose\n"
+" -E         make all warnings errors (non-zero exit status)\n"
+" -b blksz   use this blocksize, must equal page size\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file    insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name    set name of cramfs filesystem\n"
+" -p         pad by %d bytes for boot code\n"
+" -s         sort directory entries (old option, ignored)\n"
+" -z         make explicit holes (requires >= 2.3.39)\n"
+" dirname    root of the filesystem to be compressed\n"
+" outfile    output file\n"
 msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-v] [-b ÒÁÚÍ_ÂÌÏËÁ] [-e ÉÚÄÁÎÉÅ] [-i ÆÁÊÌ] [-n ÉÍÑ] ÉÍÑ_ËÁÔÁÌÏÇÁ ×ÙÈ_ÆÁÊÌ\n"
+" -h         ×Ù×ÏÄ ÜÔÏÊ ÓÐÒÁ×ËÉ\n"
+" -v         ÐÏÄÒÏÂÎÙÊ ÒÅÖÉÍ\n"
+" -E         ÓÏÚÄÁÎÉÅ ×ÓÅÈ ÏÛÉÂÏË Ó ÐÒÅÄÕÐÒÅÖÄÅÎÉÅÍ (ÎÅÎÕÌÅ×ÏÊ ÓÔÁÔÕÓ ×ÙÈÏÄÁ)\n"
+" -b ÒÁÚÍ_ÂÌÏËÁ  ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÜÔÏÇÏ ÒÁÚÍÅÒÁ ÂÌÏËÁ, ÄÏÌÖÅÎ ÒÁ×ÎÑÔØÓÑ ÒÁÚÍÅÒÕ ÓÔÒÁÎÉÃÙ\n"
+" -e ÉÚÄÁÎÉÅ ÕÓÔÁÎÏ×ËÁ ÎÏÍÅÒÁ ÉÚÄÁÎÉÑ (ÞÁÓÔØ fsid)\n"
+" -i ÆÁÊÌ    ×ÓÔÁ×ËÁ ÆÁÊÌÁ ÏÂÒÁÚÁ × ÆÁÊÌÏ×ÕÀ ÓÉÓÔÅÍÕ (ÔÒÅÂÕÅÔÓÑ >= 2.4.0)\n"
+" -n ÉÍÑ     ÕÓÔÁÎÏ×ËÁ ÉÍÅÎÉ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ cramfs\n"
+" -p         ÚÁÐÏÌÎÅÎÉÅ %d ÂÁÊÔÁÍÉ ÄÌÑ ÚÁÇÒÕÚÏÞÎÏÇÏ ËÏÄÁ\n"
+" -s         ÓÏÒÔÉÒÏ×ËÁ ÓÏÄÅÒÖÉÍÏÇÏ ËÁÔÁÌÏÇÁ (ÕÓÔÁÒÅ×ÛÁÑ ÏÐÃÉÑ, ÉÇÎÏÒÉÒÕÅÔÓÑ)\n"
+" -z         ÓÏÚÄÁÎÉÅ Ñ×ÎÙÈ ÄÙÒ (ÔÒÅÂÕÅÔÓÑ >= 2.3.39)\n"
+" ÉÍÑ_ËÁÔÁÌÏÇÁ   ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ ÓÖÉÍÁÅÍÏÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ\n"
+" ×ÙÈ_ÆÁÊÌ   ×ÙÈÏÄÎÏÊ ÆÁÊÌ\n"
 
-#: disk-utils/mkfs.minix.c:181
+#: disk-utils/mkfs.cramfs.c:335
 #, c-format
-msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
+"îÁÊÄÅÎÏ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ (%u ÂÁÊÔ) ÉÍÑ ÆÁÊÌÁ `%s'.\n"
+" ðÏÖÁÌÕÊÓÔÁ, Õ×ÅÌÉÞØÔÅ MAX_INPUT_NAMELEN × mkcramfs.c É ÐÅÒÅËÏÍÐÉÌÉÒÕÊÔÅ.  úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.cramfs.c:463
+msgid "filesystem too big.  Exiting.\n"
+msgstr "ÆÁÊÌÏ×ÁÑ ÓÉÓÔÅÍÁ ÓÌÉÛËÏÍ ×ÅÌÉËÁ.  úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
+
+#: disk-utils/mkfs.cramfs.c:514
+msgid "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  Exiting.\n"
+msgstr "ðÒÅ×ÙÛÅÎ MAXENTRIES.  õ×ÅÌÉÞØÔÅ ÜÔÏ ÚÎÁÞÅÎÉÅ × mkcramfs.c É ÐÅÒÅËÏÍÐÉÌÉÒÕÊÔÅ.  úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
-msgid "%s is mounted; will not make a filesystem here!"
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr "AIEEE: ÂÌÏË \"ÓÖÁÔ\" × > 2*ÄÌÉÎÁ_ÂÌÏËÁ (%ld)\n"
+
+#: disk-utils/mkfs.cramfs.c:641
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr "%6.2f%% (%+d ÂÁÊÔ)\t%s\n"
+
+#: disk-utils/mkfs.cramfs.c:819
+#, c-format
+msgid "warning: guestimate of required size (upper bound) is %LdMB, but maximum image size is %uMB.  We might die prematurely.\n"
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÒÉÂÌÉÚÉÔÅÌØÎÏ ÔÒÅÂÕÅÍÙÊ ÒÁÚÍÅÒ (×ÅÒÈÎÑÑ ÇÒÁÎÉÃÁ) ÓÏÓÔÁ×ÌÑÅÔ %Ldíâ, Á ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÏÂÒÁÚÁ - %uíâ.  ÷ÏÚÍÏÖÎÏ ÐÒÅÖÄÅ×ÒÅÍÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
+
+#: disk-utils/mkfs.cramfs.c:860
+#, c-format
+msgid "Including: %s\n"
+msgstr "÷ËÌÀÞÁÑ: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:866
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr "äÁÎÎÙÅ ËÁÔÁÌÏÇÁ: %d ÂÁÊÔ\n"
+
+#: disk-utils/mkfs.cramfs.c:874
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr "÷ÓÅ: %d ËÉÌÏÂÁÊÔ\n"
+
+#: disk-utils/mkfs.cramfs.c:879
+#, c-format
+msgid "Super block: %d bytes\n"
+msgstr "óÕÐÅÒÂÌÏË: %d ÂÁÊÔ\n"
+
+#: disk-utils/mkfs.cramfs.c:886
+#, c-format
+msgid "CRC: %x\n"
+msgstr "CRC: %x\n"
+
+#: disk-utils/mkfs.cramfs.c:891
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr "ÎÅ È×ÁÔÁÅÔ ÍÅÓÔÁ, ×ÙÄÅÌÅÎÎÏÇÏ ÄÌÑ ROM-ÏÂÒÁÚÁ (%Ld ×ÙÄÅÌÅÎÏ, %d ÉÓÐÏÌØÚÕÅÔÓÑ)\n"
+
+#: disk-utils/mkfs.cramfs.c:903
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr "úÁÐÉÓØ ROM-ÏÂÒÁÚÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ (%d %d)\n"
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:912
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÍÅÎÁ ÆÁÊÌÏ× ÕËÏÒÏÞÅÎÙ ÄÏ 255 ÂÁÊÔ.\n"
+
+#: disk-utils/mkfs.cramfs.c:915
+msgid "warning: files were skipped due to errors.\n"
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÚ-ÚÁ ÏÛÉÂÏË ÂÙÌÉ ÐÒÏÐÕÝÅÎÙ ÆÁÊÌÙ.\n"
+
+#: disk-utils/mkfs.cramfs.c:918
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÍÅÒÙ ÆÁÊÌÏ× ÕÍÅÎØÛÅÎÙ ÄÏ %luíâ (ÍÉÎÕÓ 1 ÂÁÊÔ).\n"
+
+#: disk-utils/mkfs.cramfs.c:923
+#, c-format
+msgid "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: uid'Ù ÕËÏÒÏÞÅÎÙ ÄÏ %u ÂÉÔ.  (üÔÏ ÍÏÖÅÔ ËÁÓÁÔØÓÑ ÂÅÚÏÐÁÓÎÏÓÔÉ.)\n"
+
+#: disk-utils/mkfs.cramfs.c:928
+#, c-format
+msgid "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: gid'Ù ÕËÏÒÏÞÅÎÙ ÄÏ %u ÂÉÔ.  (üÔÏ ÍÏÖÅÔ ËÁÓÁÔØÓÑ ÂÅÚÏÐÁÓÎÏÓÔÉ.)\n"
+
+#: disk-utils/mkfs.cramfs.c:933
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
+"that some device files will be wrong.\n"
 msgstr ""
+"ðòåäõðòåöäåîéå: ÞÉÓÌÏ ÕÓÔÒÏÊÓÔ× ÕÍÅÎØÛÅÎÏ ÄÏ %u ÂÉÔ.  üÔÏ ÐÒÁËÔÉÞÅÓËÉ\n"
+"×ÓÅÇÄÁ ÏÚÎÁÞÁÅÔ, ÞÔÏ ÎÅËÏÔÏÒÙÅ ÆÁÊÌÙ ÕÓÔÒÏÊÓÔ× ÂÙÌÉ ÎÅ×ÅÒÎÙ.\n"
+
+#: disk-utils/mkfs.minix.c:175
+#, c-format
+msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-c | -l ÉÍÑ_ÆÁÊÌÁ] [-nXX] [-iXX] /dev/ÉÍÑ [ÂÌÏËÉ]\n"
+
+#: disk-utils/mkfs.minix.c:199
+#, c-format
+msgid "%s is mounted; will not make a filesystem here!"
+msgstr "%s ÐÒÉÍÏÎÔÉÒÏ×ÁÎ; ÎÅ ÓÏÚÄÁ×ÁÊÔÅ ÚÄÅÓØ ÆÁÊÌÏ×ÕÀ ÓÉÓÔÅÍÕ!"
 
-#: disk-utils/mkfs.minix.c:266
+#: disk-utils/mkfs.minix.c:260
 msgid "seek to boot block failed in write_tables"
-msgstr ""
+msgstr "ÐÏÉÓË ÚÁÇÒÕÚÏÞÎÏÇÏ ÂÌÏËÁ × write_tables ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:262
 msgid "unable to clear boot sector"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÞÉÓÔÉÔØ ÚÁÇÒÕÚÏÞÎÙÊ ÓÅËÔÏÒ"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:264
 msgid "seek failed in write_tables"
-msgstr ""
+msgstr "ÐÏÉÓË × write_tables ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: disk-utils/mkfs.minix.c:274
+#: disk-utils/mkfs.minix.c:268
 msgid "unable to write inode map"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ËÁÒÔÕ inode"
 
-#: disk-utils/mkfs.minix.c:276
+#: disk-utils/mkfs.minix.c:270
 msgid "unable to write zone map"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ËÁÒÔÕ ÚÏÎ"
 
-#: disk-utils/mkfs.minix.c:278
+#: disk-utils/mkfs.minix.c:272
 msgid "unable to write inodes"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ inode'Ù"
 
-#: disk-utils/mkfs.minix.c:287
+#: disk-utils/mkfs.minix.c:281
 msgid "write failed in write_block"
-msgstr ""
+msgstr "ÚÁÐÉÓØ × write_block ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:295 disk-utils/mkfs.minix.c:369
-#: disk-utils/mkfs.minix.c:419
+#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
+#: disk-utils/mkfs.minix.c:413
 msgid "too many bad blocks"
-msgstr ""
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÌÏÈÉÈ ÂÌÏËÏ×"
 
-#: disk-utils/mkfs.minix.c:303
+#: disk-utils/mkfs.minix.c:297
 msgid "not enough good blocks"
-msgstr ""
+msgstr "ÎÅ È×ÁÔÁÅÔ ÈÏÒÏÛÉÈ ÂÌÏËÏ×"
 
-#: disk-utils/mkfs.minix.c:515
+#: disk-utils/mkfs.minix.c:509
 msgid "unable to allocate buffers for maps"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÂÕÆÅÒÙ ÄÌÑ ËÁÒÔ"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:518
 msgid "unable to allocate buffer for inodes"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÂÕÆÅÒÙ ÄÌÑ inodes"
 
-#: disk-utils/mkfs.minix.c:530
+#: disk-utils/mkfs.minix.c:524
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
 "\n"
 msgstr ""
+"íÁËÓ. ÒÁÚÍÅÒ=%ld\n"
+"\n"
 
-#: disk-utils/mkfs.minix.c:544
+#: disk-utils/mkfs.minix.c:538
 msgid "seek failed during testing of blocks"
-msgstr ""
+msgstr "ÐÏÉÓË ×Ï ×ÒÅÍÑ ÐÒÏ×ÅÒËÉ ÂÌÏËÏ× ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: disk-utils/mkfs.minix.c:552
+#: disk-utils/mkfs.minix.c:546
 msgid "Weird values in do_check: probably bugs\n"
-msgstr ""
+msgstr "îÅÐÏÎÑÔÎÙÅ ÚÎÁÞÅÎÉÑ × do_check: ×ÏÚÍÏÖÎÏ ÓÂÏÊ\n"
 
-#: disk-utils/mkfs.minix.c:583 disk-utils/mkswap.c:362
+#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
-msgstr ""
+msgstr "ÐÏÉÓË × check_blocks ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: disk-utils/mkfs.minix.c:592
+#: disk-utils/mkfs.minix.c:586
 msgid "bad blocks before data-area: cannot make fs"
-msgstr ""
+msgstr "ÐÌÏÈÉÅ ÂÌÏËÉ ÐÅÒÅÄ data-area: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÓ"
 
-#: disk-utils/mkfs.minix.c:598 disk-utils/mkfs.minix.c:620
+#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
 #, c-format
 msgid "%d bad blocks\n"
-msgstr ""
+msgstr "%d ÐÌÏÈÉÈ ÂÌÏËÏ×\n"
 
-#: disk-utils/mkfs.minix.c:600 disk-utils/mkfs.minix.c:622
+#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
 msgid "one bad block\n"
-msgstr ""
+msgstr "ÏÄÉÎ ÐÌÏÈÏÊ ÂÌÏË\n"
 
-#: disk-utils/mkfs.minix.c:610
+#: disk-utils/mkfs.minix.c:604
 msgid "can't open file of bad blocks"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÐÌÏÈÉÈ ÂÌÏËÏ×"
 
-#: disk-utils/mkfs.minix.c:681
+#: disk-utils/mkfs.minix.c:674
 #, c-format
 msgid "%s: not compiled with minix v2 support\n"
-msgstr ""
+msgstr "%s: ÏÔËÏÍÐÉÌÉÒÏ×ÁÎ ÂÅÚ ÐÏÄÄÅÒÖËÉ minix v2\n"
 
-#: disk-utils/mkfs.minix.c:697
+#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
-msgstr ""
+msgstr "ÏÛÉÂËÁ strtol: ËÏÌÉÞÅÓÔ×Ï ÂÌÏËÏ× ÎÅ ÚÁÄÁÎÏ"
 
-#: disk-utils/mkfs.minix.c:729
+#: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ%s"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ %s"
 
-#: disk-utils/mkfs.minix.c:735
+#: disk-utils/mkfs.minix.c:731
 #, c-format
 msgid "will not try to make filesystem on '%s'"
-msgstr ""
+msgstr "ÐÏÐÙÔËÁ ÓÏÚÄÁÔØ ÆÁÊÌÏ×ÕÀ ÓÉÓÔÅÍÕ ÎÁ '%s' ×ÙÐÏÌÎÅÎÁ ÎÅ ÂÕÄÅÔ"
 
 #: disk-utils/mkswap.c:178
 #, c-format
 msgid "Bad user-specified page size %d\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÙÊ ÒÁÚÍÅÒ ÓÔÒÁÎÉÃÙ %d, ÕËÁÚÁÎÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌÅÍ\n"
 
 #: disk-utils/mkswap.c:187
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÚÁÄÁÎÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌÅÍ ÒÁÚÍÅÒ ÓÔÒÁÎÉÃÙ %d, ×ÍÅÓÔÏ ÓÉÓÔÅÍÎÙÈ ÚÎÁÞÅÎÉÊ %d/%d\n"
 
 #: disk-utils/mkswap.c:191
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr ""
+msgstr "ðÏÄÒÁÚÕÍÅ×ÁÅÍÙÊ ÒÁÚÍÅÒ ÓÔÒÁÎÎÉà %d (ÎÅ %d)\n"
 
-#: disk-utils/mkswap.c:316
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/ÉÍÑ [ÂÌÏËÉ]\n"
 
-#: disk-utils/mkswap.c:339
+#: disk-utils/mkswap.c:349
 msgid "too many bad pages"
-msgstr ""
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÌÏÈÉÈ ÓÔÒÁÎÉÃ"
 
-#: disk-utils/mkswap.c:353 misc-utils/look.c:182 misc-utils/setterm.c:1129
-#: text-utils/more.c:1934 text-utils/more.c:1945
+#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1145
+#: text-utils/more.c:2090 text-utils/more.c:2101
 msgid "Out of memory"
-msgstr ""
+msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ"
 
-#: disk-utils/mkswap.c:370
+#: disk-utils/mkswap.c:380
 msgid "one bad page\n"
-msgstr ""
+msgstr "ÏÄÎÁ ÐÌÏÈÁÑ ÓÔÒÁÎÉÃÁ\n"
 
-#: disk-utils/mkswap.c:372
+#: disk-utils/mkswap.c:382
 #, c-format
 msgid "%d bad pages\n"
-msgstr ""
+msgstr "%d ÐÌÏÈÉÈ ÓÔÒÁÎÉÃ\n"
 
-#: disk-utils/mkswap.c:492
+#: disk-utils/mkswap.c:501
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
-msgstr ""
+msgstr "%s: ÏÛÉÂËÁ: îÉÇÄÅ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ ÆÁÊÌ Ó×ÏÐÉÎÇÁ?\n"
 
-#: disk-utils/mkswap.c:510
+#: disk-utils/mkswap.c:519
 #, c-format
 msgid "%s: error: size %ld is larger than device size %d\n"
-msgstr ""
+msgstr "%s: ÏÛÉÂËÁ: ÒÁÚÍÅÒ %ld ÂÏÌØÛÅ, ÞÅÍ ÒÁÚÍÅÒ ÕÓÔÒÏÊÓÔ×Á %d\n"
 
-#: disk-utils/mkswap.c:529
+#: disk-utils/mkswap.c:538
 #, c-format
 msgid "%s: error: unknown version %d\n"
-msgstr ""
+msgstr "%s: ÏÛÉÂËÁ: ÎÅÉÚ×ÅÓÔÎÁÑ ×ÅÒÓÉÑ %d\n"
 
-#: disk-utils/mkswap.c:535
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
-msgstr ""
+msgstr "%s: ÏÛÉÂËÁ: ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ ÄÏÌÖÎÏ ÂÙÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ %ldËâ\n"
 
-#: disk-utils/mkswap.c:554
+#: disk-utils/mkswap.c:562
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
-msgstr ""
+msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ ÕÍÅÎØÛÁÅÔÓÑ ÄÏ %ldËâ\n"
 
-#: disk-utils/mkswap.c:566
+#: disk-utils/mkswap.c:576
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
-msgstr ""
+msgstr "ðÏÐÙÔËÁ ÓÏÚÄÁÔØ ÕÓÔÒÏÊÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ ÎÁ '%s' ×ÙÐÏÌÎÅÎÁ ÎÅ ÂÕÄÅÔ"
 
-#: disk-utils/mkswap.c:575 disk-utils/mkswap.c:596
+#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
 msgid "fatal: first page unreadable"
-msgstr ""
+msgstr "ÈÒÅÎÏ×Ï: ÐÅÒ×ÁÑ ÓÔÒÁÎÉÃÁ ÎÅÞÉÔÁÂÅÌØÎÁ"
 
-#: disk-utils/mkswap.c:581
+#: disk-utils/mkswap.c:591
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -896,114 +1169,117 @@ 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: õÓÔÒÏÊÓÔ×Ï '%s' ÓÏÄÅÒÖÉÔ ×ÅÒÎÕÀ ÍÅÔËÕ ÄÉÓËÁ Sun.\n"
+"÷ÏÚÍÏÖÎÏ, ÜÔÏ ÏÚÎÁÞÁÅÔ, ÞÔÏ ÓÏÚÄÁÎÉÅ Ó×ÏÐÁ v0 ÒÁÚÒÕÛÉÔ ×ÁÛÕ ÔÁÂÌÉÃÕ\n"
+"ÒÁÚÄÅÌÏ×. ó×ÏÐ ÎÅ ÓÏÚÄÁÎ. åÓÌÉ ×Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÓÏÚÄÁÔØ Ó×ÏÐ v0\n"
+"ÎÁ ÜÔÏÍ ÕÓÔÒÏÊÓÔ×Å, ÉÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ -f ÄÌÑ ÐÒÉÎÕÄÉÔÅÌØÎÏÇÏ ÓÏÚÄÁÎÉÑ.\n"
 
-#: disk-utils/mkswap.c:605
+#: disk-utils/mkswap.c:615
 msgid "Unable to set up swap-space: unreadable"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ: ÎÅÞÉÔÁÅÍÙÊ"
 
-#: disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:616
 #, c-format
-msgid "Setting up swapspace version %d, size = %ld bytes\n"
-msgstr ""
+msgid "Setting up swapspace version %d, size = %llu kB\n"
+msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ ×ÅÒÓÉÉ %d, ÒÁÚÍÅÒ = %llu Ëâ\n"
 
-#: disk-utils/mkswap.c:612
+#: disk-utils/mkswap.c:622
 msgid "unable to rewind swap-device"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÍÏÔÁÔØ ÕÓÔÒÏÊÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:625
 msgid "unable to write signature page"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÔÒÁÎÉÃÕ Ó ÓÉÇÎÁÔÕÒÏÊ"
 
-#: disk-utils/mkswap.c:623
+#: disk-utils/mkswap.c:633
 msgid "fsync failed"
-msgstr ""
+msgstr "fsync ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
 #: disk-utils/setfdprm.c:31
 #, c-format
 msgid "Invalid number: %s\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÏÅ ÞÉÓÌÏ: %s\n"
 
 #: disk-utils/setfdprm.c:81
 #, c-format
 msgid "Syntax error: '%s'\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ÓÉÎÔÁËÓÉÓÁ: '%s'\n"
 
 #: disk-utils/setfdprm.c:91
 #, c-format
 msgid "No such parameter set: '%s'\n"
-msgstr ""
+msgstr "îÅÔ ÔÁËÏÇÏ ÎÁÂÏÒÁ ÐÁÒÁÍÅÔÒÏ×: '%s'\n"
 
 #: disk-utils/setfdprm.c:101
 #, c-format
 msgid "   %s [ -p ] dev name\n"
-msgstr ""
+msgstr "   %s [ -p ] dev ÉÍÑ\n"
 
 #: disk-utils/setfdprm.c:102
 #, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
+msgid "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+msgstr "   %s [ -p ] dev ÉÍÑ ÓÅËÔÏÒ ÇÏÌÏ×ËÉ ÄÏÒÏÖËÉ ÕÞÁÓÔÏË ÐÒÏÍÅÖÕÔÏË ÞÁÓÔÏÔÁ ÓÐÅà 1 fmt_gap\n"
 
 #: disk-utils/setfdprm.c:105
 #, c-format
 msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr ""
+msgstr "   %s [ -c | -y | -n | -d ] dev\n"
 
 #: disk-utils/setfdprm.c:107
 #, c-format
 msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr ""
+msgstr "   %s [ -c | -y | -n ] dev\n"
 
-#: fdisk/cfdisk.c:398 fdisk/cfdisk.c:1991
+#: fdisk/cfdisk.c:392 fdisk/cfdisk.c:2015
 msgid "Unusable"
-msgstr "îÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
+msgstr "îÅÉÓÐÏÌØÚÕÅÍÙÊ"
 
-#: fdisk/cfdisk.c:400 fdisk/cfdisk.c:1993
+#: fdisk/cfdisk.c:394 fdisk/cfdisk.c:2017
 msgid "Free Space"
-msgstr "ó×ÏÂÏÄÎÏ"
+msgstr "ó×ÏÂÏÄÎÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï"
 
-#: fdisk/cfdisk.c:403
+#: fdisk/cfdisk.c:397
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:405
+#: fdisk/cfdisk.c:399
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:401
 msgid "Linux XFS"
-msgstr ""
+msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:403
 msgid "Linux ReiserFS"
-msgstr ""
+msgstr "Linux ReiserFS"
 
 #. also Solaris
-#: fdisk/cfdisk.c:411 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:405 fdisk/i386_sys_types.c:57
 msgid "Linux"
-msgstr ""
+msgstr "Linux"
 
-#: fdisk/cfdisk.c:414
+#: fdisk/cfdisk.c:408
 msgid "OS/2 HPFS"
-msgstr ""
+msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:416
+#: fdisk/cfdisk.c:410
 msgid "OS/2 IFS"
-msgstr ""
+msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:420
+#: fdisk/cfdisk.c:414
 msgid "NTFS"
-msgstr ""
+msgstr "NTFS"
 
-#: fdisk/cfdisk.c:431
+#: fdisk/cfdisk.c:425
 msgid "Disk has been changed.\n"
-msgstr "óÏÄÅÒÖÉÍÏÅ ÉÚÍÅÎÅÎÏ.\n"
+msgstr "äÉÓË ÂÙÌ ÉÚÍÅÎÅÎ.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:426
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
-msgstr "ðÅÒÅÚÁÇÒÕÚÉÔÅ ÓÉÓÔÅÍÕ ÄÌÑ ËÏÒÒÅËÔÎÏÇÏ ÏÂÎÏ×ÌÅÎÉÑ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×.\n"
+msgstr "ÐÅÒÅÚÁÇÒÕÚÉÔÅ ÓÉÓÔÅÍÕ, ÞÔÏÂÙ ÕÂÅÄÉÔØÓÑ × ÔÏÍ, ÞÔÏ ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ËÏÒÒÅËÔÎÏ ÏÂÎÏ×ÌÅÎÁ.\n"
 
-#: fdisk/cfdisk.c:435
+#: fdisk/cfdisk.c:429
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1011,124 +1287,128 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 "\n"
-"÷îéíáîéå: åÓÌÉ ×Ù ÓÏÚÄÁÌÉ ÉÌÉ ÉÚÍÅÎÉÌÉ ÒÁÚÄÅÌ DOS 6.x,\n"
-"ÏÂÒÁÔÉÔÅÓØ Ë ÓÐÒÁ×ËÅ ÐÏ cfdisk ÚÁ ÄÏÐÏÌÎÉÔÅÌØÎÙÍÉ Ó×ÅÄÅÎÉÑÍÉ.\n"
+"ðòåäõðòåöäåîéå: åÓÌÉ ×Ù ÓÏÚÄÁ×ÁÌÉ É ÉÚÍÅÎÑÌÉ\n"
+"ËÁËÉÅ-ÌÉÂÏ ÒÁÚÄÅÌÙ DOS 6.x, ÐÏÖÁÌÕÊÓÔÁ, ÐÒÏÞÔÉÔÅ\n"
+"ÏÐÅÒÁÔÉ×ÎÕÀ ÓÔÒÁÎÉÃÕ ÒÕËÏ×ÏÄÓÔ×Á cfdisk ÄÌÑ\n"
+"ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
-#: fdisk/cfdisk.c:530
+#: fdisk/cfdisk.c:524
 msgid "FATAL ERROR"
-msgstr "æáôáìøîáñ ïûéâëá"
+msgstr "îåéóðòá÷éíáñ ïûéâëá"
 
-#: fdisk/cfdisk.c:531
+#: fdisk/cfdisk.c:525
 msgid "Press any key to exit cfdisk"
-msgstr "îÁÖÍÉÔÅ ÌÀÂÕÀ ËÌÁ×ÉÛÕ ÄÌÑ ÚÁ×ÅÒÛÅÎÉÑ ÐÒÏÇÒÁÍÍÙ"
+msgstr "îÁÖÍÉÔÅ ÌÀÂÕÀ ËÌÁ×ÉÛÕ ÄÌÑ ×ÙÈÏÄÁ ÉÚ cfdisk"
 
-#: fdisk/cfdisk.c:578 fdisk/cfdisk.c:586
+#: fdisk/cfdisk.c:572 fdisk/cfdisk.c:580
 msgid "Cannot seek on disk drive"
-msgstr "ðÏÉÓË ÐÏ ÄÉÓËÕ ÎÅ×ÏÚÍÏÖÅÎ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÁ ÄÉÓËÏ×ÏÍ ÎÁËÏÐÉÔÅÌÅ"
 
-#: fdisk/cfdisk.c:580
+#: fdisk/cfdisk.c:574
 msgid "Cannot read disk drive"
-msgstr "þÔÅÎÉÅ Ó ÄÉÓËÁ ÎÅ×ÏÚÍÏÖÏ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ Ó ÄÉÓËÏ×ÏÇÏ ÎÁËÏÐÉÔÅÌÑ"
 
-#: fdisk/cfdisk.c:588
+#: fdisk/cfdisk.c:582
 msgid "Cannot write disk drive"
-msgstr "úÁÐÉÓØ ÎÁ ÄÉÓË ÎÅ×ÏÚÍÏÖÎÁ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÎÁ ÄÉÓËÏ×ÙÊ ÎÁËÏÐÉÔÅÌØ"
 
-#: fdisk/cfdisk.c:888
+#: fdisk/cfdisk.c:880
 msgid "Too many partitions"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/cfdisk.c:893
+#: fdisk/cfdisk.c:885
 msgid "Partition begins before sector 0"
-msgstr "îÁÞÁÌÏ ÒÁÚÄÅÌÁ ÎÁÈÏÄÉÔÓÑ ÄÏ ÎÕÌÅ×ÏÇÏ ÓÅËÔÏÒÁ"
+msgstr "òÁÚÄÅÌ ÎÁÞÉÎÁÅÔÓÑ ÄÏ ÓÅËÔÏÒÁ 0"
 
-#: fdisk/cfdisk.c:898
+#: fdisk/cfdisk.c:890
 msgid "Partition ends before sector 0"
-msgstr "ëÏÎÅà ÒÁÚÄÅÌÁ ÎÁÈÏÄÉÔÓÑ ÄÏ ÎÕÌÅ×ÏÇÏ ÓÅËÔÏÒÁ"
+msgstr "òÁÚÄÅÌ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÄÏ ÓÅËÔÏÒÁ 0"
 
-#: fdisk/cfdisk.c:903
+#: fdisk/cfdisk.c:895
 msgid "Partition begins after end-of-disk"
-msgstr "îÁÞÁÌÏ ÒÁÚÄÅÌÁ ÎÁÈÏÄÉÔÓÑ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÓËÁ"
+msgstr "òÁÚÄÅÌ ÎÁÞÉÎÁÅÔÓÑ ÐÏÓÌÅ ËÏÎÃÁ ÄÉÓËÁ"
 
-#: fdisk/cfdisk.c:908
+#: fdisk/cfdisk.c:900
 msgid "Partition ends after end-of-disk"
-msgstr "ëÏÎÅà ÒÁÚÄÅÌÁ ÎÁÈÏÄÉÔÓÑ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÓËÁ"
+msgstr "òÁÚÄÅÌ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÐÏÓÌÅ ËÏÎÃÁ ÄÉÓËÁ"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:905
+msgid "Partition ends in the final partial cylinder"
+msgstr "òÁÚÄÅÌ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÐÏÓÌÅÄÎÅÍ ÃÉÌÉÎÄÒÅ ÒÁÚÄÅÌÁ"
+
+#: fdisk/cfdisk.c:929
 msgid "logical partitions not in disk order"
-msgstr "îÅ ×ÅÒÎÙÊ ÐÏÒÑÄÏË ÌÏÇÉÞÅÓËÉÈ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓËÅ"
+msgstr "ÌÏÇÉÞÅÓËÉÅ ÒÁÚÄÅÌÙ ÉÄÕÔ ÎÅ ÐÏ ÐÏÒÑÄËÕ ÄÉÓËÏ×"
 
-#: fdisk/cfdisk.c:935
+#: fdisk/cfdisk.c:932
 msgid "logical partitions overlap"
-msgstr "ðÅÒÅËÒÙÔÉÅ ÌÏÇÉÞÅÓËÉÈ ÒÁÚÄÅÌÏ×"
+msgstr "ÌÏÇÉÞÅÓËÉÅ ÒÁÚÄÅÌÙ ÐÅÒÅËÒÙ×ÁÀÔÓÑ"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:934
 msgid "enlarged logical partitions overlap"
-msgstr "ðÅÒÅËÒÙÔÉÅ Õ×ÅÌÉÞÅÎÎÙÈ ÌÏÇÉÞÅÓËÉÈ ÒÁÚÄÅÌÏ×"
+msgstr "Õ×ÅÌÉÞÅÎÎÙÅ ÌÏÇÉÞÅÓËÉÅ ÄÉÓËÉ ÐÅÒÅËÒÙ×ÁÀÔÓÑ"
 
-#: fdisk/cfdisk.c:967
-msgid ""
-"!!!! Internal error creating logical drive with no extended partition !!!!"
-msgstr "!!!! ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÌÏÇÉÞÅÓËÏÇÏ ÄÉÓËÁ ÂÅÚ ÒÁÓÛÉÒÅÎÎÏÇÏ ÒÁÚÄÅÌÁ"
+#: fdisk/cfdisk.c:964
+msgid "!!!! Internal error creating logical drive with no extended partition !!!!"
+msgstr "!!!! ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÐÒÉ ÓÏÚÄÁÎÉÉ ÌÏÇÉÞÅÓËÏÇÏ ÄÉÓËÁ ÂÅÚ ÒÁÓÛÉÒÅÎÎÏÇÏ ÒÁÚÄÅÌÁ !!!!"
 
-#: fdisk/cfdisk.c:978 fdisk/cfdisk.c:990
-msgid ""
-"Cannot create logical drive here -- would create two extended partitions"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÌÏÇÉÞÅÓËÉÊ ÄÉÓË -- ÍÏÖÎÏ ÓÏÚÄÁÔØ Ä×Á ÒÁÓÛÉÒÅÎÎÙÈ ÒÁÚÄÅÌÁ"
+#: fdisk/cfdisk.c:975 fdisk/cfdisk.c:987
+msgid "Cannot create logical drive here -- would create two extended partitions"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÚÄÅÓØ ÌÏÇÉÞÅÓËÉÊ ÄÉÓË -- ÂÙÌÉ ÂÙ ÓÏÚÄÁÎÙ Ä×Á ÒÁÓÛÉÒÅÎÎÙÈ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:1138
+#: fdisk/cfdisk.c:1135
 msgid "Menu item too long. Menu may look odd."
-msgstr "óÌÉÛËÏÍ ÄÌÉÎÎÙÊ ÐÕÎËÔ ÍÅÎÀ. íÅÎÀ ÍÏÖÅÔ ×ÙÇÌÑÄÅÔØ ÎÅÕÄÏÂÎÏ."
+msgstr "ðÕÎËÔ ÍÅÎÀ ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ. íÅÎÀ ÍÏÖÅÔ ×ÙÇÌÑÄÅÔØ ÎÅÞÅÔËÏ."
 
-#: fdisk/cfdisk.c:1192
+#: fdisk/cfdisk.c:1191
 msgid "Menu without direction. Defaulting horizontal."
-msgstr "îÅ ÕËÁÚÁÎÏ ÎÁÐÒÁ×ÌÅÎÉÅ ÍÅÎÀ. çÏÒÉÚÏÎÔÁÌØÎÏ ÐÏ ÕÍÏÌÞÁÎÉÀ"
+msgstr "íÅÎÀ ÂÅÚ ÎÁÐÒÁ×ÌÅÎÉÑ. ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ÇÏÒÉÚÏÎÔÁÌØÎÏÅ."
 
 #: fdisk/cfdisk.c:1322
 msgid "Illegal key"
-msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ËÌÀÞ"
+msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ"
 
 #: fdisk/cfdisk.c:1345
 msgid "Press a key to continue"
-msgstr "äÌÑ ÐÒÏÄÏÌÖÅÎÉÑ ÎÁÖÍÉÔÅ ÌÀÂÕÀ ËÌÁ×ÉÛÕ"
+msgstr "îÁÖÍÉÔÅ ËÌÁ×ÉÛÕ ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ"
 
-#: fdisk/cfdisk.c:1392 fdisk/cfdisk.c:1962 fdisk/cfdisk.c:2493
-#: fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:1392 fdisk/cfdisk.c:1986 fdisk/cfdisk.c:2518
+#: fdisk/cfdisk.c:2520
 msgid "Primary"
-msgstr "ïÓÎÏ×Î."
+msgstr "ïÓÎÏ×ÎÏÊ"
 
 #: fdisk/cfdisk.c:1392
 msgid "Create a new primary partition"
 msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:1393 fdisk/cfdisk.c:1962 fdisk/cfdisk.c:2492
-#: fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:1393 fdisk/cfdisk.c:1986 fdisk/cfdisk.c:2517
+#: fdisk/cfdisk.c:2520
 msgid "Logical"
-msgstr "ìÏÇÉÞ."
+msgstr "ìÏÇÉÞÅÓËÉÊ"
 
 #: fdisk/cfdisk.c:1393
 msgid "Create a new logical partition"
 msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ ÌÏÇÉÞÅÓËÉÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1449 fdisk/cfdisk.c:2167
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1449 fdisk/cfdisk.c:2191
 msgid "Cancel"
 msgstr "ïÔÍÅÎÁ"
 
 #: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1449
 msgid "Don't create a partition"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÒÁÚÄÅÌ"
+msgstr "îÅ ÓÏÚÄÁ×ÁÔØ ÒÁÚÄÅÌ"
 
 #: fdisk/cfdisk.c:1410
 msgid "!!! Internal error !!!"
-msgstr "!!! ÷ÎÕÔÒÑÎÎÑÑ ÏÛÉÂËÁ !!!"
+msgstr "!!! ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ !!!"
 
 #: fdisk/cfdisk.c:1413
 msgid "Size (in MB): "
-msgstr "òÁÚÍÅÒ (× ÍÅÇÁÂÁÊÔÁÈ)"
+msgstr "òÁÚÍÅÒ (× íâ): "
 
 #: fdisk/cfdisk.c:1447
 msgid "Beginning"
-msgstr "ðÕÓË"
+msgstr "îÁÞÁÌÏ"
 
 #: fdisk/cfdisk.c:1447
 msgid "Add partition at beginning of free space"
@@ -1144,617 +1424,619 @@ msgstr "
 
 #: fdisk/cfdisk.c:1466
 msgid "No room to create the extended partition"
-msgstr "îÅÔ ÍÅÓÔÁ, ÞÔÏÂÙ ÓÏÚÄÁÔØ ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ"
+msgstr "îÅÔ ÍÅÓÔÁ ÄÌÑ ÓÏÚÄÁÎÉÑ ÒÁÓÛÉÒÅÎÎÏÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:1510
+#: fdisk/cfdisk.c:1525
 msgid "No partition table or unknown signature on partition table"
-msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÉÌÉ × ÎÅÊ ÓÏÄÅÒÖÉÔÓÑ ÎÅÉÚ×ÅÓÔÎÁÑ ÚÁÐÉÓØ"
+msgstr "îÅÔ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÉÌÉ ÎÅÉÚ×ÅÓÔÎÁÑ ÓÉÇÎÁÔÕÒÁ × ÔÁÂÌÉÃÅ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/cfdisk.c:1512
+#: fdisk/cfdisk.c:1527
 msgid "Do you wish to start with a zero table [y/N] ?"
-msgstr "÷Ù ÖÅÌÁÅÔÅ ÎÁÞÁÔØ Ó ÎÕÌÅ×ÏÊ ÔÁÂÌÉÃÙ [y/N] ?"
+msgstr "èÏÔÉÔÅ ÎÁÞÁÔØ ÔÁÂÌÉÃÕ Ó ÎÕÌÑ [Ä/î] ?"
 
-#: fdisk/cfdisk.c:1564
+#: fdisk/cfdisk.c:1579
 msgid "You specified more cylinders than fit on disk"
-msgstr "÷Ù ÕËÁÚÁÌÉ ÂÏÌØÛÅ ÃÉÌÉÎÄÒÏ× ÞÅÍ ÅÓÔØ ÎÁ ÄÉÓËÅ"
+msgstr "÷Ù ÕËÁÚÁÌÉ ÃÉÌÉÎÄÒÏ× ÂÏÌØÛÅ, ÞÅÍ ÍÏÖÅÔ ÂÙÔØ ÎÁ ÄÉÓËÅ"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1611
 msgid "Cannot open disk drive"
-msgstr "äÉÓË ÎÅÄÏÓÔÕÐÅÎ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÄÉÓËÏ×ÙÊ ÎÁËÏÐÉÔÅÌØ"
 
-#: fdisk/cfdisk.c:1596 fdisk/cfdisk.c:1775
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1799
 msgid "Opened disk read-only - you have no permission to write"
-msgstr "äÉÓË ÄÏÓÔÕÐÅÎ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ - Õ ÷ÁÓ ÎÅÔ ÐÒÁ× ÄÌÑ ÚÁÐÉÓÉ"
+msgstr "äÉÓË ÏÔËÒÙÔ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ - Õ ×ÁÓ ÎÅÔ ÒÁÚÒÅÛÅÎÉÑ ÎÁ ÚÁÐÉÓØ"
 
-#: fdisk/cfdisk.c:1617
+#: fdisk/cfdisk.c:1639
 msgid "Cannot get disk size"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÒÁÚÍÅÒ ÄÉÓËÁ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ ÄÉÓËÁ"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1666
 msgid "Bad primary partition"
-msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ"
+msgstr "ðÌÏÈÏÊ ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:1672
+#: fdisk/cfdisk.c:1696
 msgid "Bad logical partition"
-msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÌÏÇÉÞÅÓËÉÊ ÒÁÚÄÅÌ"
+msgstr "ðÌÏÈÏÊ ÌÏÇÉÞÅÓËÉÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1811
 msgid "Warning!!  This may destroy data on your disk!"
-msgstr "÷ÎÉÍÁÎÉÅ!!  üÔÏ ÍÏÖÅÔ ÕÎÉÞÔÏÖÉÔØ ÄÁÎÎÙÅ ÎÁ ÷ÁÛÅÍ ÄÉÓËÅ!"
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ!!  üÔÏ ÍÏÖÅÔ ÕÎÉÞÔÏÖÉÔØ ÄÁÎÎÙÅ ÎÁ ×ÁÛÅÍ ÄÉÓËÅ!"
 
-#: fdisk/cfdisk.c:1791
+#: fdisk/cfdisk.c:1815
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
-msgstr "÷Ù Õ×ÅÒÅÎÙ ÞÔÏ ÈÏÔÉÔÅ ÚÁÐÉÓÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË? (yes or no): "
+msgstr "÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÚÁÐÉÓÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË? (ÄÁ ÉÌÉ ÎÅÔ): "
 
-#: fdisk/cfdisk.c:1797
+#: fdisk/cfdisk.c:1821
 msgid "no"
 msgstr "ÎÅÔ"
 
-#: fdisk/cfdisk.c:1798
+#: fdisk/cfdisk.c:1822
 msgid "Did not write partition table to disk"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË"
+msgstr "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÎÅ ÚÁÐÉÓÁÎÁ ÎÁ ÄÉÓË"
 
-#: fdisk/cfdisk.c:1800
+#: fdisk/cfdisk.c:1824
 msgid "yes"
 msgstr "ÄÁ"
 
-#: fdisk/cfdisk.c:1803
+#: fdisk/cfdisk.c:1827
 msgid "Please enter `yes' or `no'"
-msgstr "÷×ÅÄÉÔÅ ÐÏÖÁÌÕÊÓÔÁ `yes' ÉÌÉ `no'"
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ `ÄÁ' ÉÌÉ `ÎÅÔ'"
 
-#: fdisk/cfdisk.c:1807
+#: fdisk/cfdisk.c:1831
 msgid "Writing partition table to disk..."
-msgstr "úÁÐÉÓØ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË..."
+msgstr "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÚÁÐÉÓÙ×ÁÅÔÓÑ ÎÁ ÄÉÓË..."
 
-#: fdisk/cfdisk.c:1832 fdisk/cfdisk.c:1836
+#: fdisk/cfdisk.c:1856 fdisk/cfdisk.c:1860
 msgid "Wrote partition table to disk"
 msgstr "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÚÁÐÉÓÁÎÁ ÎÁ ÄÉÓË"
 
-#: fdisk/cfdisk.c:1834
-msgid ""
-"Wrote partition table, but re-read table failed.  Reboot to update table."
-msgstr "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÚÁÐÉÓÁÎÁ, ÎÏ Å£ ÞÔÅÎÉÅ ÎÅ ÕÄÁÌÏÓØ. ðÅÒÅÚÁÇÒÕÚÉÔÅÓØ ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÔÁÂÌÉÃÙ."
+#: fdisk/cfdisk.c:1858
+msgid "Wrote partition table, but re-read table failed.  Reboot to update table."
+msgstr "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÚÁÐÉÓÁÎÁ, ÎÏ ÐÏ×ÔÏÒÎÏÅ ÞÔÅÎÉÅ ÔÁÂÌÉÃÙ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ.  ðÅÒÅÚÁÇÒÕÚÉÔÅÓØ, ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÔÁÂÌÉÃÕ."
 
-#: fdisk/cfdisk.c:1844
+#: fdisk/cfdisk.c:1868
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
-msgstr "îÉ ÏÄÉÎ ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ ÎÅ Ñ×ÌÑÅÓÔÑ ÚÁÇÒÕÚÏÞÎÙÍ. DOS MBR ÎÅ Ñ×ÌÑÅÔÓÑ ÚÁÇÒÕÚÏÞÎÏÊ."
+msgstr "îÅÔ ÏÓÎÏ×ÎÙÈ ÒÁÚÄÅÌÏ×, ÐÏÍÅÞÅÎÎÙÈ ËÁË ÚÁÇÒÕÚÏÞÎÙÅ. DOS'Ï×ÓËÉÊ MBR ÎÅ ÍÏÖÅÔ ×ÙÐÏÌÎÉÔØ ÚÁÇÒÕÚËÕ."
 
-#: fdisk/cfdisk.c:1846
-msgid ""
-"More than one primary partition is marked bootable. DOS MBR cannot boot this."
-msgstr "âÏÌÅÅ ÏÄÎÏÇÏ ÏÓÎÏ×ÎÏÇÏ ÒÁÚÄÅÌÁ ÏÔÍÅÞÅÎÏ ËÁË ÚÁÇÒÕÚÏÞÎÙÊ. DOS MBR ÎÅ Ñ×ÌÑÅÔÓÑ ÚÁÇÒÕÚÏÞÎÏÊ."
+#: fdisk/cfdisk.c:1870
+msgid "More than one primary partition is marked bootable. DOS MBR cannot boot this."
+msgstr "âÏÌÅÅ, ÞÅÍ ÏÄÉÎ ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ ÐÏÍÅÞÅÎ ËÁË ÚÁÇÒÕÚÏÞÎÙÊ. DOS'Ï×ÓËÉÊ MBR ÎÅ ÍÏÖÅÔ ×ÙÐÏÌÎÉÔØ ÚÁÇÒÕÚËÕ."
 
-#: fdisk/cfdisk.c:1904 fdisk/cfdisk.c:2023 fdisk/cfdisk.c:2107
+#: fdisk/cfdisk.c:1928 fdisk/cfdisk.c:2047 fdisk/cfdisk.c:2131
 msgid "Enter filename or press RETURN to display on screen: "
-msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ ÉÌÉ ÎÁÖÍÉÔÅ ÷÷ïä ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÎÁ ÜËÒÁÎÅ: "
+msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ ÉÌÉ ÎÁÖÍÉÔÅ RETURN, ÞÔÏÂÙ ×Ù×ÅÓÔÉ ÎÁ ÜËÒÁÎ: "
 
-#: fdisk/cfdisk.c:1913 fdisk/cfdisk.c:2031 fdisk/cfdisk.c:2115
+#: fdisk/cfdisk.c:1937 fdisk/cfdisk.c:2055 fdisk/cfdisk.c:2139
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ '%s'"
 
-#: fdisk/cfdisk.c:1924
+#: fdisk/cfdisk.c:1948
 #, c-format
 msgid "Disk Drive: %s\n"
-msgstr "äÉÓË: %s\n"
+msgstr "äÉÓËÏ×ÙÊ ÎÁËÏÐÉÔÅÌØ: %s\n"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1950
 msgid "Sector 0:\n"
 msgstr "óÅËÔÏÒ 0:\n"
 
-#: fdisk/cfdisk.c:1933
+#: fdisk/cfdisk.c:1957
 #, c-format
 msgid "Sector %d:\n"
 msgstr "óÅËÔÏÒ %d:\n"
 
-#: fdisk/cfdisk.c:1953
+#: fdisk/cfdisk.c:1977
 msgid "   None   "
-msgstr "    îÅÔ   "
+msgstr "   îÅÔ   "
 
-#: fdisk/cfdisk.c:1955
+#: fdisk/cfdisk.c:1979
 msgid "   Pri/Log"
 msgstr "   ïÓÎ/ìÏÇ"
 
-#: fdisk/cfdisk.c:1957
+#: fdisk/cfdisk.c:1981
 msgid "   Primary"
-msgstr "  ïÓÎÏ×ÎÏÊ"
+msgstr "   ïÓÎÏ×ÎÏÊ"
 
-#: fdisk/cfdisk.c:1959
+#: fdisk/cfdisk.c:1983
 msgid "   Logical"
-msgstr "   ìÏÇÉÞ. "
+msgstr "   ìÏÇÉÞÅÓËÉÊ"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1997 fdisk/fdisk.c:1275 fdisk/fdisk.c:1563
-#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:691 fdisk/sfdisk.c:582
+#: fdisk/cfdisk.c:2021 fdisk/fdisk.c:1401 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:241 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:581
 msgid "Unknown"
-msgstr "îÅÉÚ×ÅÓÔ"
+msgstr "îÅÉÚ×ÅÓÔÎÙÊ"
 
-#: fdisk/cfdisk.c:2003
-#, c-format
-msgid "Boot (%02X)"
-msgstr "úÁÇÒ.(%02X)"
+#: fdisk/cfdisk.c:2027 fdisk/cfdisk.c:2495 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "úÁÇÒÕÚÏÞÎÙÊ"
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2501
+#: fdisk/cfdisk.c:2029
 #, c-format
-msgid "Unknown (%02X)"
-msgstr "îÅÏÐÒÅÄ.(%02X)"
+msgid "(%02X)"
+msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2007
-#, c-format
-msgid "None (%02X)"
-msgstr "îÅÔ (%02X)"
+#: fdisk/cfdisk.c:2031
+msgid "None"
+msgstr "îÅÔ"
 
-#: fdisk/cfdisk.c:2042 fdisk/cfdisk.c:2126
+#: fdisk/cfdisk.c:2066 fdisk/cfdisk.c:2150
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÄÌÑ %s\n"
 
-#: fdisk/cfdisk.c:2044
-msgid "            First    Last\n"
-msgstr "            ðÅÒ×ÙÊ  ðÏÓÌÅÄÎÉÊ\n"
+#: fdisk/cfdisk.c:2068
+msgid "               First       Last\n"
+msgstr "              ðÅÒ×ÙÊ   ðÏÓÌÅÄÎ.\n"
 
-#: fdisk/cfdisk.c:2045
-msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
-msgstr " # ôÉÐ      óÅËÔÏÒ   óÅËÔÏÒ   ïÔÓÔÕÐ   äÌÉÎÁ    ôÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ    æÌÁÇÉ\n"
+#: fdisk/cfdisk.c:2069
+msgid " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) Flag\n"
+msgstr " # ôÉÐ        óÅËÔÏÒ      óÅËÔÏÒ   óÍÅÝ.     äÌÉÎÁ    ôÉÐ ÆÁÊÌ.ÓÉÓÔ.  (ID) æÌÁÇ\n"
 
-#: fdisk/cfdisk.c:2046
-msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
-msgstr ""
+#: fdisk/cfdisk.c:2070
+msgid "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
+msgstr "-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2129
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
-msgstr "          ---îÁÞÁÌÏ---        ----ëÏÎÅÃ---- îÁÞÁÌØÎÙÊ   ÷ÓÅÇÏ\n"
+#: fdisk/cfdisk.c:2153
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
+msgstr "         ----îÁÞÁÌÏ----      ----ëÏÎÅÃ-----    ðÅÒ×ÙÊ    þÉÓÌÏ\n"
 
-#: fdisk/cfdisk.c:2130
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
-msgstr " # æÌÁÇÉ  çÏÌ óÅËÔ ãÉÌ   ID   çÏÌ óÅËÔ ãÉÌ   ÓÅËÔÏÒ   ÓÅËÔÏÒÏ×\n"
+#: fdisk/cfdisk.c:2154
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr " # æÌÁÇÉ çÏÌ. óÅËÔ ãÉÌ   ID  çÏÌ. óÅËÔ ãÉÌ     ÓÅËÔÏÒ    ÓÅËÔÏÒÏ×\n"
 
-#: fdisk/cfdisk.c:2131
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-msgstr ""
+#: fdisk/cfdisk.c:2155
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2164
+#: fdisk/cfdisk.c:2188
 msgid "Raw"
-msgstr "éÓÈÏÄÎ."
+msgstr "óÙÒÏÊ"
 
-#: fdisk/cfdisk.c:2164
+#: fdisk/cfdisk.c:2188
 msgid "Print the table using raw data format"
-msgstr "ðÅÞÁÔØ ÔÁÂÌÉÃÙ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÉÓÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ ÄÁÎÎÙÈ"
+msgstr "÷Ù×ÅÓÔÉ ÔÁÂÌÉÃÕ, ÉÓÐÏÌØÚÕÑ ÆÏÒÍÁÔ ÓÙÒÙÈ ÄÁÎÎÙÈ"
 
-#: fdisk/cfdisk.c:2165 fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2189 fdisk/cfdisk.c:2292
 msgid "Sectors"
-msgstr "óÅËÔÏÒÁ"
+msgstr "óÅËÔÏÒÙ"
 
-#: fdisk/cfdisk.c:2165
+#: fdisk/cfdisk.c:2189
 msgid "Print the table ordered by sectors"
-msgstr "ðÅÞÁÔØ ÔÁÂÌÉÃÙ Ó ÕÐÏÒÑÄÏÞÅÎÎÙÍÉ ÓÅËÔÏÒÁÍÉ"
+msgstr "÷Ù×ÅÓÔÉ ÔÁÂÌÉÃÕ, ÕÐÏÒÑÄÏÞÅÎÎÕÀ ÐÏ ÓÅËÔÏÒÁÍ"
 
-#: fdisk/cfdisk.c:2166
+#: fdisk/cfdisk.c:2190
 msgid "Table"
 msgstr "ôÁÂÌÉÃÁ"
 
-#: fdisk/cfdisk.c:2166
+#: fdisk/cfdisk.c:2190
 msgid "Just print the partition table"
-msgstr "ðÅÞÁÔÁÔØ ÔÏÌØËÏ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ×"
+msgstr "ðÒÏÓÔÏ ×Ù×ÅÓÔÉ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/cfdisk.c:2167
+#: fdisk/cfdisk.c:2191
 msgid "Don't print the table"
-msgstr "îÅ ÐÅÞÁÔÁÔØ ÔÁÂÌÉÃÕ"
+msgstr "îÅ ×Ù×ÏÄÉÔØ ÔÁÂÌÉÃÕ"
 
-#: fdisk/cfdisk.c:2195
+#: fdisk/cfdisk.c:2219
 msgid "Help Screen for cfdisk"
-msgstr "ðÏÍÏÝØ ÄÌÑ cfdisk"
+msgstr "üËÒÁÎ ÓÐÒÁ×ËÉ ÄÌÑ cfdisk"
 
-#: fdisk/cfdisk.c:2197
+#: fdisk/cfdisk.c:2221
 msgid "This is cfdisk, a curses based disk partitioning program, which"
-msgstr "cfdisk - ÜÔÏ ÐÒÏÇÒÁÍÍÁ ÒÁÚÂÉÅÎÉÑ ÄÉÓËÁ, ËÏÔÏÒÁÑ ÐÏÚ×ÏÌÑÅÔ ÷ÁÍ ÓÏÚÄÁ×ÁÔØ,"
+msgstr "üÔÏ cfdisk - ÐÒÏËÌÑÔÁÑ ÐÒÏÇÒÁÍÍÁ ÄÌÑ ÒÁÚÍÅÔËÉ ÄÉÓËÁ, ËÏÔÏÒÁÑ"
 
-#: fdisk/cfdisk.c:2198
+#: fdisk/cfdisk.c:2222
 msgid "allows you to create, delete and modify partitions on your hard"
-msgstr "         ÕÄÁÌÑÔØ É ÉÚÍÅÎÑÔØ ÒÁÚÄÅÌÙ ÎÁ ÷ÁÛÅÍ ÄÉÓËÅ."
+msgstr "ÐÏÚ×ÏÌÑÅÔ ×ÁÍ ÓÏÚÄÁ×ÁÔØ, ÕÄÁÌÑÔØ É ÉÚÍÅÎÑÔØ ÒÁÚÄÅÌÙ ÎÁ"
 
-#: fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:2223
 msgid "disk drive."
-msgstr " "
+msgstr "Ó×ÏÅÍ ÎÁËÏÐÉÔÅÌÅ ÎÁ ÖÅÓÔËÏÍ ÄÉÓËÅ."
 
-#: fdisk/cfdisk.c:2201
+#: fdisk/cfdisk.c:2225
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
-msgstr ""
+msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2203
+#: fdisk/cfdisk.c:2227
 msgid "Command      Meaning"
 msgstr "ëÏÍÁÎÄÁ      úÎÁÞÅÎÉÅ"
 
-#: fdisk/cfdisk.c:2204
+#: fdisk/cfdisk.c:2228
 msgid "-------      -------"
-msgstr ""
+msgstr "-------      --------"
 
-#: fdisk/cfdisk.c:2205
+#: fdisk/cfdisk.c:2229
 msgid "  b          Toggle bootable flag of the current partition"
-msgstr "  b          óÄÅÌÁÔØ ÔÅËÕÝÉÊ ÒÁÚÄÅÌ ÚÁÇÒÕÚÏÞÎÙÍ"
+msgstr "  b          ðÅÒÅËÌÀÞÅÎÉÅ ÚÁÇÒÕÚÏÞÎÏÇÏ ÆÌÁÇÁ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2206
+#: fdisk/cfdisk.c:2230
 msgid "  d          Delete the current partition"
-msgstr "  d          õÄÁÌÉÔØ ÔÅËÕÝÉÊ ÒÁÚÄÅÌ"
+msgstr "  d          õÄÁÌÅÎÉÅ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2231
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
-msgstr "  g          éÚÍÅÎÉÔØ ËÏÌÉÞÅÓÔ×Ï ÃÉÌÉÎÄÒÏ×, ÇÏÌÏ×ÏË, ÓÅËÔÏÒÏ× × ÄÏÒÏÖËÅ"
+msgstr "  g          óÍÅÎÁ ÐÁÒÁÍÅÔÒÏ× ÃÉÌÉÎÄÒÏ×, ÇÏÌÏ×ÏË, ÓÅËÔÏÒÏ× ÎÁ ÄÏÒÏÖËÕ"
 
-#: fdisk/cfdisk.c:2208
+#: fdisk/cfdisk.c:2232
 msgid "             WARNING: This option should only be used by people who"
-msgstr "             ÷îéíáîéå: üÔÁ ÏÐÃÉÑ ÄÏÌÖÎÁ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÔÏÌØËÏ ÓÐÅÃÉÁÌÉÓÔÁÍÉ"
+msgstr "             ðòåäõðòåöäåîéå: üÔÁ ÏÐÃÉÑ ÄÏÌÖÎÁ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÔÏÌØËÏ"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2233
 msgid "             know what they are doing."
-msgstr " "
+msgstr "             ÔÅÍÉ, ËÔÏ ÚÎÁÅÔ, ÞÔÏ ÏÎ ÄÅÌÁÅÔ."
 
-#: fdisk/cfdisk.c:2210
+#: fdisk/cfdisk.c:2234
 msgid "  h          Print this screen"
-msgstr "  h          ÷Ù×ÅÓÔÉ ÐÏÍÏÝØ ÎÁ ÜËÒÁÎ"
+msgstr "  h          ÷Ù×ÏÄ ÜÔÏÊ ÓÐÒÁ×ËÉ"
 
-#: fdisk/cfdisk.c:2211
+#: fdisk/cfdisk.c:2235
 msgid "  m          Maximize disk usage of the current partition"
-msgstr "  m          õ×ÅÌÉÞÉÔØ ÒÁÚÍÅÒ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ"
+msgstr "  m          äÏ×ÅÓÔÉ ÄÏ ÍÁËÓÉÍÕÍÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2236
 msgid "             Note: This may make the partition incompatible with"
-msgstr "             ÷ÎÉÍÁÎÉÅ: üÔÏ ÍÏÖÅÔ ÓÄÅÌÁÔØ ÒÁÚÄÅÌ ÎÅ ÓÏ×ÍÅÓÔÉÍÙÍ Ó DOS, OS/2, ..."
+msgstr "             ðÒÉÍÅÞÁÎÉÅ: üÔÏ ÍÏÖÅÔ ÓÄÅÌÁÔØ ÒÁÚÄÅÌ ÎÅÓÏ×ÍÅÓÔÉÍÙÍ Ó "
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2237
 msgid "             DOS, OS/2, ..."
-msgstr " "
+msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2238
 msgid "  n          Create new partition from free space"
-msgstr "  n          óÏÚÄÁÔØ ÎÏ×ÙÊ ÒÁÚÄÅÌ × Ó×ÏÂÏÄÎÏÊ ÏÂÌÁÓÔÉ ÄÉÓËÁ"
+msgstr "  n          óÏÚÄÁÎÉÅ ÎÏ×ÏÇÏ ÒÁÚÄÅÌÁ ÎÁ Ó×ÏÂÏÄÎÏÍ ÐÒÏÓÔÒÁÎÓÔ×Å"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2239
 msgid "  p          Print partition table to the screen or to a file"
-msgstr "  p          ÷Ù×ÅÓÔÉ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÜËÒÁÎ ÉÌÉ × ÆÁÊÌ"
+msgstr "  p          ÷Ù×ÏÄ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÎÁ ÜËÒÁÎ ÉÌÉ × ÆÁÊÌ"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2240
 msgid "             There are several different formats for the partition"
-msgstr "             åÓÔØ ÎÅÓËÏÌØËÏ ÒÁÚÌÉÞÎÙÈ ÆÏÒÍÁÔÏ× ÒÁÚÄÅÌÏ×"
+msgstr "             óÕÝÅÓÔ×ÕÅÔ ÎÅÓËÏÌØËÏ ÒÁÚÌÉÞÎÙÈ ÆÏÒÍÁÔÏ×"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2241
 msgid "             that you can choose from:"
-msgstr "             ÉÚ ËÏÔÏÒÙÈ ÷Ù ÍÏÖÅÔÅ ×ÙÂÒÁÔØ:"
+msgstr "             ÄÌÑ ÒÁÚÄÅÌÏ×, ÉÚ ËÏÔÏÒÙÈ ×Ù ÍÏÖÅÔÅ ×ÙÂÒÁÔØ:"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2242
 msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr "                r - îÅÏÂÒÁÂÏÔÁÎÎÙÅ ÄÁÎÎÙÅ (ÔÏÖÅ, ÞÔÏ ÂÙÌÏ ÚÁÐÉÓÁÎÏ ÎÁ ÄÉÓËÅ)"
+msgstr "                r - óÙÒÙÅ ÄÁÎÎÙÅ (ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ, ÞÔÏ ÂÕÄÅÔ ÚÁÐÉÓÁÎÏ ÎÁ ÄÉÓË)"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2243
 msgid "                s - Table ordered by sectors"
-msgstr "                s - ôÁÂÌÉÃÁ Ó ÕÐÏÒÑÄÏÞÅÎÎÙÍÉ ÓÅËÔÏÒÁÍÉ"
+msgstr "                s - ôÁÂÌÉÃÁ, ÕÐÏÒÑÄÏÞÅÎÎÁÑ ÐÏ ÓÅËÔÏÒÁÍ"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2244
 msgid "                t - Table in raw format"
-msgstr "                t - éÓÈÏÄÎÁÑ ÔÁÂÌÉÃÁ"
+msgstr "                t - ôÁÂÌÉÃÁ × ÆÏÒÍÁÔÅ ÓÙÒÙÈ ÄÁÎÎÙÈ"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2245
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          ÷ÙÈÏÄ ÉÚ ÐÒÏÇÒÁÍÍÙ ÂÅÚ ÚÁÐÉÓÉ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2246
 msgid "  t          Change the filesystem type"
-msgstr "  t          éÚÍÅÎÉÔØ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ"
+msgstr "  t          óÍÅÎÁ ÔÉÐÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2247
 msgid "  u          Change units of the partition size display"
-msgstr "  u          íÅÎÑÔØ ÏÔÏÂÒÁÖÁÅÍÙÅ ÅÄÉÎÉÃÙ ÉÚÍÅÒÅÎÉÑ ÒÁÚÍÅÒÁ ÒÁÚÄÅÌÁ"
+msgstr "  u          éÚÍÅÎÅÎÉÅ ÅÄÉÎÉÃÙ ÉÚÍÅÒÅÎÉÑ ÏÔÏÂÒÁÖÁÅÍÏÇÏ ÒÁÚÍÅÒÁ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2248
 msgid "             Rotates through MB, sectors and cylinders"
-msgstr "             ÍÅÖÄÕ ÍÅÇÁÂÁÊÔÁÍÉ, ÓÅËÔÏÒÁÍÉ É ÃÉÌÉÎÄÒÁÍÉ"
+msgstr "             þÅÒÅÄÕÅÔÓÑ ÞÅÒÅÚ íâ, ÓÅËÔÏÒÙ É ÃÉÌÉÎÄÒÙ"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2249
 msgid "  W          Write partition table to disk (must enter upper case W)"
-msgstr "  W          úÁÐÉÓÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË (Ä.Â. ÎÁÖÁÔÁ ËÌÁ×ÉÛÁ W"
+msgstr "  W          úÁÐÉÓØ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË (ÔÒÅÂÕÅÔÓÑ ××ÅÓÔÉ ÚÁÇÌÁ×ÎÕÀ W)"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2250
 msgid "             Since this might destroy data on the disk, you must"
-msgstr "             × ×ÅÒÈÎÅÍ ÒÅÇÉÓÔÒÅ). ô.Ë. ÜÔÏ ÍÏÖÅÔ ÕÎÉÞÔÏÖÉÔØ ÄÁÎÎÙÅ ÎÁ ÄÉÓËÅ,"
+msgstr "             ô.Ë. ÜÔÏ ÍÏÖÅÔ ÒÁÚÒÕÛÉÔØ ÄÁÎÎÙÅ ÎÁ ÄÉÓËÅ, ×Ù ÄÏÌÖÎÙ"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2251
 msgid "             either confirm or deny the write by entering `yes' or"
-msgstr "             ÷Ù ÄÏÌÖÎÙ ÐÏÄÔ×ÅÒÄÉÔØ ÉÌÉ ÏÔÍÅÎÉÔØ ÚÁÐÉÓØ, ××ÅÄÑ `yes' ÉÌÉ `no'"
+msgstr "             ÐÏÄÔ×ÅÒÄÉÔØ ÉÌÉ ÏÔÍÅÎÉÔØ ÚÁÐÉÓØ, ÎÁÂÒÁ× `ÄÁ' ÉÌÉ"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2252
 msgid "             `no'"
-msgstr " "
+msgstr "             `ÎÅÔ'"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2253
 msgid "Up Arrow     Move cursor to the previous partition"
-msgstr "Up Arrow     ðÅÒÅÍÅÓÔÉÔØ ËÕÒÓÏÒ ÎÁ ÐÒÅÄÙÄÕÝÉÊ ÒÁÚÄÅÌ"
+msgstr "óÔÒÅÌËÁ ××ÅÒÈ ðÅÒÅÍÅÝÅÎÉÅ ËÕÒÓÏÒÁ ÎÁ ÐÒÅÄÙÄÕÝÉÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2254
 msgid "Down Arrow   Move cursor to the next partition"
-msgstr "Down Arrow   ðÅÒÅÍÅÓÔÉÔØ ËÕÒÓÏÒ ÎÁ ÓÌÅÄÕÀÝÉÊ ÒÁÚÄÅÌ"
+msgstr "óÔÒÅÌËÁ ×ÎÉÚ ðÅÒÅÍÅÝÅÎÉÅ ËÕÒÓÏÒÁ ÎÁ ÓÌÅÄÕÀÝÉÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2255
 msgid "CTRL-L       Redraws the screen"
-msgstr "CTRL-L       ðÅÒÅÒÉÓÏ×ÁÔØ ÏËÎÏ"
+msgstr "CTRL-L       ðÅÒÅÒÉÓÏ×Ù×ÁÎÉÅ ÜËÒÁÎÁ"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2256
 msgid "  ?          Print this screen"
-msgstr "  ?          ÷Ù×ÅÓÔÉ ÜÔÏ ÏËÎÏ"
+msgstr "  ?          ÷Ù×ÏÄ ÜÔÏÊ ÓÐÒÁ×ËÉ"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2258
 msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "÷ÎÉÍÁÎÉÅ: ÷ÓÅ ËÏÍÁÎÄÙ ÍÏÇÕÔ ÂÙÔØ ××ÅÄÅÎÙ × ×ÅÒÈÎÅÍ ÉÌÉ × ÎÉÖÎÅÍ ÒÅÇÉÓÔÒÅ"
+msgstr "ðÒÉÍÅÞÁÎÉÅ: ÷ÓÅ ËÏÍÁÎÄÙ ÍÏÇÕÔ ÂÙÔØ ××ÅÄÅÎÙ × ×ÅÒÈÎÅÍ"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2259
 msgid "case letters (except for Writes)."
-msgstr "(ÚÁ ÉÓËÌÀÞÅÎÉÅÍ ÚÁÐÉÓÉ)"
+msgstr "ÉÌÉ ÎÉÖÎÅÍ ÒÅÇÉÓÔÒÅ (ÚÁ ÉÓËÌÀÞÅÎÉÅÍ ÚÁÐÉÓÉ)."
 
-#: fdisk/cfdisk.c:2265 fdisk/cfdisk.c:2587 fdisk/fdisksunlabel.c:321
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/cfdisk.c:2290 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
-msgstr " ãÉÌÉÎÄÒÙ"
+msgstr "ãÉÌÉÎÄÒÙ"
 
-#: fdisk/cfdisk.c:2265
+#: fdisk/cfdisk.c:2290
 msgid "Change cylinder geometry"
-msgstr "éÚÍÅÎÉÔØ ÒÁÚÍÅÒ ÃÉÌÉÎÄÒÁ"
+msgstr "éÚÍÅÎÉÔØ ÇÅÏÍÅÔÒÉÀ ÃÉÌÉÎÄÒÁ"
 
-#: fdisk/cfdisk.c:2266 fdisk/fdisksunlabel.c:318
+#: fdisk/cfdisk.c:2291 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "çÏÌÏ×ËÉ"
 
-#: fdisk/cfdisk.c:2266
+#: fdisk/cfdisk.c:2291
 msgid "Change head geometry"
-msgstr "éÚÍÅÎÉÔØ ËÏÌÉÞÅÓÔ×Ï ÇÏÌÏ×ÏË"
+msgstr "éÚÍÅÎÉÔØ ÇÅÏÍÅÔÒÉÀ ÇÏÌÏ×ËÉ"
 
-#: fdisk/cfdisk.c:2267
+#: fdisk/cfdisk.c:2292
 msgid "Change sector geometry"
-msgstr "éÚÍÅÎÉÔØ ÒÁÚÍÅÒ ÓÅËÔÏÒÁ"
+msgstr "éÚÍÅÎÉÔØ ÇÅÏÍÅÔÒÉÀ ÓÅËÔÏÒÁ"
 
-#: fdisk/cfdisk.c:2268
+#: fdisk/cfdisk.c:2293
 msgid "Done"
-msgstr "äÁÌØÛÅ"
+msgstr "çÏÔÏ×Ï"
 
-#: fdisk/cfdisk.c:2268
+#: fdisk/cfdisk.c:2293
 msgid "Done with changing geometry"
-msgstr "ðÒÏÄÏÌÖÉÔØ Ó ÉÚÍÅÎÅÎÉÑÍÉ"
+msgstr "çÏÔÏ×Ï Ó ÉÚÍÅÎÅÎÉÅÍ ÇÅÏÍÅÔÒÉÉ"
 
-#: fdisk/cfdisk.c:2281
+#: fdisk/cfdisk.c:2306
 msgid "Enter the number of cylinders: "
-msgstr "õËÁÖÉÔÅ ËÏÌ-×Ï ÃÉÌÉÎÄÒÏ×: "
+msgstr "÷×ÅÄÉÔÅ ËÏÌÉÞÅÓÔ×Ï ÃÉÌÉÎÄÒÏ×:"
 
-#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2855
+#: fdisk/cfdisk.c:2317 fdisk/cfdisk.c:2887
 msgid "Illegal cylinders value"
-msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ËÏÌ-×Ï ÃÉÌÉÎÄÒÏ×"
+msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2323
 msgid "Enter the number of heads: "
-msgstr "õËÁÖÉÔÅ ËÏÌ-×Ï ÇÏÌÏ×ÏË: "
+msgstr "÷×ÅÄÉÔÅ ËÏÌÉÞÅÓÔ×Ï ÇÏÌÏ×ÏË:"
 
-#: fdisk/cfdisk.c:2306 fdisk/cfdisk.c:2865
+#: fdisk/cfdisk.c:2330 fdisk/cfdisk.c:2897
 msgid "Illegal heads value"
-msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ËÏÌ-×Ï ÇÏÌÏ×ÏË"
+msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÇÏÌÏ×ÏË"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2336
 msgid "Enter the number of sectors per track: "
-msgstr "õËÁÖÉÔÅ ËÏÌ-×Ï ÓÅËÔÏÒÏ× × ÄÏÒÏÖËÅ: "
+msgstr "÷×ÅÄÉÔÅ ËÏÌÉÞÅÓÔ×Ï ÓÅËÔÏÒÏ× ÎÁ ÄÏÒÏÖËÕ:"
 
-#: fdisk/cfdisk.c:2319 fdisk/cfdisk.c:2872
+#: fdisk/cfdisk.c:2343 fdisk/cfdisk.c:2904
 msgid "Illegal sectors value"
-msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ËÏÌ-×Ï ÓÅËÔÏÒÏ×"
+msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÓÅËÔÏÒÏ×"
 
-#: fdisk/cfdisk.c:2422
+#: fdisk/cfdisk.c:2446
 msgid "Enter filesystem type: "
-msgstr "õËÁÖÉÔÅ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ: "
+msgstr "÷×ÅÄÉÔÅ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ:"
 
-#: fdisk/cfdisk.c:2440
+#: fdisk/cfdisk.c:2464
 msgid "Cannot change FS Type to empty"
-msgstr "õËÁÖÉÔÅ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÔÉÐ æó ÎÁ ÐÕÓÔÕÀ"
 
-#: fdisk/cfdisk.c:2442
+#: fdisk/cfdisk.c:2466
 msgid "Cannot change FS Type to extended"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ ÎÁ ÒÁÓÛÉÒÅÎÎÕÀ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÔÉÐ æó ÎÁ ÒÁÓÛÉÒÅÎÎÕÀ"
 
-#: fdisk/cfdisk.c:2470 fdisk/fdisksunlabel.c:44
-msgid "Boot"
-msgstr "úÁÇÒ."
-
-#: fdisk/cfdisk.c:2472
+#: fdisk/cfdisk.c:2497
 #, c-format
 msgid "Unk(%02X)"
-msgstr ""
+msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2475 fdisk/cfdisk.c:2478
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid ", NC"
-msgstr ""
+msgstr ", NC"
 
-#: fdisk/cfdisk.c:2483 fdisk/cfdisk.c:2486
+#: fdisk/cfdisk.c:2508 fdisk/cfdisk.c:2511
 msgid "NC"
-msgstr ""
+msgstr "NC"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2519
 msgid "Pri/Log"
 msgstr "ïÓÎ/ìÏÇ"
 
-#: fdisk/cfdisk.c:2570
+#: fdisk/cfdisk.c:2526
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "îÅÉÚ×ÅÓÔÎÙÊ (%02X)"
+
+#: fdisk/cfdisk.c:2595
 #, c-format
 msgid "Disk Drive: %s"
-msgstr "äÉÓË: %s"
+msgstr "äÉÓËÏ×ÙÊ ÎÁËÏÐÉÔÅÌØ: %s"
 
-#: fdisk/cfdisk.c:2573
+#: fdisk/cfdisk.c:2601
 #, c-format
-msgid "Size: %lld bytes"
-msgstr "òÁÚÍÅÒ: %lld ÂÁÊÔ"
+msgid "Size: %lld bytes, %lld MB"
+msgstr "òÁÚÍÅÒ: %lld ÂÁÊÔ, %lld íâ"
 
-#: fdisk/cfdisk.c:2575
+#: fdisk/cfdisk.c:2604
 #, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
-msgstr "çÏÌÏ×ÏË: %d   óÅËÔÏÒÏ× × ÄÏÒÏÖËÅ: %d   ãÉÌÉÎÄÒÏ×: %d"
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "òÁÚÍÅÒ: %lld ÂÁÊÔ, %lld.%lld çâ"
 
-#: fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2608
+#, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "çÏÌÏ×ÏË: %d   óÅËÔÏÒÏ× ÎÁ ÄÏÒÏÖËÕ: %d   ãÉÌÉÎÄÒÏ×: %lld"
+
+#: fdisk/cfdisk.c:2612
 msgid "Name"
 msgstr "éÍÑ"
 
-#: fdisk/cfdisk.c:2580
+#: fdisk/cfdisk.c:2613
 msgid "Flags"
 msgstr "æÌÁÇÉ"
 
-#: fdisk/cfdisk.c:2581
+#: fdisk/cfdisk.c:2614
 msgid "Part Type"
-msgstr "òÁÚÄÅÌ"
+msgstr "ôÉÐ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2615
 msgid "FS Type"
-msgstr "æÁÊÌÏ×ÁÑ ÓÉÓÔÅÍÁ"
+msgstr "ôÉÐ æó"
 
-#: fdisk/cfdisk.c:2583
+#: fdisk/cfdisk.c:2616
 msgid "[Label]"
 msgstr "[íÅÔËÁ]"
 
-#: fdisk/cfdisk.c:2585
-msgid "  Sectors"
-msgstr "  óÅËÔÏÒÁ"
+#: fdisk/cfdisk.c:2618
+msgid "    Sectors"
+msgstr "    óÅËÔÏÒÙ"
 
-#: fdisk/cfdisk.c:2589
-msgid "Size (MB)"
-msgstr "òÁÚÍÅÒ(íÂ)"
+#: fdisk/cfdisk.c:2620
+msgid "  Cylinders"
+msgstr "  ãÉÌÉÎÄÒÙ"
 
-#: fdisk/cfdisk.c:2591
-msgid "Size (GB)"
-msgstr "òÁÚÍÅÒ(çÂ)"
+#: fdisk/cfdisk.c:2622
+msgid "  Size (MB)"
+msgstr "  òÁÚÍÅÒ (íâ)"
 
-#: fdisk/cfdisk.c:2646
+#: fdisk/cfdisk.c:2624
+msgid "  Size (GB)"
+msgstr "  òÁÚÍÅÒ (çâ)"
+
+#: fdisk/cfdisk.c:2678
 msgid "Bootable"
 msgstr "úÁÇÒÕÚ."
 
-#: fdisk/cfdisk.c:2646
+#: fdisk/cfdisk.c:2678
 msgid "Toggle bootable flag of the current partition"
-msgstr "óÄÅÌÁÔØ ÔÅËÕÝÉÊ ÒÁÚÄÅÌ ÚÁÇÒÕÚÏÞÎÙÍ"
+msgstr "ðÅÒÅËÌÀÞÉÔØ ÚÁÇÒÕÚÏÞÎÙÊ ÆÌÁÇ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2647
+#: fdisk/cfdisk.c:2679
 msgid "Delete"
-msgstr "õÄÁÌÅÎÉÅ"
+msgstr "õÄÁÌÉÔØ"
 
-#: fdisk/cfdisk.c:2647
+#: fdisk/cfdisk.c:2679
 msgid "Delete the current partition"
 msgstr "õÄÁÌÉÔØ ÔÅËÕÝÉÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:2648
+#: fdisk/cfdisk.c:2680
 msgid "Geometry"
 msgstr "çÅÏÍÅÔÒÉÑ"
 
-#: fdisk/cfdisk.c:2648
+#: fdisk/cfdisk.c:2680
 msgid "Change disk geometry (experts only)"
-msgstr "éÚÍÅÎÉÔØ ÒÁÚÍÅÔËÕ ÄÉÓËÁ (ÔÏÌØËÏ ÄÌÑ ÓÐÅÃÉÁÌÉÓÔÏ×)"
+msgstr "éÚÍÅÎÉÔØ ÇÅÏÍÅÔÒÉÀ ÄÉÓËÁ (ÔÏÌØËÏ ÄÌÑ ÜËÓÐÅÒÔÏ×)"
 
-#: fdisk/cfdisk.c:2649
+#: fdisk/cfdisk.c:2681
 msgid "Help"
-msgstr "ðÏÍÏÝØ"
+msgstr "óÐÒÁ×ËÁ"
 
-#: fdisk/cfdisk.c:2649
+#: fdisk/cfdisk.c:2681
 msgid "Print help screen"
-msgstr "÷Ù×ÅÓÔÉ ÏËÎÏ ÐÏÍÏÝÉ"
+msgstr "÷Ù×ÅÓÔÉ ÜËÒÁÎ ÓÐÒÁ×ËÉ"
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2682
 msgid "Maximize"
-msgstr "õ×ÅÌÉÞÉÔØ"
+msgstr "íÁËÓ."
 
-#: fdisk/cfdisk.c:2650
+#: fdisk/cfdisk.c:2682
 msgid "Maximize disk usage of the current partition (experts only)"
-msgstr "õ×ÅÌÉÞÉÔØ ÒÁÚÍÅÒ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ (ÔÏÌØËÏ ÄÌÑ ÓÐÅÃÉÁÌÉÓÔÏ×)"
+msgstr "äÏ×ÅÓÔÉ ÄÏ ÍÁËÓÉÍÕÍÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÔÅËÕÝÅÇÏ ÒÁÚÄÅÌÁ (ÔÏÌØËÏ ÄÌÑ ÜËÓÐÅÒÔÏ×)"
 
-#: fdisk/cfdisk.c:2651
+#: fdisk/cfdisk.c:2683
 msgid "New"
 msgstr "îÏ×ÙÊ"
 
-#: fdisk/cfdisk.c:2651
+#: fdisk/cfdisk.c:2683
 msgid "Create new partition from free space"
-msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ ÒÁÚÄÅÌ × Ó×ÏÂÏÄÎÏÊ ÏÂÌÁÓÔÉ ÄÉÓËÁ"
+msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ ÒÁÚÄÅÌ ÎÁ Ó×ÏÂÏÄÎÏÍ ÐÒÏÓÔÒÁÎÓÔ×Å"
 
-#: fdisk/cfdisk.c:2652
+#: fdisk/cfdisk.c:2684
 msgid "Print"
-msgstr "÷Ù×ÏÄ"
+msgstr "÷Ù×ÅÓÔÉ"
 
-#: fdisk/cfdisk.c:2652
+#: fdisk/cfdisk.c:2684
 msgid "Print partition table to the screen or to a file"
 msgstr "÷Ù×ÅÓÔÉ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÜËÒÁÎ ÉÌÉ × ÆÁÊÌ"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2685
 msgid "Quit"
 msgstr "÷ÙÈÏÄ"
 
-#: fdisk/cfdisk.c:2653
+#: fdisk/cfdisk.c:2685
 msgid "Quit program without writing partition table"
-msgstr "÷ÙÈÏÄ ÉÚ ÐÒÏÇÒÁÍÍÙ ÂÅÚ ÚÁÐÉÓÉ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
+msgstr "÷ÙÊÔÉ ÉÚ ÐÒÏÇÒÁÍÍÙ ÂÅÚ ÚÁÐÉÓÉ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/cfdisk.c:2654
+#: fdisk/cfdisk.c:2686
 msgid "Type"
 msgstr "ôÉÐ"
 
-#: fdisk/cfdisk.c:2654
+#: fdisk/cfdisk.c:2686
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
-msgstr "éÚÍÅÎÉÔØ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ (DOS, Linux, OS/2 É.Ô.Ä.)"
+msgstr "éÚÍÅÎÉÔØ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ (DOS, Linux, OS/2 É Ô.Ä.)"
 
-#: fdisk/cfdisk.c:2655
+#: fdisk/cfdisk.c:2687
 msgid "Units"
-msgstr "åÄÉÎÉÃÙ"
+msgstr "åÄ. ÉÚÍ."
 
-#: fdisk/cfdisk.c:2655
+#: fdisk/cfdisk.c:2687
 msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "éÚÍÅÎÉÔØ ÅÄÉÎÉÃÙ ÉÚÍÅÒÅÎÉÑ ÒÁÚÄÅÌÁ (íÂ, ÓÅËÔ, ÃÉÌ)"
+msgstr "éÚÍÅÎÉÔØ ÅÄÉÎÉÃÙ ÉÚÍÅÒÅÎÉÑ ÏÔÏÂÒÁÖÁÅÍÏÇÏ ÒÁÚÍÅÒÁ ÒÁÚÄÅÌÁ (íâ, ÓÅËÔ., ÃÉÌ.)"
 
-#: fdisk/cfdisk.c:2656
+#: fdisk/cfdisk.c:2688
 msgid "Write"
 msgstr "úÁÐÉÓØ"
 
-#: fdisk/cfdisk.c:2656
+#: fdisk/cfdisk.c:2688
 msgid "Write partition table to disk (this might destroy data)"
-msgstr "úÁÐÉÓÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË (ÜÔÏ ÍÏÖÅÔ ÕÎÉÞÔÏÖÉÔØ ÄÁÎÎÙÅ ÎÁ ÄÉÓËÅ)"
+msgstr "úÁÐÉÓÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË (ÜÔÏ ÍÏÖÅÔ ÒÁÚÒÕÛÉÔØ ÄÁÎÎÙÅ)"
 
-#: fdisk/cfdisk.c:2702
+#: fdisk/cfdisk.c:2734
 msgid "Cannot make this partition bootable"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÄÅÌÁÔØ ÜÔÏÔ ÒÁÚÄÅÌ ÚÁÇÒÕÚÏÞÎÙÍ"
 
-#: fdisk/cfdisk.c:2712
+#: fdisk/cfdisk.c:2744
 msgid "Cannot delete an empty partition"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÒÁÚÄÅÌ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÕÓÔÏÊ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:2732 fdisk/cfdisk.c:2734
+#: fdisk/cfdisk.c:2764 fdisk/cfdisk.c:2766
 msgid "Cannot maximize this partition"
-msgstr "üÔÏÔ ÒÁÚÄÅÌ ÎÅ×ÏÚÍÏÖÎÏ Õ×ÅÌÉÞÉÔØ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÍÁËÓÉÍÉÚÉÒÏ×ÁÔØ ÜÔÏÔ ÒÁÚÄÅÌ"
 
-#: fdisk/cfdisk.c:2742
+#: fdisk/cfdisk.c:2774
 msgid "This partition is unusable"
-msgstr "îÅÉÓÐÏÌØÚÕÅÍÙÊ ÒÁÚÄÅÌ"
+msgstr "üÔÏÔ ÒÁÚÄÅÌ ÎÅÉÓÐÏÌØÚÕÅÍÙÊ"
 
-#: fdisk/cfdisk.c:2744
+#: fdisk/cfdisk.c:2776
 msgid "This partition is already in use"
-msgstr "òÁÚÄÅÌ ÇÏÔÏ× Ë ÉÓÐÏÌØÚÏ×ÁÎÉÀ"
+msgstr "üÔÏÔ ÒÁÚÄÅÌ ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
 
-#: fdisk/cfdisk.c:2761
+#: fdisk/cfdisk.c:2793
 msgid "Cannot change the type of an empty partition"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÔÉÐ ÒÁÚÄÅÌÁ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÔÉÐ ÐÕÓÔÏÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/cfdisk.c:2788 fdisk/cfdisk.c:2794
+#: fdisk/cfdisk.c:2820 fdisk/cfdisk.c:2826
 msgid "No more partitions"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÄÅÌÁÔØ ÂÏÌØÛÅ ÒÁÚÄÅÌÏ×"
+msgstr "òÁÚÄÅÌÏ× ÂÏÌØÛÅ ÎÅÔ"
 
-#: fdisk/cfdisk.c:2801
+#: fdisk/cfdisk.c:2833
 msgid "Illegal command"
-msgstr "îÅÐÒÁ×ÉÌØÎÁÑ ËÏÍÁÎÄÁ"
+msgstr "îÅ×ÅÒÎÁÑ ËÏÍÁÎÄÁ"
 
-#: fdisk/cfdisk.c:2811
-msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
-msgstr ""
+#: fdisk/cfdisk.c:2843
+msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
+msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2818
+#: fdisk/cfdisk.c:2850
 #, c-format
 msgid ""
 "\n"
@@ -1774,21 +2056,22 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"éÓÐÏÌØÚÕÊÔÅ:\n"
-"÷Ù×ÅÓÔÉ ×ÅÒÓÉÀ:\n"
+"éÓÐÏÌØÚÏ×ÁÎÉÅ:\n"
+"÷Ù×ÏÄ ×ÅÒÓÉÉ:\n"
 "        %s -v\n"
-"÷Ù×ÅÓÔÉ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ×:\n"
+"÷Ù×ÏÄ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×:\n"
 "        %s -P {r|s|t} [ÏÐÃÉÉ] ÕÓÔÒÏÊÓÔ×Ï\n"
 "éÎÔÅÒÁËÔÉ×ÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ:\n"
 "        %s [ÏÐÃÉÉ] ÕÓÔÒÏÊÓÔ×Ï\n"
 "\n"
 "ïÐÃÉÉ:\n"
-"-a: éÓÐÏÌØÚÏ×ÁÔØ ×ÍÅÓÔÏ ÐÏÄÓ×ÅÔËÉ ÓÔÒÅÌËÕ;\n"
-"-z: óÏÚÄÁÔØ ÎÏ×ÕÀ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× ÎÅ ÓÞÉÔÙ×ÁÑ Å£ Ó ÄÉÓËÁ;\n"
-"-c C -h H -s S: õËÁÚÁÔØ ËÏÌ-×Ï ÃÉÌÉÎÄÒÏ×, ÇÏÌÏ×ÏË É ÓÅËÔÏÒÏ× × ÄÏÒÏÖËÅ.\n"
+"-a: éÓÐÏÌØÚÏ×ÁÔØ ÓÔÒÅÌËÉ ×ÍÅÓÔÏ ÐÏÄÓ×ÅÔËÉ;\n"
+"-z: îÁÞÁÔØ Ó ÎÕÌÅ×ÏÊ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ×ÍÅÓÔÏ ÞÔÅÎÉÑ ôò Ó ÄÉÓËÁ;\n"
+"-c C -h H -s S: ðÅÒÅËÒÙÔØ ÐÏÎÑÔÉÅ ÑÄÒÁ Ï ËÏÌÉÞÅÓÔ×Å ÃÉÌÉÎÄÒÏ×,\n"
+"                ÇÏÌÏ×ÏË É ÞÉÓÌÅ ÓÅËÔÏÒÏ× ÎÁ ÄÏÒÏÖËÕ.\n"
 "\n"
 
-#: fdisk/fdisk.c:193
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -1799,8 +2082,16 @@ msgid ""
 "-u: give Start and End in sector (instead of cylinder) units\n"
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: fdisk [-b SSZ] [-u] äéóë  éÚÍÅÎÅÎÉÅ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×\n"
+"       fdisk -l [-b SSZ] [-u] äéóë       óÐÉÓÏË ÔÁÂÌÉÃ(Ù) ÒÁÚÄÅÌÏ×\n"
+"       fdisk -s òáúäåì                   ÷Ù×ÏÄ ÒÁÚÍÅÒÁ(Ï×) ÒÁÚÄÅÌÁ × ÂÌÏËÁÈ\n"
+"       fdisk -v                          ÷Ù×ÏÄ ×ÅÒÓÉÉ fdisk\n"
+"úÄÅÓØ äéóë - ÞÔÏ-ÔÏ ×ÒÏÄÅ /dev/hdb ÉÌÉ /dev/sda,\n"
+"Á òáúäåì   - ÞÔÏ-ÔÏ ×ÒÏÄÅ /dev/hda7\n"
+"-u: ÏÐÒÅÄÅÌÑÅÔ îÁÞÁÌÏ É ëÏÎÅÃ × ÅÄÉÎÉÃÁÈ ÓÅËÔÏÒÁ (×ÍÅÓÔÏ ÃÉÌÉÎÄÒÁ)\n"
+"-b 2048: (ÄÌÑ ÎÅËÏÔÏÒÙÈ MO-ÄÉÓËÏ×) ÉÓÐÏÌØÚÏ×ÁÎÉÅ 2048-ÂÁÊÔÏ×ÙÈ ÓÅËÔÏÒÏ×\n"
 
-#: fdisk/fdisk.c:205
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -1809,234 +2100,242 @@ msgid ""
 "  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
 "  ...\n"
 msgstr ""
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: fdisk [-l] [-b SSZ] [-u] ÕÓÔÒÏÊÓÔ×Ï\n"
+"îÁÐÒ.: fdisk /dev/hda  (ÄÌÑ ÐÅÒ×ÏÇÏ IDE-ÄÉÓËÁ)\n"
+"  ÉÌÉ: fdisk /dev/sdc  (ÄÌÑ ÔÒÅÔØÅÇÏ SCSI-ÄÉÓËÁ)\n"
+"  ÉÌÉ: fdisk /dev/eda  (ÄÌÑ ÐÅÒ×ÏÇÏ PS/2 ESDI-ÄÉÓËÁ)\n"
+"  ÉÌÉ: fdisk /dev/rd/c0d0  ÉÌÉ: fdisk /dev/ida/c0d0  (ÄÌÑ RAID-ÕÓÔÒÏÊÓÔ×)\n"
+"  ...\n"
 
-#: fdisk/fdisk.c:214
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÁ %s\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ %s\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
-msgstr ""
+msgstr "BLKGETSIZE ioctl ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ ÎÁ %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÅÝÅ ÐÁÍÑÔÉ\n"
 
-#: fdisk/fdisk.c:237
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
-msgstr ""
+msgstr "îÅÉÓÐÒÁ×ÉÍÁÑ ÏÛÉÂËÁ\n"
 
-#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:358 fdisk/fdisk.c:365
-#: fdisk/fdisk.c:388 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:438
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
+#: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
-msgstr ""
+msgstr "äÅÊÓÔ×ÉÅ ËÏÍÁÎÄÙ"
 
-#: fdisk/fdisk.c:322
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
-msgstr ""
+msgstr "   a   ÐÅÒÅËÌÀÞÅÎÉÅ ÆÌÁÇÁ ÚÁÇÒÕÚËÉ"
 
 #. sun
-#: fdisk/fdisk.c:323 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
-msgstr ""
+msgstr "   b   ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÍÅÔËÉ ÄÉÓËÁ bsd"
 
-#: fdisk/fdisk.c:324
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
-msgstr ""
+msgstr "   c   ÐÅÒÅËÌÀÞÅÎÉÅ ÆÌÁÇÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ"
 
 #. sun
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
-msgstr ""
+msgstr "   d   ÕÄÁÌÅÎÉÅ ÒÁÚÄÅÌÁ"
 
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
-msgstr ""
+msgstr "   l   ÓÐÉÓÏË ÉÚ×ÅÓÔÎÙÈ ÔÉÐÏ× ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:359 fdisk/fdisk.c:371
-#: fdisk/fdisk.c:396 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
+#: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
-msgstr ""
+msgstr "   m   ×Ù×ÏÄ ÜÔÏÇÏ ÍÅÎÀ"
 
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
-msgstr ""
+msgstr "   n   ÄÏÂÁ×ÌÅÎÉÅ ÎÏ×ÏÇÏ ÒÁÚÄÅÌÁ"
 
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:360 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
-msgstr ""
+msgstr "   o   ÓÏÚÄÁÎÉÅ ÎÏ×ÏÊ ÐÕÓÔÏÊ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× DOS"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:397
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
-msgstr ""
+msgstr "   p   ×Ù×ÏÄ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:361 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
+#: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
-msgstr ""
+msgstr "   q   ×ÙÈÏÄ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ ÉÚÍÅÎÅÎÉÊ"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
-msgstr ""
+msgstr "   s   ÓÏÚÄÁÎÉÅ ÎÏ×ÏÊ ÞÉÓÔÏÊ ÍÅÔËÉ ÄÉÓËÁ Sun"
 
 #. sun
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
-msgstr ""
+msgstr "   t   ÉÚÍÅÎÅÎÉÅ id ÓÉÓÔÅÍÙ ÒÁÚÄÅÌÁ"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
-msgstr ""
+msgstr "   u   ÉÚÍÅÎÅÎÉÅ ÅÄÉÎÉÃ ÉÚÍÅÒÅÎÉÑ ÜËÒÁÎÁ/ÓÏÄÅÒÖÉÍÏÇÏ"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
-msgstr ""
+msgstr "   v   ÐÒÏ×ÅÒËÁ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
-msgstr ""
+msgstr "   w   ÚÁÐÉÓØ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓË É ×ÙÈÏÄ"
 
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
-msgstr ""
+msgstr "   x   ÄÏÐÏÌÎÉÔÅÌØÎÁÑ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØ (ÔÏÌØËÏ ÄÌÑ ÜËÓÐÅÒÔÏ×)"
 
-#: fdisk/fdisk.c:341
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
-msgstr ""
+msgstr "   a   ×ÙÂÏÒ ÚÁÇÒÕÚÏÞÎÏÇÏ ÒÁÚÄÅÌÁ"
 
 #. sgi flavour
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
-msgstr ""
+msgstr "   b   ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÓÏÄÅÒÖÉÍÏÇÏ ÚÁÇÒÕÚÏÞÎÏÇÏ ÆÁÊÌÁ"
 
 #. sgi
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
-msgstr ""
+msgstr "   c   ×ÙÂÏÒ ÒÁÚÄÅÌÁ ÄÌÑ Ó×ÏÐÉÎÇÁ sgi"
 
-#: fdisk/fdisk.c:366
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
-msgstr ""
+msgstr "   a   ÐÅÒÅËÌÀÞÅÎÉÅ ÆÌÁÇÁ ÚÁÇÒÕÚËÉ"
 
-#: fdisk/fdisk.c:368
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
-msgstr ""
+msgstr "   c   ÐÅÒÅËÌÀÞÅÎÉÅ ÆÌÁÇÁ dos-ÓÏ×ÍÅÓÔÉÍÏÓÔÉ"
 
-#: fdisk/fdisk.c:389
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
-msgstr ""
+msgstr "   a   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÁÌØÔÅÒÎÁÔÉ×ÎÙÈ ÃÉÌÉÎÄÒÏ×"
 
 #. sun
-#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
-msgstr ""
+msgstr "   c   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
-msgstr ""
+msgstr "   d   ×Ù×ÏÄ ÓÙÒÙÈ ÄÁÎÎÙÈ × ÔÁÂÌÉÃÅ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/fdisk.c:392
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
-msgstr ""
+msgstr "   e   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÓÅËÔÏÒÏ× ÎÁ ÃÉÌÉÎÄÒ"
 
 #. sun
-#: fdisk/fdisk.c:393 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
-msgstr ""
+msgstr "   h   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÇÏÌÏ×ÏË"
 
-#: fdisk/fdisk.c:394
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
-msgstr ""
+msgstr "   i   ÉÚÍÅÎÅÎÉÅ ËÏÜÆÆÉÃÉÅÎÔÁ ÞÅÒÅÄÏ×ÁÎÉÑ"
 
 #. sun
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
-msgstr ""
+msgstr "   o   ÉÚÍÅÎÅÎÉÅ ÓËÏÒÏÓÔÉ ×ÒÁÝÅÎÉÑ (ÏÂ/ÍÉÎ)"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
+#: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
-msgstr ""
+msgstr "   r   ×ÏÚ×ÒÁÔ × ÇÌÁ×ÎÏÅ ÍÅÎÀ"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
-msgstr ""
+msgstr "   s   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÓÅËÔÏÒÏ× ÎÁ ÄÏÒÏÖËÕ"
 
-#: fdisk/fdisk.c:403
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
-msgstr ""
+msgstr "   y   ÉÚÍÅÎÅÎÉÅ ËÏÌÉÞÅÓÔ×Á ÆÉÚÉÞÅÓËÉÈ ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
-msgstr ""
+msgstr "   b   ÐÅÒÅÍÅÝÅÎÉÅ ÎÁÞÁÌÁ ÄÁÎÎÙÈ ÒÁÚÄÅÌÁ"
 
-#: fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
-msgstr ""
+msgstr "   e   ÓÐÉÓÏË ÒÁÓÛÉÒÅÎÎÙÈ ÒÁÚÄÅÌÏ×"
 
 #. !sun
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
-msgstr ""
+msgstr "   g   ÓÏÚÄÁÎÉÅ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× IRIX (SGI)"
 
 #. !sun
-#: fdisk/fdisk.c:443
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
-msgstr ""
+msgstr "   f   ÚÁËÒÅÐÌÅÎÉÅ ÐÏÒÑÄËÁ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/fdisk.c:558
+#: fdisk/fdisk.c:556
 msgid "You must set"
-msgstr ""
+msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ"
 
-#: fdisk/fdisk.c:572
+#: fdisk/fdisk.c:570
 msgid "heads"
-msgstr ""
+msgstr "ÇÏÌÏ×ËÉ"
 
-#: fdisk/fdisk.c:574 fdisk/fdisk.c:1110 fdisk/sfdisk.c:865
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1223 fdisk/sfdisk.c:864
 msgid "sectors"
-msgstr ""
+msgstr "ÓÅËÔÏÒÙ"
 
-#: fdisk/fdisk.c:576 fdisk/fdisk.c:1110 fdisk/fdiskbsdlabel.c:466
-#: fdisk/sfdisk.c:865
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1223 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:864
 msgid "cylinders"
-msgstr ""
+msgstr "ÃÉÌÉÎÄÒÙ"
 
-#: fdisk/fdisk.c:580
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
+"%s%s.\n"
+"÷Ù ÍÏÖÅÔÅ ÓÄÅÌÁÔØ ÜÔÏ ÉÚ ÍÅÎÀ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÆÕÎËÃÉÊ.\n"
 
-#: fdisk/fdisk.c:581
+#: fdisk/fdisk.c:579
 msgid " and "
-msgstr ""
+msgstr " É "
 
-#: fdisk/fdisk.c:598
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2047,372 +2346,463 @@ msgid ""
 "2) booting and partitioning software from other OSs\n"
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
-
-#: fdisk/fdisk.c:621
+"\n"
+"ëÏÌÉÞÅÓÔ×Ï ÃÉÌÉÎÄÒÏ× ÄÌÑ ÜÔÏÇÏ ÄÉÓËÁ ÕÓÔÁÎÏ×ÌÅÎÏ × %d.\n"
+"ó ÜÔÉÍ ×ÓÅ × ÐÏÒÑÄËÅ, ÎÏ ÚÎÁÞÅÎÉÅ ÂÏÌØÛÅ, ÞÅÍ 1024,\n"
+"É × ÏÔÄÅÌØÎÙÈ ÕÓÔÁÎÏ×ËÁÈ ÍÏÇÕÔ ×ÏÚÎÉËÎÕÔØ ÐÒÏÂÌÅÍÙ Ó:\n"
+"1) ÐÒÏÇÒÁÍÍÁÍÉ, ÚÁÐÕÓËÁÅÍÙÍ ÐÒÉ ÚÁÇÒÕÚËÅ (ÎÁÐÒ., ÓÔÁÒÙÅ ×ÅÒÓÉÉ LILO)\n"
+"2) ÚÁÇÒÕÚËÏÊ É ÐÒÏÇÒÁÍÍÁÍÉ ÒÁÚÍÅÔËÉ ÉÚ ÄÒÕÇÉÈ ïó\n"
+"   (ÎÁÐÒ., DOS FDISK, OS/2 FDISK)\n"
+
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÏÅ ÓÍÅÝÅÎÉÅ × ÏÓÎÏ×ÎÏÍ ÒÁÓÛÉÒÅÎÎÏÍ ÒÁÚÄÅÌÅ\n"
 
-#: fdisk/fdisk.c:635
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕÄÁÌÅÎÉÅ ÒÁÚÄÅÌÏ× ÐÏÓÌÅ %d\n"
 
-#: fdisk/fdisk.c:652
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕËÁÚÁÔÅÌØ ÎÁ ÄÏÐÏÌÎÉÔÅÌØÎÕÀ ÓÓÙÌËÕ × ÔÁÂÌÉÃÅ ÒÁÚÄÅÌÏ× %d\n"
 
-#: fdisk/fdisk.c:660
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÇÎÏÒÉÒÕÀÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÄÁÎÎÙÅ × ÔÁÂÌÉÃÅ ÒÁÚÄÅÌÏ× %d\n"
 
-#: fdisk/fdisk.c:705
+#: fdisk/fdisk.c:703
 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 ""
+"óÏÚÄÁÅÔÓÑ ÎÏ×ÁÑ ÍÅÔËÁ ÄÉÓËÁ DOS. éÚÍÅÎÅÎÉÑ ÂÕÄÕÔ ÏÓÔÁ×ÁÔØÓÑ\n"
+"ÔÏÌØËÏ × ÐÁÍÑÔÉ ÄÏ ÔÅÈ ÐÏÒ, ÐÏËÁ ×Ù ÎÅ ÒÅÛÉÔÅ ÚÁÐÉÓÁÔØ ÉÈ.\n"
+"ðÏÓÌÅ ÜÔÏÇÏ, ËÏÎÅÞÎÏ, ÐÒÅÄÙÄÕÝÅÅ ÓÏÄÅÒÖÉÍÏÅ ÎÅÌØÚÑ ÂÕÄÅÔ\n"
+"×ÏÓÓÔÁÎÏ×ÉÔØ.\n"
+"\n"
 
-#: fdisk/fdisk.c:750
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
-msgstr ""
+msgstr "ðÒÉÍÅÞÁÎÉÅ: ÒÁÚÍÅÒ ÓÅËÔÏÒÁ - %d (ÎÅ %d)\n"
 
-#: fdisk/fdisk.c:838
+#: fdisk/fdisk.c:886
 msgid "You will not be able to write the partition table.\n"
-msgstr ""
+msgstr "÷Ù ÂÕÄÅÔÅ ÎÅ × ÓÏÓÔÏÑÎÉÉ ÚÁÐÉÓÁÔØ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ×.\n"
 
-#: fdisk/fdisk.c:871
+#: fdisk/fdisk.c:915
 msgid ""
-"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
-"disklabel\n"
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
 msgstr ""
+"îÁ ÜÔÏÍ ÄÉÓËÅ ÉÍÅÀÔÓÑ ÍÜÄÖÉËÉ DOS É BSD.\n"
+"úÁÄÁÊÔÅ ËÏÍÁÎÄÕ  'b' ÄÌÑ ÐÅÒÅÈÏÄÁ × ÒÅÖÉÍ BSD.\n"
+
+#: fdisk/fdisk.c:925
+msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
+msgstr "õÓÔÒÏÊÓÔ×Ï ÎÅ ÓÏÄÅÒÖÉÔ ÎÉ ×ÅÒÎÏÊ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× DOS, ÎÉ ÍÅÔËÉ ÄÉÓËÁ Sun, SGI ÉÌÉ OSF\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:942
 msgid "Internal error\n"
-msgstr ""
+msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ\n"
 
-#: fdisk/fdisk.c:910
+#: fdisk/fdisk.c:955
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
-msgstr ""
+msgstr "éÇÎÏÒÉÒÕÅÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ %d\n"
 
-#: fdisk/fdisk.c:922
+#: fdisk/fdisk.c:967
 #, c-format
-msgid ""
-"Warning: invalid flag 0x%04x of partition table %d will be corrected by "
-"w(rite)\n"
-msgstr ""
+msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n"
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÅÒÎÙÊ ÆÌÁÇ 0x%04x ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× %d ÂÕÄÅÔ ÉÓÐÒÁ×ÌÅÎ ÚÁÐÉÓØÀ\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:989
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
+"\n"
+"ÔÒÉÖÄÙ ÐÏÌÕÞÅÎ EOF - ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ...\n"
 
-#: fdisk/fdisk.c:983
+#: fdisk/fdisk.c:1028
 msgid "Hex code (type L to list codes): "
-msgstr ""
+msgstr "ûÅÓÔÎÁÄÃÁÔÅÒÉÞÎÙÊ ËÏÄ (××ÅÄÉÔÅ L ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÉÓËÁ ËÏÄÏ×): "
 
-#: fdisk/fdisk.c:1022
+#: fdisk/fdisk.c:1068
 #, c-format
-msgid "%s (%d-%d, default %d): "
-msgstr ""
+msgid "%s (%u-%u, default %u): "
+msgstr "%s (%u-%u, ÐÏ ÕÍÏÌÞÁÎÉÀ %u): "
 
-#: fdisk/fdisk.c:1078
+#: fdisk/fdisk.c:1135
 #, c-format
-msgid "Using default value %d\n"
-msgstr ""
+msgid "Using default value %u\n"
+msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ %u\n"
 
-#: fdisk/fdisk.c:1082
+#: fdisk/fdisk.c:1139
 msgid "Value out of range.\n"
-msgstr ""
+msgstr "úÎÁÞÅÎÉÅ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ.\n"
 
-#: fdisk/fdisk.c:1092
+#: fdisk/fdisk.c:1149
 msgid "Partition number"
-msgstr ""
+msgstr "îÏÍÅÒ ÒÁÚÄÅÌÁ"
 
-#: fdisk/fdisk.c:1101
+#: fdisk/fdisk.c:1160
 #, c-format
 msgid "Warning: partition %d has empty type\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %d ÉÍÅÅÔ ÐÕÓÔÏÊ ÔÉÐ\n"
+
+#: fdisk/fdisk.c:1182 fdisk/fdisk.c:1208
+#, c-format
+msgid "Selected partition %d\n"
+msgstr "÷ÙÂÒÁÎÎÙÊ ÒÁÚÄÅÌ %d\n"
+
+#: fdisk/fdisk.c:1185
+msgid "No partition is defined yet!\n"
+msgstr "òÁÚÄÅÌÙ ÅÝÅ ÎÅ ÏÐÒÅÄÅÌÅÎÙ!\n"
+
+#: fdisk/fdisk.c:1211
+msgid "All primary partitions have been defined already!\n"
+msgstr "÷ÓÅ ÏÓÎÏ×ÎÙÅ ÒÁÚÄÅÌÙ ÕÖÅ ÂÙÌÉ ÏÐÒÅÄÅÌÅÎÙ!\n"
 
-#: fdisk/fdisk.c:1108
+#: fdisk/fdisk.c:1221
 msgid "cylinder"
-msgstr ""
+msgstr "ÃÉÌÉÎÄÒ"
 
-#: fdisk/fdisk.c:1108
+#: fdisk/fdisk.c:1221
 msgid "sector"
-msgstr ""
+msgstr "ÓÅËÔÏÒ"
 
-#: fdisk/fdisk.c:1117
+#: fdisk/fdisk.c:1230
 #, c-format
 msgid "Changing display/entry units to %s\n"
-msgstr ""
+msgstr "éÚÍÅÎÅÎÉÅ ÅÄÉÎÉÃ ÉÚÍÅÒÅÎÉÑ ÜËÒÁÎÁ/ÓÏÄÅÒÖÉÍÏÇÏ ÎÁ %s\n"
 
-#: fdisk/fdisk.c:1128
+#: fdisk/fdisk.c:1241
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
-msgstr ""
+msgstr "ðòåäõðòåöäåîéå: òÁÚÄÅÌ %d ÎÅ Ñ×ÌÑÅÔÓÑ ÒÁÓÛÉÒÅÎÎÙÍ ÒÁÚÄÅÌÏÍ\n"
 
-#: fdisk/fdisk.c:1139
+#: fdisk/fdisk.c:1252
 msgid "DOS Compatibility flag is set\n"
-msgstr ""
+msgstr "æÌÁÇ DOS-ÓÏ×ÍÅÓÔÉÍÏÓÔÉ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: fdisk/fdisk.c:1143
+#: fdisk/fdisk.c:1256
 msgid "DOS Compatibility flag is not set\n"
-msgstr ""
+msgstr "æÌÁÇ DOS-ÓÏ×ÍÅÓÔÉÍÏÓÔÉ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1356
 #, c-format
 msgid "Partition %d does not exist yet!\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d ÅÝÅ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ!\n"
 
-#: fdisk/fdisk.c:1234
+#: fdisk/fdisk.c:1361
 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 ""
+"ôÉÐ 0 ÏÚÎÁÞÁÅÔ Ó×ÏÂÏÄÎÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï\n"
+"ÄÌÑ ÍÎÏÇÉÈ ÓÉÓÔÅÍ (ÎÏ ÎÅ ÄÌÑ Linux).\n"
+"îÁÌÉÞÉÅ ÒÁÚÄÅÌÏ× ÔÉÐÁ 0 ÎÁ×ÅÒÎÑËÁ\n"
+"ÎÅÒÁÚÕÍÎÏ. ÷Ù ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÒÁÚÄÅÌ,\n"
+"ÉÓÐÏÌØÚÕÑ ËÏÍÁÎÄÕ `d'.\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1370
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
+"÷Ù ÎÅ ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ÒÁÚÄÅÌ ÎÁ ÒÁÓÛÉÒÅÎÎÙÊ ÉÌÉ ÎÁÏÂÏÒÏÔ\n"
+"óÎÁÞÁÌÁ ÕÄÁÌÉÔÅ ÅÇÏ.\n"
 
-#: fdisk/fdisk.c:1252
+#: fdisk/fdisk.c:1379
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
 "\n"
 msgstr ""
+"ðÒÅÄÌÁÇÁÅÔÓÑ ÏÓÔÁ×ÉÔØ ÒÁÚÄÅÌ 3 × ×ÉÄÅ ÃÅÌÏÇÏ ÄÉÓËÁ (5),\n"
+"ËÁË ÔÏÇÏ ÏÖÉÄÁÅÔ SunOS/Solaris, É ËÏÔÏÒÙÊ ÇÏÄÉÔÓÑ ÄÁÖÅ ÄÌÑ Linux.\n"
+"\n"
 
-#: fdisk/fdisk.c:1258
+#: fdisk/fdisk.c:1385
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
 "\n"
 msgstr ""
+"ðÒÅÄÌÁÇÁÅÔÓÑ ÏÓÔÁ×ÉÔØ ÒÁÚÄÅÌ 9 × ×ÉÄÅ ÚÁÇÏÌÏ×ËÁ ÔÏÍÁ (0),\n"
+"Á ÒÁÚÄÅÌ 11 × ×ÉÄÅ ÃÅÌÏÇÏ ÔÏÍÁ (6), ËÁË ÔÏÇÏ ÏÖÉÄÁÅÔ IRIX.\n"
+"\n"
 
-#: fdisk/fdisk.c:1272
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
-msgstr ""
+msgstr "óÉÓÔÅÍÎÙÊ ÔÉÐ ÒÁÚÄÅÌÁ %d ÉÚÍÅÎÅÎ ÎÁ %x (%s)\n"
 
-#: fdisk/fdisk.c:1326
+#: fdisk/fdisk.c:1453
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d ÉÍÅÅÔ ÒÁÚÌÉÞÎÙÅ ÆÉÚÉÞÅÓËÉÅ/ÌÏÇÉÞÅÓËÉÅ ÎÁÞÁÌÁ (ÎÅ-Linux?):\n"
 
-#: fdisk/fdisk.c:1328 fdisk/fdisk.c:1336 fdisk/fdisk.c:1345 fdisk/fdisk.c:1354
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
-msgstr ""
+msgstr "     ÆÉÚ=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1329 fdisk/fdisk.c:1337
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
-msgstr ""
+msgstr "ÌÏÇÉÞ=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1334
+#: fdisk/fdisk.c:1461
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d ÉÍÅÅÔ ÒÁÚÌÉÞÎÙÅ ÆÉÚÉÞÅÓËÉÅ/ÌÏÇÉÞÅÓËÉÅ ÏËÏÎÞÁÎÉÑ:\n"
 
-#: fdisk/fdisk.c:1343
+#: fdisk/fdisk.c:1470
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %i ÎÁÞÉÎÁÅÔÓÑ ÎÅ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ:\n"
 
-#: fdisk/fdisk.c:1346
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
-msgstr ""
+msgstr "ÄÏÌÖÅÎ ÂÙÔØ (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1479
 #, c-format
-msgid "Partition %i does not end on cylinder boundary:\n"
-msgstr ""
+msgid "Partition %i does not end on cylinder boundary.\n"
+msgstr "òÁÚÄÅÌ %i ÎÅ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ.\n"
 
-#: fdisk/fdisk.c:1355
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
+msgstr "ÄÏÌÖÅÎ ÂÙÔØ (%d, %d, %d)\n"
+
+#: fdisk/fdisk.c:1495
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
+"\n"
+"äÉÓË %s: %ld íâ, %lld ÂÁÊÔ\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid ""
 "\n"
-"Disk %s: %d heads, %d sectors, %d cylinders\n"
-"Units = %s of %d * %d bytes\n"
+"Disk %s: %ld.%ld GB, %lld bytes\n"
+msgstr ""
+"\n"
+"äÉÓË %s: %ld.%ld çâ, %lld ÂÁÊÔ\n"
+
+#: fdisk/fdisk.c:1500
+#, c-format
+msgid "%d heads, %d sectors/track, %d cylinders"
+msgstr "%d ÇÏÌÏ×ÏË, %d ÓÅËÔÏÒÏ×/ÄÏÒÏÖËÕ, %d ÃÉÌÉÎÄÒÏ×"
+
+#: fdisk/fdisk.c:1503
+#, c-format
+msgid ", total %llu sectors"
+msgstr ", ×ÓÅÇÏ %llu ÓÅËÔÏÒÏ×"
+
+#: fdisk/fdisk.c:1506
+#, c-format
+msgid ""
+"Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
+"åÄÉÎÉÃÙ = %s ÐÏ %d * %d = %d ÂÁÊÔ\n"
+"\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
+"îÅÞÅÇÏ ×ÙÐÏÌÎÑÔØ. ïÞÅÒÅÄÎÏÓÔØ ÕÖÅ × ÐÏÒÑÄËÅ.\n"
+"\n"
 
-#: fdisk/fdisk.c:1534
+#: fdisk/fdisk.c:1678
 #, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
-msgstr ""
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s úÁÇÒ     îÁÞÁÌÏ       ëÏÎÅà       âÌÏËÉ   Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/fdisk.c:1535 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:676
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:218 fdisk/fdisksgilabel.c:224
+#: fdisk/fdisksunlabel.c:674
 msgid "Device"
-msgstr ""
+msgstr "õÓÔÒ-×Ï"
 
-#: fdisk/fdisk.c:1572
+#: fdisk/fdisk.c:1716
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
+"\n"
+"ðÕÎËÔÙ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÒÁÓÐÏÌÏÖÅÎÙ ÎÅ × ÄÉÓËÏ×ÏÍ ÐÏÒÑÄËÅ\n"
 
-#: fdisk/fdisk.c:1582
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %d heads, %d sectors, %d cylinders\n"
 "\n"
 msgstr ""
+"\n"
+"äÉÓË %s: %d ÇÏÌÏ×ÏË, %d ÓÅËÔÏÒÏ×, %d ÃÉÌÉÎÄÒÏ×\n"
+"\n"
 
-#: fdisk/fdisk.c:1584
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
-msgstr ""
+#: fdisk/fdisk.c:1728
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "#  AF çÏÌ óÅË  ãÉÌ çÏÌ óÅË  ãÉÌ    îÁÞÁÌÏ      òÁÚÍ ID\n"
 
-#: fdisk/fdisk.c:1628
+#: fdisk/fdisk.c:1773
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %d ÓÏÄÅÒÖÉÔ ÎÕÌÅ×ÏÊ ÓÅËÔÏÒ\n"
 
-#: fdisk/fdisk.c:1631
+#: fdisk/fdisk.c:1776
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d: ÇÏÌÏ×ËÁ %d ÂÏÌØÛÅ, ÞÅÍ ÍÁËÓÉÍÕÍ %d\n"
 
-#: fdisk/fdisk.c:1634
+#: fdisk/fdisk.c:1779
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d: ÓÅËÔÏÒ %d ÂÏÌØÛÅ, ÞÅÍ ÍÁËÓÉÍÕÍ %d\n"
 
-#: fdisk/fdisk.c:1637
+#: fdisk/fdisk.c:1782
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d: ÃÉÌÉÎÄÒ %d ÂÏÌØÛÅ, ÞÅÍ ÍÁËÓÉÍÕÍ %d\n"
 
-#: fdisk/fdisk.c:1641
+#: fdisk/fdisk.c:1786
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d: ÐÒÅÄÙÄÕÝÉÅ ÓÅËÔÏÒÙ %d ÐÒÏÔÉ×ÏÒÅÞÁÔ ÓÕÍÍÁÒÎÏÍÕ ÚÎÁÞÅÎÉÀ %d\n"
 
-#: fdisk/fdisk.c:1673
+#: fdisk/fdisk.c:1818
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÅÒÎÏÅ ÎÁÞÁÌÏ ÄÁÎÎÙÈ × ÒÁÚÄÅÌÅ %d\n"
 
-#: fdisk/fdisk.c:1681
+#: fdisk/fdisk.c:1826
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %d ÐÅÒÅËÒÙ×ÁÅÔ ÒÁÚÄÅÌ %d.\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1846
 #, c-format
 msgid "Warning: partition %d is empty\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %d ÐÕÓÔ\n"
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
-msgstr ""
+msgstr "ìÏÇÉÞÅÓËÉÊ ÒÁÚÄÅÌ %d ÎÅ ÎÁÈÏÄÉÔÓÑ ÃÅÌÉËÏÍ × ÒÁÚÄÅÌÅ %d\n"
 
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1857
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
-msgstr ""
+msgstr "óÕÍÍÁÒÎÏÅ ËÏÌÉÞÅÓÔ×Ï ×ÙÄÅÌÅÎÎÙÈ ÓÅËÔÏÒÏ× %d ÂÏÌØÛÅ, ÞÅÍ ÍÁËÓÉÍÕÍ %d\n"
 
-#: fdisk/fdisk.c:1715
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "%d unallocated sectors\n"
-msgstr ""
+msgstr "%d ÎÅÚÁÎÑÔÙÈ ÓÅËÔÏÒÏ×\n"
 
-#: fdisk/fdisk.c:1728 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:506
+#: fdisk/fdisk.c:1874 fdisk/fdisksgilabel.c:635 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d ÕÖÅ ÏÐÒÅÄÅÌÅÎ.  õÄÁÌÉÔÅ ÅÇÏ ÐÅÒÅÄ ÔÅÍ, ËÁË ÓÎÏ×Á ÄÏÂÁ×ÉÔØ ÅÇÏ.\n"
 
-#: fdisk/fdisk.c:1749 fdisk/fdiskbsdlabel.c:281 fdisk/fdisksgilabel.c:684
-#: fdisk/fdisksunlabel.c:521
+#: fdisk/fdisk.c:1901 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:653
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
-msgstr ""
+msgstr "ðÅÒ×ÙÊ %s"
 
-#: fdisk/fdisk.c:1764 fdisk/fdisksunlabel.c:562
+#: fdisk/fdisk.c:1916 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
-msgstr ""
+msgstr "óÅËÔÏÒ %d ÕÖÅ ×ÙÄÅÌÅÎ\n"
 
-#: fdisk/fdisk.c:1800
+#: fdisk/fdisk.c:1952
 msgid "No free sectors available\n"
-msgstr ""
+msgstr "ïÔÓÕÔÓÔ×ÕÀÔ ÄÏÓÔÕÐÎÙÅ Ó×ÏÂÏÄÎÙÅ ÓÅËÔÏÒÙ\n"
 
-#: fdisk/fdisk.c:1809 fdisk/fdiskbsdlabel.c:288 fdisk/fdisksunlabel.c:573
+#: fdisk/fdisk.c:1961 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
-msgstr ""
+msgstr "ðÏÓÌÅÄÎÉÊ %s ÉÌÉ +size ÉÌÉ +sizeM ÉÌÉ +sizeK"
 
-#: fdisk/fdisk.c:1874
+#: fdisk/fdisk.c:2026
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
 "\ta new empty DOS partition table first. (Use o.)\n"
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
+"\të ÓÏÖÁÌÅÎÉÀ ÜÔÏÔ fdisk ÎÅ ÍÏÖÅÔ ÏÂÒÁÂÁÔÙ×ÁÔØ\n"
+"\tÍÅÔËÉ ÄÉÓËÏ× AIX. åÓÌÉ ×Ù ÈÏÔÉÔÅ ÄÏÂÁ×ÉÔØ\n"
+"\tÒÁÚÄÅÌÙ ÔÉÐÁ DOS, ÓÏÚÄÁÊÔÅ ÓÎÁÞÁÌÁ ÎÏ×ÕÀ ÐÕÓÔÕÀ\n"
+"\tÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ× DOS (ÉÓÐÏÌØÚÕÊÔÅ o).\n"
+"\tðòåäõðòåöäåîéå: ðÒÉ ÜÔÏÍ ÓÏÄÅÒÖÉÍÏÅ ÎÁ\n"
+"\tÄÁÎÎÏÍ ÄÉÓËÅ ÂÕÄÅÔ ÒÁÚÒÕÛÅÎÏ.\n"
 
-#: fdisk/fdisk.c:1883 fdisk/fdiskbsdlabel.c:615
+#: fdisk/fdisk.c:2038 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
-msgstr ""
+msgstr "âÙÌÏ ÓÏÚÄÁÎÏ ÍÁËÓÉÍÁÌØÎÏ ×ÏÚÍÏÖÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÒÁÚÄÅÌÏ×\n"
 
-#: fdisk/fdisk.c:1893
+#: fdisk/fdisk.c:2046
 msgid "You must delete some partition and add an extended partition first\n"
-msgstr ""
+msgstr "óÎÁÞÁÌÁ ×Ù ÄÏÌÖÎÙ ÕÄÁÌÉÔØ ÎÅËÏÔÏÒÙÅ ÒÁÚÄÅÌÙ É ÄÏÂÁ×ÉÔØ ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ\n"
 
-#: fdisk/fdisk.c:1898
+#: fdisk/fdisk.c:2051
 #, c-format
 msgid ""
 "Command action\n"
 "   %s\n"
 "   p   primary partition (1-4)\n"
 msgstr ""
+"äÅÊÓÔ×ÉÅ ËÏÍÁÎÄÙ\n"
+"   %s\n"
+"   p   ÏÓÎÏ×ÎÏÊ ÒÁÚÄÅÌ (1-4)\n"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:2053
 msgid "l   logical (5 or over)"
-msgstr ""
+msgstr "l   ÌÏÇÉÞÅÓËÉÊ (5 ÉÌÉ ÂÏÌÅÅ)"
 
-#: fdisk/fdisk.c:1900
+#: fdisk/fdisk.c:2053
 msgid "e   extended"
-msgstr ""
+msgstr "e   ÒÁÓÛÉÒÅÎÎÙÊ"
 
-#: fdisk/fdisk.c:1917
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÒÁÚÄÅÌÁ ÄÌÑ ÔÉÐÁ `%c'\n"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2108
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
+"ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÂÙÌÁ ÉÚÍÅÎÅÎÁ!\n"
+"\n"
 
-#: fdisk/fdisk.c:1961
+#: fdisk/fdisk.c:2117
 msgid "Calling ioctl() to re-read partition table.\n"
-msgstr ""
+msgstr "÷ÙÚÙ×ÁÅÔÓÑ ioctl() ÄÌÑ ÐÅÒÅÞÉÔÙ×ÁÎÉÑ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×.\n"
 
-#: fdisk/fdisk.c:1977
+#: fdisk/fdisk.c:2133
 #, c-format
 msgid ""
 "\n"
@@ -2420,112 +2810,123 @@ msgid ""
 "The kernel still uses the old table.\n"
 "The new table will be used at the next reboot.\n"
 msgstr ""
+"\n"
+"ðòåäõðòåöäåîéå: ðÅÒÅÞÉÔÙ×ÁÎÉÅ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ Ó ÏÛÉÂËÏÊ %d: %s.\n"
+"ñÄÒÏ ×ÓÅ ÅÝÅ ÉÓÐÏÌØÚÕÅÔ ÓÔÁÒÕÀ ÔÁÂÌÉÃÕ.\n"
+"îÏ×ÁÑ ÔÁÂÌÉÃÁ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÁ ÐÒÉ ÓÌÅÄÕÀÝÅÊ ÐÅÒÅÚÁÇÒÕÚËÅ.\n"
 
-#: fdisk/fdisk.c:1987
+#: fdisk/fdisk.c:2143
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
 "partitions, please see the fdisk manual page for additional\n"
 "information.\n"
 msgstr ""
+"\n"
+"ðòåäõðòåöäåîéå: åÓÌÉ ×Ù ÓÏÚÄÁÌÉ ÉÌÉ ÉÚÍÅÎÉÌÉ\n"
+"ËÁËÉÅ-ÌÉÂÏ ÒÁÚÄÅÌÙ DOS 6.x, ÐÏÖÁÌÕÊÓÔÁ, ÐÒÏÞÔÉÔÅ\n"
+"ÓÔÒÁÎÉÃÕ ÒÕËÏ×ÏÄÓÔ×Á fdisk ÄÌÑ ÐÏÌÕÞÅÎÉÑ\n"
+"ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
-#: fdisk/fdisk.c:1994
+#: fdisk/fdisk.c:2150
 msgid "Syncing disks.\n"
-msgstr ""
+msgstr "óÉÎÈÒÏÎÉÚÉÒÕÀÔÓÑ ÄÉÓËÉ.\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2197
 #, c-format
 msgid "Partition %d has no data area\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d ÎÅ ÉÍÅÅÔ ÏÂÌÁÓÔÉ Ó ÄÁÎÎÙÍÉ\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2202
 msgid "New beginning of data"
-msgstr ""
+msgstr "îÏ×ÏÅ ÎÁÞÁÌÏ ÄÁÎÎÙÈ"
 
-#: fdisk/fdisk.c:2062
+#: fdisk/fdisk.c:2218
 msgid "Expert command (m for help): "
-msgstr ""
+msgstr "ëÏÍÁÎÄÙ ÜËÓÐÅÒÔÁ (m ÄÌÑ ÓÐÒÁ×ËÉ): "
 
-#: fdisk/fdisk.c:2075
+#: fdisk/fdisk.c:2231
 msgid "Number of cylinders"
-msgstr ""
+msgstr "ëÏÌÉÞÅÓÔ×Ï ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/fdisk.c:2101
+#: fdisk/fdisk.c:2258
 msgid "Number of heads"
-msgstr ""
+msgstr "ëÏÌÉÞÅÓÔ×Ï ÇÏÌÏ×ÏË"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2283
 msgid "Number of sectors"
-msgstr ""
+msgstr "ëÏÌÉÞÅÓÔ×Ï ÓÅËÔÏÒÏ×"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2286
 msgid "Warning: setting sector offset for DOS compatiblity\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÍÅÝÅÎÉÅ ÓÅËÔÏÒÁ ÄÌÑ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó DOS\n"
 
-#: fdisk/fdisk.c:2204
+#: fdisk/fdisk.c:2361
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
-msgstr ""
+msgstr "îÁ ÄÉÓËÅ %s ÏÔÓÕÔÓÔ×ÕÅÔ ×ÅÒÎÁÑ ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ×\n"
 
-#: fdisk/fdisk.c:2218
+#: fdisk/fdisk.c:2375
 #, c-format
 msgid "Cannot open %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s\n"
 
-#: fdisk/fdisk.c:2234
+#: fdisk/fdisk.c:2391 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s\n"
 
-#: fdisk/fdisk.c:2256
+#: fdisk/fdisk.c:2413
 #, c-format
 msgid "%c: unknown command\n"
-msgstr ""
+msgstr "%c: ÎÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ\n"
 
-#: fdisk/fdisk.c:2306
+#: fdisk/fdisk.c:2481
 msgid "This kernel finds the sector size itself - -b option ignored\n"
-msgstr ""
+msgstr "üÔÏ ÑÄÒÏ ÓÁÍÏ ÎÁÈÏÄÉÔ ÒÁÚÍÅÒ ÓÅËÔÏÒÁ - ÏÐÃÉÑ -b ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÁ\n"
 
-#: fdisk/fdisk.c:2309
-msgid ""
-"Warning: the -b (set sector size) option should be used with one specified "
-"device\n"
-msgstr ""
+#: fdisk/fdisk.c:2485
+msgid "Warning: the -b (set sector size) option should be used with one specified device\n"
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÐÃÉÑ -b (ÕÓÔÁÎÏ×ËÁ ÒÁÚÍÅÒÁ ÓÅËÔÏÒÁ) ÄÏÌÖÎÁ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ Ó ÏÄÎÉÍ ÕËÁÚÁÎÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ\n"
 
-#: fdisk/fdisk.c:2372
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2544
 #, 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 ""
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+msgstr "ïÂÎÁÒÕÖÅÎÁ ÍÅÔËÁ ÄÉÓËÁ OSF/1 ÎÁ %s, ×ÙÐÏÌÎÑÅÔÓÑ ÐÅÒÅÈÏÄ × ÒÅÖÉÍ ÍÅÔËÉ ÄÉÓËÁ.\n"
 
-#: fdisk/fdisk.c:2381
+#: fdisk/fdisk.c:2554
 msgid "Command (m for help): "
-msgstr ""
+msgstr "ëÏÍÁÎÄÁ (m ÄÌÑ ÓÐÒÁ×ËÉ): "
 
-#: fdisk/fdisk.c:2397
+#: fdisk/fdisk.c:2570
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
+"\n"
+"ôÅËÕÝÉÊ boot-ÆÁÊÌ: %s\n"
 
-#: fdisk/fdisk.c:2399
+#: fdisk/fdisk.c:2572
 msgid "Please enter the name of the new boot file: "
-msgstr ""
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÉÍÑ ÎÏ×ÏÇÏ boot-ÆÁÊÌÁ: "
 
-#: fdisk/fdisk.c:2401
+#: fdisk/fdisk.c:2574
 msgid "Boot file unchanged\n"
-msgstr ""
+msgstr "Boot-ÆÁÊÌ ÎÅ ÉÚÍÅÎÅÎ\n"
 
-#: fdisk/fdisk.c:2465
+#: fdisk/fdisk.c:2647
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
 "\n"
 msgstr ""
+"\n"
+"\të ÓÏÖÁÌÅÎÉÀ ÍÅÎÀ ÜËÓÐÅÒÔÁ ÄÌÑ ÔÁÂÌÉà ÒÁÚÄÅÌÏ× SGI ÎÅ ÄÏÓÔÕÐÎÏ.\n"
+"\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -2540,361 +2941,380 @@ msgid ""
 "\t   to remove the disk logically from your AIX\n"
 "\t   machine.  (Otherwise you become an AIXpert)."
 msgstr ""
-
-#: fdisk/fdiskbsdlabel.c:119
+"\n"
+"\tîÁ ÜÔÏÍ ÄÉÓËÅ ÅÓÔØ ×ÅÒÎÁÑ ÍÅÔËÁ AIX.\n"
+"\të ÓÏÖÁÌÅÎÉÀ ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ Linux ÎÅ\n"
+"\tÍÏÖÅÔ ÏÂÒÁÂÁÔÙ×ÁÔØ ÜÔÉ ÄÉÓËÉ. ôÅÍ ÎÅ\n"
+"\tÍÅÎÅÅ ×ÏÔ ÎÅÓËÏÌØËÏ ÓÏ×ÅÔÏ×:\n"
+"\t1. ðÒÉ ÚÁÐÉÓÉ fdisk ÒÁÚÒÕÛÉÔ ×ÓÅ ÄÁÎÎÙÅ\n"
+"\t   ÎÁ ÄÉÓËÅ.\n"
+"\t2. õÂÅÄÉÔÅÓØ, ÞÔÏÂÙ ÜÔÏÔ ÄÉÓË îå Ñ×ÌÑÌÓÑ\n"
+"\t   ×ÁÖÎÏÊ ÞÁÓÔØÀ ÇÒÕÐÐÙ ÔÏÍÏ×. (éÎÁÞÅ ×Ù\n"
+"\t   ÍÏÖÅÔÅ ÓÔÅÒÅÔØ ×ÓÅ ÏÓÔÁÌØÎÙÅ ÄÉÓËÉ,\n"
+"\t   ÅÓÌÉ ÏÎÉ ÎÅ ÏÔÚÅÒËÁÌÅÎÙ.)\n"
+"\t3. ðÅÒÅÄ ÕÄÁÌÅÎÉÅÍ ÜÔÏÇÏ ÆÉÚÉÞÅÓËÏÇÏ\n"
+"\t   ÔÏÍÁ ÕÂÅÄÉÔÅÓØ, ÞÔÏ ÌÏÇÉÞÅÓËÉ ÕÄÁÌÉÌÉ\n"
+"\t   ÄÉÓË ÉÚ AIX Ó×ÏÅÊ ÍÁÛÉÎÙ. (éÎÁÞÅ, ×Ù\n"
+"]\t   ÓÔÁÎÅÔÅ AIXpert'ÏÍ)."
+
+#: fdisk/fdiskbsdlabel.c:122
 #, c-format
 msgid ""
 "\n"
 "BSD label for device: %s\n"
 msgstr ""
+"\n"
+"íÅÔËÁ BSD ÄÌÑ ÕÓÔÒÏÊÓÔ×Á: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:130
 msgid "   d   delete a BSD partition"
-msgstr ""
+msgstr "   d   ÕÄÁÌÅÎÉÅ ÒÁÚÄÅÌÁ BSD"
 
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:131
 msgid "   e   edit drive data"
-msgstr ""
+msgstr "   e   ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÄÁÎÎÙÈ ÄÉÓËÁ"
 
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdiskbsdlabel.c:132
 msgid "   i   install bootstrap"
-msgstr ""
+msgstr "   i   ÕÓÔÁÎÏ×ËÁ bootstrap"
 
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:133
 msgid "   l   list known filesystem types"
-msgstr ""
+msgstr "   l   ÓÐÉÓÏË ÔÉÐÏ× ÉÚ×ÅÓÔÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ"
 
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdiskbsdlabel.c:135
 msgid "   n   add a new BSD partition"
-msgstr ""
+msgstr "   n   ÄÏÂÁ×ÌÅÎÉÅ ÎÏ×ÏÇÏ ÒÁÚÄÅÌÁ BSD"
 
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdiskbsdlabel.c:136
 msgid "   p   print BSD partition table"
-msgstr ""
+msgstr "   p   ×Ù×ÏÄ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× BSD"
 
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:139
 msgid "   s   show complete disklabel"
-msgstr ""
+msgstr "   s   ÏÔÏÂÒÁÖÅÎÉÅ ÐÏÌÎÏÊ ÍÅÔËÉ ÄÉÓËÁ"
 
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:140
 msgid "   t   change a partition's filesystem id"
-msgstr ""
+msgstr "   t   ÉÚÍÅÎÅÎÉÅ id ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ ÒÁÚÄÅÌÁ"
 
-#: fdisk/fdiskbsdlabel.c:138
+#: fdisk/fdiskbsdlabel.c:141
 msgid "   u   change units (cylinders/sectors)"
-msgstr ""
+msgstr "   u   ÉÚÍÅÎÅÎÉÅ ÅÄÉÎÉÃ ÉÚÍÅÒÅÎÉÑ (ÃÉÌÉÎÄÒÙ/ÓÅËÔÏÒÙ)"
 
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:142
 msgid "   w   write disklabel to disk"
-msgstr ""
+msgstr "   w   ÚÁÐÉÓØ ÍÅÔËÉ ÄÉÓËÁ ÎÁ ÄÉÓË"
 
-#: fdisk/fdiskbsdlabel.c:141
+#: fdisk/fdiskbsdlabel.c:144
 msgid "   x   link BSD partition to non-BSD partition"
-msgstr ""
+msgstr "   x   Ó×ÑÚÙ×ÁÎÉÅ ÒÁÚÄÅÌÁ BSD Ó ÒÁÚÄÅÌÏÍ ÎÅ-BSD"
 
-#: fdisk/fdiskbsdlabel.c:173
+#: fdisk/fdiskbsdlabel.c:176
 #, c-format
 msgid "Partition %s has invalid starting sector 0.\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %s ÓÏÄÅÒÖÉÔ ÎÅ×ÅÒÎÙÊ ÎÁÞÁÌØÎÙÊ ÎÕÌÅ×ÏÊ ÓÅËÔÏÒ.\n"
 
-#: fdisk/fdiskbsdlabel.c:177
+#: fdisk/fdiskbsdlabel.c:180
 #, c-format
 msgid "Reading disklabel of %s at sector %d.\n"
-msgstr ""
+msgstr "þÉÔÁÅÔÓÑ ÍÅÔËÁ ÄÉÓËÁ %s Ó ÓÅËÔÏÒÁ %d.\n"
 
-#: fdisk/fdiskbsdlabel.c:187
+#: fdisk/fdiskbsdlabel.c:190
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
-msgstr ""
+msgstr "îÁ %s ÎÅÔ ÒÁÚÄÅÌÁ *BSD.\n"
 
-#: fdisk/fdiskbsdlabel.c:201
+#: fdisk/fdiskbsdlabel.c:204
 msgid "BSD disklabel command (m for help): "
-msgstr ""
+msgstr "ëÏÍÁÎÄÁ ÍÅÔËÉ ÄÉÓËÁ BSD (m ÄÌÑ ÓÐÒÁ×ËÉ): "
 
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:318
 #, c-format
 msgid "type: %s\n"
-msgstr ""
+msgstr "ÔÉÐ: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:320
 #, c-format
 msgid "type: %d\n"
-msgstr ""
+msgstr "ÔÉÐ: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:321
 #, c-format
 msgid "disk: %.*s\n"
-msgstr ""
+msgstr "ÄÉÓË: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:319
+#: fdisk/fdiskbsdlabel.c:322
 #, c-format
 msgid "label: %.*s\n"
-msgstr ""
+msgstr "ÍÅÔËÁ: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:323
 msgid "flags:"
-msgstr ""
+msgstr "ÆÌÁÇÉ:"
 
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:325
 msgid " removable"
-msgstr ""
+msgstr " ÓßÅÍÎÙÊ"
 
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:327
 msgid " ecc"
-msgstr ""
+msgstr " ecc"
 
-#: fdisk/fdiskbsdlabel.c:326
+#: fdisk/fdiskbsdlabel.c:329
 msgid " badsect"
-msgstr ""
+msgstr " bad-ÓÅËÔÏÒ"
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
-msgstr ""
+msgstr "ÂÁÊÔ/ÓÅËÔÏÒ: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "sectors/track: %ld\n"
-msgstr ""
+msgstr "ÓÅËÔÏÒÙ/ÄÏÒÏÖËÁ: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:335
 #, c-format
 msgid "tracks/cylinder: %ld\n"
-msgstr ""
+msgstr "ÄÏÒÏÖËÉ/ÃÉÌÉÎÄÒ: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:336
 #, c-format
 msgid "sectors/cylinder: %ld\n"
-msgstr ""
+msgstr "ÓÅËÔÏÒÙ/ÃÉÌÉÎÄÒ: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:337
 #, c-format
 msgid "cylinders: %ld\n"
-msgstr ""
+msgstr "ÃÉÌÉÎÄÒÙ: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:338
 #, c-format
 msgid "rpm: %d\n"
-msgstr ""
+msgstr "ÏÂ/ÍÉÎ: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:339
 #, c-format
 msgid "interleave: %d\n"
-msgstr ""
+msgstr "ÞÅÒÅÄÏ×ÁÎÉÅ: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:340
 #, c-format
 msgid "trackskew: %d\n"
-msgstr ""
+msgstr "ÐÅÒÅËÏÓ ÄÏÒÏÖËÉ: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:338
+#: fdisk/fdiskbsdlabel.c:341
 #, c-format
 msgid "cylinderskew: %d\n"
-msgstr ""
+msgstr "ÐÅÒÅËÏÓ ÃÉÌÉÎÄÒÁ: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:342
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr ""
+msgstr "ÐÅÒÅËÌÀÞÅÎÉÅ ÇÏÌÏ×ËÉ: %ld\t\t# ÍÉÌÌÉÓÅËÕÎÄ\n"
 
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:344
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
-msgstr ""
+msgstr "ÐÏÉÓË ÄÏÒÏÖËÉ: %ld\t# ÍÉÌÌÉÓÅËÕÎÄ\n"
 
-#: fdisk/fdiskbsdlabel.c:343
+#: fdisk/fdiskbsdlabel.c:346
 msgid "drivedata: "
-msgstr ""
+msgstr "ÄÁÎÎÙÅ ÄÉÓËÁ: "
 
-#: fdisk/fdiskbsdlabel.c:352
+#: fdisk/fdiskbsdlabel.c:355
 #, c-format
 msgid ""
 "\n"
 "%d partitions:\n"
 msgstr ""
+"\n"
+"%d ÒÁÚÄÅÌÙ:\n"
 
-#: fdisk/fdiskbsdlabel.c:353
+#: fdisk/fdiskbsdlabel.c:356
 msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr ""
+msgstr "#      ÎÁÞÁÌÏ     ËÏÎÅÃ      ÒÁÚÍÅÒ   ÔÉÐ ÆÓ   [fsize bsize   cpg]\n"
 
-#: fdisk/fdiskbsdlabel.c:402 fdisk/fdiskbsdlabel.c:405
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
 msgid "Writing disklabel to %s.\n"
-msgstr ""
+msgstr "íÅÔËÁ ÄÉÓËÁ ÚÁÐÉÓÙ×ÁÅÔÓÑ ÎÁ %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:417 fdisk/fdiskbsdlabel.c:419
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
 #, c-format
 msgid "%s contains no disklabel.\n"
-msgstr ""
+msgstr "%s ÎÅ ÓÏÄÅÒÖÉÔ ÍÅÔËÉ ÄÉÓËÁ.\n"
 
-#: fdisk/fdiskbsdlabel.c:424
+#: fdisk/fdiskbsdlabel.c:427
 msgid "Do you want to create a disklabel? (y/n) "
-msgstr ""
+msgstr "èÏÔÉÔÅ ÓÏÚÄÁÔØ ÍÅÔËÕ ÄÉÓËÁ? (Ä/Î) "
 
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:467
 msgid "bytes/sector"
-msgstr ""
+msgstr "ÂÁÊÔ/ÓÅËÔÏÒ"
 
-#: fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdiskbsdlabel.c:468
 msgid "sectors/track"
-msgstr ""
+msgstr "ÓÅËÔÏÒÙ/ÄÏÒÏÖËÁ"
 
-#: fdisk/fdiskbsdlabel.c:465
+#: fdisk/fdiskbsdlabel.c:469
 msgid "tracks/cylinder"
-msgstr ""
+msgstr "ÄÏÒÏÖËÉ/ÃÉÌÉÎÄÒ"
 
-#: fdisk/fdiskbsdlabel.c:473
+#: fdisk/fdiskbsdlabel.c:477
 msgid "sectors/cylinder"
-msgstr ""
+msgstr "ÓÅËÔÏÒÙ/ÃÉÌÉÎÄÒ"
 
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:481
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
-msgstr ""
+msgstr "äÏÌÖÎÏ ÂÙÔØ <= ÓÅËÔÏÒÙ/ÄÏÒÏÖËÁ * ÄÏÒÏÖËÉ/ÃÉÌÉÎÄÒ (ÐÏ ÕÍÏÌÞÁÎÉÀ).\n"
 
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:483
 msgid "rpm"
-msgstr ""
+msgstr "ÏÂ/ÍÉÎ"
 
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:484
 msgid "interleave"
-msgstr ""
+msgstr "ÞÅÒÅÄÏ×ÁÎÉÅ"
 
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:485
 msgid "trackskew"
-msgstr ""
+msgstr "ÐÅÒÅËÏÓ ÄÏÒÏÖËÉ"
 
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:486
 msgid "cylinderskew"
-msgstr ""
+msgstr "ÐÅÒÅËÏÓ ÃÉÌÉÎÄÒÁ"
 
-#: fdisk/fdiskbsdlabel.c:483
+#: fdisk/fdiskbsdlabel.c:487
 msgid "headswitch"
-msgstr ""
+msgstr "ÐÅÒÅËÌÀÞÅÎÉÅ ÇÏÌÏ×ËÉ"
 
-#: fdisk/fdiskbsdlabel.c:484
+#: fdisk/fdiskbsdlabel.c:488
 msgid "track-to-track seek"
-msgstr ""
+msgstr "ÐÏÉÓË ÄÏÒÏÖËÉ"
 
-#: fdisk/fdiskbsdlabel.c:525
+#: fdisk/fdiskbsdlabel.c:529
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
-msgstr ""
+msgstr "Bootstrap: %sboot -> boot%s (%s): "
 
-#: fdisk/fdiskbsdlabel.c:550
+#: fdisk/fdiskbsdlabel.c:554
 msgid "Bootstrap overlaps with disk label!\n"
-msgstr ""
+msgstr "Bootstrap ÐÅÒÅËÒÙ×ÁÅÔÓÑ Ó ÍÅÔËÏÊ ÄÉÓËÁ!\n"
 
-#: fdisk/fdiskbsdlabel.c:571 fdisk/fdiskbsdlabel.c:573
+#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
 #, c-format
 msgid "Bootstrap installed on %s.\n"
-msgstr ""
+msgstr "Bootstrap ÕÓÔÁÎÏ×ÌÅÎ ÎÁ %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:595
+#: fdisk/fdiskbsdlabel.c:599
 #, c-format
 msgid "Partition (a-%c): "
-msgstr ""
+msgstr "òÁÚÄÅÌ (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:626
+#: fdisk/fdiskbsdlabel.c:630
 msgid "This partition already exists.\n"
-msgstr ""
+msgstr "üÔÏÔ ÒÁÚÄÅÌ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
 
-#: fdisk/fdiskbsdlabel.c:746
+#: fdisk/fdiskbsdlabel.c:756
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÒÁÚÄÅÌÏ× (%d, ÍÁËÓÉÍÕÍ - %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:793
+#: fdisk/fdiskbsdlabel.c:804
 msgid ""
 "\n"
 "Syncing disks.\n"
 msgstr ""
+"\n"
+"óÉÎÈÒÏÎÉÚÉÒÕÀÔÓÑ ÄÉÓËÉ.\n"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
-msgstr ""
+msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
-msgstr ""
+msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
-msgstr ""
+msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
-msgstr ""
+msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
-msgstr ""
+msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
-msgstr ""
+msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
-msgstr ""
+msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
-msgstr ""
+msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
-msgstr ""
+msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
-msgstr ""
+msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
-msgstr ""
+msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI xfslog"
-msgstr ""
+msgstr "SGI xfslog"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:92
 msgid "SGI xlv"
-msgstr ""
+msgstr "SGI xlv"
 
-#: fdisk/fdisksgilabel.c:92
+#: fdisk/fdisksgilabel.c:93
 msgid "SGI xvm"
-msgstr ""
+msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
-msgstr ""
+msgstr "Linux Ó×ÏÐ"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
-msgstr ""
+msgstr "Linux ÓÏÂÓÔ×ÅÎ."
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
-msgstr ""
+msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:96
+#: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
-msgstr ""
+msgstr "Linux RAID"
 
-#: fdisk/fdisksgilabel.c:159
-msgid ""
-"According to MIPS Computer Systems, Inc the Label must not contain more than "
-"512 bytes\n"
-msgstr ""
+#: fdisk/fdisksgilabel.c:163
+msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
+msgstr "÷ ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó MIPS Computer Systems, Inc ÍÅÔËÁ ÎÅ ÄÏÌÖÎÁ ÓÏÄÅÒÖÁÔØ ÂÏÌÅÅ 512 ÂÁÊÔ\n"
 
-#: fdisk/fdisksgilabel.c:178
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
-msgstr ""
+msgstr "ïÂÎÁÒÕÖÅÎÁ ÍÅÔËÁ ÄÉÓËÁ sgi Ó ÎÅ×ÅÒÎÏÊ ËÏÎÔÒÏÌØÎÏÊ ÓÕÍÍÏÊ.\n"
 
-#: fdisk/fdisksgilabel.c:201
+#: fdisk/fdisksgilabel.c:198
 #, c-format
 msgid ""
 "\n"
@@ -2905,8 +3325,15 @@ msgid ""
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
+"\n"
+"äÉÓË %s (ÍÅÔËÁ ÄÉÓËÁ SGI): %d ÇÏÌÏ×ÏË, %d ÓÅËÔÏÒÏ×\n"
+"%d ÃÉÌÉÎÄÒÏ×, %d ÆÉÚÉÞÅÓËÉÈ ÃÉÌÉÎÄÒÏ×\n"
+"%d ÄÏÐ ÓÅËÔ/ÃÉÌ, ÞÅÒÅÄÏ×ÁÎÉÅ %d:1\n"
+"%s\n"
+"åÄÉÎÉÃÙ = %s ÐÏ %d * 512 ÂÁÊÔ\n"
+"\n"
 
-#: fdisk/fdisksgilabel.c:213
+#: fdisk/fdisksgilabel.c:210
 #, c-format
 msgid ""
 "\n"
@@ -2914,53 +3341,74 @@ msgid ""
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
+"\n"
+"äÉÓË %s (ÍÅÔËÁ ÄÉÓËÁ SGI): %d ÇÏÌÏ×ÏË, %d ÓÅËÔÏÒÏ×, %d ÃÉÌÉÎÄÒÏ×\n"
+"åÄÉÎÉÃÙ = %s ÐÏ %d * 512 ÂÁÊÔ\n"
+"\n"
 
-#: fdisk/fdisksgilabel.c:219
+#: fdisk/fdisksgilabel.c:222
 #, c-format
 msgid ""
 "----- partitions -----\n"
 "Pt# %*s  Info     Start       End   Sectors  Id  System\n"
 msgstr ""
+"------ òÁÚÄÅÌÙ ------\n"
+"ò# %*s  éÎÆÏ    îÁÞÁÌÏ     ëÏÎÅà   óÅËÔÏÒÙ  Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/fdisksgilabel.c:241
+#: fdisk/fdisksgilabel.c:244
 #, c-format
 msgid ""
 "----- Bootinfo -----\n"
 "Bootfile: %s\n"
 "----- Directory Entries -----\n"
 msgstr ""
+"----- Boot-ÉÎÆÏ -----\n"
+"Boot-ÆÁÊÌ: %s\n"
+"----- ðÕÎËÔÙ ËÁÔÁÌÏÇÏ× -----\n"
 
-#: fdisk/fdisksgilabel.c:251
+#: fdisk/fdisksgilabel.c:252
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
-msgstr ""
+msgstr "%2d: %-10s ÓÅËÔÏÒ%5u ÒÁÚÍÅÒ%8u\n"
 
-#: fdisk/fdisksgilabel.c:305
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:306
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
 "\tThe bootfile must be an absolute non-zero pathname,\n"
 "\te.g. \"/unix\" or \"/unix.save\".\n"
 msgstr ""
+"\n"
+"îÅ×ÅÒÎÙÊ Boot-ÆÁÊÌ!\n"
+"\tBoot-ÆÁÊÌ ÄÏÌÖÅÎ ÂÙÔØ ÁÂÓÏÌÀÔÎÙÍ ÎÅÎÕÌÅ×ÙÍ ÐÕÔÅ×ÙÍ ÉÍÅÎÅÍ,\n"
+"\tÎÁÐÒ. \"/unix\" ÉÌÉ \"/unix.save\".\n"
 
 #: fdisk/fdisksgilabel.c:312
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
 msgstr ""
+"\n"
+"\téÍÑ Boot-ÆÁÊÌÁ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ:  ÍÁËÓÉÍÕÍ 16 ÂÁÊÔ.\n"
 
 #: fdisk/fdisksgilabel.c:317
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
 msgstr ""
+"\n"
+"\tBoot-ÆÁÊÌ ÄÏÌÖÅÎ ÉÍÅÔØ ÐÏÌÎÏÓÔØÀ ÕÔÏÞÎÅÎÎÏÅ ÐÕÔÅ×ÏÅ ÉÍÑ.\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"
+"\túÎÁÊÔÅ, ÞÔÏ ÓÕÝÅÓÔ×Ï×ÁÎÉÅ boot-ÆÁÊÌÁ ÎÅ ÐÒÏ×ÅÒÑÅÔÓÑ.\n"
+"\t÷ SGI ÐÏ ÕÍÏÌÞÁÎÉÀ - \"/unix\" É ÄÌÑ ÒÅÚÅÒ×ÎÏÊ ËÏÐÉÉ \"/unix.save\".\n"
 
 #: fdisk/fdisksgilabel.c:350
 #, c-format
@@ -2968,84 +3416,97 @@ msgid ""
 "\n"
 "\tBootfile is changed to \"%s\".\n"
 msgstr ""
+"\n"
+"\tBoot-ÆÁÊÌ ÉÚÍÅÎÅÎ ÎÁ \"%s\".\n"
 
-#: fdisk/fdisksgilabel.c:448
+#: fdisk/fdisksgilabel.c:440
 msgid "More than one entire disk entry present.\n"
-msgstr ""
+msgstr "ðÒÉÓÕÔÓÔ×ÕÅÔ ÂÏÌÅÅ ÏÄÎÏÇÏ ÐÕÎËÔÁ ÄÌÑ ×ÓÅÇÏ ÄÉÓËÁ.\n"
 
-#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:482
+#: fdisk/fdisksgilabel.c:447 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
-msgstr ""
+msgstr "òÁÚÄÅÌÙ ÎÅ ÏÐÒÅÄÅÌÅÎÙ\n"
 
-#: fdisk/fdisksgilabel.c:463
+#: fdisk/fdisksgilabel.c:453
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
-msgstr ""
+msgstr "IRIX ÌÀÂÉÔ, ËÏÇÄÁ òÁÚÄÅÌ 11 ÏÈ×ÁÔÙ×ÁÅÔ ×ÅÓØ ÄÉÓË.\n"
 
-#: fdisk/fdisksgilabel.c:465
+#: fdisk/fdisksgilabel.c:455
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
 "not at diskblock %d.\n"
 msgstr ""
+"òÁÚÄÅÌ ×ÓÅÇÏ ÄÉÓËÁ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó ÂÌÏËÁ 0,\n"
+"Á ÎÅ Ó ÄÉÓËÏ×ÏÇÏ ÂÌÏËÁ %d.\n"
 
-#: fdisk/fdisksgilabel.c:469
+#: fdisk/fdisksgilabel.c:461
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
 "but the disk is %d diskblocks long.\n"
 msgstr ""
+"òÁÚÍÅÒ ÒÁÚÄÅÌÁ ×ÓÅÇÏ ÄÉÓËÁ - ÔÏÌØËÏ %d ÄÉÓËÏ×ÙÈ ÂÌÏËÏ×,\n"
+"Á ÄÌÉÎÁ ÄÉÓËÁ - %d ÄÉÓËÏ×ÙÈ ÂÌÏËÏ×.\n"
 
-#: fdisk/fdisksgilabel.c:476
+#: fdisk/fdisksgilabel.c:467
 msgid "One Partition (#11) should cover the entire disk.\n"
-msgstr ""
+msgstr "ïÄÉÎ òÁÚÄÅÌ (#11) ÄÏÌÖÅÎ ÏÈ×ÁÔÙ×ÁÔØ ×ÅÓØ ÄÉÓË.\n"
 
-#: fdisk/fdisksgilabel.c:488
+#: fdisk/fdisksgilabel.c:477
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d ÎÅ ÎÁÞÉÎÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ.\n"
 
-#: fdisk/fdisksgilabel.c:495
+#: fdisk/fdisksgilabel.c:483
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d ÎÅ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ.\n"
 
-#: fdisk/fdisksgilabel.c:503
+#: fdisk/fdisksgilabel.c:490
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
-msgstr ""
+msgstr "òÁÚÄÅÌÙ %d É %d ÐÅÒÅËÒÙ×ÁÀÔÓÑ × %d ÓÅËÔÏÒÁÈ.\n"
 
-#: fdisk/fdisksgilabel.c:512 fdisk/fdisksgilabel.c:532
+#: fdisk/fdisksgilabel.c:498 fdisk/fdisksgilabel.c:516
 #, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
-msgstr ""
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
+msgstr "îÅÉÓÐÏÌØÚÕÅÍÙÊ ÐÒÏÍÅÖÕÔÏË ÉÚ %8u ÓÅËÔÏÒÏ× - ÓÅËÔÏÒÙ %8u-%u\n"
 
-#: fdisk/fdisksgilabel.c:545
+#: fdisk/fdisksgilabel.c:527
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
 msgstr ""
+"\n"
+"úÁÇÒÕÚÏÞÎÙÊ ÒÁÚÄÅÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
 
-#: fdisk/fdisksgilabel.c:549
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
 msgstr ""
+"\n"
+"òÁÚÄÅÌ Ó×ÏÐÉÎÇÁ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
 
-#: fdisk/fdisksgilabel.c:554
+#: fdisk/fdisksgilabel.c:534
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
 msgstr ""
+"\n"
+"òÁÚÄÅÌ Ó×ÏÐÉÎÇÁ ÎÅ ÉÍÅÅÔ ÔÉÐ swap.\n"
 
-#: fdisk/fdisksgilabel.c:558
+#: fdisk/fdisksgilabel.c:537
 msgid "\tYou have chosen an unusual boot file name.\n"
-msgstr ""
+msgstr "\t÷Ù ×ÙÂÒÁÌÉ ÎÅÏÂÙÞÎÏÅ ÉÍÑ boot-ÆÁÊÌÁ.\n"
 
-#: fdisk/fdisksgilabel.c:569
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:546
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr ""
+msgstr "ë ÓÏÖÁÌÅÎÉÀ ×Ù ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ôÜÇ ÎÅÐÕÓÔÙÈ ÒÁÚÄÅÌÏ×.\n"
 
-#: fdisk/fdisksgilabel.c:576
+#: fdisk/fdisksgilabel.c:552
 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"
@@ -3053,212 +3514,255 @@ 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 ""
+"îÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ, ÞÔÏÂÙ ÒÁÚÄÅÌ ÓÏ\n"
+"ÓÍÅÝÅÎÉÅÍ 0 ÉÍÅÌ ÔÉÐ \"SGI volhdr\", ÓÉÓÔÅÍÁ IRIX\n"
+"ÂÕÄÅÔ ÎÁÄÅÑÔØÓÑ ÎÁ ÎÅÇÏ ÄÌÑ ÉÚ×ÌÅÞÅÎÉÑ ÉÚ ÅÇÏ ËÁÔÁÌÏÇÁ\n"
+"ÓÁÍÏÓÔÏÑÔÅÌØÎÙÈ ÕÔÉÌÉÔ ÔÉÐÁ sash É fx.\n"
+"ôÏÌØËÏ ÒÁÚÄÅÌ ×ÓÅÇÏ ÄÉÓËÁ \"SGI volume\" ÍÏÖÅÔ ÎÁÒÕÛÉÔØ ÜÔÏ.\n"
+"÷×ÅÄÉÔÅ äá, ÅÓÌÉ ×Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÒÁÚÍÅÔÉÌÉ ÜÔÏÔ ÒÁÚÄÅÌ ÏÔÄÅÌØÎÏ.\n"
 
-#: fdisk/fdisksgilabel.c:581 fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksgilabel.c:557 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
-msgstr ""
+msgstr "äá\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:607
+#: fdisk/fdisksgilabel.c:581
 msgid "Do You know, You got a partition overlap on the disk?\n"
-msgstr ""
+msgstr "úÎÁÅÔÅ ÌÉ ×Ù, ÞÔÏ ×Ù ÐÏÌÕÞÉÌÉ ÐÅÒÅËÒÙ×ÁÎÉÅ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓËÅ?\n"
 
-#: fdisk/fdisksgilabel.c:669
+#: fdisk/fdisksgilabel.c:641
 msgid "Attempting to generate entire disk entry automatically.\n"
-msgstr ""
+msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÏÚÄÁÔØ ÐÕÎËÔ ×ÓÅÇÏ ÄÉÓËÁ.\n"
 
-#: fdisk/fdisksgilabel.c:676
+#: fdisk/fdisksgilabel.c:646
 msgid "The entire disk is already covered with partitions.\n"
-msgstr ""
+msgstr "÷ÅÓØ ÄÉÓË ÕÖÅ ÒÁÚÂÉÔ ÎÁ ÒÁÚÄÅÌÙ.\n"
 
-#: fdisk/fdisksgilabel.c:681
+#: fdisk/fdisksgilabel.c:650
 msgid "You got a partition overlap on the disk. Fix it first!\n"
-msgstr ""
+msgstr "÷Ù ÐÏÌÕÞÉÌÉ ÐÅÒÅËÒÙ×ÁÎÉÅ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓËÅ. óÎÁÞÁÌÁ ÉÓÐÒÁ×ØÔÅ ÜÔÏ!\n"
 
-#: fdisk/fdisksgilabel.c:690 fdisk/fdisksgilabel.c:719
+#: fdisk/fdisksgilabel.c:659 fdisk/fdisksgilabel.c:688
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
 msgstr ""
+"îÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ, ÞÔÏÂÙ ÏÄÉÎÎÁÄÃÁÔÙÊ\n"
+"ÒÁÚÄÅÌ ÏÈ×ÁÔÙ×ÁÌ ×ÅÓØ ÄÉÓË É ÉÍÅÌ ÔÉÐ `SGI volume'\n"
 
-#: fdisk/fdisksgilabel.c:706
+#: fdisk/fdisksgilabel.c:675
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
-msgstr ""
+msgstr "÷Ù ÐÏÌÕÞÉÔÅ ÐÅÒÅËÒÙ×ÁÎÉÅ ÒÁÚÄÅÌÏ× ÎÁ ÄÉÓËÅ. óÎÁÞÁÌÁ ÉÓÐÒÁ×ØÔÅ ÜÔÏ!\n"
 
-#: fdisk/fdisksgilabel.c:711
+#: fdisk/fdisksgilabel.c:680
 #, c-format
 msgid " Last %s"
-msgstr ""
+msgstr " ðÏÓÌÅÄÎÉÊ %s"
 
-#: fdisk/fdisksgilabel.c:733
+#: fdisk/fdisksgilabel.c:710
 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 ""
+"óÏÚÄÁÅÔÓÑ ÎÏ×ÁÑ ÍÅÔËÁ ÄÉÓËÁ SGI. éÚÍÅÎÅÎÉÑ ÂÕÄÕÔ ÏÓÔÁ×ÁÔØÓÑ\n"
+"ÔÏÌØËÏ × ÐÁÍÑÔÉ ÄÏ ÔÅÈ ÐÏÒ, ÐÏËÁ ×Ù ÎÅ ÒÅÛÉÔÅ ÚÁÐÉÓÁÔØ ÉÈ.\n"
+"ðÏÓÌÅ ÜÔÏÇÏ, ËÏÎÅÞÎÏ, ÐÒÅÄÙÄÕÝÅÅ ÓÏÄÅÒÖÉÍÏÅ ÎÅÌØÚÑ ÂÕÄÅÔ\n"
+"×ÏÓÓÔÁÎÏ×ÉÔØ.\n"
+"\n"
 
-#: fdisk/fdisksgilabel.c:759
+#: fdisk/fdisksgilabel.c:729
 #, c-format
-msgid "Trying to keep parameters of partition %d.\n"
+msgid ""
+"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %d.\n"
+"This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: BLKGETSIZE ioctl ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ ÎÁ %s. éÓÐÏÌØÚÕÅÔÓÑ ÚÎÁÞÅÎÉÅ ÇÅÏÍÅÔÒÉÉ ÃÉÌÉÎÄÒÁ %d.\n"
+"üÔÏ ÚÎÁÞÅÎÉÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÅÞÅÎÅÎÏ ÄÌÑ ÕÓÔÒÏÊÓÔ× > 33.8 çâ.\n"
+
+#: fdisk/fdisksgilabel.c:742
+#, c-format
+msgid "Trying to keep parameters of partition %d.\n"
+msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ ÓÏÈÒÁÎÉÔØ ÐÁÒÁÍÅÔÒÙ ÒÁÚÄÅÌÁ %d.\n"
 
-#: fdisk/fdisksgilabel.c:761
+#: fdisk/fdisksgilabel.c:744
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
-msgstr ""
+msgstr "ID=%02x\tîáþáìï=%d\täìéîá=%d\n"
 
-#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
+#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
 msgid "Empty"
-msgstr ""
+msgstr "ðÕÓÔÏÊ"
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS root"
-msgstr ""
+msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS swap"
-msgstr ""
+msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS usr"
-msgstr ""
+msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:49
 msgid "Whole disk"
-msgstr ""
+msgstr "Whole disk"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:50
 msgid "SunOS stand"
-msgstr ""
+msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:51
 msgid "SunOS var"
-msgstr ""
+msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:52
 msgid "SunOS home"
-msgstr ""
+msgstr "SunOS home"
 
 #. DOS 3.3+ secondary
-#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:95
+#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:98
 msgid "Linux raid autodetect"
-msgstr ""
+msgstr "á×ÔÏÏÐÒÅÄÅÌÅÎÉÅ Linux raid"
 
-#: fdisk/fdisksunlabel.c:132
+#: fdisk/fdisksunlabel.c:133
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
 "Probably you'll have to set all the values,\n"
 "e.g. heads, sectors, cylinders and partitions\n"
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
+"ïÂÎÁÒÕÖÅÎÁ ÍÅÔËÁ ÄÉÓËÁ sun Ó ÎÅ×ÅÒÎÏÊ\n"
+"ËÏÎÔÒÏÌØÎÏÊ ÓÕÍÍÏÊ. ÷ÏÚÍÏÖÎÏ ×ÁÍ\n"
+"ÐÏÎÁÄÏÂÉÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ×ÓÅ ÚÎÁÞÅÎÉÑ,\n"
+"ÎÁÐÒ. ÇÏÌÏ×ËÉ, ÓÅËÔÏÒÙ, ÃÉÌÉÎÄÒÙ É ÒÁÚÄÅÌÙ,\n"
+"ÉÌÉ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÏÂÎÏ×ÉÔØ ÍÅÔËÕ (ËÏÍÁÎÄÁ\n"
+"s × ÇÌÁ×ÎÏÍ ÍÅÎÀ)\n"
 
-#: fdisk/fdisksunlabel.c:231
+#: fdisk/fdisksunlabel.c:232
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
-msgstr ""
+msgstr "á×ÔÏËÏÎÆÉÇÕÒÁÃÉÑ ÎÁÛÌÁ %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:258
+#: fdisk/fdisksunlabel.c:259
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
+"óÏÚÄÁÅÔÓÑ ÎÏ×ÁÑ ÍÅÔËÁ ÄÉÓËÁ sun. éÚÍÅÎÅÎÉÑ ÂÕÄÕÔ ÏÓÔÁ×ÁÔØÓÑ\n"
+"ÔÏÌØËÏ × ÐÁÍÑÔÉ ÄÏ ÔÅÈ ÐÏÒ, ÐÏËÁ ×Ù ÎÅ ÒÅÛÉÔÅ ÚÁÐÉÓÁÔØ ÉÈ.\n"
+"ðÏÓÌÅ ÜÔÏÇÏ, ËÏÎÅÞÎÏ, ÐÒÅÄÙÄÕÝÅÅ ÓÏÄÅÒÖÉÍÏÅ ÎÅÌØÚÑ ÂÕÄÅÔ\n"
+"×ÏÓÓÔÁÎÏ×ÉÔØ.\n"
+"\n"
 
-#: fdisk/fdisksunlabel.c:269
+#: fdisk/fdisksunlabel.c:270
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
 "   0   custom (with hardware detected defaults)"
 msgstr ""
+"ôÉÐ ÄÉÓËÁ\n"
+"   ?   Á×ÔÏÍÁÔÉÞÅÓËÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ\n"
+"   0   ×ÙÂÏÒÏÞÎÙÊ (ÓÏ ÚÎÁÞÅÎÉÑÍÉ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ÏÂÎÁÒÕÖÅÎÎÏÇÏ ÏÂÏÒÕÄÏ×ÁÎÉÑ)"
 
-#: fdisk/fdisksunlabel.c:279
+#: fdisk/fdisksunlabel.c:280
 msgid "Select type (? for auto, 0 for custom): "
-msgstr ""
+msgstr "÷ÙÂÅÒÉÔÅ ÔÉÐ (? - Á×ÔÏ, 0 - ×ÙÂÏÒÏÞÎÙÊ): "
 
-#: fdisk/fdisksunlabel.c:291
+#: fdisk/fdisksunlabel.c:292
 msgid "Autoconfigure failed.\n"
-msgstr ""
+msgstr "á×ÔÏËÏÎÆÉÇÕÒÁÃÉÑ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ.\n"
 
-#: fdisk/fdisksunlabel.c:319
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
-msgstr ""
+msgstr "óÅËÔÏÒÙ/ÄÏÒÏÖËÁ"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
-msgstr ""
+msgstr "áÌØÔÅÒÎÁÔÉ×ÎÙÅ ÃÉÌÉÎÄÒÙ"
 
-#: fdisk/fdisksunlabel.c:329
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
-msgstr ""
+msgstr "æÉÚÉÞÅÓËÉÅ ÃÉÌÉÎÄÒÙ"
 
-#: fdisk/fdisksunlabel.c:332 fdisk/fdisksunlabel.c:726
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
-msgstr ""
+msgstr "óËÏÒÏÓÔØ ×ÒÁÝÅÎÉÑ (ÏÂ/ÍÉÎ)"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:719
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
-msgstr ""
+msgstr "ëÏÜÆÆÉÃÉÅÎÔ ÞÅÒÅÄÏ×ÁÎÉÑ"
 
-#: fdisk/fdisksunlabel.c:337 fdisk/fdisksunlabel.c:712
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
-msgstr ""
+msgstr "äÏÐÏÌÎÉÔÅÌØÎÙÅ ÓÅËÔÏÒÙ ÎÁ ÃÉÌÉÎÄÒ"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
-msgstr ""
+msgstr "÷Ù ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ×ÓÅ ÐÁÒÁÍÅÔÒÙ ÄÉÓËÁ ÉÚ ÍÅÎÀ x"
 
-#: fdisk/fdisksunlabel.c:358
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
-msgstr ""
+msgstr "3,5\" ÄÉÓË"
 
-#: fdisk/fdisksunlabel.c:358
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
-msgstr ""
+msgstr "Linux ÚÁËÁÚÎÏÊ"
 
-#: fdisk/fdisksunlabel.c:445
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d ÎÁ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ\n"
 
-#: fdisk/fdisksunlabel.c:465
+#: fdisk/fdisksunlabel.c:462
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d ÐÅÒÅËÒÙ×ÁÅÔÓÑ Ó ÄÒÕÇÉÍÉ × ÓÅËÔÏÒÁÈ %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:487
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
-msgstr ""
+msgstr "îÅÉÓÐÏÌØÚÕÅÍÙÊ ÐÒÏÍÅÖÕÔÏË - ÓÅËÔÏÒÙ 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:489 fdisk/fdisksunlabel.c:493
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
-msgstr ""
+msgstr "îÅÉÓÐÏÌØÚÕÅÍÙÊ ÐÒÏÍÅÖÕÔÏË - ÓÅËÔÏÒÙ %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:516
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
+"äÒÕÇÉÅ ÒÁÚÄÅÌÙ ÕÖÅ ÏÈ×ÁÔÙ×ÁÀÔ ×ÅÓØ ÄÉÓË.\n"
+"õÄÁÌÉÔÅ ÎÅËÏÔÏÒÙÅ ÉÌÉ ÕÍÅÎØÛÉÔÅ ÉÈ ÐÅÒÅÄ ÐÏ×ÔÏÒÎÏÊ ÐÏÐÙÔËÏÊ.\n"
 
-#: fdisk/fdisksunlabel.c:592
+#: fdisk/fdisksunlabel.c:589
 #, 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 ""
+"÷Ù ÎÅ ÏÈ×ÁÔÉÌÉ ×ÅÓØ ÄÉÓË 3-Í ÒÁÚÄÅÌÏÍ, ÎÏ ×ÁÛÅ ÚÎÁÞÅÎÉÅ\n"
+"%d %s ÚÁÈ×ÁÔÉÌÏ ÄÒÕÇÏÊ ÒÁÚÄÅÌ. ÷ÁÛ ÐÕÎËÔ ÂÙÌ ÉÚÍÅÎÅÎ\n"
+"ÎÁ %d %s\n"
 
-#: fdisk/fdisksunlabel.c:612
+#: fdisk/fdisksunlabel.c:611
 #, 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 ""
+"åÓÌÉ ×Ù ÈÏÔÉÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÏ×ÍÅÓÔÉÍÏÓÔØ Ó SunOS/Solaris, ÐÏÓÔÁÒÁÊÔÅÓØ\n"
+"ÏÓÔÁ×ÉÔØ ÜÔÏÔ ÒÁÚÄÅÌ ËÁË ×ÅÓØ disk (5), ÎÁÞÉÎÁÑ Ó 0, Ó %u ÓÅËÔÏÒÁÍÉ\n"
 
-#: fdisk/fdisksunlabel.c:625
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3266,8 +3770,15 @@ msgid ""
 "Type YES if you're very sure you would like that partition\n"
 "tagged with 82 (Linux swap): "
 msgstr ""
+"îÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ, ÞÔÏÂÙ ÒÁÚÄÅÌ ÓÏ\n"
+"ÓÍÅÝÅÎÉÅÍ 0 ÂÙÌ Ó ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÏÊ UFS,\n"
+"EXT2FS ÉÌÉ Ó×ÏÐÏÍ SunOS. òÁÚÍÅÝÅÎÉÅ ÎÁ ÎÅÍ Ó×ÏÐÁ\n"
+"Linux ÍÏÖÅÔ ÒÁÚÒÕÛÉÔØ ×ÁÛÕ ÔÁÂÌÉÃÕ ÒÁÚÄÅÌÏ×\n"
+"É ÚÁÇÒÕÚÏÞÎÙÊ ÂÌÏË. ÷×ÅÄÉÔÅ äá, ÅÓÌÉ ×Ù ÐÏÌÎÏÓÔØÀ\n"
+"Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÐÏÍÅÔÉÔØ ÜÔÏÔ ÒÁÚÄÅÌ ËÁË 82\n"
+"82 (Linux Ó×ÏÐ): "
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3278,8 +3789,15 @@ msgid ""
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
+"\n"
+"äÉÓË %s (ÍÅÔËÁ ÄÉÓËÁ Sun): %d ÇÏÌÏ×ÏË, %d ÓÅËÔÏÒÏ×\n"
+"%d ÏÂ/ÍÉÎ, %d ÃÉÌÉÎÄÒÏ×, %d ÁÌØÔÅÒÎÁÔÉ×ÎÙÈ ÃÉÌÉÎÄÒÏ×\n"
+"%d ÆÉÚÉÞÅÓËÉÈ ÃÉÌÉÎÄÒÏ×, %d ÄÏÐ ÓÅËÔ/ÃÉÌ, ÞÅÒÅÄÏ×ÁÎÉÅ %d:1\n"
+"%s\n"
+"åÄÉÎÉÃÙ = %s ÐÏ %d * 512 ÂÁÊÔ\n"
+"\n"
 
-#: fdisk/fdisksunlabel.c:670
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3287,1453 +3805,1514 @@ msgid ""
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
+"\n"
+"äÉÓË %s (ÍÅÔËÁ ÄÉÓËÁ Sun): %d ÇÏÌÏ×ÏË, %d ÓÅËÔÏÒÏ×, %d ÃÉÌÉÎÄÒÏ×\n"
+"åÄÉÎÉÃÙ = %s ÐÏ %d * 512 ÂÁÊÔ\n"
+"\n"
 
-#: fdisk/fdisksunlabel.c:675
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
-msgstr ""
+msgstr "%*s æÌÁÇ   îÁÞÁÌÏ     ëÏÎÅà     âÌÏËÉ   Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/fdisksunlabel.c:700
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
-msgstr ""
+msgstr "ëÏÌÉÞÅÓÔ×Ï ÁÌØÔÅÒÎÁÔÉ×ÎÙÈ ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/fdisksunlabel.c:733
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
-msgstr ""
+msgstr "ëÏÌÉÞÅÓÔ×Ï ÆÉÚÉÞÅÓËÉÈ ÃÉÌÉÎÄÒÏ×"
 
 #: fdisk/i386_sys_types.c:7
 msgid "FAT12"
-msgstr ""
+msgstr "FAT12"
 
 #: fdisk/i386_sys_types.c:8
 msgid "XENIX root"
-msgstr ""
+msgstr "XENIX root"
 
 #: fdisk/i386_sys_types.c:9
 msgid "XENIX usr"
-msgstr ""
+msgstr "XENIX usr"
 
 #: fdisk/i386_sys_types.c:10
 msgid "FAT16 <32M"
-msgstr ""
+msgstr "FAT16 <32M"
 
 #: fdisk/i386_sys_types.c:11
 msgid "Extended"
-msgstr ""
+msgstr "òÁÓÛÉÒÅÎÎÙÊ"
 
 #. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
-msgstr ""
+msgstr "FAT16"
 
 #. DOS 16-bit >=32M
 #: fdisk/i386_sys_types.c:13
 msgid "HPFS/NTFS"
-msgstr ""
+msgstr "HPFS/NTFS"
 
 #. OS/2 IFS, eg, HPFS or NTFS or QNX
 #: fdisk/i386_sys_types.c:14
 msgid "AIX"
-msgstr ""
+msgstr "AIX"
 
 #. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
-msgstr ""
+msgstr "AIX ÚÁÇÒÕÚÏÞÎÙÊ"
 
 #. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
-msgstr ""
+msgstr "OS/2 Boot-ÍÅÎÅÄÖÅÒ"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
-msgstr ""
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
-msgstr ""
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
-msgstr ""
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
-msgstr ""
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 ÒÁÓÛÉÒ. (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
-msgstr ""
+msgstr "OPUS"
 
 #: fdisk/i386_sys_types.c:22
 msgid "Hidden FAT12"
-msgstr ""
+msgstr "óËÒÙÔÙÊ FAT12"
 
 #: fdisk/i386_sys_types.c:23
 msgid "Compaq diagnostics"
-msgstr ""
+msgstr "Compaq ÄÉÁÇÎÏÓÔÉËÁ"
 
 #: fdisk/i386_sys_types.c:24
 msgid "Hidden FAT16 <32M"
-msgstr ""
+msgstr "óËÒÙÔÙÊ FAT16 <32M"
 
 #: fdisk/i386_sys_types.c:25
 msgid "Hidden FAT16"
-msgstr ""
+msgstr "óËÒÙÔÙÊ FAT16"
 
 #: fdisk/i386_sys_types.c:26
 msgid "Hidden HPFS/NTFS"
-msgstr ""
+msgstr "óËÒÙÔÙÊ HPFS/NTFS"
 
 #: fdisk/i386_sys_types.c:27
 msgid "AST SmartSleep"
-msgstr ""
+msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
-msgstr ""
+msgid "Hidden W95 FAT32"
+msgstr "óËÒÙÔÙÊ W95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
-msgstr ""
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "óËÒÙÔÙÊ W95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
-msgstr ""
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "óËÒÙÔÙÊ W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
-msgstr ""
+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 ""
+msgstr "PartitionMagic ×ÏÓÓÔÁÎÏ×ÌÅÎÉÅ"
 
 #: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
-msgstr ""
+msgstr "Venix 80286"
 
 #: fdisk/i386_sys_types.c:35
 msgid "PPC PReP Boot"
-msgstr ""
+msgstr "PPC PReP Boot"
 
 #: fdisk/i386_sys_types.c:36
 msgid "SFS"
-msgstr ""
+msgstr "SFS"
 
 #: fdisk/i386_sys_types.c:37
 msgid "QNX4.x"
-msgstr ""
+msgstr "QNX4.x"
 
 #: fdisk/i386_sys_types.c:38
 msgid "QNX4.x 2nd part"
-msgstr ""
+msgstr "QNX4.x 2-Ñ ÞÁÓÔØ"
 
 #: fdisk/i386_sys_types.c:39
 msgid "QNX4.x 3rd part"
-msgstr ""
+msgstr "QNX4.x 3-Ñ ÞÁÓÔØ"
 
 #: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
-msgstr ""
+msgstr "OnTrack DM"
 
 #: fdisk/i386_sys_types.c:41
 msgid "OnTrack DM6 Aux1"
-msgstr ""
+msgstr "OnTrack DM6 Aux1"
 
 #. (or Novell)
 #: fdisk/i386_sys_types.c:42
 msgid "CP/M"
-msgstr ""
+msgstr "CP/M"
 
 #. CP/M or Microport SysV/AT
 #: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
-msgstr ""
+msgstr "OnTrack DM6 Aux3"
 
 #: fdisk/i386_sys_types.c:44
 msgid "OnTrackDM6"
-msgstr ""
+msgstr "OnTrackDM6"
 
 #: fdisk/i386_sys_types.c:45
 msgid "EZ-Drive"
-msgstr ""
+msgstr "EZ-Drive"
 
 #: fdisk/i386_sys_types.c:46
 msgid "Golden Bow"
-msgstr ""
+msgstr "Golden Bow"
 
 #: fdisk/i386_sys_types.c:47
 msgid "Priam Edisk"
-msgstr ""
+msgstr "Priam Edisk"
 
 #. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:86
-#: fdisk/i386_sys_types.c:92 fdisk/i386_sys_types.c:93
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:89
+#: fdisk/i386_sys_types.c:95 fdisk/i386_sys_types.c:96
 msgid "SpeedStor"
-msgstr ""
+msgstr "SpeedStor"
 
 #: fdisk/i386_sys_types.c:49
 msgid "GNU HURD or SysV"
-msgstr ""
+msgstr "GNU HURD ÉÌÉ SysV"
 
 #. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
-msgstr ""
+msgstr "Novell Netware 286"
 
 #: fdisk/i386_sys_types.c:51
 msgid "Novell Netware 386"
-msgstr ""
+msgstr "Novell Netware 386"
 
 #: fdisk/i386_sys_types.c:52
 msgid "DiskSecure Multi-Boot"
-msgstr ""
+msgstr "DiskSecure Multi-Boot"
 
 #: fdisk/i386_sys_types.c:53
 msgid "PC/IX"
-msgstr ""
+msgstr "PC/IX"
 
 #: fdisk/i386_sys_types.c:54
 msgid "Old Minix"
-msgstr ""
+msgstr "Old Minix"
 
 #. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
-msgstr ""
+msgstr "Minix / ÓÔÁÒÙÊ Linux"
 
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
-msgstr ""
+msgstr "OS/2 ÓËÒÙÔÙÊ ÄÉÓË C:"
 
 #: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
-msgstr ""
+msgstr "Linux ÒÁÓÛÉÒÅÎ"
 
 #: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
-msgstr ""
+msgstr "NTFS ÎÁÂÏÒ ÔÏÍÏ×"
 
 #: fdisk/i386_sys_types.c:63
 msgid "Amoeba"
-msgstr ""
+msgstr "Amoeba"
 
 #: fdisk/i386_sys_types.c:64
 msgid "Amoeba BBT"
-msgstr ""
+msgstr "Amoeba BBT"
 
 #. (bad block table)
 #: fdisk/i386_sys_types.c:65
 msgid "BSD/OS"
-msgstr ""
+msgstr "BSD/OS"
 
 #. BSDI
 #: fdisk/i386_sys_types.c:66
 msgid "IBM Thinkpad hibernation"
-msgstr ""
+msgstr "IBM Thinkpad hibernation"
 
 #: fdisk/i386_sys_types.c:67
 msgid "FreeBSD"
-msgstr ""
+msgstr "FreeBSD"
 
 #. various BSD flavours
 #: fdisk/i386_sys_types.c:68
 msgid "OpenBSD"
-msgstr ""
+msgstr "OpenBSD"
 
 #: fdisk/i386_sys_types.c:69
 msgid "NeXTSTEP"
-msgstr ""
+msgstr "NeXTSTEP"
 
 #: fdisk/i386_sys_types.c:70
-msgid "NetBSD"
-msgstr ""
+msgid "Darwin UFS"
+msgstr "Darwin UFS"
 
 #: fdisk/i386_sys_types.c:71
-msgid "BSDI fs"
-msgstr ""
+msgid "NetBSD"
+msgstr "NetBSD"
 
 #: fdisk/i386_sys_types.c:72
-msgid "BSDI swap"
-msgstr ""
+msgid "Darwin boot"
+msgstr "Darwin ÚÁÇÒÕÚÏÞÎÙÊ"
 
 #: fdisk/i386_sys_types.c:73
-msgid "Boot Wizard hidden"
-msgstr ""
+msgid "BSDI fs"
+msgstr "BSDI ÆÓ"
 
 #: fdisk/i386_sys_types.c:74
-msgid "DRDOS/sec (FAT-12)"
-msgstr ""
+msgid "BSDI swap"
+msgstr "BSDI Ó×ÏÐ"
 
 #: fdisk/i386_sys_types.c:75
-msgid "DRDOS/sec (FAT-16 < 32M)"
-msgstr ""
+msgid "Boot Wizard hidden"
+msgstr "Boot Wizard ÓËÒÙÔÙÊ"
 
 #: fdisk/i386_sys_types.c:76
-msgid "DRDOS/sec (FAT-16)"
-msgstr ""
+msgid "Solaris boot"
+msgstr "Solaris ÚÁÇÒ."
 
 #: fdisk/i386_sys_types.c:77
-msgid "Syrinx"
-msgstr ""
+msgid "DRDOS/sec (FAT-12)"
+msgstr "DRDOS/sec (FAT-12)"
 
 #: fdisk/i386_sys_types.c:78
-msgid "Non-FS data"
-msgstr ""
+msgid "DRDOS/sec (FAT-16 < 32M)"
+msgstr "DRDOS/sec (FAT-16 < 32M)"
 
 #: fdisk/i386_sys_types.c:79
+msgid "DRDOS/sec (FAT-16)"
+msgstr "DRDOS/sec (FAT-16)"
+
+#: fdisk/i386_sys_types.c:80
+msgid "Syrinx"
+msgstr "Syrinx"
+
+#: fdisk/i386_sys_types.c:81
+msgid "Non-FS data"
+msgstr "äÁÎÎÙÅ ÎÅ æó"
+
+#: fdisk/i386_sys_types.c:82
 msgid "CP/M / CTOS / ..."
-msgstr ""
+msgstr "CP/M / CTOS / ..."
 
 #. CP/M or Concurrent CP/M or
 #. Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:84
 msgid "Dell Utility"
-msgstr ""
+msgstr "Dell Utility"
 
 #. Dell PowerEdge Server utilities
-#: fdisk/i386_sys_types.c:82
+#: fdisk/i386_sys_types.c:85
 msgid "BootIt"
-msgstr ""
+msgstr "BootIt"
 
 #. BootIt EMBRM
-#: fdisk/i386_sys_types.c:83
+#: fdisk/i386_sys_types.c:86
 msgid "DOS access"
-msgstr ""
+msgstr "DOS access"
 
 #. DOS access or SpeedStor 12-bit FAT
 #. extended partition
-#: fdisk/i386_sys_types.c:85
+#: fdisk/i386_sys_types.c:88
 msgid "DOS R/O"
-msgstr ""
+msgstr "DOS R/O"
 
 #. SpeedStor 16-bit FAT extended
 #. partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:88
+#: fdisk/i386_sys_types.c:91
 msgid "BeOS fs"
-msgstr ""
+msgstr "BeOS ÆÓ"
 
-#: fdisk/i386_sys_types.c:89
+#: fdisk/i386_sys_types.c:92
 msgid "EFI GPT"
-msgstr ""
+msgstr "EFI GPT"
 
 #. Intel EFI GUID Partition Table
-#: fdisk/i386_sys_types.c:90
+#: fdisk/i386_sys_types.c:93
 msgid "EFI (FAT-12/16/32)"
-msgstr ""
+msgstr "EFI (FAT-12/16/32)"
 
 #. Intel EFI System Partition
-#: fdisk/i386_sys_types.c:91
+#: fdisk/i386_sys_types.c:94
 msgid "Linux/PA-RISC boot"
-msgstr ""
+msgstr "Linux/PA-RISC ÚÁÇÒ."
 
 #. SpeedStor large partition
-#: fdisk/i386_sys_types.c:94
+#: fdisk/i386_sys_types.c:97
 msgid "DOS secondary"
-msgstr ""
+msgstr "DOS ×ÔÏÒÉÞÎÙÊ"
 
 #. New (2.2.x) raid partition with
 #. autodetect using persistent
 #. superblock
-#: fdisk/i386_sys_types.c:98
+#: fdisk/i386_sys_types.c:101
 msgid "LANstep"
-msgstr ""
+msgstr "LANstep"
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:99
+#: fdisk/i386_sys_types.c:102
 msgid "BBT"
-msgstr ""
+msgstr "BBT"
 
-#: fdisk/sfdisk.c:152
+#: fdisk/sfdisk.c:151
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÐÏÉÓËÁ ÎÁ %s - ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %lu\n"
 
-#: fdisk/sfdisk.c:157
+#: fdisk/sfdisk.c:156
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÐÏÉÓËÁ: ÎÕÖÎÙ 0x%08x%08x, ÐÏÌÕÞÅÎÙ 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:203
+#: fdisk/sfdisk.c:202
 msgid "out of memory - giving up\n"
-msgstr ""
+msgstr "ÎÅÈ×ÁÔËÁ ÐÁÍÑÔÉ - ÓÄÁÀÓØ\n"
 
-#: fdisk/sfdisk.c:208 fdisk/sfdisk.c:291
+#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ Ó %s - ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÅËÔÏÒ %lu\n"
 
-#: fdisk/sfdisk.c:226
+#: fdisk/sfdisk.c:225
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
-msgstr ""
+msgstr "ïûéâëá: ÓÅËÔÏÒ %lu ÎÅ ÉÍÅÅÔ ÓÉÇÎÁÔÕÒÙ msdos\n"
 
-#: fdisk/sfdisk.c:241
+#: fdisk/sfdisk.c:240
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÎÁ %s - ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÅËÔÏÒ %lu\n"
 
-#: fdisk/sfdisk.c:279
+#: fdisk/sfdisk.c:278
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ Ó ÓÏÈÒÁÎÅÎÎÙÍ ÓÅËÔÏÒÏÍ ÒÁÚÄÅÌÁ (%s)\n"
 
-#: fdisk/sfdisk.c:297
+#: fdisk/sfdisk.c:296
 #, c-format
 msgid "write error on %s\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÎÁ %s\n"
 
-#: fdisk/sfdisk.c:315
+#: fdisk/sfdisk.c:314
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÒÁÚÄÅÌÁ (%s)\n"
 
-#: fdisk/sfdisk.c:320
+#: fdisk/sfdisk.c:319
 msgid "partition restore file has wrong size - not restoring\n"
-msgstr ""
+msgstr "ÆÁÊÌ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÒÁÚÄÅÌÁ ÉÍÅÅÔ ÎÅ×ÅÒÎÙÊ ÒÁÚÍÅÒ - ×ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÏÔÍÅÎÅÎÏ\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:323
 msgid "out of memory?\n"
-msgstr ""
+msgstr "ÎÅÈ×ÁÔËÁ ÐÁÍÑÔÉ?\n"
 
-#: fdisk/sfdisk.c:330
+#: fdisk/sfdisk.c:329
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÒÁÚÄÅÌÁ  (%s)\n"
 
-#: fdisk/sfdisk.c:336
+#: fdisk/sfdisk.c:335
 #, c-format
 msgid "error reading %s\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ %s\n"
 
-#: fdisk/sfdisk.c:343
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open device %s for writing\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÕÓÔÒÏÊÓÔ×Ï %s ÄÌÑ ÚÁÐÉÓÉ\n"
 
-#: fdisk/sfdisk.c:355
+#: fdisk/sfdisk.c:354
 #, c-format
 msgid "error writing sector %lu on %s\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÓÅËÔÏÒÁ %lu ÎÁ %s\n"
 
-#: fdisk/sfdisk.c:406
+#: fdisk/sfdisk.c:405
 #, c-format
 msgid "Disk %s: cannot get size\n"
-msgstr ""
+msgstr "äÉÓË %s: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÁÚÍÅÒ\n"
 
-#: fdisk/sfdisk.c:411
+#: fdisk/sfdisk.c:410
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
-msgstr ""
+msgstr "äÉÓË %s: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÇÅÏÍÅÔÒÉÀ\n"
 
-#: fdisk/sfdisk.c:435
+#: fdisk/sfdisk.c:434
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
 "the entire disk. Using fdisk on it is probably meaningless.\n"
 "[Use the --force option if you really want this]\n"
 msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÁÞÁÌÏ=%lu - ÐÏÈÏÖÅ, ÞÔÏ ÜÔÏ ÓËÏÒÅÅ\n"
+"ÒÁÚÄÅÌ, ÞÅÍ ×ÅÓØ ÄÉÓË. éÓÐÏÌØÚÏ×ÁÎÉÅ ÎÁ ÎÅÍ fdisk\n"
+"×ÅÒÏÑÔÎÏ ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ.\n"
+"[éÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ --force, ÅÓÌÉ ×Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÜÔÏÇÏ]\n"
 
-#: fdisk/sfdisk.c:442
+#: fdisk/sfdisk.c:441
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: HDIO_GETGEO ÓÏÏÂÝÉÌ, ÞÔÏ ÉÍÅÅÔÓÑ %lu ÇÏÌÏ×ÏË\n"
 
-#: fdisk/sfdisk.c:445
+#: fdisk/sfdisk.c:444
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: HDIO_GETGEO ÓÏÏÂÝÉÌ, ÞÔÏ ÉÍÅÅÔÓÑ %lu ÓÅËÔÏÒÏ×\n"
 
-#: fdisk/sfdisk.c:449
+#: fdisk/sfdisk.c:448
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: BLKGETSIZE/HDIO_GETGEO ÓÏÏÂÝÉÌ, ÞÔÏ ÉÍÅÅÔÓÑ %lu ÃÉÌÉÎÄÒÏ×\n"
 
-#: fdisk/sfdisk.c:453
+#: fdisk/sfdisk.c:452
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÍÁÌÏ×ÅÒÏÑÔÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÓÅËÔÏÒÏ× (%lu) - ÏÂÙÞÎÏ ÉÈ 63\n"
+"üÔÏ ×ÙÚÏ×ÅÔ ÐÒÏÂÌÅÍÙ Õ ×ÓÅÈ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ ÁÄÒÅÓÁÃÉÀ C/H/S.\n"
 
-#: fdisk/sfdisk.c:457
+#: fdisk/sfdisk.c:456
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
+"\n"
+"äÉÓË %s: %lu ÃÉÌÉÎÄÒÏ×, %lu ÇÏÌÏ×ÏË, %lu ÓÅËÔÏÒÏ×/ÄÏÒÏÖËÕ\n"
 
-#: fdisk/sfdisk.c:539
+#: fdisk/sfdisk.c:538
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
-msgstr ""
+msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr "%s ÒÁÚÄÅÌÁ %s ÉÍÅÅÔ ÎÅ×ÏÚÍÏÖÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÇÏÌÏ×ËÉ: %lu (ÄÏÌÖÎÏ ÂÙÔØ ÍÅÖÄÕ 0-%lu)\n"
 
-#: fdisk/sfdisk.c:544
+#: fdisk/sfdisk.c:543
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for sector: %lu (should be in "
-"1-%lu)\n"
-msgstr ""
+msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
+msgstr "%s ÒÁÚÄÅÌÁ %s ÉÍÅÅÔ ÎÅ×ÏÚÍÏÖÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÓÅËÔÏÒÁ: %lu (ÄÏÌÖÎÏ ÂÙÔØ ÍÅÖÄÕ 1-%lu)\n"
 
-#: fdisk/sfdisk.c:549
+#: fdisk/sfdisk.c:548
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for cylinders: %lu (should be in "
-"0-%lu)\n"
-msgstr ""
+msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
+msgstr "%s ÒÁÚÄÅÌÁ %s ÉÍÅÅÔ ÎÅ×ÏÚÍÏÖÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ ÃÉÌÉÎÄÒÏ×: %lu (ÄÏÌÖÎÏ ÂÙÔØ ÍÅÖÄÕ 0-%lu)\n"
 
-#: fdisk/sfdisk.c:589
+#: fdisk/sfdisk.c:588
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr ""
+"Id  éÍÑ\n"
+"\n"
 
-#: fdisk/sfdisk.c:742
+#: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
-msgstr ""
+msgstr "ðÅÒÅÞÉÔÙ×ÁÅÔÓÑ ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ×...\n"
 
-#: fdisk/sfdisk.c:748
+#: fdisk/sfdisk.c:747
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
+"ëÏÍÁÎÄÁ ÐÅÒÅÞÉÔÙ×ÁÎÉÑ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×\n"
+"ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ. ðÅÒÅÇÒÕÚÉÔÅ Ó×ÏÀ\n"
+"ÓÉÓÔÅÍÕ ÐÅÒÅÄ ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ mkfs\n"
 
-#: fdisk/sfdisk.c:753
+#: fdisk/sfdisk.c:752
 #, c-format
 msgid "Error closing %s\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ÚÁËÒÙÔÉÑ %s\n"
 
-#: fdisk/sfdisk.c:791
+#: fdisk/sfdisk.c:790
 #, c-format
 msgid "%s: no such partition\n"
-msgstr ""
+msgstr "%s: ÎÅÔ ÔÁËÏÇÏ ÒÁÚÄÅÌÁ\n"
 
-#: fdisk/sfdisk.c:814
+#: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
-msgstr ""
+msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÆÏÒÍÁÔ - ÉÓÐÏÌØÚÕÀÔÓÑ ÓÅËÔÏÒÙ\n"
 
-#: fdisk/sfdisk.c:853
+#: fdisk/sfdisk.c:852
 #, c-format
 msgid "# partition table of %s\n"
-msgstr ""
+msgstr "# ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× %s\n"
 
-#: fdisk/sfdisk.c:864
+#: fdisk/sfdisk.c:863
 #, c-format
 msgid "unimplemented format - using %s\n"
-msgstr ""
+msgstr "ÎÅÏÂÓÌÕÖÉ×ÁÅÍÙÊ ÆÏÒÍÁÔ - ÉÓÐÏÌØÚÕÅÔÓÑ %s\n"
 
-#: fdisk/sfdisk.c:868
+#: fdisk/sfdisk.c:867
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
+"åÄÉÎÉÃÙ = ÃÉÌÉÎÄÒÙ ÐÏ %lu ÂÁÊÔ, ÂÌÏËÉ ÐÏ 1024 ÂÁÊÔ, ÎÁÞÉÎÁÑ Ó %d\n"
+"\n"
 
-#: fdisk/sfdisk.c:871
-msgid "   Device Boot Start     End   #cyls   #blocks   Id  System\n"
-msgstr ""
+#: fdisk/sfdisk.c:870
+msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
+msgstr "  õÓÔÒ-×Ï úÁÇÒ   îÁÞ   ëÏÎÅà    #ÃÉÌ     #ÂÌÏËÉ   Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/sfdisk.c:876
+#: fdisk/sfdisk.c:875
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
+"åÄÉÎÉÃÙ = ÓÅËÔÏÒÙ ÐÏ 512 ÂÁÊÔ, ÎÁÞÉÎÁÑ Ó %d\n"
+"\n"
 
-#: fdisk/sfdisk.c:878
-msgid "   Device Boot    Start       End  #sectors  Id  System\n"
-msgstr ""
+#: fdisk/sfdisk.c:877
+msgid "   Device Boot    Start       End   #sectors  Id  System\n"
+msgstr "  õÓÔÒ-×Ï úÁÇÒ   îÁÞÁÌÏ     ëÏÎÅà   #ÓÅËÔÏÒÙ  Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/sfdisk.c:881
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
+"åÄÉÎÉÃÙ = ÂÌÏËÉ ÐÏ 1024 ÂÁÊÔ, ÎÁÞÉÎÁÑ Ó %d\n"
+"\n"
 
-#: fdisk/sfdisk.c:883
-msgid "   Device Boot   Start       End   #blocks   Id  System\n"
-msgstr ""
+#: fdisk/sfdisk.c:882
+msgid "   Device Boot   Start       End    #blocks   Id  System\n"
+msgstr "  õÓÔÒ-×Ï úÁÇÒ  îÁÞÁÌÏ     ëÏÎÅà     #ÂÌÏËÉ   Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/sfdisk.c:886
+#: fdisk/sfdisk.c:885
 #, c-format
 msgid ""
-"Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
+"Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
+"åÄÉÎÉÃÙ = mebi-ÂÁÊÔÙ ÐÏ 1048576 ÂÁÊÔ, ÂÌÏËÉ ÐÏ 1024 ÂÁÊÔ, ÎÁÞÉÎÁÑ Ó %d\n"
+"\n"
 
-#: fdisk/sfdisk.c:888
-msgid "   Device Boot Start   End     MB   #blocks   Id  System\n"
-msgstr ""
+#: fdisk/sfdisk.c:887
+msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
+msgstr "  õÓÔÒ-×Ï úÁÇÒ   îÁÞ ëÏÎÅà    íiB     #ÂÌÏËÉ   Id  óÉÓÔÅÍÁ\n"
 
-#: fdisk/sfdisk.c:1020
+#: fdisk/sfdisk.c:1047
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
+msgstr "\t\tÎÁÞÁÌÏ: (c,h,s) ÏÖÉÄÁÌÏÓØ (%ld,%ld,%ld) ÎÁÊÄÅÎÏ (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1027
+#: fdisk/sfdisk.c:1054
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
+msgstr "\t\tËÏÎÅÃ: (c,h,s) ÏÖÉÄÁÌÏÓØ (%ld,%ld,%ld) ÎÁÊÄÅÎÏ (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1030
+#: fdisk/sfdisk.c:1057
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
-msgstr ""
+msgstr "ÒÁÚÄÅÌ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÃÉÌÉÎÄÒÅ %ld, ÐÏÓÌÅ ËÏÎÃÁ ÄÉÓËÁ\n"
 
-#: fdisk/sfdisk.c:1041
+#: fdisk/sfdisk.c:1067
 msgid "No partitions found\n"
-msgstr ""
+msgstr "òÁÚÄÅÌÙ ÎÅ ÎÁÊÄÅÎÙ\n"
 
-#: fdisk/sfdisk.c:1048
+#: fdisk/sfdisk.c:1071
 #, c-format
 msgid ""
-"Warning: The first partition looks like it was made\n"
+"Warning: The partition table looks like it was made\n"
 "  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
 "For this listing I'll assume that geometry.\n"
 msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ôÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ×ÙÇÌÑÄÉÔ ÔÁË,\n"
+"ÓÌÏ×ÎÏ ÏÎÁ ÂÙÌÁ ÓÏÚÄÁÎÁ ÄÌÑ C/H/S=*/%ld/%ld\n"
+"(×ÍÅÓÔÏ %ld/%ld/%ld).\n"
+"äÌÑ ÌÉÓÔÉÎÇÁ ÂÕÄÅÔ ÐÏÄÒÁÚÕÍÅ×ÁÔØÓÑ ÜÔÁ ÇÅÏÍÅÔÒÉÑ.\n"
 
-#: fdisk/sfdisk.c:1098
+#: fdisk/sfdisk.c:1120
 msgid "no partition table present.\n"
-msgstr ""
+msgstr "ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÏÔÓÕÔÓÔ×ÕÅÔ.\n"
 
-#: fdisk/sfdisk.c:1100
+#: fdisk/sfdisk.c:1122
 #, c-format
 msgid "strange, only %d partitions defined.\n"
-msgstr ""
+msgstr "ÓÔÒÁÎÎÏ, ÏÐÒÅÄÅÌÅÎÙ ÔÏÌØËÏ ÒÁÚÄÅÌÙ %d.\n"
 
-#: fdisk/sfdisk.c:1109
+#: fdisk/sfdisk.c:1131
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÉÍÅÅÔ ÎÕÌÅ×ÏÊ ÒÁÚÍÅÒ, ÎÏ ÏÎ ÎÅ ÐÏÍÅÞÅÎ ËÁË ÐÕÓÔÏÊ\n"
 
-#: fdisk/sfdisk.c:1112
+#: fdisk/sfdisk.c:1134
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÉÍÅÅÔ ÎÕÌÅ×ÏÊ ÒÁÚÍÅÒ É Ñ×ÌÑÅÔÓÑ ÚÁÇÒÕÚÏÞÎÙÍ\n"
 
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1137
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÉÍÅÅÔ ÎÕÌÅ×ÏÊ ÒÁÚÍÅÒ É ÎÅÎÕÌÅ×ÏÅ ÎÁÞÁÌÏ\n"
 
-#: fdisk/sfdisk.c:1126
+#: fdisk/sfdisk.c:1148
 #, c-format
 msgid "Warning: partition %s "
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s "
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1149
 #, c-format
 msgid "is not contained in partition %s\n"
-msgstr ""
+msgstr "ÎÅ ÎÁÈÏÄÉÔÓÑ × ÒÁÚÄÅÌÅ %s\n"
 
-#: fdisk/sfdisk.c:1138
+#: fdisk/sfdisk.c:1160
 #, c-format
 msgid "Warning: partitions %s "
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌÙ %s "
 
-#: fdisk/sfdisk.c:1139
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "and %s overlap\n"
-msgstr ""
+msgstr "É ÐÅÒÅËÒÙ×ÁÅÔÓÑ Ó %s\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1172
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÓÏÄÅÒÖÉÔ ÞÁÓÔØ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ× (ÓÅËÔÏÒ %lu),\n"
+"É ÒÁÚÒÕÛÉÔ ÅÅ ÐÒÉ ÚÁÐÏÌÎÅÎÉÉ\n"
 
-#: fdisk/sfdisk.c:1162
+#: fdisk/sfdisk.c:1184
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÎÁÞÉÎÁÅÔÓÑ Ó ÎÕÌÅ×ÏÇÏ ÓÅËÔÏÒÁ\n"
 
-#: fdisk/sfdisk.c:1166
+#: fdisk/sfdisk.c:1188
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÒÁÓÐÏÌÏÇÁÅÔÓÑ ÄÏ ËÏÎÃÁ ÄÉÓËÁ\n"
 
-#: fdisk/sfdisk.c:1181
+#: fdisk/sfdisk.c:1203
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
+"óÒÅÄÉ ÏÓÎÏ×ÎÙÈ ÒÁÚÄÅÌÏ× ÚÁÞÁÓÔÕÀ ÔÏÌØËÏ ÏÄÉÎ ÍÏÖÅÔ\n"
+"ÂÙÔØ ÒÁÓÛÉÒÅÎ (ÔÅÍ ÎÅ ÍÅÎÅÅ, ÄÌÑ Linux ÜÔÏ ÎÅ ÐÒÏÂÌÅÍÁ)\n"
 
-#: fdisk/sfdisk.c:1199
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÎÅ ÎÁÞÉÎÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ\n"
 
-#: fdisk/sfdisk.c:1205
+#: fdisk/sfdisk.c:1227
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÚÄÅÌ %s ÎÅ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÃÉÌÉÎÄÒÁ\n"
 
-#: fdisk/sfdisk.c:1223
+#: fdisk/sfdisk.c:1245
 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 ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÂÏÌÅÅ ÏÄÎÏÇÏ ÒÁÚÄÅÌÁ ÐÏÍÅÞÅÎÏ ËÁË ÚÁÇÒÕÚÏÞÎÙÊ (ÁËÔÉ×ÎÙÊ)\n"
+"üÔÏ ÎÅ ÉÍÅÅÔ ÚÎÁÞÅÎÉÑ ÄÌÑ LILO, ÎÏ DOS'Ï×ÓËÉÊ MBR ÎÅ ÚÁÇÒÕÚÉÔ ÜÔÏÔ ÄÉÓË.\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1252
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÂÙÞÎÏ ÚÁÇÒÕÚËÁ ÍÏÖÅÔ ÂÙÔØ ×ÙÐÏÌÎÅÎÁ ÔÏÌØËÏ Ó ÏÓÎÏ×ÎÙÈ ÒÁÚÄÅÌÏ×\n"
+"LILO ÉÇÎÏÒÉÒÕÅÔ ÆÌÁÇ `ÚÁÇÒÕÚÏÞÎÙÊ'.\n"
 
-#: fdisk/sfdisk.c:1236
+#: fdisk/sfdisk.c:1258
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÔ ÏÓÎÏ×ÎÏÇÏ ÒÁÚÄÅÌÁ, ÐÏÍÅÞÅÎÎÏÇÏ ËÁË ÚÁÇÒÕÚÏÞÎÙÊ (ÁËÔÉ×ÎÙÊ)\n"
+"üÔÏ ÎÅ ÉÍÅÅÔ ÚÎÁÞÅÎÉÑ ÄÌÑ LILO, ÎÏ DOS'Ï×ÓËÉÊ MBR ÎÅ ÚÁÇÒÕÚÉÔ ÜÔÏÔ ÄÉÓË.\n"
+
+#: fdisk/sfdisk.c:1272
+msgid "start"
+msgstr "ÎÁÞÁÌÏ"
 
-#: fdisk/sfdisk.c:1253
+#: fdisk/sfdisk.c:1275
 #, c-format
-msgid ""
-"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
+msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "ÒÁÚÄÅÌ %s: ÎÁÞÁÌÏ: (c,h,s) ÏÖÉÄÁÌÏÓØ (%ld,%ld,%ld) ÎÁÊÄÅÎÏ (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1262
+#: fdisk/sfdisk.c:1281
+msgid "end"
+msgstr "ËÏÎÅÃ"
+
+#: fdisk/sfdisk.c:1284
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
+msgstr "ÒÁÚÄÅÌ %s: ËÏÎÅÃ: (c,h,s) ÏÖÉÄÁÌÏÓØ (%ld,%ld,%ld) ÎÁÊÄÅÎÏ (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1265
+#: fdisk/sfdisk.c:1287
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
-msgstr ""
+msgstr "ÒÁÚÄÅÌ %s ÚÁËÁÎÞÉ×ÁÅÔÓÑ ÎÁ ÃÉÌÉÎÄÒÅ %ld, ÐÏÓÌÅ ËÏÎÃÁ ÄÉÓËÁ\n"
 
-#: fdisk/sfdisk.c:1290
+#: fdisk/sfdisk.c:1312
 #, 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 ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÁÞÁÌÏ ÒÁÓÛÉÒÅÎÎÏÇÏ ÒÁÚÄÅÌÁ ÓÄ×ÉÎÕÔÏ Ó %ld ÎÁ %ld\n"
+"(ôÏÌØËÏ ÄÌÑ ×Ù×ÏÄÁ ÌÉÓÔÉÎÇÁ, ÂÅÚ ÉÚÍÅÎÅÎÉÑ ÅÇÏ ÓÏÄÅÒÖÉÍÏÇÏ.)\n"
 
-#: fdisk/sfdisk.c:1296
+#: fdisk/sfdisk.c:1318
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ ÎÅ ÎÁÞÉÎÁÅÔÓÑ ÎÁ ÇÒÁÎÉÃÅ ÒÁÚÄÅÌÁ.\n"
+"DOS É Linux ÂÕÄÕÔ ÉÎÔÅÒÐÒÅÔÉÒÏ×ÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÐÏ-Ó×ÏÅÍÕ.\n"
 
-#: fdisk/sfdisk.c:1314 fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
-msgstr ""
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÒÁÚÄÅÌÏ× - ÉÇÎÏÒÉÒÕÀÔÓÑ ÜÔÉ ÐÏÓÌÅÄÎÉÅ ÎÏÍÅÒÁ (%d)\n"
 
-#: fdisk/sfdisk.c:1329
+#: fdisk/sfdisk.c:1351
 msgid "tree of partitions?\n"
-msgstr ""
+msgstr "ÄÅÒÅ×Ï ÒÁÚÄÅÌÏ×?\n"
 
-#: fdisk/sfdisk.c:1450
+#: fdisk/sfdisk.c:1472
 msgid "detected Disk Manager - unable to handle that\n"
-msgstr ""
+msgstr "ÏÂÎÁÒÕÖÅÎ ÍÅÎÅÄÖÅÒ ÄÉÓËÏ× - ÎÅ×ÏÚÍÏÖÎÏ ÏÂÒÁÂÏÔÁÔØ\n"
 
-#: fdisk/sfdisk.c:1457
+#: fdisk/sfdisk.c:1479
 msgid "DM6 signature found - giving up\n"
-msgstr ""
+msgstr "îÁÊÄÅÎÁ ÓÉÇÎÁÔÕÒÁ DM6  - ÓÄÁÀÓØ\n"
 
-#: fdisk/sfdisk.c:1477
+#: fdisk/sfdisk.c:1499
 msgid "strange..., an extended partition of size 0?\n"
-msgstr ""
+msgstr "ÓÔÒÁÎÎÏ... ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ ÎÕÌÅ×ÏÇÏ ÒÁÚÍÅÒÁ?\n"
 
-#: fdisk/sfdisk.c:1484 fdisk/sfdisk.c:1495
+#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
 msgid "strange..., a BSD partition of size 0?\n"
-msgstr ""
+msgstr "ÓÔÒÁÎÎÏ... ÒÁÚÄÅÌ BSD ÎÕÌÅ×ÏÇÏ ÒÁÚÍÅÒÁ?\n"
 
-#: fdisk/sfdisk.c:1529
+#: fdisk/sfdisk.c:1551
 #, c-format
 msgid " %s: unrecognized partition\n"
-msgstr ""
+msgstr " %s: ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÒÁÚÄÅÌ\n"
 
-#: fdisk/sfdisk.c:1541
+#: fdisk/sfdisk.c:1563
 msgid "-n flag was given: Nothing changed\n"
-msgstr ""
+msgstr "âÙÌ ÕËÁÚÁÎ ÆÌÁÇ -n: îÉÞÅÇÏ ÎÅ ÉÚÍÅÎÅÎÏ\n"
 
-#: fdisk/sfdisk.c:1555
+#: fdisk/sfdisk.c:1579
 msgid "Failed saving the old sectors - aborting\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÓÔÁÒÙÈ ÓÅËÔÏÒÏ× - ×ÙÐÏÌÎÑÅÔÓÑ ÐÒÅÒÙ×ÁÎÉÅ\n"
 
-#: fdisk/sfdisk.c:1560
+#: fdisk/sfdisk.c:1584
 #, c-format
 msgid "Failed writing the partition on %s\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÒÁÚÄÅÌÁ ÎÁ %s\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1661
 msgid "long or incomplete input line - quitting\n"
-msgstr ""
+msgstr "ÄÌÉÎÎÁÑ ÉÌÉ ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ ××ÏÄÁ - ×ÙÐÏÌÎÑÅÔÓÑ ×ÙÈÏÄ\n"
 
-#: fdisk/sfdisk.c:1673
+#: fdisk/sfdisk.c:1697
 #, c-format
 msgid "input error: `=' expected after %s field\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ××ÏÄÁ: `=' ÏÖÉÄÁÌÓÑ ÐÏÓÌÅ ÐÏÌÑ %s\n"
 
-#: fdisk/sfdisk.c:1680
+#: fdisk/sfdisk.c:1704
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ××ÏÄÁ: ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ %c ÐÏÓÌÅ ÐÏÌÑ %s\n"
 
-#: fdisk/sfdisk.c:1686
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
-msgstr ""
+msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ××ÏÄ: %s\n"
 
-#: fdisk/sfdisk.c:1728
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
-msgstr ""
+msgstr "ÞÉÓÌÏ ÓÌÉÛËÏÍ ÂÏÌØÛÏÅ\n"
 
-#: fdisk/sfdisk.c:1732
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
-msgstr ""
+msgstr "ÍÕÓÏÒ ÐÏÓÌÅ ÞÉÓÌÁ\n"
 
-#: fdisk/sfdisk.c:1853
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
-msgstr ""
+msgstr "ÎÅÔ ÍÅÓÔÁ ÄÌÑ ÄÅÓËÒÉÐÔÏÒÁ ÒÁÚÄÅÌÁ\n"
 
-#: fdisk/sfdisk.c:1886
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÏËÒÕÖÁÀÝÉÊ ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ\n"
 
-#: fdisk/sfdisk.c:1937
+#: fdisk/sfdisk.c:1961
 msgid "too many input fields\n"
-msgstr ""
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÏÌÅÊ ××ÏÄÁ\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1971
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
-msgstr ""
+msgstr "íÅÓÔÁ ÂÏÌØÛÅ ÎÅÔ\n"
 
-#: fdisk/sfdisk.c:1990
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ\n"
 
-#: fdisk/sfdisk.c:2022
+#: fdisk/sfdisk.c:2046
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕËÁÚÁÎÎÙÊ ÒÁÚÍÅÒ (%lu) ÐÒÅ×ÙÛÁÅÔ ÍÁËÓÉÍÁÌØÎÏ ÄÏÐÕÓÔÉÍÙÊ ÒÁÚÍÅÒ (%lu)\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÒÁÚÄÅÌ\n"
 
-#: fdisk/sfdisk.c:2042
+#: fdisk/sfdisk.c:2066
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÅÒÎÏÅ ÎÁÞÁÌÏ ÒÁÚÄÅÌÁ (ÒÁÎÅÅ %lu)\n"
 
-#: fdisk/sfdisk.c:2055
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
-msgstr ""
+msgstr "ÎÅÒÁÓÐÏÚÁÎÎÙÊ ÚÁÇÒÕÚÏÞÎÙÊ ÆÌÁÇ - ×ÙÂÅÒÉÔÅ - ÉÌÉ *\n"
 
-#: fdisk/sfdisk.c:2072 fdisk/sfdisk.c:2085
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
-msgstr ""
+msgstr "ÞÁÓÔÉÞÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ c,h,s?\n"
 
-#: fdisk/sfdisk.c:2096
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
-msgstr ""
+msgstr "òÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ ÎÅ ÔÁÍ, ÇÄÅ ÏÖÉÄÁÌÓÑ\n"
 
-#: fdisk/sfdisk.c:2128
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
-msgstr ""
+msgstr "ÎÅ×ÅÒÎÙÊ ××ÏÄ\n"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
-msgstr ""
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÒÁÚÄÅÌÏ×\n"
 
-#: fdisk/sfdisk.c:2183
+#: fdisk/sfdisk.c:2207
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
+"÷×ÏÄ × ÓÌÅÄÕÀÝÅÍ ÆÏÒÍÁÔÅ; ÏÔÓÕÔÓÔ×ÕÀÝÉÅ ÐÏÌÑ ÐÏÌÕÞÁÀÔ ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ.\n"
+"<ÎÁÞÁÌÏ> <ÒÁÚÍÅÒ> <ÔÉÐ [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
+"ïÂÙÞÎÏ ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÔÏÌØËÏ ÕËÁÚÁÔØ <ÎÁÞÁÌÏ> É <ÒÁÚÍÅÒ> (É ×ÏÚÍÏÖÎÏ <ÔÉÐ>).\n"
 
-#: fdisk/sfdisk.c:2203
+#: fdisk/sfdisk.c:2227
 msgid "version"
-msgstr ""
+msgstr "×ÅÒÓÉÑ"
 
-#: fdisk/sfdisk.c:2209
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ÏÐÃÉÉ] ÕÓÔÒÏÊÓÔ×Ï...\n"
 
-#: fdisk/sfdisk.c:2210
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
-msgstr ""
+msgstr "ÕÓÔÒÏÊÓÔ×Ï: ÞÔÏ-ÔÏ ×ÒÏÄÅ /dev/hda ÉÌÉ /dev/sda"
 
-#: fdisk/sfdisk.c:2211
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
-msgstr ""
+msgstr "ðÏÌÅÚÎÙÅ ÏÐÃÉÉ:"
 
-#: fdisk/sfdisk.c:2212
+#: fdisk/sfdisk.c:2236
 msgid "    -s [or --show-size]: list size of a partition"
-msgstr ""
+msgstr "    -s [ÉÌÉ --show-size]: ÓÐÉÓÏË ÒÁÚÍÅÒÏ× ÒÁÚÄÅÌÏ×"
 
-#: fdisk/sfdisk.c:2213
+#: fdisk/sfdisk.c:2237
 msgid "    -c [or --id]:        print or change partition Id"
-msgstr ""
+msgstr "    -c [ÉÌÉ --id]:        ×Ù×ÏÄ ÉÌÉ ÉÚÍÅÎÅÎÉÅ Id ÒÁÚÄÅÌÁ"
 
-#: fdisk/sfdisk.c:2214
+#: fdisk/sfdisk.c:2238
 msgid "    -l [or --list]:      list partitions of each device"
-msgstr ""
+msgstr "    -l [ÉÌÉ --list]:      ÓÐÉÓÏË ÒÁÚÄÅÌÏ× ËÁÖÄÏÇÏ ÕÓÔÒÏÊÓÔ×Á"
 
-#: fdisk/sfdisk.c:2215
+#: fdisk/sfdisk.c:2239
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
-msgstr ""
+msgstr "    -d [ÉÌÉ --dump]:      ÄÁÍÐ, ÎÏ × ÆÏÒÍÁÔÅ, ÐÏÄÈÏÄÑÝÅÍ ÄÌÑ ÄÁÌØÎÅÊÛÅÇÏ ××ÏÄÁ"
 
-#: fdisk/sfdisk.c:2216
+#: fdisk/sfdisk.c:2240
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
-msgstr ""
+msgstr "    -i [ÉÌÉ --increment]: ÞÉÓÌÏ ÃÉÌÉÎÄÒÏ× É Ô.Ä. Ó 1, Á ÎÅ Ó 0"
 
-#: fdisk/sfdisk.c:2217
-msgid ""
-"    -uS, -uB, -uC, -uM:  accept/report in units of "
-"sectors/blocks/cylinders/MB"
-msgstr ""
+#: fdisk/sfdisk.c:2241
+msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
+msgstr "    -uS, -uB, -uC, -uM:   ÐÒÉÅÍ/ÏÔÞÅÔ × ÅÄÉÎÉÃÁÈ ÓÅËÔÏÒÙ/ÂÌÏËÉ/ÃÉÌÉÎÄÒÙ/íâ"
 
-#: fdisk/sfdisk.c:2218
+#: fdisk/sfdisk.c:2242
 msgid "    -T [or --list-types]:list the known partition types"
-msgstr ""
+msgstr "    -T [ÉÌÉ --list-types]:ÓÐÉÓÏË ÉÚ×ÅÓÔÎÙÈ ÔÉÐÏ× ÒÁÚÄÅÌÏ×"
 
-#: fdisk/sfdisk.c:2219
+#: fdisk/sfdisk.c:2243
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
-msgstr ""
+msgstr "    -D [ÉÌÉ --DOS]:       ÄÌÑ DOS-ÓÏ×ÍÅÓÔÉÍÏÓÔÉ: ÒÁÓÈÏÄÕÅÔÓÑ ÎÅÍÎÏÇÏ ÍÅÓÔÁ"
 
-#: fdisk/sfdisk.c:2220
+#: fdisk/sfdisk.c:2244
 msgid "    -R [or --re-read]:   make kernel reread partition table"
-msgstr ""
+msgstr "    -R [ÉÌÉ --re-read]:   ÐÅÒÅÞÉÔÙ×ÁÎÉÅ ÑÄÒÏÍ ÔÁÂÌÉÃÙ ÒÁÚÄÅÌÏ×"
 
-#: fdisk/sfdisk.c:2221
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
-msgstr ""
+msgstr "    -N# :                 ÉÚÍÅÎÅÎÉÅ ÔÏÌØËÏ ÒÁÚÄÅÌÁ Ó ÎÏÍÅÒÏÍ #"
 
-#: fdisk/sfdisk.c:2222
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
-msgstr ""
+msgstr "    -n :                  ÎÁ ÓÁÍÏÍ ÄÅÌÅ ÎÅ ÚÁÐÉÓÙ×ÁÔØ ÎÁ ÄÉÓË"
 
-#: fdisk/sfdisk.c:2223
-msgid ""
-"    -O file :            save the sectors that will be overwritten to file"
-msgstr ""
+#: fdisk/sfdisk.c:2247
+msgid "    -O file :            save the sectors that will be overwritten to file"
+msgstr "    -O ÆÁÊÌ :             ÓÏÈÒÁÎÅÎÉÅ × ÆÁÊÌ ÓÅËÔÏÒÏ×, ËÏÔÏÒÙÅ ÂÕÄÕÔ ÐÅÒÅÚÁÐÉÓÁÎÙ"
 
-#: fdisk/sfdisk.c:2224
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
-msgstr ""
+msgstr "    -I ÆÁÊÌ :             ×ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÜÔÉÈ ÓÅËÔÏÒÏ×"
 
-#: fdisk/sfdisk.c:2225
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
-msgstr ""
+msgstr "    -v [ÉÌÉ --version]:   ×Ù×ÏÄ ÎÏÍÅÒÁ ×ÅÒÓÉÉ"
 
-#: fdisk/sfdisk.c:2226
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
-msgstr ""
+msgstr "    -? [ÉÌÉ --help]:      ×Ù×ÏÄ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
-msgstr ""
+msgstr "ïÐÁÓÎÙÅ ÏÐÃÉÉ:"
 
-#: fdisk/sfdisk.c:2228
+#: fdisk/sfdisk.c:2252
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
-msgstr ""
+msgstr "    -g [ÉÌÉ --show-geometry]: ×Ù×ÏÄ ÇÅÏÍÅÔÒÉÉ, ÔÒÁËÔÕÅÍÏÊ ÑÄÒÏÍ"
 
-#: fdisk/sfdisk.c:2229
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
+"    -x [ÉÌÉ --show-extended]: ÔÁËÖÅ ×Ù×ÏÄ ÓÐÉÓËÁ ÒÁÓÛÉÒÅÎÎÙÈ ÒÁÚÄÅÌÏ× ÎÁ ×ÙÈÏÄÅ\n"
+"                              ÉÌÉ ÏÖÉÄÁÅÍÙÅ ÄÅÓËÒÉÐÔÏÒÙ ÄÌÑ ÎÉÈ ÎÁ ×ÈÏÄÅ"
 
-#: fdisk/sfdisk.c:2231
-msgid ""
-"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
-msgstr ""
+#: fdisk/sfdisk.c:2255
+msgid "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+msgstr "    -L  [ÉÌÉ --Linux]:      ÉÇÎÏÒÉÒÏ×ÁÎÉÅ ×ÅÝÅÊ, ÎÅÕÍÅÓÔÎÙÈ ÄÌÑ Linux"
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
-msgstr ""
+msgstr "    -q  [ÉÌÉ --quiet]:      ÐÏÄÁ×ÌÅÎÉÅ ÐÒÅÄÕÐÒÅÖÄÁÀÝÉÈ ÓÏÏÂÝÅÎÉÊ"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
-msgstr ""
+msgstr "÷Ù ÍÏÖÅÔÅ ÐÅÒÅËÒÙÔØ ÏÂÎÁÒÕÖÅÎÎÕÀ ÇÅÏÍÅÔÒÉÀ, ÉÓÐÏÌØÚÕÑ:"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2258
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
-msgstr ""
+msgstr "    -C# [ÉÌÉ --cylinders #]:ÕÓÔÁÎÏ×ËÁ ÞÉÓÌÁ ÉÓÐÏÌØÚÕÅÍÙÈ ÃÉÌÉÎÄÒÏ×"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2259
 msgid "    -H# [or --heads #]:    set the number of heads to use"
-msgstr ""
+msgstr "    -H# [ÉÌÉ --heads #]:    ÕÓÔÁÎÏ×ËÁ ÞÉÓÌÁ ÉÓÐÏÌØÚÕÅÍÙÈ ÇÏÌÏ×ÏË"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2260
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
-msgstr ""
+msgstr "    -S# [ÉÌÉ --sectors #]:  ÕÓÔÁÎÏ×ËÁ ÞÉÓÌÁ ÉÓÐÏÌØÚÕÅÍÙÈ ÓÅËÔÏÒÏ×"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
-msgstr ""
+msgstr "÷Ù ÍÏÖÅÔÅ ÏÔËÌÀÞÉÔØ ÐÒÏ×ÅÒËÕ ×ÓÅÈ ÐÒÏÔÉ×ÏÒÅÞÉÊ:"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2262
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
-msgstr ""
+msgstr "    -f  [ÉÌÉ --force]:      ×ÙÐÏÌÎÑÔØ ÔÏ, ÞÔÏ Ñ ÓËÁÖÕ, ÄÁÖÅ ÅÓÌÉ ÜÔÏ ÇÌÕÐÏÓÔØ"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2269
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
-msgstr ""
+msgstr "%s ÕÓÔÒÏÊÓÔ×Ï\t\t ×Ù×ÏÄÉÔ ÓÐÉÓÏË ÁËÔÉ×ÎÙÈ ÒÁÚÄÅÌÏ× ÕÓÔÒÏÊÓÔ×Á\n"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2270
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr ""
+msgstr "%s ÕÓÔÒÏÊÓÔ×Ï n1 n2 ... ÁËÔÉ×ÉÒÕÅÔ ÒÁÚÄÅÌÙ n1 ... É ÄÅÚÁËÔÉ×ÉÒÕÅÔ ÏÓÔÁÌØÎÙÅ\n"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2271
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
-msgstr ""
+msgstr "%s -ÕÓÔÒÏÊÓÔ×Ï \t ÁËÔÉ×ÉÒÕÅÔ ÒÁÚÄÅÌ n, ÄÅÚÁËÔÉ×ÉÒÕÅÔ ÄÒÕÇÉÅ ÒÁÚÄÅÌÙ\n"
 
-#: fdisk/sfdisk.c:2384
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
-msgstr ""
+msgstr "ÎÅÔ ËÏÍÁÎÄÙ?\n"
 
-#: fdisk/sfdisk.c:2509
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
-msgstr ""
+msgstr "×ÓÅÇÏ: %d ÂÌÏËÏ×\n"
 
-#: fdisk/sfdisk.c:2546
+#: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --print-id device partition-number\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: sfdisk --print-id ÕÓÔÒÏÊÓÔ×Ï ÎÏÍÅÒ_ÒÁÚÄÅÌÁ\n"
 
-#: fdisk/sfdisk.c:2548
+#: fdisk/sfdisk.c:2580
 msgid "usage: sfdisk --change-id device partition-number Id\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: sfdisk --change-id ÕÓÔÒÏÊÓÔ×Ï ÎÏÍÅÒ_ÒÁÚÄÅÌÁ Id\n"
 
-#: fdisk/sfdisk.c:2550
+#: fdisk/sfdisk.c:2582
 msgid "usage: sfdisk --id device partition-number [Id]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: sfdisk --id ÕÓÔÒÏÊÓÔ×Ï ÎÏÍÅÒ_ÒÁÚÄÅÌÁ [Id]\n"
 
-#: fdisk/sfdisk.c:2557
+#: fdisk/sfdisk.c:2589
 msgid "can specify only one device (except with -l or -s)\n"
-msgstr ""
+msgstr "ÍÏÖÎÏ ÕËÁÚÁÔØ ÔÏÌØËÏ ÏÄÎÏ ÕÓÔÒÏÊÓÔ×Ï (ËÒÏÍÅ ÔÅÈ, ÞÔÏ Ó  -l ÉÌÉ -s)\n"
 
-#: fdisk/sfdisk.c:2583
+#: fdisk/sfdisk.c:2615
 #, c-format
 msgid "cannot open %s read-write\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ-ÚÁÐÉÓÉ\n"
 
-#: fdisk/sfdisk.c:2585
+#: fdisk/sfdisk.c:2617
 #, c-format
 msgid "cannot open %s for reading\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ\n"
 
-#: fdisk/sfdisk.c:2610
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
-msgstr ""
+msgstr "%s: ïë\n"
 
-#: fdisk/sfdisk.c:2627
+#: fdisk/sfdisk.c:2659
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
-msgstr ""
+msgstr "%s: %ld ÃÉÌÉÎÄÒÏ×, %ld ÇÏÌÏ×ÏË, %ld ÓÅËÔÏÒÏ×/ÄÏÒÏÖËÕ\n"
 
-#: fdisk/sfdisk.c:2644
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
-msgstr ""
+msgstr "BLKGETSIZE ioctl ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ ÄÌÑ %s\n"
 
-#: fdisk/sfdisk.c:2721
+#: fdisk/sfdisk.c:2754
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
-msgstr ""
+msgstr "ÎÅ×ÅÒÎÙÊ active-ÂÁÊÔ: 0x%x ×ÍÅÓÔÏ 0x80\n"
 
-#: fdisk/sfdisk.c:2738 fdisk/sfdisk.c:2791 fdisk/sfdisk.c:2822
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
 msgstr ""
+"çÏÔÏ×Ï\n"
+"\n"
 
-#: fdisk/sfdisk.c:2747
+#: fdisk/sfdisk.c:2781
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
+"õ ×ÁÓ ÉÍÅÀÔÓÑ %d ÁËÔÉ×ÎÙÈ ÏÓÎÏ×ÎÙÈ ÒÁÚÄÅÌÁ. üÔÏ ÎÅ ÉÍÅÅÔ ÚÎÁÞÅÎÉÑ ÄÌÑ LILO,\n"
+"ÎÏ DOS'Ï×ÓËÉÊ MBR ÚÁÇÒÕÚÉÔ ÔÏÌØËÏ ÄÉÓË Ó ÏÄÎÉÍ ÁËÔÉ×ÎÙÍ ÒÁÚÄÅÌÏÍ.\n"
 
-#: fdisk/sfdisk.c:2761
+#: fdisk/sfdisk.c:2795
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
-msgstr ""
+msgstr "ÒÁÚÄÅÌ %s ÉÍÅÅÔ id %x É ÎÅ Ñ×ÌÑÅÔÓÑ ÓËÒÙÔÙÍ\n"
 
-#: fdisk/sfdisk.c:2818
+#: fdisk/sfdisk.c:2852
 #, c-format
 msgid "Bad Id %lx\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÙÊ Id %lx\n"
 
-#: fdisk/sfdisk.c:2833
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
-msgstr ""
+msgstr "üÔÏÔ ÄÉÓË ÓÅÊÞÁÓ ÉÓÐÏÌØÚÕÅÔÓÑ.\n"
 
-#: fdisk/sfdisk.c:2850
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
-msgstr ""
+msgstr "îÅÉÓÐÒÁ×ÉÍÁÑ ÏÛÉÂËÁ: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s\n"
 
-#: fdisk/sfdisk.c:2853
+#: fdisk/sfdisk.c:2887
 #, c-format
 msgid "Warning: %s is not a block device\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ\n"
 
-#: fdisk/sfdisk.c:2859
+#: fdisk/sfdisk.c:2893
 msgid "Checking that no-one is using this disk right now ...\n"
-msgstr ""
+msgstr "ðÒÏ×ÅÒÑÅÔÓÑ, ÞÔÏÂÙ ÓÅÊÞÁÓ ÎÉËÔÏ ÎÅ ÉÓÐÏÌØÚÏ×ÁÌ ÜÔÏÔ ÄÉÓË...\n"
 
-#: fdisk/sfdisk.c:2861
+#: fdisk/sfdisk.c:2895
 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"
+"äÉÓË ÓÅÊÞÁÓ ÉÓÐÏÌØÚÕÅÔÓÑ - ÓËÏÒÅÅ ×ÓÅÇÏ, ÒÁÚÍÅÔËÁ - ÜÔÏ ÐÌÏÈÁÑ ÉÄÅÑ.\n"
+"òÁÚÍÏÎÔÉÒÕÊÔÅ ×ÓÅ ÆÁÊÌÏ×ÙÅ ÓÉÓÔÅÍÙ É ÏÔËÌÀÞÉÔÅ ×ÓÅ ÒÁÚÄÅÌÙ Ó×ÏÐÉÎÇÁ ÜÔÏÇÏ ÄÉÓËÁ.\n"
+"éÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ --no-reread ÄÌÑ ÏÔÍÅÎÙ ÜÔÏÊ ÐÒÏ×ÅÒËÉ.\n"
 
-#: fdisk/sfdisk.c:2865
+#: fdisk/sfdisk.c:2899
 msgid "Use the --force flag to overrule all checks.\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ --force ÄÌÑ ÏÔËÌÀÞÅÎÉÑ ×ÓÅÈ ÐÒÏ×ÅÒÏË.\n"
 
-#: fdisk/sfdisk.c:2869
+#: fdisk/sfdisk.c:2903
 msgid "OK\n"
-msgstr ""
+msgstr "ïë\n"
 
-#: fdisk/sfdisk.c:2878
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
-msgstr ""
+msgstr "óÔÁÒÁÑ ÓÉÔÕÁÃÉÑ:\n"
 
-#: fdisk/sfdisk.c:2882
+#: fdisk/sfdisk.c:2916
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
-msgstr ""
+msgstr "òÁÚÄÅÌ %d ÎÅ ÓÕÝÅÓÔ×ÕÅÔ, ÎÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÅÇÏ\n"
 
-#: fdisk/sfdisk.c:2890
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
-msgstr ""
+msgstr "îÏ×ÁÑ ÓÉÔÕÁÃÉÑ:\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2929
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
+"îÅ ÎÒÁ×ÑÔÓÑ ÍÎÅ ÜÔÉ ÒÁÚÄÅÌÙ - ÎÉÞÅÇÏ ÎÅ ÉÚÍÅÎÅÎÏ.\n"
+"(åÓÌÉ ×Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÜÔÏÇÏ, ÉÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ --force.)\n"
 
-#: fdisk/sfdisk.c:2898
+#: fdisk/sfdisk.c:2932
 msgid "I don't like this - probably you should answer No\n"
-msgstr ""
+msgstr "îÅ ÎÒÁ×ÉÔÓÑ ÍÎÅ ÜÔÏ - ×ÏÚÍÏÖÎÏ, ×ÁÍ ÓÌÅÄÕÅÔ ÏÔ×ÅÔÉÔØ îÅÔ\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
-msgstr ""
+msgstr "÷ÁÓ ÕÓÔÒÁÉ×ÁÅÔ ÔÁËÏÊ ×ÁÒÉÁÎÔ? [ÄÎ×] "
 
-#: fdisk/sfdisk.c:2905
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
-msgstr ""
+msgstr "÷Ù ÈÏÔÉÔÅ ÚÁÐÉÓÁÔØ ÜÔÏ ÎÁ ÄÉÓË? [ÄÎ×] "
 
-#: fdisk/sfdisk.c:2910
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
+"\n"
+"sfdisk: ÐÒÅÖÄÅ×ÒÅÍÅÎÎÏÅ ÏËÏÎÞÁÎÉÅ ××ÏÄÁ\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
-msgstr ""
+msgstr "úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ - ÎÉÞÅÇÏ ÎÅ ÉÚÍÅÎÅÎÏ\n"
 
-#: fdisk/sfdisk.c:2918
+#: fdisk/sfdisk.c:2952
 msgid "Please answer one of y,n,q\n"
-msgstr ""
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÏÔ×ÅÔØÔÅ Ä, Î ÉÌÉ ×\n"
 
-#: fdisk/sfdisk.c:2926
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
+"îÏ×ÁÑ ÔÁÂÌÉÃÁ ÒÁÚÄÅÌÏ× ÕÓÐÅÛÎÏ ÚÁÐÉÓÁÎÁ\n"
+"\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2966
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
+"åÓÌÉ ×Ù ÓÏÚÄÁÌÉ ÉÌÉ ÉÚÍÅÎÉÌÉ ÒÁÚÄÅÌ DOS, ÓËÁÖÅÍ, /dev/foo7, ÉÓÐÏÌØÚÕÊÔÅ ÚÁÔÅÍ dd(1),\n"
+"ÞÔÏÂÙ ÏÂÎÕÌÉÔØ ÐÅÒ×ÙÅ 512 ÂÁÊÔ:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+"(óÍ. fdisk(8).)\n"
 
 #: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
-msgstr ""
+msgstr "ðÏÐÒÏÂÕÊÔÅ `getopt --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
 #: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
-msgstr ""
+msgstr "ÐÕÓÔÁÑ ÏÐÃÉÑ long ÐÏÓÌÅ ÁÒÇÕÍÅÎÔÁ -l ÉÌÉ --long"
 
 #: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
-msgstr ""
+msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÂÏÌÏÞËÁ ÐÏÓÌÅ ÁÒÇÕÍÅÎÔÁ -s ÉÌÉ --shell"
 
 #: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: getopt ÓÔÒÏËÁ_ÏÐÃÉÊ ÐÁÒÁÍÅÔÒÙ\n"
 
 #: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
-msgstr ""
+msgstr "       getopt [ÏÐÃÉÉ] [--] ÓÔÒÏËÁ_ÏÐÃÉÊ ÐÁÒÁÍÅÔÒÙ\n"
 
 #: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-msgstr ""
+msgstr "       getopt [ÏÐÃÉÉ] -o|--options ÓÔÒÏËÁ_ÏÐÃÉÊ [ÏÐÃÉÉ] [--]\n"
 
 #: getopt/getopt.c:327
 msgid "              parameters\n"
-msgstr ""
+msgstr "              ÐÁÒÁÍÅÔÒÙ\n"
 
 #: getopt/getopt.c:328
-msgid ""
-"  -a, --alternative            Allow long options starting with single -\n"
-msgstr ""
+msgid "  -a, --alternative            Allow long options starting with single -\n"
+msgstr "  -a, --alternative            òÁÚÒÅÛÅÎÉÅ ÄÌÉÎÎÙÈ ÏÐÃÉÊ, ÎÁÞÉÎÁÀÝÉÈÓÑ Ó ÏÄÎÏÇÏ -\n"
 
 #: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
-msgstr ""
+msgstr "  -h, --help                   üÔÏ ÎÅÂÏÌØÛÏÅ ÒÕËÏ×ÏÄÓÔ×Ï ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ\n"
 
 #: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-msgstr ""
+msgstr "  -l, --longoptions=longopts   äÌÉÎÎÙÅ ÏÐÃÉÉ ÄÌÑ ÒÁÓÐÏÚÎÁ×ÁÎÉÑ\n"
 
 #: getopt/getopt.c:331
-msgid ""
-"  -n, --name=progname          The name under which errors are reported\n"
-msgstr ""
+msgid "  -n, --name=progname          The name under which errors are reported\n"
+msgstr "  -n, --name=ÉÍÑ_ÐÒÏÇÒÁÍÍÙ     éÍÑ, ÏÔ ËÏÔÏÒÏÇÏ ×ÅÄÅÔÓÑ ÏÔÞÅÔ Ï ÏÛÉÂËÁÈ\n"
 
 #: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
-msgstr ""
+msgstr "  -o, --options=ÓÔÒÏËÁ_ÏÐÃÉÊ   ëÏÒÏÔËÉÅ ÏÐÃÉÉ ÄÌÑ ÒÁÓÐÏÚÎÁ×ÁÎÉÑ\n"
 
 #: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-msgstr ""
+msgstr "  -q, --quiet                  ïÔËÌÀÞÅÎÉÅ ÏÔÞÅÔÁ ÏÂ ÏÛÉÂËÁÈ getopt(3)\n"
 
 #: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
-msgstr ""
+msgstr "  -Q, --quiet-output           âÅÚ ÏÂÙÞÎÙÈ ×ÙÈÏÄÎÙÈ ÄÁÎÎÙÈ\n"
 
 #: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-msgstr ""
+msgstr "  -s, --shell=ÏÂÏÌÏÞËÁ         õÓÔÁÎÏ×ËÁ ÕÓÌÏ×ÉÊ ÚÁËÌ. × ËÁ×ÙÞËÉ ÄÌÑ ÏÂÏÌÏÞËÉ\n"
 
 #: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
-msgstr ""
+msgstr "  -T, --test                   ðÒÏ×ÅÒËÁ ×ÅÒÓÉÉ getopt(1)\n"
 
 #: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr ""
+msgstr "  -u, --unqote                 îÅ ÚÁËÌÀÞÁÔØ × ËÁ×ÙÞËÉ ×ÙÈÏÄÎÙÅ ÄÁÎÎÙÅ\n"
 
 #: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
-msgstr ""
+msgstr "  -V, --version                ÷Ù×ÏÄ ÉÎÆÏÒÍÁÃÉÉ Ï ×ÅÒÓÉÉ\n"
 
-#: getopt/getopt.c:392 getopt/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
-msgstr ""
+msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÁÒÇÕÍÅÎÔ ÓÔÒÏËÉ ÏÐÃÉÊ"
 
-#: getopt/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
-msgstr ""
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (ÕÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÎÙÊ) 1.1.3\n"
 
-#: getopt/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
-msgstr ""
+msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ, Ó×ÑÖÉÔÅÓØ Ó Á×ÔÏÒÏÍ."
 
-#: hwclock/cmos.c:164
+#: hwclock/cmos.c:172
 msgid "booted from MILO\n"
-msgstr ""
+msgstr "ÚÁÇÒÕÖÅÎ ÉÚ MILO\n"
 
-#: hwclock/cmos.c:173
+#: hwclock/cmos.c:181
 msgid "Ruffian BCD clock\n"
-msgstr ""
+msgstr "Ruffian BCD-ÞÁÓÙ\n"
 
-#: hwclock/cmos.c:189
+#: hwclock/cmos.c:197
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
-msgstr ""
+msgstr "ÐÏÒÔ ÞÁÓÏ× ×ÙÓÔÁ×ÌÅÎ ÎÁ 0x%x\n"
 
-#: hwclock/cmos.c:201
+#: hwclock/cmos.c:209
 msgid "funky TOY!\n"
-msgstr ""
+msgstr "ËÌÁÓÓÎÁÑ éçòõûëá!\n"
 
-#: hwclock/cmos.c:255
+#: hwclock/cmos.c:263
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr ""
+msgstr "%s: ÁÔÏÍÎÙÊ %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ ÄÌÑ 1000 ÉÔÅÒÁÃÉÊ!"
 
-#: hwclock/cmos.c:579
+#: hwclock/cmos.c:587
 #, c-format
 msgid "Cannot open /dev/port: %s"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ /dev/port: %s"
 
-#: hwclock/cmos.c:586
+#: hwclock/cmos.c:594
 msgid "I failed to get permission because I didn't try.\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÂÙÌÏ ÐÏÌÕÞÉÔØ ÒÁÚÒÅÛÅÎÉÅ, ÐÏÔÏÍÕ ÎÅ ÂÙÌÁ ×ÙÐÏÌÎÅÎÁ ÐÏÐÙÔËÁ.\n"
 
-#: hwclock/cmos.c:589
+#: hwclock/cmos.c:597
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
-msgstr ""
+msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ Ë ÐÏÒÔÕ I/O:  ×ÙÚÏ× iopl(3) ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ.\n"
 
-#: hwclock/cmos.c:592
+#: hwclock/cmos.c:600
 msgid "Probably you need root privileges.\n"
-msgstr ""
+msgstr "÷ÏÚÍÏÖÎÏ, ×ÁÍ ÎÕÖÎÙ ÐÒÉ×ÉÌÅÇÉÉ root'Á.\n"
 
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
-msgstr ""
+msgstr "ðÏÄÒÁÚÕÍÅ×ÁÅÔÓÑ, ÞÔÏ ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ×ÙÓÔÁ×ÌÅÎÙ ÐÏ %s ×ÒÅÍÅÎÉ.\n"
 
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
-msgstr ""
+msgstr "UTC"
 
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
-msgstr ""
+msgstr "ÍÅÓÔÎÏÍÕ"
 
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
-msgstr ""
+msgstr "%s: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÒÁÓÐÏÚÎÁÎÎÁÑ ÔÒÅÔØÑ ÓÔÒÏËÁ × ÆÁÊÌÅ adjtime\n"
 
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
-msgstr ""
+msgstr "(ïÖÉÄÁÌÏÓØ: `UTC' ÉÌÉ `LOCAL' ÉÌÉ ÎÉÞÅÇÏ.)\n"
 
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
-msgstr ""
+msgstr "äÁÔÁ ÐÏÓÌÅÄÎÅÊ ËÏÒÒÅËÔÉÒÏ×ËÉ ÏÔËÌÏÎÅÎÉÑ - %ld ÓÅËÕÎÄ ÐÏÓÌÅ 1969\n"
 
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
-msgstr ""
+msgstr "äÁÔÁ ÐÏÓÌÅÄÎÅÊ ËÁÌÉÂÒÏ×ËÉ - %ld ÓÅËÕÎÄ ÐÏÓÌÅ 1969\n"
 
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
-msgstr ""
+msgstr "áÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ×ÙÓÔÁ×ÌÅÎÙ ÐÏ %s ×ÒÅÍÅÎÉ\n"
 
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
 msgid "unknown"
-msgstr ""
+msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ"
 
-#. -----------------------------------------------------------------------------
-#. 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:336
+#: hwclock/hwclock.c:342
 msgid "Waiting for clock tick...\n"
-msgstr ""
+msgstr "ïÖÉÄÁÅÔÓÑ ÔÉËÁÎØÅ ÞÁÓÏ×...\n"
 
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
 msgid "...got clock tick\n"
-msgstr ""
+msgstr "...ÐÏÌÕÞÅÎÏ ÔÉËÁÎØÅ ÞÁÓÏ×\n"
 
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÙÅ ÚÎÁÞÅÎÉÑ × ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÁÈ: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
-msgstr ""
+msgstr "áÐÐÁÒÁÔÎÏÅ ×ÒÅÍÑ: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld ÓÅËÕÎÄ Ó 1969\n"
 
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-msgstr ""
+msgstr "÷ÒÅÍÑ, ÐÒÏÞÉÔÁÎÎÏÅ Ó ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ×: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
-msgstr ""
+msgstr "áÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ÕÓÔÁÎÁ×ÌÉ×ÁÀÔÓÑ × %.2d:%.2d:%.2d = %ld ÓÅËÕÎÄ Ó 1969\n"
 
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
 msgid "Clock not changed - testing only.\n"
-msgstr ""
+msgstr "þÁÓÙ ÎÅ ÉÚÍÅÎÅÎÙ - ÔÏÌØËÏ ÔÅÓÔÉÒÏ×ÁÎÉÅ.\n"
 
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the next full second.\n"
 msgstr ""
+"÷ÒÅÍÑ, ÐÒÏÛÅÄÛÅÅ Ó ÎÁÞÁÌÁ ÏÔÓÞÅÔÁ, ÓÏÓÔÁ×ÉÌÏ %.6f ÓÅËÕÎÄ.\n"
+"äÏÐÏÌÎÉÔÅÌØÎÁÑ ÚÁÄÅÒÖËÁ ÄÌÑ ÄÏÓÔÉÖÅÎÉÑ ÓÌÅÄÕÀÝÅÊ ÐÏÌÎÏÊ ÓÅËÕÎÄÙ.\n"
 
-#: hwclock/hwclock.c:532
-msgid ""
-"The Hardware Clock registers contain values that are either invalid (e.g. "
-"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
-msgstr ""
+#: hwclock/hwclock.c:545
+msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr "òÅÇÉÓÔÒÙ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× ÓÏÄÅÒÖÁÔ ÚÎÁÞÅÎÉÑ, ËÏÔÏÒÙÅ ÌÉÂÏ ÎÅ×ÅÒÎÙ (ÎÁÐÒ., 50-Ê ÄÅÎØ ÍÅÓÑÃÁ), ÌÉÂÏ ÎÁÈÏÄÑÔÓÑ ÚÁ ÐÒÅÄÅÌÁÍÉ ÜÆÆÅËÔÉ×ÎÏÇÏ ÄÉÁÐÁÚÏÎÁ (ÎÁÐÒ, 2095 ÇÏÄ).\n"
 
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
-msgstr ""
+msgstr "%s  %.6f ÓÅËÕÎÄ\n"
 
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:589
 msgid "No --date option specified.\n"
-msgstr ""
+msgstr "îÅ ÕËÁÚÁÎÁ ÏÐÃÉÑ --date.\n"
 
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:595
 msgid "--date argument too long\n"
-msgstr ""
+msgstr "áÒÇÕÍÅÎÔ --date ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ\n"
 
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:602
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
+"úÎÁÞÅÎÉÅ ÏÐÃÉÉ --date ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÏÊ ÄÁÔÏÊ.\n"
+"÷ ÞÁÓÔÎÏÓÔÉ, ÏÎÏ ÓÏÄÅÒÖÉÔ ËÁ×ÙÞËÉ.\n"
 
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
-msgstr ""
+msgstr "ðÏÄÁÅÔÓÑ ËÏÍÁÎÄÙ ÄÁÔÙ: %s\n"
 
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ ÐÒÏÇÒÁÍÍÕ 'date' × ÏÂÏÌÏÞËÅ /bin/sh. popen() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
-msgstr ""
+msgstr "ÏÔ×ÅÔ ËÏÍÁÎÄÙ date = %s\n"
 
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:624
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -4742,155 +5321,169 @@ msgid ""
 "The response was:\n"
 "  %s\n"
 msgstr ""
+"ëÏÍÁÎÄÁ date, ×ÙÚ×ÁÎÎÁÑ %s, ×ÏÚ×ÒÁÔÉÌÁ ÎÅÏÖÉÄÁÎÎÙÅ ÒÅÚÕÌØÔÁÔÙ.\n"
+"ëÏÍÁÎÄÁ ÂÙÌÁ:\n"
+"  %s\n"
+"ïÔ×ÅÔ ÂÙÌ:\n"
+"  %s\n"
 
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:636
 #, c-format
 msgid ""
-"The date command issued by %s returned something other than an integer where "
-"the converted time value was expected.\n"
+"The date command issued by %s returned something other than an integer where the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
 " %s\n"
 msgstr ""
+"ëÏÍÁÎÄÁ date, ×ÙÚ×ÁÎÎÁÑ %s, ×ÏÚ×ÒÁÔÉÌÁ ÞÔÏ-ÔÏ ËÒÏÍÅ ÃÅÌÏÇÏ ÞÉÓÌÁ, ÔÏÇÄÁ ËÁË ÏÖÉÄÁÌÏÓØ ÐÒÅÏÂÒÁÚÏ×ÁÎÎÏÅ ÚÎÁÞÅÎÉÅ ×ÒÅÍÅÎÉ.\n"
+"ëÏÍÁÎÄÁ ÂÙÌÁ:\n"
+"  %s\n"
+"ïÔ×ÅÔ ÂÙÌ:\n"
+"  %s\n"
 
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:647
 #, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
-msgstr ""
+msgstr "ÓÔÒÏËÁ ÄÁÔÙ %s ÒÁ×ÎÑÅÔÓÑ %ld ÓÅËÕÎÄÁÍ Ó 1969.\n"
 
-#: hwclock/hwclock.c:666
-msgid ""
-"The Hardware Clock does not contain a valid time, so we cannot set the "
-"System Time from it.\n"
-msgstr ""
+#: hwclock/hwclock.c:679
+msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
+msgstr "áÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ÎÅ ÓÏÄÅÒÖÁÔ ×ÅÒÎÏÇÏ ×ÒÅÍÅÎÉ, ÐÏÜÔÏÍÕ Ó ÎÉÈ ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÓÉÓÔÅÍÎÏÅ ×ÒÅÍÑ.\n"
 
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:701
 msgid "Calling settimeofday:\n"
-msgstr ""
+msgstr "÷ÙÚÙ×ÁÅÔÓÑ settimeofday:\n"
 
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:702
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-msgstr ""
+msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:704
 #, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
-msgstr ""
+msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:707
 msgid "Not setting system clock because running in test mode.\n"
-msgstr ""
+msgstr "óÉÓÔÅÍÎÙÅ ÞÁÓÙ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÙ, ÐÏÔÏÍÕ ÞÔÏ ÚÁÐÕÓË × ÔÅÓÔÏ×ÏÍ ÒÅÖÉÍÅ.\n"
 
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:716
 msgid "Must be superuser to set system clock.\n"
-msgstr ""
+msgstr "äÌÑ ÕÓÔÁÎÏ×ËÉ ÓÉÓÔÅÍÎÙÈ ÞÁÓÏ× ÎÕÖÎÙ ÐÒÁ×Á ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ.\n"
 
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
-msgstr ""
+msgstr "settimeofday() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/hwclock.c:737
-msgid ""
-"Not adjusting drift factor because the Hardware Clock previously contained "
-"garbage.\n"
-msgstr ""
+#: hwclock/hwclock.c:749
+msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
+msgstr "ëÏÒÒÅËÔÉÒÏ×ËÁ ËÏÜÆÆÉÃÉÅÎÔÁ ÏÔËÌÏÎÅÎÉÑ ÎÅ ×ÙÐÏÌÎÅÎÁ, ÐÏÔÏÍÕ ÞÔÏ ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ÒÁÎÅÅ ÓÏÄÅÒÖÁÌÉ ÍÕÓÏÒ.\n"
 
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:754
 msgid ""
-"Not adjusting drift factor because it has been less than a day since the "
-"last calibration.\n"
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
 msgstr ""
+"ëÏÒÒÅËÔÉÒÏ×ËÁ ËÏÜÆÆÉÃÉÅÎÔÁ ÏÔËÌÏÎÅÎÉÑ ÎÅ ×ÙÐÏÌÎÅÎÁ, ÐÏÔÏÍÕ\n"
+"ÞÔÏ ÐÏÓÌÅÄÎÑÑ ËÁÌÉÂÒÏ×ËÁ ÂÙÌÁ ÎÕÌÅ×ÏÊ, ÐÏÜÔÏÍÕ ÎÅ×ÅÒÎÁ\n"
+"ÈÒÏÎÏÌÏÇÉÑ É ÎÅÏÂÈÏÄÉÍ ÚÁÐÕÓË ËÁÌÉÂÒÏ×ËÉ.\n"
+
+#: hwclock/hwclock.c:760
+msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
+msgstr "ëÏÒÒÅËÔÉÒÏ×ËÁ ËÏÜÆÆÉÃÉÅÎÔÁ ÏÔËÌÏÎÅÎÉÑ ÎÅ ×ÙÐÏÌÎÅÎÁ, ÐÏÔÏÍÕ ÞÔÏ ÓÏ ×ÒÅÍÅÎÉ ÐÏÓÌÅÄÎÅÊ ËÁÌÉÂÒÏ×ËÉ ÐÒÏÛÌÏ ÍÅÎÅÅ ÄÎÑ.\n"
 
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:808
 #, 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 %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
+"þÁÓÙ ÐÅÒÅ×ÅÄÅÎÙ ÎÁ %.1f ÓÅËÕÎÄ ÎÁÚÁÄ, %d ÓÅËÕÎÄ ÎÅÓÍÏÔÒÑ ÎÁ ËÏÜÆÆÉÃÉÅÎÔ ÏÔËÌÏÎÅÎÉÑ %f ÓÅËÕÎÄ × ÄÅÎØ.\n"
+"ëÏÜÆÆÉÃÉÅÎÔ ÏÔËÌÏÎÅÎÉÑ ÎÁÓÔÒÁÉ×ÁÅÔÓÑ ÎÁ %f ÓÅËÕÎÄ × ÄÅÎØ\n"
 
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
-msgstr ""
+msgstr "÷ÒÅÍÑ ÐÏÓÌÅ ÐÏÓÌÅÄÎÅÊ ËÏÒÒÅËÔÉÒÏ×ËÉ ÓÏÓÔÁ×ÌÑÅÔ %d ÓÅËÕÎÄ\n"
 
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
-msgstr ""
+msgstr "îÅÏÂÈÏÄÉÍÏ ÄÏÂÁ×ÉÔØ %d ÓÅËÕÎÄ É ÐÅÒÅ×ÅÓÔÉ ÞÁÓÙ ÎÁ %.6f ÓÅËÕÎÄ ÎÁÚÁÄ\n"
 
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:890
 msgid "Not updating adjtime file because of testing mode.\n"
-msgstr ""
+msgstr "æÁÊÌ adjtime ÎÅ ÏÂÎÏ×ÌÑÅÔÓÑ, ÐÏÔÏÍÕ ÞÔÏ ×ËÌÀÞÅÎ ÒÅÖÉÍ ÔÅÓÔÉÒÏ×ÁÎÉÑ.\n"
 
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:891
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
+"óÌÅÄÕÀÝÅÅ ÂÕÄÅÔ ÚÁÐÉÓÁÎÏ × %s:\n"
+"%s"
 
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:915
 msgid "Drift adjustment parameters not updated.\n"
-msgstr ""
+msgstr "ðÁÒÁÍÅÔÒÙ ËÏÒÒÅËÔÉÒÏ×ËÉ ÏÔËÌÏÎÅÎÉÑ ÎÅ ÏÂÎÏ×ÌÅÎÙ.\n"
 
-#: hwclock/hwclock.c:898
-msgid ""
-"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr ""
+#: hwclock/hwclock.c:956
+msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr "áÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ÎÅ ÓÏÄÅÒÖÁÔ ×ÅÒÎÏÇÏ ×ÒÅÍÅÎÉ, ÐÏÜÔÏÍÕ ÏÔËÏÒÒÅËÔÉÒÏ×ÁÔØ ÉÈ ÎÅ×ÏÚÍÏÖÎÏ.\n"
 
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:988
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
-msgstr ""
+msgstr "îÅÏÂÈÏÄÉÍÁÑ ËÏÒÒÅËÔÉÒÏ×ËÁ ÓÏÓÔÁ×ÌÑÅÔ ÍÅÎØÛÅ ÓÅËÕÎÄÙ, ÐÏÜÔÏÍÕ ÞÁÓÙ ÎÅ ÎÁÓÔÒÁÉ×ÁÀÔÓÑ.\n"
 
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÕÅÔÓÑ %s.\n"
 
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1016
 msgid "No usable clock interface found.\n"
-msgstr ""
+msgstr "îÅ ÎÁÊÄÅÎ ÐÒÉÇÏÄÎÙÊ ÞÁÓÏ×ÏÊ ÉÎÔÅÒÆÅÊÓ.\n"
 
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1112
 msgid "Unable to set system clock.\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÓÉÓÔÅÍÎÙÅ ÞÁÓÙ.\n"
 
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1142
 msgid ""
-"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
-"machine.\n"
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha machine.\n"
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
+"úÎÁÞÅÎÉÅ ×ÅËÁ ÄÌÑ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× ÑÄÒÏ ÈÒÁÎÉÔ ÔÏÌØËÏ ÎÁ Alpha-ÍÁÛÉÎÁÈ.\n"
+"üÔÁ ËÏÐÉÑ hwclock ÂÙÌÁ ÓÏÚÄÁÎÁ ÄÌÑ ÍÁÛÉÎÙ, ÏÔÌÉÞÎÏÊ ÏÔ Alpha\n"
+"(É, ÔÁËÉÍ ÏÂÒÁÚÏÍ, ÓÅÊÞÁÓ, ÐÏ-×ÉÄÉÍÏÍÕ, ÎÁ Alpha ÎÅ ÒÁÂÏÔÁÅÔ).  äÅÊÓÔ×ÉÅ ÏÔËÌÏÎÅÎÏ.\n"
 
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1151
 msgid "Unable to get the epoch value from the kernel.\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÚÎÁÞÅÎÉÅ ×ÅËÁ ÉÚ ÑÄÒÁ.\n"
 
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
-msgstr ""
+msgstr "ñÄÒÏ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ, ÞÔÏ ÚÎÁÞÅÎÉÅ ×ÅËÁ %lu\n"
 
-#: hwclock/hwclock.c:1090
-msgid ""
-"To set the epoch value, you must use the 'epoch' option to tell to what "
-"value to set it.\n"
-msgstr ""
+#: hwclock/hwclock.c:1156
+msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n"
+msgstr "þÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ ÚÎÁÞÅÎÉÅ ×ÅËÁ, ×Ù ÄÏÌÖÎÙ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÐÃÉÀ 'epoch' ÄÌÑ ÕËÁÚÁÎÉÑ ÎÕÖÎÏÇÏ ÚÎÁÞÅÎÉÑ.\n"
 
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
-msgstr ""
+msgstr "÷ÅË ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × %d - ÔÏÌØËÏ ÔÅÓÔÉÒÏ×ÁÎÉÅ.\n"
 
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1162
 msgid "Unable to set the epoch value in the kernel.\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ × ÑÄÒÅ ÚÎÁÞÅÎÉÅ ×ÅËÁ.\n"
 
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -4921,386 +5514,375 @@ msgid ""
 "  --noadjfile   do not access /etc/adjtime. Requires the use of\n"
 "                either --utc or --localtime\n"
 msgstr ""
-
-#: hwclock/hwclock.c:1152
+"hwclock - ÏÐÒÏÓ É ÕÓÔÁÎÏ×ËÁ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× (RTC)\n"
+"\n"
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: hwclock [ÆÕÎËÃÉÑ] [ÏÐÃÉÉ...]\n"
+"\n"
+"æÕÎËÃÉÉ:\n"
+"  --help        ×Ù×ÏÄ ÜÔÏÊ ÓÐÒÁ×ËÉ\n"
+"  --show        ÞÔÅÎÉÅ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× É ×Ù×ÏÄ ÒÅÚÕÌØÔÁÔÁ\n"
+"  --set         ÕÓÔÁÎÏ×ËÁ ÞÁÓÏ× ÉÓÔÉÎÎÏÇÏ ×ÒÅÍÅÎÉ ÎÁ ×ÒÅÍÑ, ÕËÁÚÁÎÎÏÅ Ó --date\n"
+"  --hctosys     ÕÓÔÁÎÏ×ËÁ ÓÉÓÔÅÍÎÏÇÏ ×ÒÅÍÅÎÉ ÐÏ ÁÐÐÁÒÁÔÎÙÍ ÞÁÓÁÍ\n"
+"  --systohc     ÕÓÔÁÎÏ×ËÁ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× ÐÏ ÔÅËÕÝÅÍÕ ÓÉÓÔÅÍÎÏÍÕ ×ÒÅÍÅÎÉ\n"
+"  --adjust      ÒÅÇÕÌÉÒÏ×ËÁ ÞÁÓÏ× ÉÓÔÉÎÎÏÇÏ ×ÒÅÍÅÎÉ ÄÌÑ ×ÙÞÉÓÌÅÎÉÑ ÓÉÓÔÅÍÁÔÉÞÅÓËÏÇÏ\n"
+"                ÏÔËÌÏÎÅÎÉÑ ÐÏÓÌÅ ÐÏÓÌÅÄÎÅÊ ÕÓÔÁÎÏ×ËÉ ÉÌÉ ÒÅÇÕÌÉÒÏ×ËÉ ÞÁÓÏ×\n"
+"  --getepoch    ×Ù×ÏÄ ÚÎÁÞÅÎÉÑ ×ÅËÁ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× ÑÄÒÁ\n"
+"  --setepoch    ÕÓÔÁÎÏ×ËÁ ÚÎÁÞÅÎÉÑ ×ÅËÁ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ× ÑÄÒÁ × ÚÎÁÞÅÎÉÅ,\n"
+"                ÕËÁÚÁÎÎÏÅ Ó --epoch\n"
+"  --version     ×Ù×ÏÄ ×ÅÒÓÉÉ hwclock ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×ÙÈÏÄ\n"
+"\n"
+"ïÐÃÉÉ: \n"
+"  --utc         ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ×ÙÓÔÁ×ÌÅÎÙ ÐÏ ×ÓÅÏÂÝÅÍÕ ÓËÏÏÒÄÉÎÉÒÏ×ÁÎÎÏÍÕ ×ÒÅÍÅÎÉ\n"
+"  --localtime   ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ ×ÙÓÔÁ×ÌÅÎÙ ÐÏ ÍÅÓÔÎÏÍÕ ×ÒÅÍÅÎÉ\n"
+"  --directisa   ÐÒÑÍÏÊ ÄÏÓÔÕÐ Ë ÛÉÎÅ ISA ×ÍÅÓÔÏ %s\n"
+"  --badyear     ÉÇÎÏÒÉÒÏ×ÁÔØ ÇÏÄ ÞÁÓÏ× ÉÓÔÉÎÎÏÇÏ ×ÒÅÍÅÎÉ ÉÚ-ÚÁ ÐÏ×ÒÅÖÄÅÎÎÏÇÏ bios'Á\n"
+"  --date        ÕËÁÚÁÎÉÅ ×ÒÅÍÅÎÉ, ËÏÔÏÒÏÅ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎÏ × ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ\n"
+"  --epoch=ÇÏÄ   ÕËÁÚÁÎÉÅ ÇÏÄÁ, Ó ËÏÔÏÒÏÇÏ ÎÁÞÉÎÁÅÔÓÑ  ÚÎÁÞÅÎÉÅ\n"
+"                ÜÒÙ ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ×\n"
+"  --noadjfile   ÂÅÚ ÉÓÐÏÌØÚÏ×ÁÎÉÑ /etc/adjtime. ôÒÅÂÕÅÔ ÉÓÐÏÌØÚÏ×ÁÎÉÑ\n"
+"                ÌÉÂÏ --utc, ÌÉÂÏ --localtime\n"
+
+#: hwclock/hwclock.c:1223
 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"
+"                ÓÏÏÂÝÁÅÔ hwclock'Õ ÔÉÐ ×ÁÛÅÊ alpha (ÓÍ. hwclock(8))\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
-msgstr ""
+msgstr "%s ÐÒÉÎÉÍÁÅÔ ÎÅÏÐÃÉÏÎÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ.  ÷ÁÍ ÐÒÅÄÏÓÔÁ×ÌÅÎÙ %d.\n"
 
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1403
 msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
+"÷Ù ÕËÁÚÁÌÉ ÎÅÓËÏÌØËÏ ÆÕÎËÃÉÊ.\n"
+"÷Ù ÍÏÖÅÔÅ ×ÙÐÏÌÎÉÔØ ÔÏÌØËÏ ÏÄÎÕ ÆÕÎËÃÉÀ ÚÁ ÒÁÚ.\n"
 
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1410
 #, c-format
-msgid ""
-"%s: The --utc and --localtime options are mutually exclusive.  You specified "
-"both.\n"
-msgstr ""
+msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
+msgstr "%s: ïÐÃÉÉ --utc É --localtime Ñ×ÌÑÀÔÓÑ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÍÉ. á ×Ù ÕËÁÚÁÌÉ ÏÂÅ.\n"
 
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1417
 #, c-format
-msgid ""
-"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
-"specified both.\n"
-msgstr ""
+msgid "%s: The --adjust and --noadjfile options are mutually exclusive.  You specified both.\n"
+msgstr "%s: ïÐÃÉÉ --adjust É --noadjfile Ñ×ÌÑÀÔÓÑ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÝÉÍÉ. á ×Ù ÕËÁÚÁÌÉ ÏÂÅ.\n"
 
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
-msgstr ""
+msgstr "%s: ó --noadjfile ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÌÉÂÏ --utc, ÌÉÂÏ --localtime\n"
 
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1438
 msgid "No usable set-to time.  Cannot set clock.\n"
-msgstr ""
+msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÐÒÉÇÏÄÎÏÅ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ×ÒÅÍÑ. îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÞÁÓÙ.\n"
 
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1454
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr ""
+msgstr "ë ÓÏÖÁÌÅÎÉÀ ÔÏÌØËÏ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌØ ÍÏÖÅÔ ÉÚÍÅÎÑÔØ ÁÐÐÁÒÁÔÎÙÅ ÞÁÓÙ.\n"
 
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1459
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr ""
+msgstr "ë ÓÏÖÁÌÅÎÉÀ ÔÏÌØËÏ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌØ ÍÏÖÅÔ ÉÚÍÅÎÑÔØ ÓÉÓÔÅÍÎÙÅ ÞÁÓÙ.\n"
 
-#: hwclock/hwclock.c:1321
-msgid ""
-"Sorry, only the superuser can change the Hardware Clock epoch in the "
-"kernel.\n"
-msgstr ""
+#: hwclock/hwclock.c:1464
+msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
+msgstr "ë ÓÏÖÁÌÅÎÉÀ ÔÏÌØËÏ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌØ ÍÏÖÅÔ ÉÚÍÅÎÑÔØ × ÑÄÒÅ ×ÅË ÁÐÐÁÒÁÔÎÙÈ ÞÁÓÏ×.\n"
 
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1484
 msgid "Cannot access the Hardware Clock via any known method.\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ Ë ÁÐÐÁÒÁÔÎÙÍ ÞÁÓÁÍ ËÁËÉÍ ÂÙ ÔÏ ÎÉ ÂÙÌÏ ÉÚ×ÅÓÔÎÙÍ ÓÐÏÓÏÂÏÍ.\n"
 
-#: hwclock/hwclock.c:1344
-msgid ""
-"Use the --debug option to see the details of our search for an access "
-"method.\n"
-msgstr ""
+#: hwclock/hwclock.c:1488
+msgid "Use the --debug option to see the details of our search for an access method.\n"
+msgstr "éÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ --debug, ÞÔÏÂÙ Õ×ÉÄÅÔØ ÐÏÄÒÏÂÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÎÁÛÅÍ ÐÏÉÓËÅ ÄÌÑ ÍÅÔÏÄÁ ÄÏÓÔÕÐÁ.\n"
 
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
-msgstr ""
+msgstr "÷ ÃÉËÌÅ ÏÖÉÄÁÅÔÓÑ ÉÚÍÅÎÅÎÉÅ ×ÒÅÍÅÎÉ ÉÚ KDGHWCLK\n"
 
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
 msgid "KDGHWCLK ioctl to read time failed"
-msgstr ""
+msgstr "KDGHWCLK ioctl ÐÒÉ ÞÔÅÎÉÉ ×ÒÅÍÅÎÉ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
-msgstr ""
+msgstr "éÓÔÅËÌÏ ×ÒÅÍÑ ÏÖÉÄÁÎÉÑ ÄÌÑ ÓÍÅÎÙ ×ÒÅÍÅÎÉ.\n"
 
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
 msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr ""
+msgstr "KDGHWCLK ioctl ÐÒÉ ÞÔÅÎÉÉ ×ÒÅÍÅÎÉ × ÃÉËÌÅ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
 #, c-format
 msgid "ioctl() failed to read time from %s"
-msgstr ""
+msgstr "ioctl() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ ÐÒÉ ÞÔÅÎÉÉ ×ÒÅÍÅÎÉ ÉÚ %s"
 
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
 msgid "ioctl KDSHWCLK failed"
-msgstr ""
+msgstr "ioctl KDSHWCLK ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
 msgid "Can't open /dev/tty1 or /dev/vc/1"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ /dev/tty1 ÉÌÉ /dev/vc/1"
 
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
 msgid "KDGHWCLK ioctl failed"
-msgstr ""
+msgstr "KDGHWCLK ioctl ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
-msgid "ioctl() to %s to read the time failed.\n"
-msgstr ""
+msgid "open() of %s failed"
+msgstr "open() %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:148
 #, c-format
-msgid "Waiting in loop for time from %s to change\n"
-msgstr ""
+msgid "ioctl() to %s to read the time failed.\n"
+msgstr "ioctl() %s ÐÒÉ ÞÔÅÎÉÉ ×ÒÅÍÅÎÉ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ.\n"
 
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
+#: hwclock/rtc.c:170
 #, c-format
-msgid "open() of %s failed"
-msgstr ""
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "÷ ÃÉËÌÅ ÏÖÉÄÁÅÔÓÑ ÄÌÑ ÓÍÅÎÙ ×ÒÅÍÑ ÉÚ %s\n"
 
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
-msgstr ""
+msgstr "%s ÎÅ ÉÍÅÅÔ ÆÕÎËÃÉÊ ÐÒÅÒÙ×ÁÎÉÑ. "
 
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:234
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
-msgstr ""
+msgstr "read() × %s ÄÌÑ ÏÖÉÄÁÎÉÑ ÔÉËÁÎØÑ ÞÁÓÏ× ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:243
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
-msgstr ""
+msgstr "ioctl() × %s ÄÌÑ ×ÙËÌÀÞÅÎÉÑ ÐÒÅÒÙ×ÁÎÉÊ ÏÂÎÏ×ÌÅÎÉÑ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:246
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
-msgstr ""
-
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr ""
+msgstr "ioctl() × %s ÄÌÑ ×ËÌÀÞÅÎÉÑ ÐÒÅÒÙ×ÁÎÉÊ ÏÂÎÏ×ÌÅÎÉÑ ÎÅÏÖÉÄÁÎÎÏ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:305
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
-msgstr ""
+msgstr "ioctl() × %s ÄÌÑ ÕÓÔÁÎÏ×ËÉ ×ÒÅÍÅÎÉ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ.\n"
 
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
-msgstr ""
+msgstr "ioctl(%s) ÚÁ×ÅÒÛÉÌÓÑ ÕÓÐÅÛÎÏ.\n"
 
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
-msgstr ""
+msgstr "ïÔËÒÙÔÉÅ %s ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:358 hwclock/rtc.c:404
 #, 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 ""
+msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s.  This file does not exist on this system.\n"
+msgstr "äÌÑ ÉÚÍÅÎÅÎÉÑ ÚÎÁÞÅÎÉÑ ×ÅËÁ × ÑÄÒÅ ÎÅÏÂÈÏÄÉÍÏ ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ Ë ÄÒÁÊ×ÅÒÕ ÕÓÔÒÏÊÓÔ×Á Linux 'rtc' ÐÏÓÒÅÄÓÔ×ÏÍ ÓÐÅÃÉÁÌØÎÏÇÏ ÆÁÊÌÁ ÕÓÔÒÏÊÓÔ×Á %s. ÷ ÄÁÎÎÏÊ ÓÉÓÔÅÍÅ ÜÔÏÔ ÆÁÊÌ ÏÔÓÕÔÓÔ×ÕÅÔ.\n"
 
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#, c-format
+msgid "Unable to open %s"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s"
+
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr ""
+msgstr "ioctl(RTC_EPOCH_READ) × %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:376
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr ""
+msgstr "ÂÙÌ ÐÒÏÞÉÔÁÎ ×ÅË %ld ÉÚ %s ÞÅÒÅÚ RTC_EPOCH_READ ioctl.\n"
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:396
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr ""
+msgstr "úÎÁÞÅÎÉÅ ×ÅËÁ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÍÅÎØÛÅ 1900. ÷Ù ÚÁÐÒÏÓÉÌÉ %ld\n"
 
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:414
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
-msgstr ""
+msgstr "×ÅË ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × %ld Ó RTC_EPOCH_SET ioctl × %s.\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:419
 #, c-format
-msgid ""
-"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
-msgstr ""
+msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgstr "äÒÁÊ×ÅÒ ÕÓÔÒÏÊÓÔ×Á ÑÄÒÁ ÄÌÑ %s ÎÅ ÉÍÅÅÔ RTC_EPOCH_SET ioctl.\n"
 
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
-msgstr ""
+msgstr "ioctl(RTC_EPOCH_SET) × %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr ""
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr ""
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr ""
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr ""
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr ""
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr ""
-
-#: login-utils/agetty.c:312
-msgid "calling open_tty\n"
-msgstr ""
+#: login-utils/agetty.c:312
+msgid "calling open_tty\n"
+msgstr "×ÙÚÙ×ÁÅÔÓÑ open_tty\n"
 
 #. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
-msgstr ""
+msgstr "×ÙÚÙ×ÁÅÔÓÑ termio_init\n"
 
 #: login-utils/agetty.c:330
 msgid "writing init string\n"
-msgstr ""
+msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ ÓÔÒÏËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ\n"
 
 #. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
-msgstr ""
+msgstr "ÐÅÒÅÄ autobaud\n"
 
 #: login-utils/agetty.c:352
 msgid "waiting for cr-lf\n"
-msgstr ""
+msgstr "ÏÖÉÄÁÅÔÓÑ cr-lf\n"
 
 #: login-utils/agetty.c:356
 #, c-format
 msgid "read %c\n"
-msgstr ""
+msgstr "ÞÔÅÎÉÅ %c\n"
 
 #. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
-msgstr ""
+msgstr "ÞÉÔÁÅÔÓÑ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ\n"
 
 #: login-utils/agetty.c:386
 #, c-format
 msgid "%s: can't exec %s: %m"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ %s: %m"
 
 #: login-utils/agetty.c:406
 msgid "can't malloc initstring"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ malloc ÄÌÑ ÓÔÒÏËÉ ÉÎÉÃÉÁÌÉÚÁÃÉÉ"
 
 #: login-utils/agetty.c:471
 #, c-format
 msgid "bad timeout value: %s"
-msgstr ""
+msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÔÁÊÍ-ÁÕÔÁ: %s"
 
 #: login-utils/agetty.c:480
 msgid "after getopt loop\n"
-msgstr ""
+msgstr "ÐÏÓÌÅ ÃÉËÌÁ getopt\n"
 
 #: login-utils/agetty.c:530
 msgid "exiting parseargs\n"
-msgstr ""
+msgstr "×ÙÈÏÄ ÉÚ parseargs\n"
 
 #: login-utils/agetty.c:542
 msgid "entered parse_speeds\n"
-msgstr ""
+msgstr "×ÙÐÏÌÎÅÎ ×ÈÏÄ × parse_speeds\n"
 
 #: login-utils/agetty.c:545
 #, c-format
 msgid "bad speed: %s"
-msgstr ""
+msgstr "ÎÅ×ÅÒÎÁÑ ÓËÏÒÏÓÔØ: %s"
 
 #: login-utils/agetty.c:547
 msgid "too many alternate speeds"
-msgstr ""
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÌØÔÅÒÎÁÔÉ×ÎÙÈ ÓËÏÒÏÓÔÅÊ"
 
 #: login-utils/agetty.c:549
 msgid "exiting parsespeeds\n"
-msgstr ""
+msgstr "×ÙÈÏÄ ÉÚ parsespeeds\n"
 
-#: login-utils/agetty.c:642
+#: login-utils/agetty.c:649
 #, c-format
 msgid "/dev: chdir() failed: %m"
-msgstr ""
+msgstr "/dev: chdir() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ: %m"
 
-#: login-utils/agetty.c:646
+#: login-utils/agetty.c:653
 #, c-format
 msgid "/dev/%s: not a character device"
-msgstr ""
+msgstr "/dev/%s: ÎÅÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
 
 #. ignore close(2) errors
-#: login-utils/agetty.c:653
+#: login-utils/agetty.c:660
 msgid "open(2)\n"
-msgstr ""
+msgstr "open(2)\n"
 
-#: login-utils/agetty.c:655
+#: login-utils/agetty.c:662
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
-msgstr ""
+msgstr "/dev/%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ËÁË ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ: %m"
 
-#: login-utils/agetty.c:665
+#: login-utils/agetty.c:672
 #, c-format
 msgid "%s: not open for read/write"
-msgstr ""
+msgstr "%s: ÎÅ ÏÔËÒÙÔ ÄÌÑ ÞÔÅÎÉÑ/ÚÁÐÉÓÉ"
 
 #. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:669
+#: login-utils/agetty.c:676
 msgid "duping\n"
-msgstr ""
+msgstr "×ÙÐÏÌÎÑÅÔÓÑ ÄÕÂÌÉÒÏ×ÁÎÉÅ\n"
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:671
+#: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
-msgstr ""
+msgstr "%s: ÐÒÏÂÌÅÍÁ ÄÕÂÌÉÒÏ×ÁÎÉÑ: %m"
 
-#: login-utils/agetty.c:745
+#: login-utils/agetty.c:752
 msgid "term_io 2\n"
-msgstr ""
+msgstr "term_io 2\n"
 
-#: login-utils/agetty.c:930
+#: login-utils/agetty.c:937
 msgid "user"
-msgstr ""
+msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ"
 
-#: login-utils/agetty.c:930
+#: login-utils/agetty.c:937
 msgid "users"
-msgstr ""
+msgstr "ÐÏÌØÚÏ×ÁÔÅÌÉ"
 
-#: login-utils/agetty.c:1018
+#: login-utils/agetty.c:1025
 #, c-format
 msgid "%s: read: %m"
-msgstr ""
+msgstr "%s: ÞÔÅÎÉÅ: %m"
 
-#: login-utils/agetty.c:1064
+#: login-utils/agetty.c:1071
 #, c-format
 msgid "%s: input overrun"
-msgstr ""
+msgstr "%s: ÐÅÒÅÐÏÌÎÅÎÉÅ ××ÏÄÁ"
 
-#: login-utils/agetty.c:1188
+#: login-utils/agetty.c:1195
 #, c-format
 msgid ""
-"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
-"login_host] baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
-"line baud_rate,... [termtype]\n"
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"
 msgstr ""
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-hiLmw] [-l ÐÒÏÇÒÁÍÍÁ_×ÈÏÄÁ] [-t ÔÁÊÍ-ÁÕÔ] [-I ÓÔÒÏËÁ_ÉÎÉÃÉÁÌÉÚÁÃÉÉ] [-H ÈÏÓÔ_ÄÌÑ_×ÈÏÄÁ] ÓËÏÒÏÓÔØ_ÐÅÒÅÄÁÞÉ,... ÐÏÒÔ [ÔÉÐ_ÔÅÒÍÉÎÁÌÁ]\n"
+"ÉÌÉ\t[-hiLmw] [-l ÐÒÏÇÒÁÍÍÁ_×ÈÏÄÁ] [-t ÔÁÊÍ-ÁÕÔ] [-I ÓÔÒÏËÁ_ÉÎÉÃÉÁÌÉÚÁÃÉÉ] [-H ÈÏÓÔ_ÄÌÑ_×ÈÏÄÁ] ÐÏÒÔ ÓËÏÒÏÓÔØ_ÐÅÒÅÄÁÞÉ,... [ÔÉÐ_ÔÅÒÍÉÎÁÌÁ]\n"
 
 #: login-utils/checktty.c:104 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
-msgstr ""
+msgstr "login: ÍÁÌÏ ÐÁÍÑÔÉ, ×ÈÏÄ × ÓÉÓÔÅÍÕ ÍÏÖÅÔ ÚÁ×ÅÒÛÉÔØÓÑ ÎÅÕÄÁÞÅÊ\n"
 
 #: login-utils/checktty.c:105
 msgid "can't malloc for ttyclass"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ malloc ÄÌÑ ttyclass"
 
 #: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ malloc ÄÌÑ grplist"
 
 #. there was a default rule, but user didn't match, reject!
 #: login-utils/checktty.c:422
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
-msgstr ""
+msgstr "÷ÈÏÄ × %s Ó %s ÚÁÐÒÅÝÅÎ ÐÏ ÕÍÏÌÞÁÎÉÀ.\n"
 
 #. if we get here, /etc/usertty exists, there's a line
 #. matching our username, but it doesn't contain the
@@ -5309,119 +5891,123 @@ msgstr ""
 #: login-utils/checktty.c:433
 #, c-format
 msgid "Login on %s from %s denied.\n"
-msgstr ""
+msgstr "÷ÈÏÄ × %s Ó %s ÚÁÐÒÅÝÅÎ.\n"
 
 #: login-utils/chfn.c:122 login-utils/chsh.c:107
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
-msgstr ""
+msgstr "%s: ×Ù (ÐÏÌØÚÏ×ÁÔÅÌØ %d) ÎÅ ÓÕÝÅÓÔ×ÕÅÔÅ.\n"
 
 #: login-utils/chfn.c:129 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr ""
+msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ \"%s\" ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
 
 #: 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 ""
+msgstr "%s: ÍÏÖÎÏ ÔÏÌØËÏ ÉÚÍÅÎÉÔØ ÌÏËÁÌØÎÙÅ ÜÌÅÍÅÎÔÙ; ×ÍÅÓÔÏ ÜÔÏÇÏ ÉÓÐÏÌØÚÕÊÔÅ yp%s.\n"
 
 #: login-utils/chfn.c:146
 #, c-format
 msgid "Changing finger information for %s.\n"
-msgstr ""
+msgstr "éÚÍÅÎÅÎÉÅ ÉÎÆÏÒÍÁÃÉÉ finger ÄÌÑ %s.\n"
 
 #: 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 ""
+msgstr "ïÛÉÂËÁ ÐÁÒÏÌÑ."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:775
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:320 mount/lomount.c:248
-#: mount/lomount.c:253
+#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
-msgstr ""
+msgstr "ðÁÒÏÌØ: "
 
 #: login-utils/chfn.c:179 login-utils/chsh.c:170
 msgid "Incorrect password."
-msgstr ""
+msgstr "îÅ×ÅÒÎÙÊ ÐÁÒÏÌØ."
 
 #: login-utils/chfn.c:190
 msgid "Finger information not changed.\n"
-msgstr ""
+msgstr "éÎÆÏÒÍÁÃÉÑ finger ÎÅ ÉÚÍÅÎÅÎÁ.\n"
 
 #: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ -f ÐÏÌÎÏÅ_ÉÍÑ ] [ -o ÎÏÍÅÒ_ÏÆÉÓÁ ] "
 
 #: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
+"[ -p ÒÁÂÏÞÉÊ_ÔÅÌÅÆÏÎ ]\n"
+"\t[ -h ÄÏÍÁÛÎÉÊ_ÔÅÌÅÆÏÎ ] "
 
 #: login-utils/chfn.c:294
 msgid "[ --help ] [ --version ]\n"
-msgstr ""
+msgstr "[ --help ] [ --version ]\n"
 
 #: login-utils/chfn.c:365 login-utils/chsh.c:278
 msgid ""
 "\n"
 "Aborted.\n"
 msgstr ""
+"\n"
+"ðÒÅÒ×ÁÎ.\n"
 
 #: login-utils/chfn.c:398
 msgid "field is too long.\n"
-msgstr ""
+msgstr "ÐÏÌÅ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ.\n"
 
 #: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr ""
+msgstr "'%c' ÚÁÐÒÅÝÅÎ.\n"
 
 #: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
-msgstr ""
+msgstr "Control-ÓÉÍ×ÏÌÙ ÚÁÐÒÅÝÅÎÙ.\n"
 
 #: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
-msgstr ""
+msgstr "éÎÆÏÒÍÁÃÉÑ finger *îå* ÉÚÍÅÎÅÎÁ. ðÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ ÐÏÐÏÚÖÅ.\n"
 
 #: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
-msgstr ""
+msgstr "éÎÆÏÒÍÁÃÉÑ finger ÉÚÍÅÎÅÎÁ.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:328
+#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
 msgid "malloc failed"
-msgstr ""
+msgstr "malloc ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
 #: login-utils/chsh.c:130
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr ""
+msgstr "%s: ÷ÁÛÁ ÏÂÏÌÏÞËÁ ÏÔÓÕÔÓÔ×ÕÅÔ × /etc/shells, ÓÍÅÎÁ ÏÂÏÌÏÞËÉ ÚÁÐÒÅÝÅÎÁ\n"
 
 #: login-utils/chsh.c:137
 #, c-format
 msgid "Changing shell for %s.\n"
-msgstr ""
+msgstr "éÚÍÅÎÅÎÉÅ ÏÂÏÌÏÞËÉ ÄÌÑ %s.\n"
 
 #: login-utils/chsh.c:178
 msgid "New shell"
-msgstr ""
+msgstr "îÏ×ÁÑ ÏÂÏÌÏÞËÁ"
 
 #: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
-msgstr ""
+msgstr "ïÂÏÌÏÞËÁ ÎÅ ÉÚÍÅÎÅÎÁ.\n"
 
 #: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr ""
+msgstr "ïÂÏÌÏÞËÁ *îå* ÉÚÍÅÎÅÎÁ. ðÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ ÐÏÐÏÚÖÅ.\n"
 
 #: login-utils/chsh.c:195
 msgid "Shell changed.\n"
-msgstr ""
+msgstr "ïÂÏÌÏÞËÁ ÉÚÍÅÎÅÎÁ.\n"
 
 #: login-utils/chsh.c:260
 #, c-format
@@ -5429,101 +6015,103 @@ msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr ""
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ -s ÏÂÏÌÏÞËÁ ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ ÉÍÑ_ÐÏÌØÚÏ×ÁÔÅÌÑ ]\n"
 
 #: login-utils/chsh.c:303
 #, c-format
 msgid "%s: shell must be a full path name.\n"
-msgstr ""
+msgstr "%s: ÏÂÏÌÏÞËÁ ÄÏÌÖÎÁ ÂÙÔØ ÐÏÌÎÙÍ ÓÏÓÔÁ×ÎÙÍ ÉÍÅÎÅÍ.\n"
 
 #: login-utils/chsh.c:307
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
-msgstr ""
+msgstr "%s: \"%s\" ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
 
 #: login-utils/chsh.c:311
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
-msgstr ""
+msgstr "%s: \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÉÓÐÏÌÎÑÅÍÙÍ.\n"
 
 #: login-utils/chsh.c:318
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr ""
+msgstr "%s: '%c' ÚÁÐÒÅÝÅÎ.\n"
 
 #: login-utils/chsh.c:322
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
-msgstr ""
+msgstr "%s: Control-ÓÉÍ×ÏÌÙ ÚÁÐÒÅÝÅÎÙ.\n"
 
 #: login-utils/chsh.c:329
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: \"%s\" ÏÔÓÕÔÓÔ×ÕÅÔ × ÓÐÉÓËÅ /etc/shells\n"
 
 #: login-utils/chsh.c:331
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
-msgstr ""
+msgstr "%s: \"%s\" ÏÔÓÕÔÓÔ×ÕÅÔ × ÓÐÉÓËÅ /etc/shells\n"
 
 #: login-utils/chsh.c:333
 #, c-format
 msgid "%s: use -l option to see list\n"
-msgstr ""
+msgstr "%s: ÉÓÐÏÌØÚÕÊÔÅ ÏÐÃÉÀ -l option ÄÌÑ ÐÒÏÓÍÏÔÒÁ ÓÐÉÓËÁ\n"
 
 #: login-utils/chsh.c:339
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: \"%s\" ÏÔÓÕÔÓÔ×ÕÅÔ × ÓÐÉÓËÅ /etc/shells\n"
 
 #: login-utils/chsh.c:340
 #, c-format
 msgid "Use %s -l to see list.\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÕÊÔÅ %s -l ÄÌÑ ÐÒÏÓÍÏÔÒÁ ÓÐÉÓËÁ.\n"
 
 #: login-utils/chsh.c:360
 msgid "No known shells.\n"
-msgstr ""
+msgstr "îÅÔ ÉÚ×ÅÓÔÎÙÈ ÏÂÏÌÏÞÅË.\n"
 
 #: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ /dev/urandom"
 
 #: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÌÕÞÁÊÎÙÅ ÄÁÎÎÙÅ ÉÚ /dev/urandom"
 
 #: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ"
 
 #: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ (%s)"
 
 #: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
-msgstr ""
+msgstr "%s ÎÅ ÉÍÅÅÔ ×ÅÒÎÙÈ filemode'Ï×"
 
 #: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÄÁÎÎÙÅ ÉÚ %s"
 
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s, ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: last [-#] [-f ÆÁÊÌ] [-t tty] [-h ÉÍÑ_ÈÏÓÔÁ] [ÐÏÌØÚÏ×ÁÔÅÌØ ...]\n"
 
 #: login-utils/last.c:312
 msgid "  still logged in"
-msgstr ""
+msgstr "  ×ÓÅ ÅÝÅ × ÓÉÓÔÅÍÅ"
 
 #: login-utils/last.c:340
 #, c-format
@@ -5531,14 +6119,16 @@ msgid ""
 "\n"
 "wtmp begins %s"
 msgstr ""
+"\n"
+"wtmp ÎÁÞÁÌÓÑ %s"
 
 #: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
 msgid "last: malloc failure.\n"
-msgstr ""
+msgstr "last: malloc ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ.\n"
 
 #: login-utils/last.c:441
 msgid "last: gethostname"
-msgstr ""
+msgstr "last: gethostname"
 
 #: login-utils/last.c:490
 #, c-format
@@ -5546,24 +6136,35 @@ msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
 msgstr ""
+"\n"
+"ÐÒÅÒ×ÁÎ %10.10s %5.5s \n"
 
-#: login-utils/login.c:402
+#: login-utils/login.c:254
+#, c-format
+msgid "FATAL: can't reopen tty: %s"
+msgstr "èòåîï÷ï: ÎÅ×ÏÚÍÏÖÎÏ ÐÏ×ÔÏÒÎÏ ÏÔËÒÙÔØ tty: %s"
+
+#: login-utils/login.c:285
+msgid "FATAL: bad tty"
+msgstr "èòåîï÷ï: ÐÌÏÈÏÊ tty"
+
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
-msgstr ""
+msgstr "login: -h ÔÏÌØËÏ ÄÌÑ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ.\n"
 
-#: login-utils/login.c:429
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: login [-fp] [ÉÍÑ_ÐÏÌØÚÏ×ÁÔÅÌÑ]\n"
 
 #: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
-msgstr ""
+msgstr "login: ÓÂÏÊ PAM, ÐÒÅÒÙ×ÁÎÉÅ: %s\n"
 
 #: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ PAM: %s"
 
 #.
 #. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
@@ -5573,260 +6174,275 @@ msgstr ""
 #.
 #: login-utils/login.c:557
 msgid "login: "
-msgstr ""
+msgstr "ÌÏÇÉÎ: "
 
 #: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr ""
+msgstr "óâïê ÷èïäá %d éú %s äìñ %s, %s"
 
 #: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
+"îÅ×ÅÒÎÙÊ ÌÏÇÉÎ\n"
+"\n"
 
 #: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
-msgstr ""
+msgstr "óìéûëïí íîïçï ðïðùôïë ÷èïäá (%d) éú %s äìñ %s, %s"
 
 #: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr ""
+msgstr "óâïê óåóóéé ÷èïäá éú %s äìñ %s, %s"
 
 #: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
+"\n"
+"îÅ×ÅÒÎÙÊ ÌÏÇÉÎ\n"
 
-#: login-utils/login.c:639 login-utils/login.c:646 login-utils/login.c:678
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
+"\n"
+"ðÒÏÂÌÅÍÁ ÕÓÔÁÎÏ×ËÉ ÓÅÓÓÉÉ, ÐÒÅÒÙ×ÁÎÉÅ.\n"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
-msgstr ""
+msgstr "ðõóôïå ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ × %s:%d. ðÒÅÒÙ×ÁÎÉÅ."
 
-#: login-utils/login.c:647
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr ""
+msgstr "îÅ×ÅÒÎÏÅ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ \"%s\" × %s:%d. ðÒÅÒÙ×ÁÎÉÅ."
 
-#: login-utils/login.c:664
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
-msgstr ""
+msgstr "login: îÅÈ×ÁÔËÁ ÐÁÍÑÔÉ\n"
 
-#: login-utils/login.c:710
+#: login-utils/login.c:709
 msgid "Illegal username"
-msgstr ""
+msgstr "úÁÐÒÅÝÅÎÎÏÅ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: login-utils/login.c:753
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
-msgstr ""
+msgstr "%s ×ÈÏÄ ÎÁ ÜÔÏÔ ÔÅÒÍÉÎÁÌ ÏÔ×ÅÒÇÎÕÔ.\n"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr ""
+msgstr "÷èïä %s ïô÷åòçîõô éú %s îá TTY %s"
 
-#: login-utils/login.c:762
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr ""
+msgstr "÷èïä %s ïô÷åòçîõô îá TTY %s"
 
-#: login-utils/login.c:815
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÙÊ ÌÏÇÉÎ\n"
 
-#: login-utils/login.c:837
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
 msgstr ""
+"õÖÅ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ×ÏÛÌÏ × ÓÉÓÔÅÍÕ.\n"
+"ðÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ ÐÏÐÏÚÖÅ.\n"
 
-#: login-utils/login.c:841
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
-msgstr ""
+msgstr "õ ×ÁÓ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÚÁÐÕÝÅÎÎÙÈ ÐÒÏÃÅÓÓÏ×.\n"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
-msgstr ""
+msgstr "DIALUP îá %s þåòåú %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
-msgstr ""
+msgstr "÷èïä ROOT ÷ %s ó %s"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
-msgstr ""
+msgstr "÷èïä ROOT ÷ %s"
 
-#: login-utils/login.c:1086
+#: login-utils/login.c:1077
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
-msgstr ""
+msgstr "÷èïä ÷ %s þåòåú %s éú %s"
 
-#: login-utils/login.c:1089
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
-msgstr ""
+msgstr "÷èïä ÷ %s þåòåú %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
-msgstr ""
+msgstr "÷ÁÍ ÎÏ×ÏÅ ÐÉÓØÍÏ.\n"
 
-#: login-utils/login.c:1103
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
-msgstr ""
+msgstr "÷ÁÍ ÐÉÓØÍÏ.\n"
 
 #. error in fork()
-#: login-utils/login.c:1129
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
-msgstr ""
+msgstr "login: ÓÂÏÊ ÓÏÚÄÁÎÉÑ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ: %s"
+
+#: login-utils/login.c:1149
+#, c-format
+msgid "TIOCSCTTY failed: %m"
+msgstr "TIOCSCTTY ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ: %m"
 
-#: login-utils/login.c:1151
+#: login-utils/login.c:1155
 msgid "setuid() failed"
-msgstr ""
+msgstr "setuid() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: login-utils/login.c:1157
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
-msgstr ""
+msgstr "îÅÔ ËÁÔÁÌÏÇÁ %s!\n"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
-msgstr ""
+msgstr "÷ÈÏÄ × ÓÉÓÔÅÍÕ Ó ÄÏÍÁÛÎÉÍ ËÁÔÁÌÏÇÏÍ = \"/\".\n"
 
-#: login-utils/login.c:1169
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
-msgstr ""
+msgstr "login: ÎÅÔ ÐÁÍÑÔÉ ÄÌÑ ÓËÒÉÐÔÁ ÏÂÏÌÏÞËÉ.\n"
 
-#: login-utils/login.c:1196
+#: login-utils/login.c:1200
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
-msgstr ""
+msgstr "login: ÎÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÓËÒÉÐÔ ÏÂÏÌÏÞËÉ: %s.\n"
 
-#: login-utils/login.c:1199
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
-msgstr ""
+msgstr "login: ÎÅÔ ÏÂÏÌÏÞËÉ: %s.\n"
 
-#: login-utils/login.c:1214
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
+"\n"
+"%s ÌÏÇÉÎ: "
 
-#: login-utils/login.c:1225
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
-msgstr ""
+msgstr "ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ.\n"
 
-#: login-utils/login.c:1226
+#: login-utils/login.c:1230
 msgid "NAME too long"
-msgstr ""
+msgstr "éíñ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
 
-#: login-utils/login.c:1233
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
-msgstr ""
+msgstr "ÉÍÅÎÁ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÍÏÇÕÔ ÎÅ ÎÁÞÉÎÁÔØÓÑ Ó '-'.\n"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
-msgstr ""
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÕÓÔÙÈ ÐÅÒÅ×ÏÄÏ× ÓÔÒÏË.\n"
 
-#: login-utils/login.c:1244
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
-msgstr ""
+msgstr "þòåúíåòîùå ÐÅÒÅ×ÏÄÙ ÓÔÒÏË"
 
-#: login-utils/login.c:1255
+#: login-utils/login.c:1280
 #, c-format
 msgid "Login timed out after %d seconds\n"
-msgstr ""
+msgstr "÷ÈÏÄ × ÓÉÓÔÅÍÕ ÐÒÅ×ÙÓÉÌ ÐÒÅÄÅÌ ÏÖÉÄÁÎÉÑ × %d ÓÅËÕÎÄ\n"
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1366
 #, c-format
 msgid "Last login: %.*s "
-msgstr ""
+msgstr "ðÏÓÌÅÄÎÉÊ ×ÈÏÄ × ÓÉÓÔÅÍÕ: %.*s "
 
-#: login-utils/login.c:1356
+#: login-utils/login.c:1370
 #, c-format
 msgid "from %.*s\n"
-msgstr ""
+msgstr "ÉÚ %.*s\n"
 
-#: login-utils/login.c:1359
+#: login-utils/login.c:1373
 #, c-format
 msgid "on %.*s\n"
-msgstr ""
+msgstr "× %.*s\n"
 
-#: login-utils/login.c:1379
+#: login-utils/login.c:1393
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
-msgstr ""
+msgstr "óâïê ÷èïäá ÷ óéóôåíõ éú %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1396
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
-msgstr ""
+msgstr "óâïê ÷èïäá ÷ óéóôåíõ îá %s, %s"
 
-#: login-utils/login.c:1386
+#: login-utils/login.c:1400
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr ""
+msgstr "%d óâïé ÷èïäá éú %s, %s"
 
-#: login-utils/login.c:1389
+#: login-utils/login.c:1403
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr ""
+msgstr "%d óâïé ÷èïäá ÷ %s, %s"
 
 #: login-utils/mesg.c:89
 msgid "is y\n"
-msgstr ""
+msgstr "- ÄÁ\n"
 
 #: login-utils/mesg.c:92
 msgid "is n\n"
-msgstr ""
+msgstr "- ÎÅÔ\n"
 
 #: login-utils/mesg.c:112
 msgid "usage: mesg [y | n]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: mesg [Ä | Î]\n"
 
 #: login-utils/newgrp.c:68
 msgid "newgrp: Who are you?"
-msgstr ""
+msgstr "newgrp: ÷Ù ËÔÏ?"
 
 #: login-utils/newgrp.c:76 login-utils/newgrp.c:86
 msgid "newgrp: setgid"
-msgstr ""
+msgstr "newgrp: setgid"
 
 #: login-utils/newgrp.c:81
 msgid "newgrp: No such group."
-msgstr ""
+msgstr "newgrp: îÅÔ ÔÁËÏÊ ÇÒÕÐÐÙ."
 
 #: login-utils/newgrp.c:90
 msgid "newgrp: Permission denied"
-msgstr ""
+msgstr "newgrp: äÏÓÔÕÐ ÚÁÐÒÅÝÅÎ"
 
 #: login-utils/newgrp.c:97
 msgid "newgrp: setuid"
-msgstr ""
+msgstr "newgrp: setuid"
 
 #: login-utils/newgrp.c:103
 msgid "No shell"
-msgstr ""
+msgstr "îÅÔ ÏÂÏÌÏÞËÉ"
 
 #: login-utils/passwd.c:161
 msgid "The password must have at least 6 characters, try again.\n"
-msgstr ""
+msgstr "ðÁÒÏÌØ ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ 6 ÓÉÍ×ÏÌÏ×, ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ.\n"
 
 #: login-utils/passwd.c:174
 msgid ""
@@ -5834,159 +6450,162 @@ msgid ""
 "classes:  upper and lower case letters, digits and non alphanumeric\n"
 "characters. See passwd(1) for more information.\n"
 msgstr ""
+"ðÁÒÏÌØ ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ ÓÉÍ×ÏÌÙ ÓÌÅÄÕÀÝÉÈ Ä×ÕÈ ËÌÁÓÓÏ×:\n"
+"ÓÉÍ×ÏÌÙ ×ÅÒÈÎÅÇÏ É ÎÉÖÎÅÇÏ ÒÅÇÉÓÔÒÁ, ÃÉÆÒÙ É ÎÅ ÂÕË×ÅÎÎÏÃÉÆÒÏ×ÙÅ\n"
+"ÓÉÍ×ÏÌÙ. óÍ. passwd(1) ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
 #: login-utils/passwd.c:183
 msgid "You cannot reuse the old password.\n"
-msgstr ""
+msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÐÏ×ÔÏÒÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÔÁÒÙÊ ÐÁÒÏÌØ.\n"
 
 #: login-utils/passwd.c:188
 msgid "Please don't use something like your username as password!\n"
-msgstr ""
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÎÅ ÉÓÐÏÌØÚÕÊÔÅ × ËÁÞÅÓÔ×Å ÐÁÒÏÌÑ ÞÔÏ-ÔÏ ×ÒÏÄÅ Ó×ÏÅÇÏ ÉÍÅÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ!\n"
 
 #: login-utils/passwd.c:199 login-utils/passwd.c:206
 msgid "Please don't use something like your realname as password!\n"
-msgstr ""
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÎÅ ÉÓÐÏÌØÚÕÊÔÅ × ËÁÞÅÓÔ×Å ÐÁÒÏÌÑ ÞÔÏ-ÔÏ ×ÒÏÄÅ Ó×ÏÅÇÏ ÎÁÓÔÏÑÝÅÇÏ ÉÍÅÎÉ!\n"
 
 #: login-utils/passwd.c:224
 msgid "Usage: passwd [username [password]]\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: passwd [ÉÍÑ_ÐÏÌØÚÏ×ÁÔÅÌÑ [ÐÁÒÏÌØ]]\n"
 
 #: login-utils/passwd.c:225
 msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
+msgstr "ôÏÌØËÏ root ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÆÏÒÍÙ Ó ÏÄÎÉÍ É Ä×ÕÍÑ ÁÒÇÕÍÅÎÔÁÍÉ.\n"
 
-#: login-utils/passwd.c:279
+#: login-utils/passwd.c:280
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: passwd [-foqsvV] [ÐÏÌØÚÏ×ÁÔÅÌØ [ÐÁÒÏÌØ]]\n"
 
-#: login-utils/passwd.c:300
+#: login-utils/passwd.c:301
 #, c-format
 msgid "Can't exec %s: %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ %s: %s\n"
 
-#: login-utils/passwd.c:311
+#: login-utils/passwd.c:312
 msgid "Cannot find login name"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÏÅ ÉÍÑ"
 
-#: login-utils/passwd.c:318 login-utils/passwd.c:325
+#: login-utils/passwd.c:319 login-utils/passwd.c:326
 msgid "Only root can change the password for others.\n"
-msgstr ""
+msgstr "ôÏÌØËÏ root ÍÏÖÅÔ ÉÚÍÅÎÑÔØ ÞÕÖÉÅ ÐÁÒÏÌÉ.\n"
 
-#: login-utils/passwd.c:333
+#: login-utils/passwd.c:334
 msgid "Too many arguments.\n"
-msgstr ""
+msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×.\n"
 
-#: login-utils/passwd.c:338
+#: login-utils/passwd.c:339
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ. `%s' ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÌØÚÏ×ÁÔÅÌØ?"
 
-#: login-utils/passwd.c:342
+#: login-utils/passwd.c:343
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
+msgstr "ë ÓÏÖÁÌÅÎÉÀ Ñ ÍÏÇÕ ÉÚÍÅÎÑÔØ ÔÏÌØËÏ ÌÏËÁÌØÎÙÅ ÐÁÒÏÌÉ. ÷ÍÅÓÔÏ ÜÔÏÇÏ ÉÓÐÏÌØÚÕÊÔÅ yppasswd."
 
-#: login-utils/passwd.c:348
+#: login-utils/passwd.c:349
 msgid "UID and username does not match, imposter!"
-msgstr ""
+msgstr "UID É ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÎÅ ÓÏ×ÐÁÄÁÀÔ, ÓÁÍÏÚ×ÁÎÅÃ!"
 
-#: login-utils/passwd.c:353
+#: login-utils/passwd.c:354
 #, c-format
 msgid "Changing password for %s\n"
-msgstr ""
+msgstr "éÚÍÅÎÅÎÉÅ ÐÁÒÏÌÑ ÄÌÑ %s\n"
 
-#: login-utils/passwd.c:357
+#: login-utils/passwd.c:358
 msgid "Enter old password: "
-msgstr ""
+msgstr "÷×ÅÄÉÔÅ ÓÔÁÒÙÊ ÐÁÒÏÌØ: "
 
-#: login-utils/passwd.c:359
+#: login-utils/passwd.c:360
 msgid "Illegal password, imposter."
-msgstr ""
+msgstr "úÁÐÒÅÝÅÎÎÙÊ ÐÁÒÏÌØ, ÓÁÍÏÚ×ÁÎÅÃ."
 
-#: login-utils/passwd.c:371
+#: login-utils/passwd.c:372
 msgid "Enter new password: "
-msgstr ""
+msgstr "÷×ÅÄÉÔÅ ÎÏ×ÙÊ ÐÁÒÏÌØ: "
 
-#: login-utils/passwd.c:373
+#: login-utils/passwd.c:374
 msgid "Password not changed."
-msgstr ""
+msgstr "ðÁÒÏÌØ ÎÅ ÉÚÍÅÎÅÎ."
 
-#: login-utils/passwd.c:382
+#: login-utils/passwd.c:383
 msgid "Re-type new password: "
-msgstr ""
+msgstr "ðÏ×ÔÏÒÉÔÅ ÎÏ×ÙÊ ÐÁÒÏÌØ: "
 
-#: login-utils/passwd.c:385
+#: login-utils/passwd.c:386
 msgid "You misspelled it. Password not changed."
-msgstr ""
+msgstr "÷Ù ÏÛÉÂÌÉÓØ. ðÁÒÏÌØ ÎÅ ÉÚÍÅÎÅÎ."
 
-#: login-utils/passwd.c:400
+#: login-utils/passwd.c:401
 #, c-format
 msgid "password changed, user %s"
-msgstr ""
+msgstr "ÐÁÒÏÌØ ÉÚÍÅÎÅÎ, ÐÏÌØÚÏ×ÁÔÅÌØ %s"
 
-#: login-utils/passwd.c:403
+#: login-utils/passwd.c:404
 msgid "ROOT PASSWORD CHANGED"
-msgstr ""
+msgstr "ðáòïìø ROOT'A éúíåîåî"
 
-#: login-utils/passwd.c:405
+#: login-utils/passwd.c:406
 #, c-format
 msgid "password changed by root, user %s"
-msgstr ""
+msgstr "ÐÁÒÏÌØ ÉÚÍÅÎÅÎ root'ÏÍ, ÐÏÌØÚÏ×ÁÔÅÌØ %s"
 
-#: login-utils/passwd.c:412
+#: login-utils/passwd.c:413
 msgid "calling setpwnam to set password.\n"
-msgstr ""
+msgstr "×ÙÚÙ×ÁÅÔÓÑ setpwnam ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁÒÏÌÑ.\n"
 
-#: login-utils/passwd.c:416
+#: login-utils/passwd.c:417
 msgid "Password *NOT* changed.  Try again later.\n"
-msgstr ""
+msgstr "ðÁÒÏÌØ *îå* ÉÚÍÅÎÅÎ, ðÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ ÐÏÐÏÚÖÅ.\n"
 
-#: login-utils/passwd.c:422
+#: login-utils/passwd.c:423
 msgid "Password changed.\n"
-msgstr ""
+msgstr "ðÁÒÏÌØ ÉÚÍÅÎÅÎ.\n"
 
 #: login-utils/shutdown.c:113
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: shutdown [-h|-r] [-fqs] [now|hh:ss|+ÍÉÎÕÔÙ]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
-msgstr ""
+msgstr "ðÒÏÃÅÓÓ ×ÙËÌÀÞÅÎÉÑ ÐÒÅÒ×ÁÎ"
 
 #: login-utils/shutdown.c:162
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr ""
+msgstr "%s: ôÏÌØËÏ root ÍÏÖÅÔ ÚÁ×ÅÒÛÁÔØ ÒÁÂÏÔÕ ÓÉÓÔÅÍÙ.\n"
 
 #: login-utils/shutdown.c:256
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr ""
+msgstr "üÔÏ ÄÏÌÖÎÏ ÂÙÔØ ÚÁ×ÔÒÁ, ÓÍÏÖÅÔÅ ÌÉ ×Ù ÖÄÁÔØ ÔÁË ÄÏÌÇÏ?\n"
 
 #: login-utils/shutdown.c:307
 msgid "for maintenance; bounce, bounce"
-msgstr ""
+msgstr "ÄÌÑ ÏÂÓÌÕÖÉ×ÁÎÉÑ; ÎÁ ÆÉÇ, ÎÁ ÆÉÇ"
 
 #: login-utils/shutdown.c:311
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
-msgstr ""
+msgstr "ÔÁÊÍ-ÁÕÔ = %d, ÍÏÌÞÁÎÉÅ = %d, ÐÅÒÅÚÁÇÒÕÚËÁ = %d\n"
 
 #: login-utils/shutdown.c:336
 msgid "The system is being shut down within 5 minutes"
-msgstr ""
+msgstr "óÉÓÔÅÍÁ ÚÁ×ÅÒÛÉÔ Ó×ÏÀ ÒÁÂÏÔÕ × ÔÅÞÅÎÉÅ 5 ÍÉÎÕÔ"
 
 #: login-utils/shutdown.c:340
 msgid "Login is therefore prohibited."
-msgstr ""
+msgstr "óÌÅÄÏ×ÁÔÅÌØÎÏ, ×ÈÏÄ × ÓÉÓÔÅÍÕ ÚÁÐÒÅÝÅÎ."
 
 #: login-utils/shutdown.c:362
 #, c-format
 msgid "rebooted by %s: %s"
-msgstr ""
+msgstr "ÐÅÒÅÚÁÇÒÕÖÅÎ %s'ÏÍ: %s"
 
 #: login-utils/shutdown.c:365
 #, c-format
 msgid "halted by %s: %s"
-msgstr ""
+msgstr "ÏÓÔÁÎÏ×ÌÅÎ %s'ÏÍ: %s"
 
 #. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
@@ -5994,871 +6613,877 @@ msgid ""
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
+"\n"
+"ðÏÞÅÍÕ Ñ ×ÓÅ ÅÝÅ ÖÉ× ÐÏÓÌÅ ÐÅÒÅÚÁÇÒÕÚËÉ?"
 
 #: login-utils/shutdown.c:431
 msgid ""
 "\n"
 "Now you can turn off the power..."
 msgstr ""
+"\n"
+"ôÅÐÅÒØ ×Ù ÍÏÖÅÔÅ ×ÙËÌÀÞÉÔØ ÐÉÔÁÎÉÅ..."
 
 #: login-utils/shutdown.c:447
 msgid "Calling kernel power-off facility...\n"
-msgstr ""
+msgstr "÷ÙÚÙ×ÁÅÔÓÑ ÓÒÅÄÓÔ×Ï ÑÄÒÁ ÄÌÑ ×ÙËÌÀÞÅÎÉÑ ÐÉÔÁÎÉÑ...\n"
 
 #: login-utils/shutdown.c:450
 #, c-format
 msgid "Error powering off\t%s\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ×ÙËÌÀÞÅÎÉÑ ÐÉÔÁÎÉÑ\t%s\n"
 
 #: login-utils/shutdown.c:458
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
-msgstr ""
+msgstr "÷ÙÐÏÌÎÅÎÉÅ ÐÒÏÇÒÁÍÍÙ \"%s\" ...\n"
 
 #: login-utils/shutdown.c:461
 #, c-format
 msgid "Error executing\t%s\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ\t%s\n"
 
 #. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr ""
+msgstr "óòïþîï: ÛÉÒÏËÏ×ÅÝÁÔÅÌØÎÏÅ ÓÏÏÂÝÅÎÉÅ ÏÔ %s:"
 
 #: login-utils/shutdown.c:494
 #, c-format
 msgid "System going down in %d hours %d minutes"
-msgstr ""
+msgstr "óÉÓÔÅÍÁ ÚÁ×ÅÒÛÉÔ Ó×ÏÀ ÒÁÂÏÔÕ ÞÅÒÅÚ %d ÞÁÓÏ× %d ÍÉÎÕÔ"
 
 #: login-utils/shutdown.c:497
 #, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr ""
+msgstr "óÉÓÔÅÍÁ ÚÁ×ÅÒÛÉÔ Ó×ÏÀ ÒÁÂÏÔÕ ÞÅÒÅÚ 1 ÞÁÓ %d ÍÉÎÕÔ"
 
 #: login-utils/shutdown.c:500
 #, c-format
 msgid "System going down in %d minutes\n"
-msgstr ""
+msgstr "óÉÓÔÅÍÁ ÚÁ×ÅÒÛÉÔ Ó×ÏÀ ÒÁÂÏÔÕ ÞÅÒÅÚ %d ÍÉÎÕÔ\n"
 
 #: login-utils/shutdown.c:503
 msgid "System going down in 1 minute\n"
-msgstr ""
+msgstr "óÉÓÔÅÍÁ ÚÁ×ÅÒÛÉÔ Ó×ÏÀ ÒÁÂÏÔÕ ÞÅÒÅÚ 1 ÍÉÎÕÔÕ\n"
 
 #: login-utils/shutdown.c:505
 msgid "System going down IMMEDIATELY!\n"
-msgstr ""
+msgstr "óÉÓÔÅÍÁ ÚÁ×ÅÒÛÁÅÔ Ó×ÏÀ ÒÁÂÏÔÕ îåíåäìåîîï!\n"
 
 #: login-utils/shutdown.c:510
 #, c-format
 msgid "\t... %s ...\n"
-msgstr ""
+msgstr "\t... %s ...\n"
 
 #: login-utils/shutdown.c:567
 msgid "Cannot fork for swapoff. Shrug!"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ ÄÌÑ swapoff. éÇÎÏÒÉÒÕÅÔÓÑ!"
 
 #: login-utils/shutdown.c:575
 msgid "Cannot exec swapoff, hoping umount will do the trick."
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ swapoff, ÎÁÄÅÀÓØ, ÞÔÏ umount ÓÐÒÁ×ÉÔÓÑ Ó ÜÔÉÍ."
 
 #: login-utils/shutdown.c:594
 msgid "Cannot fork for umount, trying manually."
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ ÄÌÑ umount, ÐÙÔÁÀÓØ ×ÒÕÞÎÕÀ."
 
 #: login-utils/shutdown.c:603
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ %s, ÐÙÔÁÀÓØ umount.\n"
 
 #: login-utils/shutdown.c:607
 msgid "Cannot exec umount, giving up on umount."
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ umount, ÓÄÁÀÓØ ÐÅÒÅÄ umount."
 
 #: login-utils/shutdown.c:612
 msgid "Unmounting any remaining filesystems..."
-msgstr ""
+msgstr "òÁÚÍÏÎÔÉÒÕÀÔÓÑ ×ÓÅ ÏÓÔÁ×ÛÉÅÓÑ ÆÁÊÌÏ×ÙÅ ÓÉÓÔÅÍÙ..."
 
 #: login-utils/shutdown.c:648
 #, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
-msgstr ""
+msgstr "shutdown: îÅ×ÏÚÍÏÖÎÏ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ %s: %s\n"
 
-#: login-utils/simpleinit.c:128
+#: login-utils/simpleinit.c:130
 msgid "Booting to single user mode.\n"
-msgstr ""
+msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÚÁÇÒÕÚËÁ × ÏÄÎÏÐÏÌØÚÏ×ÁÔÅÌØÓËÏÍ ÒÅÖÉÍÅ.\n"
 
-#: login-utils/simpleinit.c:132
+#: login-utils/simpleinit.c:134
 msgid "exec of single user shell failed\n"
-msgstr ""
+msgstr "×ÙÐÏÌÎÅÎÉÅ ÏÄÎÏÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÏÂÏÌÏÞËÉ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
 
-#: login-utils/simpleinit.c:136
+#: login-utils/simpleinit.c:138
 msgid "fork of single user shell failed\n"
-msgstr ""
+msgstr "ÓÏÚÄÁÎÉÅ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ ÏÄÎÏÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÏÂÏÌÏÞËÉ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
 
-#: login-utils/simpleinit.c:204
+#: login-utils/simpleinit.c:206
 msgid "error opening fifo\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ fifo\n"
+
+#: login-utils/simpleinit.c:210
+msgid "error setting close-on-exec on /dev/initctl"
+msgstr "ÏÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ close-on-exec ÎÁ /dev/initctl"
 
-#: login-utils/simpleinit.c:242
+#: login-utils/simpleinit.c:257
 msgid "error running finalprog\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÚÁÐÕÓËÁ finalprog\n"
 
 #. Error
-#: login-utils/simpleinit.c:246
+#: login-utils/simpleinit.c:261
 msgid "error forking finalprog\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ finalprog\n"
 
-#: login-utils/simpleinit.c:325
+#: login-utils/simpleinit.c:343
 msgid ""
 "\n"
 "Wrong password.\n"
 msgstr ""
+"\n"
+"îÅ×ÅÒÎÙÊ ÐÁÒÏÌØ.\n"
 
-#: login-utils/simpleinit.c:398
+#: login-utils/simpleinit.c:416
 msgid "lstat of path failed\n"
-msgstr ""
+msgstr "lstat ÐÕÔÉ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ\n"
 
-#: login-utils/simpleinit.c:406
+#: login-utils/simpleinit.c:424
 msgid "stat of path failed\n"
-msgstr ""
+msgstr "stat ÐÕÔÉ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ\n"
 
-#: login-utils/simpleinit.c:414
+#: login-utils/simpleinit.c:432
 msgid "open of directory failed\n"
-msgstr ""
+msgstr "ÏÔËÒÙÔÉÅ ËÁÔÁÌÏÇÁ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
 
-#: login-utils/simpleinit.c:481
+#: login-utils/simpleinit.c:506
 msgid "fork failed\n"
-msgstr ""
+msgstr "ÓÏÚÄÁÎÉÅ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
 
-#: login-utils/simpleinit.c:512 text-utils/more.c:1624
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
-msgstr ""
+msgstr "×ÙÐÏÌÎÅÎÉÅ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
 
-#: login-utils/simpleinit.c:536
+#: login-utils/simpleinit.c:561
 msgid "cannot open inittab\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ inittab\n"
 
-#: login-utils/simpleinit.c:603
+#: login-utils/simpleinit.c:628
 msgid "no TERM or cannot stat tty\n"
-msgstr ""
+msgstr "ÎÅÔ TERM ÉÌÉ ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ tty\n"
 
-#: login-utils/simpleinit.c:909
+#: login-utils/simpleinit.c:934
 #, c-format
 msgid "error stopping service: \"%s\""
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÏÓÔÁÎÏ×ËÉ ÓÅÒ×ÉÓÁ: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr ""
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ iov'Ï× (ÉÚÍÅÎÉÔÅ ËÏÄ × wall/ttymsg.c)"
 
 #: login-utils/ttymsg.c:85
 msgid "excessively long line arg"
-msgstr ""
+msgstr "ÞÒÅÚ×ÙÞÁÊÎÏ ÄÌÉÎÎÁÑ ÓÔÒÏËÁ arg"
 
 #: login-utils/ttymsg.c:139
 msgid "cannot fork"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ"
 
 #: login-utils/ttymsg.c:143
 #, c-format
 msgid "fork: %s"
-msgstr ""
+msgstr "ÓÏÚÄÁÎÉÅ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ: %s"
 
 #: login-utils/ttymsg.c:171
 #, c-format
 msgid "%s: BAD ERROR"
-msgstr ""
+msgstr "%s: ðìïèáñ ïûéâëá"
 
 #: login-utils/vipw.c:139
 #, c-format
 msgid "%s: the password file is busy.\n"
-msgstr ""
+msgstr "%s: ÆÁÊÌ ÐÁÒÏÌÅÊ ÚÁÎÑÔ.\n"
 
 #: login-utils/vipw.c:142
 #, c-format
 msgid "%s: the group file is busy.\n"
-msgstr ""
+msgstr "%s: ÆÁÊÌ ÇÒÕÐÐ ÚÁÎÑÔ.\n"
 
 #: login-utils/vipw.c:158
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
-msgstr ""
+msgstr "%s: ÆÁÊÌ %s ÚÁÎÑÔ (ÐÒÉÓÕÔÓÔ×ÕÅÔ %s)\n"
 
 #: login-utils/vipw.c:164
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ Ó×ÑÚÁÔØ Ó %s: %s\n"
 
 #: login-utils/vipw.c:195
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÂÌÏËÉÒÏ×ÁÔØ %s: %s (×ÁÛÉ ÉÚÍÅÎÅÎÉÑ ×ÓÅ ÅÝÅ × %s)\n"
 
 #: login-utils/vipw.c:218
 #, c-format
 msgid "%s: Cannot fork\n"
-msgstr ""
+msgstr "%s: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ\n"
 
 #: login-utils/vipw.c:254
 #, c-format
 msgid "%s: %s unchanged\n"
-msgstr ""
+msgstr "%s: %s ÎÅ ÉÚÍÅÎÅÎ\n"
 
 #: login-utils/vipw.c:273
 #, c-format
 msgid "%s: no changes made\n"
-msgstr ""
+msgstr "%s: ÉÚÍÅÎÅÎÉÑ ÎÅ ÓÄÅÌÁÎÙ\n"
 
 #: login-utils/vipw.c:328
 msgid "You are using shadow groups on this system.\n"
-msgstr ""
+msgstr "÷Ù ÉÓÐÏÌØÚÕÅÔÅ ÔÅÎÅ×ÙÅ ÇÒÕÐÐÙ ÎÁ ÜÔÏÊ ÓÉÓÔÅÍÅ.\n"
 
 #: login-utils/vipw.c:329
 msgid "You are using shadow passwords on this system.\n"
-msgstr ""
+msgstr "÷Ù ÉÓÐÏÌØÚÕÅÔÅ ÔÅÎÅ×ÙÅ ÐÁÒÏÌÉ ÎÁ ÜÔÏÊ ÓÉÓÔÅÍÅ.\n"
 
 #: login-utils/vipw.c:330
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
-msgstr ""
+msgstr "èÏÔÉÔÅ ÌÉ ×Ù ÓÅÊÞÁÓ ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ %s [Ä/Î]? "
 
 #: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ÆÁÊÌ]\n"
 
 #: login-utils/wall.c:159
 #, c-format
 msgid "%s: can't open temporary file.\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ.\n"
 
 #: login-utils/wall.c:186
 #, c-format
 msgid "Broadcast Message from %s@%s"
-msgstr ""
+msgstr "ûÉÒÏËÏ×ÅÝÁÔÅÌØÎÏÅ ÓÏÏÂÝÅÎÉÅ ÏÔ %s@%s"
 
 #: login-utils/wall.c:204
 #, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr ""
+msgstr "%s: ÎÅ ÂÕÄÅÔ ÐÒÏÞÉÔÁÎ %s - ÉÓÐÏÌØÚÕÊÔÅ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n"
 
 #: login-utils/wall.c:209
 #, c-format
 msgid "%s: can't read %s.\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s.\n"
 
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ.\n"
 
 #: login-utils/wall.c:241
 #, c-format
 msgid "%s: can't read temporary file.\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ.\n"
 
-#: misc-utils/cal.c:257
+#: misc-utils/cal.c:262
 msgid "illegal month value: use 1-12"
-msgstr ""
+msgstr "ÚÁÐÒÅÝÅÎÎÏÅ ÚÎÁÞÅÎÉÅ ÍÅÓÑÃÁ: ÉÓÐÏÌØÚÕÊÔÅ 1-12"
 
-#: misc-utils/cal.c:261
+#: misc-utils/cal.c:266
 msgid "illegal year value: use 1-9999"
-msgstr ""
+msgstr "ÚÁÐÒÅÝÅÎÎÏÅ ÚÎÁÞÅÎÉÅ ÇÏÄÁ: ÉÓÐÏÌØÚÕÊÔÅ 1-9999"
 
 #. %s is the month name, %d the year number.
-#. * you can change the order and/or add something her; eg for
+#. * you can change the order and/or add something here; eg for
 #. * Basque the translation should be: "%2$dko %1$s", and
 #. * the Vietnamese should be "%s na(m %d", etc.
 #.
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 #, c-format
 msgid "%s %d"
-msgstr ""
+msgstr "%s %d"
 
-#: misc-utils/cal.c:671
-msgid "usage: cal [-mjyV] [[month] year]\n"
-msgstr ""
+#: misc-utils/cal.c:676
+msgid "usage: cal [-13smjyV] [[month] year]\n"
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: cal [-13smjyV] [[ÍÅÓÑÃ] ÇÏÄ]\n"
 
 #: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [+ÆÏÒÍÁÔ] [ÄÅÎØ ÍÅÓÑà ÇÏÄ]\n"
 
 #. handle St. Tib's Day
 #: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
-msgstr ""
+msgstr "äÅÎØ ó×. éÚÁÂÅÌÌÙ"
 
 #: misc-utils/kill.c:206
 #, c-format
 msgid "%s: unknown signal %s\n"
-msgstr ""
+msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÇÎÁÌ %s\n"
 
 #: misc-utils/kill.c:269
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÐÒÏÃÅÓÓ \"%s\"\n"
 
 #: misc-utils/kill.c:313
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
-msgstr ""
+msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÇÎÁÌ %s; ×ÅÒÎÙÅ ÓÉÇÎÁÌÙ:\n"
 
 #: misc-utils/kill.c:353
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ -s ÓÉÇÎÁÌ | -p ] [ -a ] pid ...\n"
 
 #: misc-utils/kill.c:354
 #, c-format
 msgid "       %s -l [ signal ]\n"
-msgstr ""
+msgstr "       %s -l [ ÓÉÇÎÁÌ ]\n"
 
 #: misc-utils/logger.c:140
 #, c-format
 msgid "logger: %s: %s.\n"
-msgstr ""
+msgstr "logger: %s: %s.\n"
 
 #: misc-utils/logger.c:247
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
-msgstr ""
+msgstr "logger: ÉÍÑ ÎÅÉÚ×ÅÓÔÎÏÇÏ ÓÒÅÄÓÔ×Á: %s.\n"
 
 #: misc-utils/logger.c:259
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
-msgstr ""
+msgstr "logger: ÉÍÑ ÎÅÉÚ×ÅÓÔÎÏÇÏ ÐÒÉÏÒÉÔÅÔÁ: %s.\n"
 
 #: misc-utils/logger.c:286
-msgid ""
-"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr ""
+msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: logger [-is] [-f ÆÁÊÌ] [-p ÐÒÉÏÒÉÔÅÔ] [-t ÔÜÇ] [-u ÓÏËÅÔ] [ ÓÏÏÂÝÅÎÉÅ ... ]\n"
 
 #: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: look [-dfa] [-t ÓÉÍ×ÏÌ] ÓÔÒÏËÁ [ÆÁÊÌ]\n"
 
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
 msgid "Could not open %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s\n"
 
 #: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
 #, c-format
 msgid "Got %d bytes from %s\n"
-msgstr ""
+msgstr "ðÏÌÕÞÅÎÏ %d ÂÁÊÔ ÉÚ %s\n"
 
 #: misc-utils/namei.c:102
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
-msgstr ""
+msgstr "namei: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÔÅËÕÝÉÊ ËÁÔÁÌÏÇ - %s\n"
 
 #: misc-utils/namei.c:115
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
-msgstr ""
+msgstr "namei: ÎÅ×ÏÚÍÏÖÎÏ ÓÍÅÎÉÔØ ËÁÔÁÌÏÇ ÎÁ %s - %s (%d)\n"
 
 #: misc-utils/namei.c:125
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: namei [-mx] ÐÕÔÅ×ÏÅ_ÉÍÑ [ÐÕÔÅ×ÏÅ_ÉÍÑ ...]\n"
 
 #: misc-utils/namei.c:150
 msgid "namei: could not chdir to root!\n"
-msgstr ""
+msgstr "namei: ÎÅ×ÏÚÍÏÖÎÏ ÓÍÅÎÉÔØ ËÁÔÁÌÏÇ ÎÁ ËÏÒÎÅ×ÏÊ!\n"
 
 #: misc-utils/namei.c:157
 msgid "namei: could not stat root!\n"
-msgstr ""
+msgstr "namei: ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ ËÏÒÎÅ×ÏÇÏ ËÁÔÁÌÏÇÁ!\n"
 
 #: misc-utils/namei.c:171
 msgid "namei: buf overflow\n"
-msgstr ""
+msgstr "namei: ÐÅÒÅÐÏÌÎÅÎÉÅ ÂÕÆÅÒÁ\n"
 
 #: misc-utils/namei.c:217
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
-msgstr ""
+msgstr " ? ÎÅ×ÏÚÍÏÖÎÏ ÓÍÅÎÉÔØ ËÁÔÁÌÏÇ ÎÁ %s - %s (%d)\n"
 
 #: misc-utils/namei.c:246
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
-msgstr ""
+msgstr " ? ÐÒÏÂÌÅÍÙ ÐÒÉ ÞÔÅÎÉÉ ÓÉÍ×ÏÌÉÞÅÓËÏÊ ÓÓÙÌËÉ %s - %s (%d)\n"
 
 #: misc-utils/namei.c:256
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
-msgstr ""
+msgstr "  *** ðòå÷ùûåî ðòåäåì UNIX äìñ óéí÷ïìéþåóëéè óóùìïë ***\n"
 
 #: misc-utils/namei.c:293
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
-msgstr ""
+msgstr "namei: ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÆÁÊÌÁ 0%06o × ÆÁÊÌÅ %s\n"
 
 #: misc-utils/rename.c:38
 #, c-format
 msgid "%s: out of memory\n"
-msgstr ""
+msgstr "%s: ÎÅÈ×ÁÔËÁ ÐÁÍÑÔÉ\n"
 
 #: misc-utils/rename.c:56
 #, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr ""
+msgstr "%s: ÐÅÒÅÉÍÅÎÏ×ÁÎÉÅ %s × %s ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ: %s\n"
 
 #: misc-utils/rename.c:86
 #, c-format
 msgid "call: %s from to files...\n"
-msgstr ""
+msgstr "call: %s ÉÚ × ÆÁÊÌÙ...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
-"Warning: `%s' is a symlink.\n"
+"Warning: `%s' is a link.\n"
 "Use `%s [options] %s' if you really want to use it.\n"
 "Script not started.\n"
 msgstr ""
+"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: `%s' Ñ×ÌÑÅÔÓÑ ÓÓÙÌËÏÊ.\n"
+"éÓÐÏÌØÚÕÊÔÅ `%s [ÏÐÃÉÉ] %s', ÅÓÌÉ ×Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÜÔÏ ÉÓÐÏÌØÚÏ×ÁÔØ.\n"
+"óËÒÉÐÔ ÎÅ ÚÁÐÕÝÅÎ.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:159
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: script [-a] [-f] [-q] [-t] [ÆÁÊÌ]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:182
 #, c-format
 msgid "Script started, file is %s\n"
-msgstr ""
+msgstr "óËÒÉÐÔ ÚÁÐÕÝÅÎ, ÆÁÊÌ - %s\n"
 
-#: misc-utils/script.c:254
+#: misc-utils/script.c:268
 #, c-format
 msgid "Script started on %s"
-msgstr ""
+msgstr "óËÒÉÐÔ ÚÁÐÕÝÅÎ %s"
 
-#: misc-utils/script.c:325
+#: misc-utils/script.c:352
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
+"\n"
+"óËÒÉÐÔ ×ÙÐÏÌÎÅÎ %s"
 
-#: misc-utils/script.c:333
+#: misc-utils/script.c:359
 #, c-format
 msgid "Script done, file is %s\n"
-msgstr ""
+msgstr "óËÒÉÐÔ ×ÙÐÏÌÎÅÎ, ÆÁÊÌ - %s\n"
 
-#: misc-utils/script.c:344
+#: misc-utils/script.c:370
 msgid "openpty failed\n"
-msgstr ""
+msgstr "openpty ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ\n"
 
-#: misc-utils/script.c:378
+#: misc-utils/script.c:404
 msgid "Out of pty's\n"
-msgstr ""
+msgstr "îÅ È×ÁÔÁÅÔ pty\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:744
 #, c-format
 msgid "%s: Argument error, usage\n"
-msgstr ""
+msgstr "%s: ïÛÉÂËÁ ÁÒÇÕÍÅÎÔÁ, ÉÓÐÏÌØÚÏ×ÁÎÉÅ\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
-msgstr ""
+msgstr "  [ -term ÉÍÑ_ÔÅÒÍÉÎÁÌÁ ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
-msgstr ""
+msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
-msgstr ""
+msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
-msgstr ""
+msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
-msgstr ""
+msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
-msgstr ""
+msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
-msgstr ""
+msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
-msgstr ""
+msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
-msgstr ""
+msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
-msgstr ""
+msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
-msgstr ""
+msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:759 misc-utils/setterm.c:761
+#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
 msgid "|red|magenta|yellow|white|default ]\n"
-msgstr ""
+msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
-msgstr ""
+msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
-msgstr ""
+msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
+#: misc-utils/setterm.c:770
 msgid "|red|magenta|yellow|white ]\n"
-msgstr ""
+msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
-msgstr ""
+msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
-msgstr ""
+msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
-msgstr ""
+msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
-msgstr ""
+msgstr "  [ -standout [ ÁÔÔÒÉÂ ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
-msgstr ""
+msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
-msgstr ""
+msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
-msgstr ""
+msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
-msgstr ""
+msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
-msgstr ""
+msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
-msgstr ""
+msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
-msgstr ""
+msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
-msgstr ""
+msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:782
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-msgstr ""
+msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:783
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-msgstr ""
+msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
-msgstr ""
+msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
-msgstr ""
+msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
-msgstr ""
+msgstr "  [ -dump   [1-þéóìï_ëïîóïìåê] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
-msgstr ""
+msgstr "  [ -append [1-þéóìï_ëïîóïìåê] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
-msgstr ""
+msgstr "  [ -file ÉÍÑ_ÆÁÊÌÁ_ÄÁÍÐÁ ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
-msgstr ""
+msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
-msgstr ""
+msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:791
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-msgstr ""
+msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
-msgstr ""
+msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
-msgstr ""
+msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
-msgstr ""
+msgstr "  [ -bfreq ÞÁÓÔÏÔÁ ]\n"
 
-#: misc-utils/setterm.c:1047
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ/ÓÎÑÔØ ÒÅÖÉÍ ÜÎÅÒÇÏÓÂÅÒÅÖÅÎÉÑ\n"
 
-#: misc-utils/setterm.c:1086 misc-utils/setterm.c:1094
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ klogctl: %s\n"
 
-#: misc-utils/setterm.c:1133
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ %s\n"
 
-#: misc-utils/setterm.c:1148
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
-msgstr ""
+msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÄÁÍÐÁ ÜËÒÁÎÁ\n"
 
-#: misc-utils/setterm.c:1162
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s, É ÎÅ×ÏÚÍÏÖÎÏ ÓÄÅÌÁÔØ ÄÁÍÐ ioctl\n"
 
-#: misc-utils/setterm.c:1228
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
-msgstr ""
+msgstr "%s: ÐÅÒÅÍÅÎÎÁÑ $TERM ÎÅ ÏÐÒÅÄÅÌÅÎÁ.\n"
 
 #: misc-utils/whereis.c:157
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
-msgstr ""
+msgstr "whereis [ -sbmu ] [ -SBM ËÁÔÁÌÏÇ ... -f ] ÉÍÑ...\n"
 
 #: misc-utils/write.c:99
 msgid "write: can't find your tty's name\n"
-msgstr ""
+msgstr "write: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÉÍÑ ×ÁÛÅÇÏ tty\n"
 
 #: misc-utils/write.c:110
 msgid "write: you have write permission turned off.\n"
-msgstr ""
+msgstr "write: ×ÁÛÅ ÒÁÚÒÅÛÅÎÉÅ ÎÁ ÚÁÐÉÓØ ÂÙÌÏ ×ÙËÌÀÞÅÎÏ.\n"
 
 #: misc-utils/write.c:131
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
-msgstr ""
+msgstr "write: %s ÎÅ ×ÏÛÅÌ × ÓÉÓÔÅÍÕ %s.\n"
 
 #: misc-utils/write.c:139
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
-msgstr ""
+msgstr "write: ÄÌÑ %s ÓÏÏÂÝÅÎÉÑ ÏÔËÌÀÞÅÎÙ ÎÁ %s\n"
 
 #: misc-utils/write.c:146
 msgid "usage: write user [tty]\n"
-msgstr ""
+msgstr "usage: write ÐÏÌØÚÏ×ÁÔÅÌØ [tty]\n"
 
 #: misc-utils/write.c:234
 #, c-format
 msgid "write: %s is not logged in\n"
-msgstr ""
+msgstr "write: %s ÎÅ ×ÏÛÅÌ × ÓÉÓÔÅÍÕ\n"
 
 #: misc-utils/write.c:243
 #, c-format
 msgid "write: %s has messages disabled\n"
-msgstr ""
+msgstr "write: ÄÌÑ %s ÓÏÏÂÝÅÎÉÑ ÏÔËÌÀÞÅÎÙ\n"
 
 #: misc-utils/write.c:247
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
-msgstr ""
+msgstr "write: %s ×ÏÛÅÌ × ÓÉÓÔÅÍÕ ÂÏÌÅÅ ÏÄÎÏÇÏ ÒÁÚÁ; ÚÁÐÉÓØ ×ÙÐÏÌÎÑÅÔÓÑ × %s\n"
 
 #: misc-utils/write.c:313
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
-msgstr ""
+msgstr "óÏÏÂÝÅÎÉÅ ÏÔ %s@%s (ËÁË %s) ÎÁ %s × %s ..."
 
 #: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
-msgstr ""
+msgstr "óÏÏÂÝÅÎÉÅ ÏÔ %s@%s ÎÁ %s × %s ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
-msgstr ""
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÛÉÂËÁ ÞÔÅÎÉÑ %s: %s"
 
-#: mount/fstab.c:141 mount/fstab.c:164
+#: mount/fstab.c:142 mount/fstab.c:167
 #, c-format
 msgid "warning: can't open %s: %s"
-msgstr ""
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
-msgstr ""
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s - ×ÍÅÓÔÏ ÜÔÏÇÏ ÉÓÐÏÌØÚÕÅÔÓÑ %s\n"
 
 #. linktargetfile does not exist (as a file)
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:374
+#: mount/fstab.c:447
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s (ÉÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ -n ÄÌÑ ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÑ)"
 
-#: mount/fstab.c:386
+#: mount/fstab.c:459
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÓÓÙÌËÕ ÎÁ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s (ÉÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ -n ÄÌÑ ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÑ)"
 
-#: mount/fstab.c:398
+#: mount/fstab.c:471
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s (ÉÓÐÏÌØÚÕÊÔÅ ÆÌÁÇ -n ÄÌÑ ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÑ)"
 
-#: mount/fstab.c:413
+#: mount/fstab.c:486
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s\n"
 
-#: mount/fstab.c:426
+#: mount/fstab.c:499
 #, c-format
 msgid "can't lock lock file %s: %s"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ %s: %s"
 
-#: mount/fstab.c:428
+#: mount/fstab.c:501
 msgid "timed out"
-msgstr ""
+msgstr "×ÒÅÍÑ ÏÖÉÄÁÎÉÑ ÉÓÔÅËÌÏ"
 
-#: mount/fstab.c:435
+#: mount/fstab.c:508
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
+"îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÓÓÙÌËÕ %s\n"
+"÷ÏÚÍÏÖÎÏ, ÓÕÝÅÓÔ×ÕÅÔ ÕÓÔÁÒÅ×ÛÉÊ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ?\n"
 
-#: mount/fstab.c:484 mount/fstab.c:520
+#: mount/fstab.c:557 mount/fstab.c:593
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s (%s) - mtab ÎÅ ÏÂÎÏ×ÌÅÎ"
 
-#: mount/fstab.c:528
+#: mount/fstab.c:601
 #, c-format
 msgid "error writing %s: %s"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ %s: %s"
 
-#: mount/fstab.c:536
+#: mount/fstab.c:609
 #, c-format
 msgid "error changing mode of %s: %s\n"
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÓÍÅÎÙ ÒÅÖÉÍÁ %s: %s\n"
 
-#: mount/fstab.c:554
+#: mount/fstab.c:627
 #, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %s\n"
 
-#: mount/lomount.c:79
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
-msgstr ""
+msgstr "loop: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÕÓÔÒÏÊÓÔ×Ï %s: %s\n"
 
-#: mount/lomount.c:85
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr ""
+msgid ", offset %lld"
+msgstr ", ÓÍÅÝÅÎÉÅ %lld"
 
-#: mount/lomount.c:90
+#: mount/lomount.c:104
 #, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
-msgstr ""
+msgid ", sizelimit %lld"
+msgstr ", ÏÇÒÁÎÉÞÅÎÉÅ ÎÁ ÒÁÚÍÅÒ %lld"
 
-#: mount/lomount.c:176
-msgid "mount: could not find any device /dev/loop#"
-msgstr ""
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", ÛÉÆÒÏ×ÁÎÉÅ %s (ÔÉÐ %d)"
 
-#: mount/lomount.c:180
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
-msgstr ""
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ", ÓÍÅÝÅÎÉÅ %d"
 
-#: mount/lomount.c:184
+#: mount/lomount.c:129
 #, 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 ""
+msgid ", encryption type %d\n"
+msgstr ", ÔÉÐ ÛÉÆÒÏ×ÁÎÉÑ %d\n"
 
-#: mount/lomount.c:190
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÕÓÔÒÏÊÓÔ×Å %s: %s\n"
+
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ËÁËÏÅ-ÌÉÂÏ ÕÓÔÒÏÊÓÔ×Ï /dev/loop#"
+
+#: mount/lomount.c:192
 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?"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
+"mount: îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ËÁËÏÅ-ÌÉÂÏ ÕÓÔÒÏÊÓÔ×Ï ÏÂÒÁÔÎÏÊ\n"
+"       Ó×ÑÚÉ. íÏÖÅÔ ÜÔÏ ÑÄÒÏ ÎÅ ÚÎÁÅÔ Ï ÕÓÔÒÏÊÓÔ×ÁÈ\n"
+"       Ó ÏÂÒÁÔÎÏÊ Ó×ÑÚØÀ, (÷ ÜÔÏÍ ÓÌÕÞÁÅ ÐÅÒÅËÏÍÐÉÌÉÒÕÊÔÅ\n"
+"       ÉÌÉ `insmod loop.o'.)"
 
-#: mount/lomount.c:194
+#: mount/lomount.c:197
 msgid "mount: could not find any free loop device"
-msgstr ""
-
-#: mount/lomount.c:224
-#, c-format
-msgid "Unsupported encryption type %s\n"
-msgstr ""
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ËÁËÏÅ-ÌÉÂÏ Ó×ÏÂÏÄÎÏÅ ÕÓÔÒÏÊÓÔ×Ï ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ"
 
-#: mount/lomount.c:238
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
-msgstr ""
-
-#: mount/lomount.c:257
-msgid "Init (up to 16 hex digits): "
-msgstr ""
-
-#: mount/lomount.c:264
-#, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr ""
-
-#: mount/lomount.c:271
-#, c-format
-msgid "Don't know how to get key for encryption system %d\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ × ÐÁÍÑÔÉ, ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
 
-#: mount/lomount.c:287
+#: mount/lomount.c:340
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
-msgstr ""
+msgstr "set_loop(%s,%s,%d): ÕÓÐÅÛÎÏ ÚÁ×ÅÒÛÅÎ\n"
 
-#: mount/lomount.c:298
+#: mount/lomount.c:356
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
-msgstr ""
+msgstr "loop: ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÕÓÔÒÏÊÓÔ×Ï %s: %s\n"
 
-#: mount/lomount.c:308
+#: mount/lomount.c:366
 #, c-format
 msgid "del_loop(%s): success\n"
-msgstr ""
+msgstr "del_loop(%s): ÕÓÐÅÛÎÏ ÚÁ×ÅÒÛÅÎ\n"
 
-#: mount/lomount.c:316
+#: mount/lomount.c:374
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr ""
+msgstr "üÔÁ ×ÅÒÓÉÑ mount ÂÙÌÁ ÏÔËÏÍÐÉÌÉÒÏ×ÁÎÁ ÂÅÚ ÐÏÄÄÅÒÖËÉ loop. ðÏÖÁÌÕÊÓÔÁ, ×ÙÐÏÌÎÉÔÅ ÐÅÒÅËÏÍÐÉÌÑÃÀ.\n"
 
-#: mount/lomount.c:353
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
@@ -6866,322 +7491,350 @@ msgid ""
 "  %s -d loop_device                                   # delete\n"
 "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ:\n"
+"  %s loop_ÕÓÔÒÏÊÓÔ×Ï                                        # ÐÏÌÕÞÅÎÉÅ ÉÎÆÏÒÍÁÃÉÉ\n"
+"  %s -d loop_ÕÓÔÒÏÊÓÔ×Ï                                     # ÕÄÁÌÅÎÉÅ\n"
+"  %s [ -e ÛÉÆÒÏ×ÁÎÉÅ ] [ -o ÓÍÅÝÅÎÉÅ ] loop_ÕÓÔÒÏÊÓÔ×Ï ÆÁÊÌ # ÕÓÔÁÎÏ×ËÁ\n"
 
-#: mount/lomount.c:371 mount/sundries.c:30 mount/sundries.c:45
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
 msgid "not enough memory"
-msgstr ""
+msgstr "ÎÅÈ×ÁÔËÁ ÐÁÍÑÔÉ"
 
-#: mount/lomount.c:442
+#: mount/lomount.c:508
 msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr ""
+msgstr "ðÏÄÄÅÒÖËÁ loop ÂÙÌÁ ÎÅÄÏÓÔÕÐÎÁ ×Ï ×ÒÅÍÑ ËÏÍÐÉÌÑÃÉÉ. ðÏÖÁÌÕÊÓÔÁ, ×ÙÐÏÌÎÉÔÅ ÐÅÒÅËÏÍÉÌÑÃÉÀ.\n"
 
-#: mount/mntent.c:165
+#: mount/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
-msgstr ""
+msgstr "[mntent]: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: no final newline at the end of %s\n"
 
-#: mount/mntent.c:216
+#: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
-msgstr ""
+msgstr "[mntent]: ÓÔÒÏËÁ %d × %s ÐÌÏÈÁÑ %s\n"
 
-#: mount/mntent.c:219
+#: mount/mntent.c:222
 msgid "; rest of file ignored"
-msgstr ""
+msgstr "; ÏÓÔÁÌØÎÁÑ ÞÁÓÔØ ÆÁÊÌÁ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÁ"
 
-#: mount/mount.c:379
+#: mount/mount.c:391
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr ""
+msgstr "mount: ÓÏÇÌÁÓÎÏ mtab, %s ÕÖÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÎÁ %s"
 
-#: mount/mount.c:383
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
-msgstr ""
+msgstr "mount: ÓÏÇÌÁÓÎÏ mtab, %s ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÎÁ %s"
 
-#: mount/mount.c:404
+#: mount/mount.c:416
 #, c-format
 msgid "mount: can't open %s for writing: %s"
-msgstr ""
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÚÁÐÉÓÉ: %s"
 
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:431 mount/mount.c:656
 #, c-format
 msgid "mount: error writing %s: %s"
-msgstr ""
+msgstr "mount: ÏÛÉÂËÁ ÚÁÐÉÓÉ %s: %s"
 
-#: mount/mount.c:426
+#: mount/mount.c:438
 #, c-format
 msgid "mount: error changing mode of %s: %s"
-msgstr ""
+msgstr "mount: ÏÛÉÂËÁ ÓÍÅÎÙ ÒÅÖÉÍÁ %s: %s"
 
-#: mount/mount.c:472
+#: mount/mount.c:489
 #, c-format
 msgid "%s looks like swapspace - not mounted"
-msgstr ""
+msgstr "%s ×ÙÇÌÑÄÉÔ ËÁË ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ - ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ"
 
-#: mount/mount.c:532
+#: mount/mount.c:549
 msgid "mount failed"
-msgstr ""
+msgstr "mount ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: mount/mount.c:534
+#: mount/mount.c:551
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr ""
+msgstr "mount: ÔÏÌØËÏ root ÍÏÖÅÔ ÍÏÎÔÉÒÏ×ÁÔØ %s ÎÁ %s"
 
-#: mount/mount.c:562
+#: mount/mount.c:579
 msgid "mount: loop device specified twice"
-msgstr ""
+msgstr "mount: ÕÓÔÒÏÊÓÔ×Ï ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ ÕËÁÚÁÎÏ Ä×ÁÖÄÙ"
 
-#: mount/mount.c:567
+#: mount/mount.c:584
 msgid "mount: type specified twice"
-msgstr ""
+msgstr "mount: ÔÉÐ ÕËÁÚÁÎ Ä×ÁÖÄÙ"
 
-#: mount/mount.c:579
+#: mount/mount.c:596
 msgid "mount: skipping the setup of a loop device\n"
-msgstr ""
+msgstr "mount: ÐÒÏÐÕÓËÁÅÔÓÑ ÕÓÔÁÎÏ×ËÁ ÕÓÔÒÏÊÓÔ×Á ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ\n"
 
-#: mount/mount.c:588
+#: mount/mount.c:605
 #, c-format
 msgid "mount: going to use the loop device %s\n"
-msgstr ""
+msgstr "mount: ÐÏÄÇÏÔÏ×ËÁ Ë ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÕÓÔÒÏÊÓÔ×Á ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ %s\n"
 
-#: mount/mount.c:592
+#: mount/mount.c:610
 msgid "mount: failed setting up loop device\n"
-msgstr ""
+msgstr "mount: ÕÓÔÁÎÏ×ËÁ ÕÓÔÒÏÊÓÔ×Á ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ\n"
 
-#: mount/mount.c:596
+#: mount/mount.c:614
 msgid "mount: setup loop device successfully\n"
-msgstr ""
+msgstr "mount: ÕÓÔÁÎÏ×ËÁ ÕÓÔÒÏÊÓÔ×Á ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ ÕÓÐÅÛÎÏ ÚÁ×ÅÒÛÉÌÁÓØ\n"
 
-#: mount/mount.c:633
+#: mount/mount.c:651
 #, c-format
 msgid "mount: can't open %s: %s"
-msgstr ""
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s"
 
-#: mount/mount.c:656
+#: mount/mount.c:670
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: ÁÒÇÕÍÅÎÔ ÄÌÑ -p ÉÌÉ --pass-fd ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ"
+
+#: mount/mount.c:682
 #, c-format
 msgid "mount: cannot open %s for setting speed"
-msgstr ""
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓËÏÒÏÓÔÉ"
 
-#: mount/mount.c:659
+#: mount/mount.c:685
 #, c-format
 msgid "mount: cannot set speed: %s"
-msgstr ""
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÓËÏÒÏÓÔØ: %s"
 
-#: mount/mount.c:720 mount/mount.c:1254
+#: mount/mount.c:739 mount/mount.c:1314
 #, c-format
 msgid "mount: cannot fork: %s"
-msgstr ""
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ: %s"
 
-#: mount/mount.c:800
+#: mount/mount.c:820
 msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
+msgstr "mount: ÜÔÁ ×ÅÒÓÉÑ ÂÙÌÁ ÏÔËÏÍÐÉÌÉÒÏ×ÁÎÁ ÂÅÚ ÐÏÄÄÅÒÖËÉ ÔÉÐÁ `nfs'"
 
-#: mount/mount.c:839
+#: mount/mount.c:859
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
-msgstr ""
+msgstr "mount: ÓÂÏÊ ÍÏÎÔÉÒÏ×ÁÎÉÑ nfs ×ÅÒÓÉÉ 4, ÐÒÏÂÕÅÔÓÑ 3..\n"
 
-#: mount/mount.c:850
-msgid ""
-"mount: I could not determine the filesystem type, and none was specified"
-msgstr ""
+#: mount/mount.c:870
+msgid "mount: I could not determine the filesystem type, and none was specified"
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ, É ÎÉ ÏÄÎÁ ÎÅ ÂÙÌÁ ÕËÁÚÁÎÁ"
 
-#: mount/mount.c:853
+#: mount/mount.c:873
 msgid "mount: you must specify the filesystem type"
-msgstr ""
+msgstr "mount: ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ"
 
 #. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:876
 msgid "mount: mount failed"
-msgstr ""
+msgstr "mount: ÍÏÎÔÉÒÏ×ÁÎÉÅ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ"
 
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:882 mount/mount.c:917
 #, c-format
 msgid "mount: mount point %s is not a directory"
-msgstr ""
+msgstr "mount: ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ %s ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ"
 
-#: mount/mount.c:864
+#: mount/mount.c:884
 msgid "mount: permission denied"
-msgstr ""
+msgstr "mount: ÄÏÓÔÕÐ ÚÁÐÒÅÝÅÎ"
 
-#: mount/mount.c:866
+#: mount/mount.c:886
 msgid "mount: must be superuser to use mount"
-msgstr ""
+msgstr "mount: ÎÅÏÂÈÏÄÉÍÏ ÉÍÅÔØ ÐÒÁ×Á ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ mount"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:870 mount/mount.c:874
+#: mount/mount.c:890 mount/mount.c:894
 #, c-format
 msgid "mount: %s is busy"
-msgstr ""
+msgstr "mount: %s ÚÁÎÑÔ"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:896
 msgid "mount: proc already mounted"
-msgstr ""
+msgstr "mount: proc ÕÖÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ"
 
-#: mount/mount.c:878
+#: mount/mount.c:898
 #, c-format
 msgid "mount: %s already mounted or %s busy"
-msgstr ""
+msgstr "mount: %s ÕÖÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÉÌÉ %s ÚÁÎÑÔ"
 
-#: mount/mount.c:884
+#: mount/mount.c:904
 #, c-format
 msgid "mount: mount point %s does not exist"
-msgstr ""
+msgstr "mount: ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: mount/mount.c:886
+#: mount/mount.c:906
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr ""
+msgstr "mount: ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ %s Ñ×ÌÑÅÔÓÑ ÓÉÍ×ÏÌÉÞÅÓËÏÊ ÓÓÙÌËÏÊ × ÎÉËÕÄÁ"
 
-#: mount/mount.c:889
+#: mount/mount.c:909
 #, c-format
 msgid "mount: special device %s does not exist"
-msgstr ""
+msgstr "mount: ÓÐÅÃÉÁÌØÎÏÅ ÕÓÔÒÏÊÓÔ×Ï %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: mount/mount.c:899
+#: mount/mount.c:919
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
+"mount: ÓÐÅÃÉÁÌØÎÏÅ ÕÓÔÒÏÊÓÔ×Ï %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ\n"
+"       (ÐÒÅÆÉËÓ ÐÕÔÉ ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ)\n"
 
-#: mount/mount.c:912
+#: mount/mount.c:932
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
-msgstr ""
+msgstr "mount: %s ÕÖÅ ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÉÌÉ ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ"
 
-#: mount/mount.c:914
+#: mount/mount.c:934
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
+"mount: ÎÅ×ÅÒÎÙÊ ÔÉÐ æó, ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ, ÎÅ×ÅÒÎÙÊ ÓÕÐÅÒÂÌÏË\n"
+"       ÎÁ %s, ÉÌÉ ÐÒÉÍÏÎÔÉÒÏ×ÁÎÏ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ"
 
-#: mount/mount.c:948
+#: mount/mount.c:968
 msgid "mount table full"
-msgstr ""
+msgstr "ÔÁÂÌÉÃÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ ÚÁÐÏÌÎÅÎÁ"
 
-#: mount/mount.c:950
+#: mount/mount.c:970
 #, c-format
 msgid "mount: %s: can't read superblock"
-msgstr ""
+msgstr "mount: %s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÕÐÅÒÂÌÏË"
 
-#: mount/mount.c:954
+#: mount/mount.c:974
 #, c-format
 msgid "mount: %s: unknown device"
-msgstr ""
+msgstr "mount: %s: ÎÅÉÚ×ÅÓÔÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
 
-#: mount/mount.c:959
+#: mount/mount.c:979
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
-msgstr ""
+msgstr "mount: ÔÉÐ æó %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÑÄÒÏÍ"
 
-#: mount/mount.c:971
+#: mount/mount.c:991
 #, c-format
 msgid "mount: probably you meant %s"
-msgstr ""
+msgstr "mount: ×ÏÚÍÏÖÎÏ ×Ù ÉÍÅÌÉ × ×ÉÄÕ %s"
 
-#: mount/mount.c:973
+#: mount/mount.c:993
 msgid "mount: maybe you meant iso9660 ?"
-msgstr ""
+msgstr "mount: ÍÏÖÅÔ ÂÙÔØ ×Ù ÉÍÅÌÉ × ×ÉÄÕ iso9660?"
 
-#: mount/mount.c:976
+#: mount/mount.c:996
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
-msgstr ""
+msgstr "mount: %s ÉÍÅÅÔ ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÕÓÔÒÏÊÓÔ×Á ÉÌÉ ÔÉÐ æó %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
 #. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:1002
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr ""
+msgstr "mount: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ, Á ÏÐÒÅÄÅÌÅÎÉÅ ÓÏÓÔÏÑÎÉÑ ÎÅ×ÏÚÍÏÖÎÏ?"
 
-#: mount/mount.c:984
+#: mount/mount.c:1004
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
+"mount: ÑÄÒÏ ÎÅ ÒÁÓÐÏÚÎÁÅÔ %s ËÁË ÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï\n"
+"       (ÍÏÖÅÔ ÂÙÔØ `insmod driver'?)"
 
-#: mount/mount.c:987
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr ""
+msgstr "mount: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ (ÍÏÖÅÔ ÐÏÐÒÏÂÏ×ÁÔØ `-o loop'?)"
 
-#: mount/mount.c:990
+#: mount/mount.c:1010
 #, c-format
 msgid "mount: %s is not a block device"
-msgstr ""
+msgstr "mount: %s ÎÅ Ñ×ÌÑÅÔÓÑ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ"
 
-#: mount/mount.c:993
+#: mount/mount.c:1013
 #, c-format
 msgid "mount: %s is not a valid block device"
-msgstr ""
+msgstr "mount: %s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ÂÌÏÞÎÙÍ ÕÓÔÒÏÊÓÔ×ÏÍ"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:1016
 msgid "block device "
-msgstr ""
+msgstr "ÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï "
 
-#: mount/mount.c:998
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr ""
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÉÍÏÎÔÉÒÏ×ÁÔØ %s%s ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1022
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
-msgstr ""
+msgstr "mount: %s%s ÚÁÝÉÝÅÎ ÏÔ ÚÁÐÉÓÉ, ÎÏ Ñ×ÎÏ ÕËÁÚÁÎ ÆÌÁÇ `-w'"
 
-#: mount/mount.c:1018
+#: mount/mount.c:1038
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
-msgstr ""
+msgstr "mount: %s%s ÚÁÝÉÝÅÎ ÏÔ ÚÁÐÉÓÉ, ÍÏÎÔÉÒÕÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
+
+#: mount/mount.c:1125
+#, c-format
+msgid "mount: the label %s occurs on both %s and %s\n"
+msgstr "mount: ÍÅÔËÁ %s ×ÓÔÒÅÞÁÅÔÓÑ ËÁË ÎÁ %s, ÔÁË É ÎÁ %s\n"
+
+#: mount/mount.c:1129
+#, c-format
+msgid "mount: %s duplicate - not mounted"
+msgstr "mount: %s ÄÕÂÌÉÒÕÅÔÓÑ - ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1139
 #, c-format
 msgid "mount: going to mount %s by %s\n"
-msgstr ""
+msgstr "mount: ÐÏÄÇÏÔÏ×ËÁ Ë ÍÏÎÔÉÒÏ×ÁÎÉÀ %s ÐÏÓÒÅÄÓÔ×ÏÍ %s\n"
 
-#: mount/mount.c:1108
+#: mount/mount.c:1140
 msgid "UUID"
-msgstr ""
+msgstr "UUID"
 
-#: mount/mount.c:1108
+#: mount/mount.c:1140
 msgid "label"
-msgstr ""
+msgstr "ÍÅÔËÁ"
 
-#: mount/mount.c:1110 mount/mount.c:1489
+#: mount/mount.c:1142 mount/mount.c:1595
 msgid "mount: no such partition found"
-msgstr ""
+msgstr "mount: ÔÁËÏÊ ÒÁÚÄÅÌ ÎÅ ÎÁÊÄÅÎ"
 
-#: mount/mount.c:1118
+#: mount/mount.c:1150
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
-msgstr ""
+msgstr "mount: ÎÅ ÂÙÌ ÕËÁÚÁÎ ÔÉÐ - ÂÕÄÅÔ ÐÏÄÒÁÚÕÍÅ×ÁÔØÓÑ nfs ÉÚ-ÚÁ Ä×ÏÅÔÏÞÉÑ\n"
+
+#: mount/mount.c:1155
+msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
+msgstr "mount: ÎÅ ÂÙÌ ÕËÁÚÁÎ ÔÉÐ - ÂÕÄÅÔ ÐÏÄÒÁÚÕÍÅ×ÁÔØÓÑ smbfs ÉÚ-ÚÁ ÐÒÅÆÉËÓÁ //\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1134
+#: mount/mount.c:1171
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
-msgstr ""
+msgstr "mount: ÆÏÎÏ×ÁÑ ÏÂÒÁÂÏÔËÁ \"%s\"\n"
 
-#: mount/mount.c:1145
+#: mount/mount.c:1182
 #, c-format
 msgid "mount: giving up \"%s\"\n"
-msgstr ""
+msgstr "mount: ÓÄÁÀÓØ \"%s\"\n"
 
-#: mount/mount.c:1205
+#: mount/mount.c:1259
 #, c-format
 msgid "mount: %s already mounted on %s\n"
-msgstr ""
+msgstr "mount: %s ÕÖÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÎÁ %s\n"
 
-#: mount/mount.c:1323
+#: mount/mount.c:1392
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -7190,7 +7843,7 @@ msgid ""
 "So far the informational part. Next the mounting.\n"
 "The command is `mount [-t fstype] something somewhere'.\n"
 "Details found in /etc/fstab may be omitted.\n"
-"       mount -a                 : mount all stuff from /etc/fstab\n"
+"       mount -a [-t|-O] ...     : mount all stuff from /etc/fstab\n"
 "       mount device             : mount device at the known place\n"
 "       mount directory          : mount known device here\n"
 "       mount -t type dev dir    : ordinary mount command\n"
@@ -7198,347 +7851,391 @@ msgid ""
 "a filesystem (of the given type) found on the device.\n"
 "One can also mount an already visible directory tree elsewhere:\n"
 "       mount --bind olddir newdir\n"
+"or move a subtree:\n"
+"       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
-
-#: mount/mount.c:1473
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: mount -V         : ×Ù×ÏÄ ×ÅÒÓÉÉ\n"
+"       mount -h                 : ×Ù×ÏÄ ÜÔÏÊ ÓÐÒÁ×ËÉ\n"
+"       mount                    : ÓÐÉÓÏË ÐÒÉÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n"
+"       mount -l                 : ÔÏ ÖÅ ÓÁÍÏÅ, ×ËÌÀÞÁÑ ÍÅÔËÉ ÔÏÍÏ×\n"
+"äÏ ÓÉÈ ÐÏÒ ÂÙÌÁ ÉÎÆÏÒÍÁÃÉÏÎÎÁÑ ÞÁÓÔØ. äÁÌÅÅ ÉÄÅÔ ÍÏÎÔÉÒÏ×ÁÎÉÅ.\n"
+"ëÏÍÁÎÄÁ `mount [-t ÔÉÐ_ÆÓ] ÞÔÏ-ÔÏ ËÕÄÁ-ÔÏ'.\n"
+"äÅÔÁÌÉ, ÎÁÊÄÅÎÎÙÅ × /etc/fstab, ÍÏÇÕÔ ÂÙÔØ ÐÒÏÐÕÝÅÎÙ.\n"
+"       mount -a [-t|-O] ...     : ÍÏÎÔÉÒÏ×ÁÎÉÅ ×ÓÅÇÏ ÓÏÄÅÒÖÉÍÏÇÏ /etc/fstab\n"
+"       mount ÕÓÔÒÏÊÓÔ×Ï         : ÍÏÎÔÉÒÏ×ÁÎÉÅ ÕÓÔÒÏÊÓÔ×Á ÎÁ ÉÚ×ÅÓÔÎÏÅ ÍÅÓÔÏ\n"
+"       mount ËÁÔÁÌÏÇ            : ÍÏÎÔÉÒÏ×ÁÎÉÅ ÉÚ×ÅÓÔÎÏÇÏ ÕÓÔÒÏÊÓÔ×Á ÎÁ ÎÅÇÏ\n"
+"       mount -t ÔÉÐ ÕÓÔÒ ËÁÔ    : ÏÂÙÞÎÁÑ ËÏÍÁÎÄÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ\n"
+"ðÏÍÎÉÔÅ, ÞÔÏ mount ÎÁ ÓÁÍÏÍ ÄÅÌÅ ÍÏÎÔÉÒÕÅÔ ÎÅ ÕÓÔÒÏÊÓÔ×Ï, Á ÆÁÊÌÏ×ÕÀ\n"
+"ÓÉÓÔÅÍÕ (ÕËÁÚÁÎÎÏÇÏ ÔÉÐÁ), ÎÁÊÄÅÎÎÕÀ ÎÁ ÜÔÏÍ ÕÓÔÒÏÊÓÔ×Å.\n"
+"ïÎ ÔÁËÖÅ ÍÏÖÅÔ ÍÏÎÔÉÒÏ×ÁÔØ ÕÖÅ ×ÉÄÉÍÏÅ ÄÅÒÅ×Ï ËÁÔÁÌÏÇÏ× ËÕÄÁ ÕÇÏÄÎÏ:\n"
+"       mount --bind ÓÔÁÒ_ËÁÔ ÎÏ×_ËÁÔ\n"
+"ÉÌÉ ÐÅÒÅÍÅÝÁÔØ ÐÏÄÄÅÒÅ×Ï:\n"
+"       mount --move ÓÔÁÒ_ËÁÔ ÎÏ×_ËÁÔ\n"
+"õÓÔÒÏÊÓÔ×Ï ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÏ ÐÏ ÉÍÅÎÉ, ÓËÁÖÅÍ, /dev/hda1 ÉÌÉ /dev/cdrom,\n"
+"ÉÌÉ ÐÏ ÍÅÔËÅ, ÉÓÐÏÌØÚÕÑ  -L ÍÅÔËÁ  ÉÌÉ ÐÏ uuid, ÉÓÐÏÌØÚÕÑ  -U uuid .\n"
+"äÒÕÇÉÅ ÏÐÃÉÉ: [-nfFrsvw] [-o ÏÐÃÉÉ] [-p passwdfd].\n"
+"äÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ ÎÁÂÅÒÉÔÅ  man 8 mount .\n"
+
+#: mount/mount.c:1571
 msgid "mount: only root can do that"
-msgstr ""
+msgstr "mount: ÔÏÌØËÏ root ÍÏÖÅÔ ÓÄÅÌÁÔØ ÜÔÏ"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1576
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr ""
+msgstr "mount: %s ÎÅ ÎÁÊÄÅÎ - ÓÏÚÄÁÅÔÓÑ...\n"
+
+#: mount/mount.c:1590
+#, c-format
+msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
+msgstr "mount: ÍÅÔËÁ %s ×ÓÔÒÅÞÁÅÔÓÑ ËÁË ÎÁ %s, ÔÁË É ÎÁ %s - ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ\n"
 
-#: mount/mount.c:1491
+#: mount/mount.c:1597
 #, c-format
 msgid "mount: mounting %s\n"
-msgstr ""
+msgstr "mount: ÍÏÎÔÉÒÕÅÔÓÑ %s\n"
 
-#: mount/mount.c:1500
+#: mount/mount.c:1606
 msgid "nothing was mounted"
-msgstr ""
+msgstr "ÎÉÞÅÇÏ ÎÅ ÂÙÌÏ ÐÒÉÍÏÎÔÉÒÏ×ÁÎÏ"
 
-#: mount/mount.c:1515
+#: mount/mount.c:1621
 #, c-format
 msgid "mount: cannot find %s in %s"
-msgstr ""
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s × %s"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1636
 #, c-format
 msgid "mount: can't find %s in %s or %s"
-msgstr ""
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s × %s ÉÌÉ %s"
 
-#: mount/mount_by_label.c:153
+#: mount/mount_by_label.c:187
 #, c-format
-msgid ""
-"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
-msgstr ""
+msgid "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s, ÐÏÜÔÏÍÕ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ UUID É íåôëé ÎÅ ÍÏÖÅÔ ÂÙÔØ ×ÙÐÏÌÎÅÎÏ.\n"
 
-#: mount/mount_by_label.c:257
+#: mount/mount_by_label.c:307
 msgid "mount: bad UUID"
-msgstr ""
+msgstr "mount: ÎÅ×ÅÒÎÙÊ UUID"
 
-#: mount/mount_guess_fstype.c:433
+#: mount/mount_guess_fstype.c:485
 msgid "mount: error while guessing filesystem type\n"
-msgstr ""
+msgstr "mount: ÏÛÉÂËÁ ÏÐÒÅÄÅÌÅÎÉÑ ÐÒÅÄÐÏÌÁÇÁÅÍÏÇÏ ÔÉÐÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ\n"
 
-#: mount/mount_guess_fstype.c:442
+#: mount/mount_guess_fstype.c:494
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr ""
+msgstr "mount: ×Ù ÎÅ ÕËÁÚÁÌÉ ÔÉÐ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ ÄÌÑ %s\n"
 
-#: mount/mount_guess_fstype.c:445
+#: mount/mount_guess_fstype.c:497
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
-msgstr ""
+msgstr "       Ñ ÐÏÐÒÏÂÕÀ ×ÓÅ ÔÉÐÙ, ÕÐÏÍÉÎÁÀÝÉÅÓÑ × %s ÉÌÉ %s\n"
 
-#: mount/mount_guess_fstype.c:448
+#: mount/mount_guess_fstype.c:500
 msgid "       and it looks like this is swapspace\n"
-msgstr ""
+msgstr "       É ÏÎ ×ÙÇÌÑÄÉÔ ËÁË ÐÒÏÓÔÒÁÎÓÔ×Ï ÄÌÑ Ó×ÏÐÉÎÇÁ\n"
 
-#: mount/mount_guess_fstype.c:450
+#: mount/mount_guess_fstype.c:502
 #, c-format
 msgid "       I will try type %s\n"
-msgstr ""
+msgstr "       Ñ ÐÏÐÒÏÂÕÀ ÔÉÐ %s\n"
 
-#: mount/mount_guess_fstype.c:538
+#: mount/mount_guess_fstype.c:590
 #, c-format
 msgid "Trying %s\n"
-msgstr ""
+msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ %s\n"
 
-#: mount/nfsmount.c:231
+#: mount/nfsmount.c:237
 msgid "mount: excessively long host:dir argument\n"
-msgstr ""
+msgstr "mount: ÞÒÅÚ×ÙÞÁÊÎÏ ÄÌÉÎÎÙÊ ÁÒÇÕÍÅÎÔ host:dir\n"
 
-#: mount/nfsmount.c:245
+#: mount/nfsmount.c:251
 msgid "mount: warning: multiple hostnames not supported\n"
-msgstr ""
+msgstr "mount: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÍÎÏÇÏËÒÁÔÎÙÅ ÉÍÅÎÁ ÈÏÓÔÏ× ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
 
-#: mount/nfsmount.c:250
+#: mount/nfsmount.c:256
 msgid "mount: directory to mount not in host:dir format\n"
-msgstr ""
+msgstr "mount: ËÁÔÁÌÏÇ ÄÌÑ ÍÏÎÔÉÒÏ×ÁÎÉÑ ÎÅ × ÆÏÒÍÁÔÅ host:dir\n"
 
-#: mount/nfsmount.c:261 mount/nfsmount.c:516
+#: mount/nfsmount.c:267 mount/nfsmount.c:522
 #, c-format
 msgid "mount: can't get address for %s\n"
-msgstr ""
+msgstr "mount: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÁÄÒÅÓ ÄÌÑ %s\n"
 
-#: mount/nfsmount.c:267
+#: mount/nfsmount.c:273
 msgid "mount: got bad hp->h_length\n"
-msgstr ""
+msgstr "mount: ÐÏÌÕÞÅÎ ÎÅ×ÅÒÎÙÊ hp->h_length\n"
 
-#: mount/nfsmount.c:284
+#: mount/nfsmount.c:290
 msgid "mount: excessively long option argument\n"
-msgstr ""
+msgstr "mount: ÞÒÅÚ×ÙÞÁÊÎÏ ÄÌÉÎÎÙÊ ÁÒÇÕÍÅÎÔ ÏÐÃÉÉ\n"
 
-#: mount/nfsmount.c:376
+#: mount/nfsmount.c:382
 msgid "Warning: Unrecognized proto= option.\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: îÅÒÁÓÐÏÚÎÁÎÎÁÑ ÏÐÃÉÑ proto= .\n"
 
-#: mount/nfsmount.c:383
+#: mount/nfsmount.c:389
 msgid "Warning: Option namlen is not supported.\n"
-msgstr ""
+msgstr "Warning: ïÐÃÉÑ namlen ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.\n"
 
-#: mount/nfsmount.c:387
+#: mount/nfsmount.c:393
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
-msgstr ""
+msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ ÍÏÎÔÉÒÏ×ÁÎÉÑ nfs: %s=%d\n"
 
-#: mount/nfsmount.c:421
+#: mount/nfsmount.c:427
 msgid "Warning: option nolock is not supported.\n"
-msgstr ""
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÐÃÉÑ nolock ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.\n"
 
-#: mount/nfsmount.c:426
+#: mount/nfsmount.c:432
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
-msgstr ""
+msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ ÍÏÎÔÉÒÏ×ÁÎÉÑ nfs: %s%s\n"
 
-#: mount/nfsmount.c:522
+#: mount/nfsmount.c:528
 msgid "mount: got bad hp->h_length?\n"
-msgstr ""
+msgstr "mount: ÐÏÌÕÞÅÎ ÎÅ×ÅÒÎÙÊ hp->h_length?\n"
 
-#: mount/nfsmount.c:710
+#: mount/nfsmount.c:716
 msgid "NFS over TCP is not supported.\n"
-msgstr ""
+msgstr "NFS ÞÅÒÅÚ TCP ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.\n"
 
-#: mount/nfsmount.c:717
+#: mount/nfsmount.c:723
 msgid "nfs socket"
-msgstr ""
+msgstr "ÓÏËÅÔ nfs"
 
-#: mount/nfsmount.c:721
+#: mount/nfsmount.c:727
 msgid "nfs bindresvport"
-msgstr ""
+msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:735
+#: mount/nfsmount.c:741
 msgid "nfs server reported service unavailable"
-msgstr ""
+msgstr "ÓÅÒ×ÅÒ nfs ÓÏÏÂÝÉÌ, ÞÔÏ ÓÅÒ×ÉÓ ÎÅÄÏÓÔÕÐÅÎ"
 
-#: mount/nfsmount.c:744
+#: mount/nfsmount.c:750
 msgid "used portmapper to find NFS port\n"
-msgstr ""
+msgstr "ÄÌÑ ÎÁÈÏÖÄÅÎÉÑ ÐÏÒÔÁ NFS ÉÓÐÏÌØÚÕÅÔÓÑ portmapper\n"
 
-#: mount/nfsmount.c:748
+#: mount/nfsmount.c:754
 #, c-format
 msgid "using port %d for nfs deamon\n"
-msgstr ""
+msgstr "ÄÌÑ ÄÅÍÏÎÁ nfs ÉÓÐÏÌØÚÕÅÔÓÑ ÐÏÒÔ %d\n"
 
-#: mount/nfsmount.c:759
+#: mount/nfsmount.c:765
 msgid "nfs connect"
-msgstr ""
+msgstr "nfs ÐÏÄËÌÀÞÅÎÉÅ"
 
-#: mount/nfsmount.c:846
+#: mount/nfsmount.c:852
 #, c-format
 msgid "unknown nfs status return value: %d"
-msgstr ""
+msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ×ÏÚ×ÒÁÝÁÅÍÏÅ ÚÎÁÞÅÎÉÅ ÓÏÓÔÏÑÎÉÑ nfs: %d"
 
 #: mount/sundries.c:55
 msgid "bug in xstrndup call"
-msgstr ""
+msgstr "ÏÛÉÂËÁ × ×ÙÚÏ×Å xstrndup"
 
-#: mount/swapon.c:51
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
-"       %s -a [-v]\n"
+"       %s -a [-e] [-v]\n"
 "       %s [-v] [-p priority] special ...\n"
 "       %s [-s]\n"
 msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-hV]\n"
+"       %s -a [-e] [-v]\n"
+"       %s [-v] [-p ÐÒÉÏÒÉÔÅÔ] ÓÐÅÃÉÁÌØÎÙÊ ...\n"
+"       %s [-s]\n"
 
-#: mount/swapon.c:88
+#: mount/swapon.c:74
 #, c-format
-msgid "%s on %s\n"
+msgid ""
+"usage: %s [-hV]\n"
+"       %s -a [-v]\n"
+"       %s [-v] special ...\n"
 msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-hV]\n"
+"       %s -a [-v]\n"
+"       %s [-v] ÓÐÅÃÉÁÌØÎÙÊ ...\n"
 
-#: mount/swapon.c:93
+#: mount/swapon.c:178 mount/swapon.c:242
+#, c-format
+msgid "%s on %s\n"
+msgstr "%s ÎÁ %s\n"
+
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
-msgstr ""
+msgstr "swapon: ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÓÏÓÔÏÑÎÉÅ %s: %s\n"
 
-#: mount/swapon.c:105
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
-msgstr ""
+msgstr "swapon: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: %s ÉÍÅÅÔ ÎÅÂÅÚÏÐÁÓÎÙÅ ÒÁÚÒÅÛÅÎÉÑ %04o, ÒÅËÏÍÅÎÄÕÅÔÓÑ %04o\n"
 
-#: mount/swapon.c:115
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
-msgstr ""
+msgstr "swapon: ðÒÏÐÕÓËÁÅÔÓÑ ÆÁÊÌ %s - ËÁÖÅÔÓÑ ÏÎ ÉÍÅÅÔ ÄÙÒÙ.\n"
 
-#: mount/swapon.c:222
+#: mount/swapon.c:248
+msgid "Not superuser.\n"
+msgstr "îÅ ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌØ.\n"
+
+#: mount/swapon.c:312 mount/swapon.c:401
 #, c-format
 msgid "%s: cannot open %s: %s\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: mount/umount.c:75
+#: mount/umount.c:77
 msgid "umount: compiled without support for -f\n"
-msgstr ""
+msgstr "umount: ÏÔËÏÍÐÉÌÉÒÏ×ÁÎ ÂÅÚ ÐÏÄÄÅÒÖËÉ -f\n"
 
-#: mount/umount.c:148
+#: mount/umount.c:150
 #, c-format
 msgid "host: %s, directory: %s\n"
-msgstr ""
+msgstr "ÈÏÓÔ: %s, ËÁÔÁÌÏÇ: %s\n"
 
-#: mount/umount.c:168
+#: mount/umount.c:170
 #, c-format
 msgid "umount: can't get address for %s\n"
-msgstr ""
+msgstr "umount: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÁÄÒÅÓ ÄÌÑ %s\n"
 
-#: mount/umount.c:173
+#: mount/umount.c:175
 msgid "umount: got bad hostp->h_length\n"
-msgstr ""
+msgstr "umount: ÐÏÌÕÞÅÎ ÎÅ×ÅÒÎÙÊ hostp->h_length\n"
 
-#: mount/umount.c:221
+#: mount/umount.c:223
 #, c-format
 msgid "umount: %s: invalid block device"
-msgstr ""
+msgstr "umount: %s: ÎÅ×ÅÒÎÏÅ ÂÌÏÞÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
 
-#: mount/umount.c:223
+#: mount/umount.c:225
 #, c-format
 msgid "umount: %s: not mounted"
-msgstr ""
+msgstr "umount: %s: ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ"
 
-#: mount/umount.c:225
+#: mount/umount.c:227
 #, c-format
 msgid "umount: %s: can't write superblock"
-msgstr ""
+msgstr "umount: %s: ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÕÐÅÒÂÌÏË"
 
 #. Let us hope fstab has a line "proc /proc ..."
 #. and not "none /proc ..."
-#: mount/umount.c:229
+#: mount/umount.c:231
 #, c-format
 msgid "umount: %s: device is busy"
-msgstr ""
+msgstr "umount: %s: ÕÓÔÒÏÊÓÔ×Ï ÚÁÎÑÔÏ"
 
-#: mount/umount.c:231
+#: mount/umount.c:233
 #, c-format
 msgid "umount: %s: not found"
-msgstr ""
+msgstr "umount: %s: ÎÅ ÎÁÊÄÅÎ"
 
-#: mount/umount.c:233
+#: mount/umount.c:235
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr ""
+msgstr "umount: %s: ÎÅÏÂÈÏÄÉÍÏ ÉÍÅÔØ ÐÒÁ×Á ÓÕÐÅÒÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÒÁÚÍÏÎÔÉÒÏ×ÁÎÉÑ"
 
-#: mount/umount.c:235
+#: mount/umount.c:237
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
-msgstr ""
+msgstr "umount: %s: ÂÌÏÞÎÙÅ ÕÓÔÒÏÊÓÔ×Á ÎÁ fs ÚÁÐÒÅÝÅÎÙ"
 
-#: mount/umount.c:237
+#: mount/umount.c:239
 #, c-format
 msgid "umount: %s: %s"
-msgstr ""
+msgstr "umount: %s: %s"
 
-#: mount/umount.c:284
+#: mount/umount.c:285
 msgid "no umount2, trying umount...\n"
-msgstr ""
+msgstr "ÎÅÔ umount2, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ umount...\n"
 
-#: mount/umount.c:300
+#: mount/umount.c:301
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ %s - ×ÍÅÓÔÏ ÜÔÏÇÏ ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ %s\n"
 
-#: mount/umount.c:318
+#: mount/umount.c:319
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
-msgstr ""
+msgstr "umount: %s ÚÁÎÑÔ - ÐÅÒÅÍÏÎÔÉÒÏ×ÁÎ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ\n"
 
-#: mount/umount.c:328
+#: mount/umount.c:329
 #, c-format
 msgid "umount: could not remount %s read-only\n"
-msgstr ""
+msgstr "umount: ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÍÏÎÔÉÒÏ×ÁÔØ %s ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ\n"
 
-#: mount/umount.c:337
+#: mount/umount.c:338
 #, c-format
 msgid "%s umounted\n"
-msgstr ""
+msgstr "%s ÒÁÚÍÏÎÔÉÒÏ×ÁÎ\n"
 
-#: mount/umount.c:424
+#: mount/umount.c:434
 msgid "umount: cannot find list of filesystems to unmount"
-msgstr ""
+msgstr "umount: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÓÐÉÓÏË ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ ÄÌÑ ÒÁÚÍÏÎÔÉÒÏ×ÁÎÉÑ"
 
-#: mount/umount.c:453
+#: mount/umount.c:465
 msgid ""
 "Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
+"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: umount [-hV]\n"
+"       umount -a [-f] [-r] [-n] [-v] [-t ÔÉÐÙ_ÆÓ] [-O ÏÐÃÉÉ]\n"
+"       umount [-f] [-r] [-n] [-v] ÓÐÅÃÉÁÌØÎÙÊ | ÕÚÅÌ...\n"
 
-#: mount/umount.c:510
+#: mount/umount.c:546
 #, c-format
 msgid "Trying to umount %s\n"
-msgstr ""
+msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÐÏÐÙÔËÁ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ %s\n"
 
-#: mount/umount.c:514
+#: mount/umount.c:552
 #, c-format
 msgid "Could not find %s in mtab\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s × mtab\n"
 
-#: mount/umount.c:518
+#: mount/umount.c:557
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
-msgstr ""
+msgstr "umount: %s ÎÅ ÐÒÉÍÏÎÔÉÒÏ×ÁÎ (ÓÏÇÌÁÓÎÏ mtab)"
 
-#: mount/umount.c:520
+#: mount/umount.c:561
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr ""
+msgstr "umount: ÐÏÈÏÖÅ, ÞÔÏ %s ÐÒÉÍÏÎÔÉÒÏ×ÁÎ ÎÅÓËÏÌØËÏ ÒÁÚ"
 
-#: mount/umount.c:532
+#: mount/umount.c:574
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr ""
+msgstr "umount: %s ÎÅ × fstab (Á ×Ù ÎÅ root)"
 
-#: mount/umount.c:535
+#: mount/umount.c:577
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
-msgstr ""
+msgstr "umount: ÍÏÎÔÉÒÏ×ÁÎÉÅ %s ÐÒÏÔÉ×ÏÒÅÞÉÔ fstab'Õ"
 
-#: mount/umount.c:556
+#: mount/umount.c:611
 #, c-format
 msgid "umount: only root can unmount %s from %s"
-msgstr ""
-
-#: mount/umount.c:567
-#, c-format
-msgid "umount: only %s can unmount %s from %s"
-msgstr ""
+msgstr "umount: ÔÏÌØËÏ root ÍÏÖÅÔ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ %s ÏÔ %s"
 
-#: mount/umount.c:639
+#: mount/umount.c:682
 msgid "umount: only root can do that"
-msgstr ""
+msgstr "umount: ÔÏÌØËÏ root ÍÏÖÅÔ ÓÄÅÌÁÔØ ÜÔÏ"
 
 #: sys-utils/ctrlaltdel.c:27
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr ""
+msgstr "÷Ù ÄÏÌÖÎÙ ÉÍÅÔØ ÐÒÁ×Á root'Á ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓÏÂÙÔÉÑ Ctrl-Alt-Del.\n"
 
 #: sys-utils/ctrlaltdel.c:42
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: ctrlaltdel hard|soft\n"
 
 #: sys-utils/cytune.c:120
 #, c-format
@@ -7546,937 +8243,1021 @@ 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 ""
+"æÁÊÌ %s, äÌÑ ÐÏÒÏÇÏ×ÏÇÏ ÚÎÁÞÅÎÉÑ %lu, íÁËÓÉÍÕÍ ÓÉÍ×ÏÌÏ× × fifo ÂÙÌÉ %d,\n"
+"É ÍÁËÓÉÍÁÌØÎÁÑ ÓËÏÒÏÓÔØ ÐÅÒÅÄÁÞÉ × ÓÉÍ×ÏÌÁÈ/ÓÅËÕÎÄÕ ÂÙÌÁ %f\n"
 
 #: sys-utils/cytune.c:131
 #, c-format
 msgid ""
-"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
-"in fifo were %d,\n"
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
+"æÁÊÌ %s, äÌÑ ÐÏÒÏÇÏ×ÏÇÏ ÚÎÁÞÅÎÉÑ %lu É ÚÎÁÞÅÎÉÑ ÔÁÊÍ-ÁÕÔÁ %lu, íÁËÓÉÍÕÍ ÓÉÍ×ÏÌÏ× × fifo ÂÙÌÉ %d,\n"
+"É ÍÁËÓÉÍÁÌØÎÁÑ ÓËÏÒÏÓÔØ ÐÅÒÅÄÁÞÉ × ÓÉÍ×ÏÌÁÈ/ÓÅËÕÎÄÕ ÂÙÌÁ %f\n"
 
-#: sys-utils/cytune.c:196
+#: sys-utils/cytune.c:195
 #, c-format
 msgid "Invalid interval value: %s\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÉÎÔÅÒ×ÁÌÁ: %s\n"
 
-#: sys-utils/cytune.c:204
+#: sys-utils/cytune.c:203
 #, c-format
 msgid "Invalid set value: %s\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÕÓÔÁÎÏ×ËÉ: %s\n"
 
-#: sys-utils/cytune.c:212
+#: sys-utils/cytune.c:211
 #, c-format
 msgid "Invalid default value: %s\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ: %s\n"
 
-#: sys-utils/cytune.c:220
+#: sys-utils/cytune.c:219
 #, c-format
 msgid "Invalid set time value: %s\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÕÓÔÁÎÏ×ËÉ ×ÒÅÍÅÎÉ: %s\n"
 
-#: sys-utils/cytune.c:228
+#: sys-utils/cytune.c:227
 #, c-format
 msgid "Invalid default time value: %s\n"
-msgstr ""
+msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ×ÒÅÍÅÎÉ ÐÏ ÕÍÏÌÞÁÎÉÀ: %s\n"
 
-#: sys-utils/cytune.c:245
+#: sys-utils/cytune.c:244
 #, c-format
-msgid ""
-"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
-"[-g|-G] file [file...]\n"
-msgstr ""
+msgid "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) [-g|-G] file [file...]\n"
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-q [-i ÉÎÔÅÒ×ÁÌ]] ([-s ÚÎÁÞÅÎÉÅ]|[-S ÚÎÁÞÅÎÉÅ]) ([-t ÚÎÁÞÅÎÉÅ]|[-T ÚÎÁÞÅÎÉÅ]) [-g|-G] ÆÁÊÌ [ÆÁÊÌ...]\n"
 
-#: sys-utils/cytune.c:257 sys-utils/cytune.c:276 sys-utils/cytune.c:296
-#: sys-utils/cytune.c:346
+#: sys-utils/cytune.c:256 sys-utils/cytune.c:275 sys-utils/cytune.c:295
+#: sys-utils/cytune.c:345
 #, c-format
 msgid "Can't open %s: %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: sys-utils/cytune.c:264
+#: sys-utils/cytune.c:263
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ %s × ÐÏÒÏÇÏ×ÏÅ ÚÎÁÞÅÎÉÅ %d: %s\n"
 
-#: sys-utils/cytune.c:283
+#: sys-utils/cytune.c:282
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ %s × ÐÏÒÏÇÏ×ÏÅ ÚÎÁÞÅÎÉÅ ×ÒÅÍÅÎÉ %d: %s\n"
 
-#: sys-utils/cytune.c:301 sys-utils/cytune.c:358 sys-utils/cytune.c:389
+#: sys-utils/cytune.c:300 sys-utils/cytune.c:357 sys-utils/cytune.c:388
 #, c-format
 msgid "Can't get threshold for %s: %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÐÏÒÏÇÏ×ÏÅ ÚÎÁÞÅÎÉÅ ÄÌÑ %s: %s\n"
 
-#: sys-utils/cytune.c:307 sys-utils/cytune.c:364 sys-utils/cytune.c:395
+#: sys-utils/cytune.c:306 sys-utils/cytune.c:363 sys-utils/cytune.c:394
 #, c-format
 msgid "Can't get timeout for %s: %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÔÁÊÍ-ÁÕÔ ÄÌÑ %s: %s\n"
 
-#: sys-utils/cytune.c:313
+#: sys-utils/cytune.c:312
 #, c-format
 msgid "%s: %ld current threshold and %ld current timeout\n"
-msgstr ""
+msgstr "%s: %ld ÔÅËÕÝÅÅ ÐÏÒÏÇÏ×ÏÅ ÚÎÁÞÅÎÉÅ É %ld ÔÅËÕÝÉÊ ÔÁÊÍ-ÁÕÔ\n"
 
-#: sys-utils/cytune.c:316
+#: sys-utils/cytune.c:315
 #, c-format
 msgid "%s: %ld default threshold and %ld default timeout\n"
-msgstr ""
+msgstr "%s: %ld ÐÏÒÏÇÏ×ÏÅ ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ É %ld ÔÁÊÍ-ÁÕÔ ÐÏ ÕÍÏÌÞÁÎÉÀ\n"
 
-#: sys-utils/cytune.c:334
+#: sys-utils/cytune.c:333
 msgid "Can't set signal handler"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÏÂÒÁÂÏÔÞÉË ÓÉÇÎÁÌÁ"
 
-#: sys-utils/cytune.c:338 sys-utils/cytune.c:373
+#: sys-utils/cytune.c:337 sys-utils/cytune.c:372
 msgid "gettimeofday failed"
-msgstr ""
+msgstr "gettimeofday ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ"
 
-#: sys-utils/cytune.c:351 sys-utils/cytune.c:383
+#: sys-utils/cytune.c:350 sys-utils/cytune.c:382
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÄÁÔØ CYGETMON ÎÁ %s: %s\n"
 
-#: sys-utils/cytune.c:425
+#: sys-utils/cytune.c:424
 #, c-format
-msgid ""
-"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr ""
+msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu ÐÒÅÒÙ×, %lu/%lu ÓÉÍ×; fifo: %lu ÐÏÒÏÇ, %lu ÔÁÊÍ-ÁÕÔ, %lu ÍÁËÓ, %lu ÓÅÊÞÁÓ\n"
 
-#: sys-utils/cytune.c:431
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
-msgstr ""
+msgstr "   %f ÐÒÅÒÙ×/ÓÅË; %f ÚÁÐ, %f ÏÔÐÒÁ×ÌÅÎÏ (ÓÉÍ×/ÓÅË)\n"
 
-#: sys-utils/cytune.c:436
+#: sys-utils/cytune.c:435
 #, c-format
-msgid ""
-"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr ""
+msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu ÐÒÅÒÙ×, %lu ÓÉÍ×; fifo: %lu ÐÏÒÏÇ, %lu ÔÁÊÍ-ÁÕÔ, %lu ÍÁËÓ, %lu ÓÅÊÞÁÓ\n"
 
-#: sys-utils/cytune.c:442
+#: sys-utils/cytune.c:441
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
-msgstr ""
+msgstr "   %f ÐÒÅÒÙ×/ÓÅË; %f ÚÁÐ (ÓÉÍ×/ÓÅË)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-c] [-n ÕÒÏ×ÅÎØ] [-s ÒÁÚÍ_ÂÕÆÅÒÁ]\n"
 
-#: sys-utils/ipcrm.c:59
+#: sys-utils/ipcrm.c:66
 #, c-format
 msgid "invalid id: %s\n"
-msgstr ""
+msgstr "ÎÅ×ÅÒÎÙÊ id: %s\n"
 
-#: sys-utils/ipcrm.c:77
+#: sys-utils/ipcrm.c:84
 #, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ id %s (%s)\n"
 
-#: sys-utils/ipcrm.c:91
+#: sys-utils/ipcrm.c:99
 #, c-format
-msgid "usage: %s {shm | msg | sem} id ...\n"
-msgstr ""
+msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
+msgstr "ÎÅ ÒÅËÏÍÅÎÄÕÅÍÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s {shm | msg | sem} id ...\n"
 
-#: sys-utils/ipcrm.c:124
+#: sys-utils/ipcrm.c:126
 #, c-format
 msgid "unknown resource type: %s\n"
-msgstr ""
+msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÒÅÓÕÒÓÁ: %s\n"
 
-#: sys-utils/ipcrm.c:128
+#: sys-utils/ipcrm.c:130
 msgid "resource(s) deleted\n"
+msgstr "ÒÅÓÕÒÓÙ(Ù) ÕÄÁÌÅÎ(Ù)\n"
+
+#: sys-utils/ipcrm.c:140
+#, c-format
+msgid ""
+"usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"          [-Q ËÌÀÞ_msg] [-M ËÌÀÞ_shm] [-S ËÌÀÞ_sem] ... ]\n"
 
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcrm.c:181
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ -- %c\n"
+
+#: sys-utils/ipcrm.c:193
+#, c-format
+msgid "%s: illegal key (%s)\n"
+msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ (%s)\n"
+
+#: sys-utils/ipcrm.c:208 sys-utils/ipcrm.c:240
+msgid "permission denied for key"
+msgstr "ÄÌÑ ËÌÀÞÁ ÄÏÓÔÕÐ ÚÁÐÒÅÝÅÎ"
+
+#: sys-utils/ipcrm.c:211 sys-utils/ipcrm.c:250
+msgid "already removed key"
+msgstr "ËÌÀÞ ÕÖÅ ÕÄÁÌÅÎ"
+
+#: sys-utils/ipcrm.c:214 sys-utils/ipcrm.c:245
+msgid "invalid key"
+msgstr "ÎÅ×ÅÒÎÙÊ ËÌÀÞ"
+
+#: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
+msgid "unknown error in key"
+msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ × ËÌÀÞÅ"
+
+#: sys-utils/ipcrm.c:241
+msgid "permission denied for id"
+msgstr "ÄÌÑ id ÄÏÓÔÕÐ ÚÁÐÒÅÝÅÎ"
+
+#: sys-utils/ipcrm.c:246
+msgid "invalid id"
+msgstr "ÎÅ×ÅÒÎÙÊ id"
+
+#: sys-utils/ipcrm.c:251
+msgid "already removed id"
+msgstr "id ÕÖÅ ÕÄÁÌÅÎ"
+
+#: sys-utils/ipcrm.c:256
+msgid "unknown error in id"
+msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ × id"
+
+#: sys-utils/ipcrm.c:259
+#, c-format
+msgid "%s: %s (%s)\n"
+msgstr "%s: %s (%s)\n"
+
+#: sys-utils/ipcrm.c:267
+#, c-format
+msgid "%s: unknown argument: %s\n"
+msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ÁÒÇÕÍÅÎÔ: %s\n"
+
+#: sys-utils/ipcs.c:121
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s -asmq -tclup \n"
 
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
 #, c-format
 msgid "\t%s [-s -m -q] -i id\n"
-msgstr ""
+msgstr "\t%s [-s -m -q] -i id\n"
 
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s -h for help.\n"
-msgstr ""
+msgstr "\t%s -h ÄÌÑ ÓÐÒÁ×ËÉ.\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
 #, c-format
-msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
-msgstr ""
+msgid "%s provides information on ipc facilities for which you have read access.\n"
+msgstr "%s ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÒÅÄÓÔ×ÁÈ ipc, Ë ËÏÔÏÒÙÍ ×Ù ÉÍÅÅÔÅ ÄÏÓÔÕÐ ÎÁ ÞÔÅÎÉÅ.\n"
 
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
 msgid ""
 "Resource Specification:\n"
 "\t-m : shared_mem\n"
 "\t-q : messages\n"
 msgstr ""
+"óÐÅÃÉÆÉËÁÃÉÑ ÒÅÓÕÒÓÁ:\n"
+"\t-m : ÓÏ×Í_ÉÓÐ_ÐÁÍÑÔØ\n"
+"\t-q : ÓÏÏÂÝÅÎÉÑ\n"
 
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
 msgstr ""
+"\t-s : ÓÅÍÁÆÏÒÙ\n"
+"\t-a : ×ÓÅ (ÐÏ ÕÍÏÌÞÁÎÉÀ)\n"
 
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
 msgid ""
 "Output Format:\n"
 "\t-t : time\n"
 "\t-p : pid\n"
 "\t-c : creator\n"
 msgstr ""
+"æÏÒÍÁÔ ×ÙÈÏÄÎÙÈ ÄÁÎÎÙÈ:\n"
+"\t-t : ×ÒÅÍÑ\n"
+"\t-p : pid\n"
+"\t-c : ÓÏÚÄÁÔÅÌØ\n"
 
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
 msgstr ""
+"\t-l : ÐÒÅÄÅÌÙ\n"
+"\t-u : Ó×ÏÄËÁ\n"
 
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
 msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr ""
+msgstr "-i id [-s -q -m] : ÐÏÄÒÏÂÎÏÓÔÉ Ï ÒÅÓÕÒÓÅ, ÉÄÅÎÔÉÆÉÃÉÒÏ×ÁÎÎÏÍ ÐÏ id\n"
 
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
 msgid "kernel not configured for shared memory\n"
-msgstr ""
+msgstr "ÑÄÒÏ ÎÅ ÎÁÓÔÒÏÅÎÏ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÏÊ ÐÁÍÑÔÉ\n"
 
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
 msgid "------ Shared Memory Limits --------\n"
-msgstr ""
+msgstr "------ ðÒÅÄÅÌÙ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ --------\n"
 
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %ld\n"
-msgstr ""
+msgstr "ÍÁËÓÉÍÁÌØÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÓÅÇÍÅÎÔÏ× = %ld\n"
 
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
 #, c-format
 msgid "max seg size (kbytes) = %ld\n"
-msgstr ""
+msgstr "ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÓÅÇÍÅÎÔÁ (ËÂÁÊÔ) = %ld\n"
 
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
 #, c-format
 msgid "max total shared memory (kbytes) = %ld\n"
-msgstr ""
+msgstr "ÍÁËÓÉÍÕÍ ÓÕÍÍÁÒÎÏÊ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ (ËÂÁÊÔ) = %ld\n"
 
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
 #, c-format
 msgid "min seg size (bytes) = %ld\n"
-msgstr ""
+msgstr "ÍÉÎÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÓÅÇÍÅÎÔÁ (ÂÁÊÔ) = %ld\n"
 
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
 msgid "------ Shared Memory Status --------\n"
-msgstr ""
+msgstr "------ óÏÓÔÏÑÎÉÅ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ --------\n"
 
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "segments allocated %d\n"
-msgstr ""
+msgstr "×ÙÄÅÌÅÎÏ ÓÅÇÍÅÎÔÏ× %d\n"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
 #, c-format
 msgid "pages allocated %ld\n"
-msgstr ""
+msgstr "×ÙÄÅÌÅÎÏ ÓÔÒÁÎÉÃ %ld\n"
 
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
 #, c-format
 msgid "pages resident  %ld\n"
-msgstr ""
+msgstr "ÒÅÚÉÄÅÎÔÎÙÈ ÓÔÒÁÎÉÃ %ld\n"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
 #, c-format
 msgid "pages swapped   %ld\n"
-msgstr ""
+msgstr "ÓÔÒÁÎÉà Ó×ÏÐÁ %ld\n"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
 #, c-format
 msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr ""
+msgstr "ðÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔØ Ó×ÏÐÁ: %ld ÐÏÐÙÔÏË \t %ld ÕÓÐÅÈÏ×\n"
 
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
-msgstr ""
+msgstr "------ óÏÚÄÁÔÅÌÉ/×ÌÁÄÅÌØÃÙ ÓÅÇÍÅÎÔÁ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ --------\n"
 
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:420 sys-utils/ipcs.c:519
 #, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-msgstr ""
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
 
-#: 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
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:427
 msgid "shmid"
-msgstr ""
+msgstr "shmid"
 
-#: 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
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:520 sys-utils/ipcs.c:538
 msgid "perms"
-msgstr ""
+msgstr "ÐÒÁ×Á"
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
 msgid "cuid"
-msgstr ""
+msgstr "cuid"
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
 msgid "cgid"
-msgstr ""
+msgstr "cgid"
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
 msgid "uid"
-msgstr ""
+msgstr "uid"
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:520
 msgid "gid"
-msgstr ""
+msgstr "gid"
 
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
-msgstr ""
+msgstr "------ þÉÓÌÏ ÐÏÄËÌÀÞÅÎÉÊ/ÏÔËÌÀÞÅÎÉÊ/ÉÚÍÅÎÅÎÉÑ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ --------\n"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
 #, c-format
 msgid "%-10s %-10s %-20s %-20s %-20s\n"
-msgstr ""
+msgstr "%-10s %-10s %-20s %-20s %-20s\n"
 
-#: 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
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:427 sys-utils/ipcs.c:436 sys-utils/ipcs.c:526
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:538
 msgid "owner"
-msgstr ""
+msgstr "×ÌÁÄÅÌÅÃ"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
 msgid "attached"
-msgstr ""
+msgstr "ÐÏÄËÌÀÞÅÎÏ"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
 msgid "detached"
-msgstr ""
+msgstr "ÏÔËÌÀÞÅÎÏ"
 
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
 msgid "changed"
-msgstr ""
+msgstr "ÉÚÍÅÎÅÎÏ"
 
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
 msgid "------ Shared Memory Creator/Last-op --------\n"
-msgstr ""
+msgstr "------ óÏÚÄÁÔÅÌØ/ÐÏÓÌÅÄÎÑÑ ÏÐÅÒÁÃÉÑ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ --------\n"
 
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:531
 #, c-format
 msgid "%-10s %-10s %-10s %-10s\n"
-msgstr ""
+msgstr "%-10s %-10s %-10s %-10s\n"
 
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
 msgid "cpid"
-msgstr ""
+msgstr "cpid"
 
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
 msgid "lpid"
-msgstr ""
+msgstr "lpid"
 
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
 msgid "------ Shared Memory Segments --------\n"
-msgstr ""
+msgstr "------ óÅÇÍÅÎÔÙ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ --------\n"
 
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
 #, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr ""
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
 
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:436 sys-utils/ipcs.c:538
 msgid "key"
-msgstr ""
+msgstr "ËÌÀÞ"
 
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
 msgid "bytes"
-msgstr ""
+msgstr "ÂÁÊÔÙ"
 
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
 msgid "nattch"
-msgstr ""
+msgstr "nattch"
 
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
 msgid "status"
-msgstr ""
+msgstr "ÓÏÓÔÏÑÎÉÅ"
 
-#: 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
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:458 sys-utils/ipcs.c:460 sys-utils/ipcs.c:559
+#: sys-utils/ipcs.c:561 sys-utils/ipcs.c:563 sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:647 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:651 sys-utils/ipcs.c:675
 msgid "Not set"
-msgstr ""
+msgstr "îÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:374
 msgid "dest"
-msgstr ""
+msgstr "ÎÁÚÎÁÞÅÎÉÅ"
 
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:375
 msgid "locked"
-msgstr ""
+msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:395
 msgid "kernel not configured for semaphores\n"
-msgstr ""
+msgstr "ÑÄÒÏ ÎÅ ÎÁÓÔÒÏÅÎÏ ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÓÅÍÁÆÏÒÏ×\n"
 
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:401
 msgid "------ Semaphore Limits --------\n"
-msgstr ""
+msgstr "------ ðÒÅÄÅÌÙ ÓÅÍÁÆÏÒÏ× --------\n"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:405
 #, c-format
 msgid "max number of arrays = %d\n"
-msgstr ""
+msgstr "ÍÁËÓÉÍÁÌØÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÍÁÓÓÉ×Ï× = %d\n"
 
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:406
 #, c-format
 msgid "max semaphores per array = %d\n"
-msgstr ""
+msgstr "ÍÁËÓÉÍÕÍ ÓÅÍÁÆÏÒÏ× ÎÁ ÍÁÓÓÉ× = %d\n"
 
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:407
 #, c-format
 msgid "max semaphores system wide = %d\n"
-msgstr ""
+msgstr "ÍÁËÓÉÍÕÍ ÓÅÍÁÆÏÒÏ× ÎÁ ×ÓÀ ÓÉÓÔÅÍÕ = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:408
 #, c-format
 msgid "max ops per semop call = %d\n"
-msgstr ""
+msgstr "ÍÁËÓÉÍÕÍ ÏÐÅÒÁÃÉÊ ÎÁ ×ÙÚÏ× ÓÅÍÁÆÏÒÁ = %d\n"
 
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:409
 #, c-format
 msgid "semaphore max value = %d\n"
-msgstr ""
+msgstr "ÍÁËÓÉÍÁÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÓÅÍÁÆÏÒÁ = %d\n"
 
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:413
 msgid "------ Semaphore Status --------\n"
-msgstr ""
+msgstr "------ óÏÓÔÏÑÎÉÅ ÓÅÍÁÆÏÒÁ --------\n"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:414
 #, c-format
 msgid "used arrays = %d\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÏ ÍÁÓÓÉ×Ï× = %d\n"
 
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:415
 #, c-format
 msgid "allocated semaphores = %d\n"
-msgstr ""
+msgstr "×ÙÄÅÌÅÎÏ ÓÅÍÁÆÏÒÏ× = %d\n"
 
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:419
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
-msgstr ""
+msgstr "------ óÏÚÄÁÔÅÌÉ/×ÌÁÄÅÌØÃÙ ÍÁÓÓÉ×Ï× ÓÅÍÁÆÏÒÏ× --------\n"
 
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:421 sys-utils/ipcs.c:436
 msgid "semid"
-msgstr ""
+msgstr "semid"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:425
 msgid "------ Shared Memory Operation/Change Times --------\n"
-msgstr ""
+msgstr "------ ëÏÌÉÞÅÓÔ×Ï ÏÐÅÒÁÃÉÊ/ÉÚÍÅÎÅÎÉÊ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ --------\n"
 
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:426
 #, c-format
 msgid "%-8s %-10s %-26.24s %-26.24s\n"
-msgstr ""
+msgstr "%-8s %-10s %-26.24s %-26.24s\n"
 
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:427
 msgid "last-op"
-msgstr ""
+msgstr "ÐÏÓÌÅÄÎÑÑ ÏÐÅÒÁÃÉÑ"
 
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:427
 msgid "last-changed"
-msgstr ""
+msgstr "ÐÏÓÌÅÄÎÅÅ ÉÚÍÅÎÅÎÉÅ"
 
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:434
 msgid "------ Semaphore Arrays --------\n"
-msgstr ""
+msgstr "------ íÁÓÓÉ×Ù ÓÅÍÁÆÏÒÏ× --------\n"
 
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:435 sys-utils/ipcs.c:678
 #, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr ""
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
 
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:437
 msgid "nsems"
-msgstr ""
+msgstr "nsems"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:496
 msgid "kernel not configured for message queues\n"
-msgstr ""
+msgstr "ÑÄÒÏ ÎÅ ÎÁÓÔÒÏÅÎÏ ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÏÞÅÒÅÄÉ ÓÏÏÂÝÅÎÉÊ\n"
 
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:504
 msgid "------ Messages: Limits --------\n"
-msgstr ""
+msgstr "------ óÏÏÂÝÅÎÉÑ: ðÒÅÄÅÌÙ --------\n"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:505
 #, c-format
 msgid "max queues system wide = %d\n"
-msgstr ""
+msgstr "ÍÁËÓÉÍÕÍ ÏÞÅÒÅÄÅÊ ÄÌÑ ×ÓÅÊ ÓÉÓÔÅÍÙ = %d\n"
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:506
 #, c-format
 msgid "max size of message (bytes) = %d\n"
-msgstr ""
+msgstr "ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÓÏÏÂÝÅÎÉÑ (ÂÁÊÔ) = %d\n"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:507
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
-msgstr ""
+msgstr "ÍÁËÓÉÍÁÌØÎÙÊ ÐÏ ÕÍÏÌÞÁÎÉÀ ÒÁÚÍÅÒ ÓÏÏÂÝÅÎÉÑ (ÂÁÊÔ) = %d\n"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:511
 msgid "------ Messages: Status --------\n"
-msgstr ""
+msgstr "------ óÏÏÂÝÅÎÉÑ: óÏÓÔÏÑÎÉÅ--------\n"
 
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:512
 #, c-format
 msgid "allocated queues = %d\n"
-msgstr ""
+msgstr "×ÙÄÅÌÅÎÏ ÏÞÅÒÅÄÅÊ = %d\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:513
 #, c-format
 msgid "used headers = %d\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÏ ÚÁÇÏÌÏ×ËÏ× = %d\n"
 
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:514
 #, c-format
 msgid "used space = %d bytes\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÏ ÐÒÏÓÔÒÁÎÓÔ×Á = %d ÂÁÊÔ\n"
 
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:518
 msgid "------ Message Queues: Creators/Owners --------\n"
-msgstr ""
+msgstr "------ ïÞÅÒÅÄÉ ÓÏÏÂÝÅÎÉÊ: óÏÚÄÁÔÅÌÉ/×ÌÁÄÅÌØÃÙ--------\n"
 
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:520 sys-utils/ipcs.c:526 sys-utils/ipcs.c:532
+#: sys-utils/ipcs.c:538
 msgid "msqid"
-msgstr ""
+msgstr "msqid"
 
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:524
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
-msgstr ""
+msgstr "------ ëÏÌÉÞÅÓÔ×Ï ÏÔÐÒÁ×ÌÅÎÉÊ/ÐÒÉÅÍÁ/ÉÚÍÅÎÅÎÉÊ ÏÞÅÒÅÄÉ ÓÏÏÂÝÅÎÉÊ --------\n"
 
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:525
 #, c-format
 msgid "%-8s %-10s %-20s %-20s %-20s\n"
-msgstr ""
+msgstr "%-8s %-10s %-20s %-20s %-20s\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:526
 msgid "send"
-msgstr ""
+msgstr "ÏÔÐÒÁ×ÌÅÎÏ"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:526
 msgid "recv"
-msgstr ""
+msgstr "ÐÒÉÎÑÔÏ"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:526
 msgid "change"
-msgstr ""
+msgstr "ÉÚÍÅÎÅÎÏ"
 
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:530
 msgid "------ Message Queues PIDs --------\n"
-msgstr ""
+msgstr "------ PID'Ù ÏÞÅÒÅÄÉ ÓÏÏÂÝÅÎÉÊ --------\n"
 
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:532
 msgid "lspid"
-msgstr ""
+msgstr "lspid"
 
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:532
 msgid "lrpid"
-msgstr ""
+msgstr "lrpid"
 
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:536
 msgid "------ Message Queues --------\n"
-msgstr ""
+msgstr "------ ïÞÅÒÅÄÉ ÓÏÏÂÝÅÎÉÊ --------\n"
 
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:537
 #, c-format
 msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-msgstr ""
+msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
 
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:539
 msgid "used-bytes"
-msgstr ""
+msgstr "ÉÓÐ. ÂÁÊÔÙ"
 
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:539
 msgid "messages"
-msgstr ""
+msgstr "ÓÏÏÂÝÅÎÉÑ"
 
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:607
 #, c-format
 msgid ""
 "\n"
 "Shared memory Segment shmid=%d\n"
 msgstr ""
+"\n"
+"óÅÇÍÅÎÔ ÓÏ×Í. ÉÓÐ. ÐÁÍÑÔÉ shmid=%d\n"
 
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:608
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-msgstr ""
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:610
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
-msgstr ""
+msgstr "ÒÅÖÉÍ=%#o\tÐÒÁ×Á_ÄÏÓÔÕÐÁ=%#o\n"
 
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:612
 #, c-format
-msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr ""
+msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "ÂÁÊÔÙ=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:615
 #, c-format
 msgid "att_time=%-26.24s\n"
-msgstr ""
+msgstr "×ÒÅÍÑ_ÐÏÄËÌ=%-26.24s\n"
 
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:617
 #, c-format
 msgid "det_time=%-26.24s\n"
-msgstr ""
+msgstr "×ÒÅÍÑ_ÏÔËÌ=%-26.24s\n"
 
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:619 sys-utils/ipcs.c:650
 #, c-format
 msgid "change_time=%-26.24s\n"
-msgstr ""
+msgstr "×ÒÅÍÑ_ÉÚÍÅÎ=%-26.24s\n"
 
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:634
 #, c-format
 msgid ""
 "\n"
 "Message Queue msqid=%d\n"
 msgstr ""
+"\n"
+"ïÞÅÒÅÄØ ÓÏÏÂÝÅÎÉÊ msqid=%d\n"
 
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:635
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
-msgstr ""
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tÒÅÖÉÍ=%#o\n"
 
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:637
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
-msgstr ""
+msgstr "c-ÂÁÊÔÙ=%ld\tq-ÂÁÊÔÙ=%ld\tq-ÎÏÍÅÒ=%ld\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "send_time=%-26.24s\n"
-msgstr ""
+msgstr "×ÒÅÍÑ_ÏÔÐÒÁ×ËÉ=%-26.24s\n"
 
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "rcv_time=%-26.24s\n"
-msgstr ""
+msgstr "×ÒÅÍÑ_ÐÏÌÕÞÅÎÉÑ=%-26.24s\n"
 
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:668
 #, c-format
 msgid ""
 "\n"
 "Semaphore Array semid=%d\n"
 msgstr ""
+"\n"
+"íÁÓÓÉ× ÓÅÍÁÆÏÒÏ× semid=%d\n"
 
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:669
 #, c-format
 msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-msgstr ""
+msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:671
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
-msgstr ""
+msgstr "ÒÅÖÉÍ=%#o, ÐÒÁ×Á_ÄÏÓÔÕÐÁ=%#o\n"
 
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:673
 #, c-format
 msgid "nsems = %ld\n"
-msgstr ""
+msgstr "Ë-×Ï_ÓÅÍ = %ld\n"
 
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:674
 #, c-format
 msgid "otime = %-26.24s\n"
-msgstr ""
+msgstr "×ÒÅÍÑ_ÏÐÅÒ = %-26.24s\n"
 
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:676
 #, c-format
 msgid "ctime = %-26.24s\n"
-msgstr ""
+msgstr "×ÒÅÍÑ_ÉÚÍ= %-26.24s\n"
 
-#: sys-utils/ipcs.c:677
-#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:679
 msgid "semnum"
-msgstr ""
+msgstr "ÞÉÓÌÏ ÓÅÍÁÆÏÒÏ×"
 
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:679
 msgid "value"
-msgstr ""
+msgstr "ÚÎÁÞÅÎÉÅ"
 
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:679
 msgid "ncount"
-msgstr ""
+msgstr "ncount"
 
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:679
 msgid "zcount"
-msgstr ""
+msgstr "zcount"
 
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:679
 msgid "pid"
-msgstr ""
+msgstr "pid"
 
 #: sys-utils/rdev.c:69
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: rdev [ -rv ] [ -o óíåýåîéå ] [ ïâòáú [ úîáþåîéå [ óíåýåîéå ] ] ]"
 
 #: sys-utils/rdev.c:70
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
+msgid "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr "  rdev /dev/fd0  (ÉÌÉ rdev /linux É Ô.Ä.) ÏÔÏÂÒÁÖÁÅÔ ÔÅËÕÝÅÅ ÕÓÔÒÏÊÓÔ×Ï ROOT"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr ""
+msgstr "  rdev /dev/fd0 /dev/hda2         ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ROOT × /dev/hda2"
 
 #: sys-utils/rdev.c:72
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
+msgstr "  rdev -R /dev/fd0 1              ÕÓÔÁÎÏ×ËÁ ROOTFLAGS (ÓÔÁÔÕÓ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ)"
 
 #: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr ""
+msgstr "  rdev -r /dev/fd0 627            ÕÓÔÁÎÏ×ËÁ ÒÁÚÍÅÒÁ RAMDISK"
 
 #: sys-utils/rdev.c:74
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
+msgstr "  rdev -v /dev/fd0 1              ÕÓÔÁÎÏ×ËÁ VIDEOMODE ÚÁÐÕÓËÁ"
 
 #: sys-utils/rdev.c:75
 msgid "  rdev -o N ...                   use the byte offset N"
-msgstr ""
+msgstr "  rdev -o N ...                   ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÓÍÅÝÅÎÉÑ ÂÁÊÔÏ× N"
 
 #: sys-utils/rdev.c:76
 msgid "  rootflags ...                   same as rdev -R"
-msgstr ""
+msgstr "  rootflags ...                   ÔÏ ÖÅ, ÞÔÏ É rdev -R"
 
 #: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
-msgstr ""
+msgstr "  ramsize ...                     ÔÏ ÖÅ, ÞÔÏ É rdev -r"
 
 #: sys-utils/rdev.c:78
 msgid "  vidmode ...                     same as rdev -v"
-msgstr ""
+msgstr "  vidmode ...                     ÔÏ ÖÅ, ÞÔÏ É rdev -v"
 
 #: sys-utils/rdev.c:79
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
+msgid "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr "ðÒÉÍÅÞÁÎÉÅ: ×ÉÄÅÏÒÅÖÉÍÙ: -3=óÐÒÏÓÉÔØ, -2=òÁÓÛÉÒÅÎÎÙÊ, -1=ïÂÙÞÎÙÊ Vga, 1=ËÌÀÞ1, 2=ËÌÀÞ2,..."
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
+msgstr "      ÉÓÐÏÌØÚÕÊÔÅ -R 1 ÄÌÑ ÍÏÎÔÉÒÏ×ÁÎÉÑ ËÏÒÎÅ×ÏÇÏ ËÁÔÁÌÏÇÁ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ, -R 0 ÄÌÑ ÞÔÅÎÉÑ/ÚÁÐÉÓÉ."
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
-msgstr ""
+msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÚÁÐÑÔÁÑ"
 
-#: sys-utils/readprofile.c:58
+#: sys-utils/readprofile.c:69
+msgid "out of memory"
+msgstr "ÎÅÈ×ÁÔËÁ ÐÁÍÑÔÉ"
+
+#: sys-utils/readprofile.c:115
 #, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
-"\t -m <mapfile>  (default = \"%s\")\n"
-"\t -p <pro-file> (default = \"%s\")\n"
+"\t -m <mapfile>  (defaults: \"%s\" and\n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <pro-file> (default: \"%s\")\n"
 "\t -M <mult>     set the profiling multiplier to <mult>\n"
 "\t -i            print only info about the sampling step\n"
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
+"\t -b            print individual histogram-bin counts\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
+"%s: éÓÐÏÌØÚÏ×ÁÎÉÅ: \"%s [ÏÐÃÉÉ]\n"
+"\t -m <map-ÆÁÊÌ>  (ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ: \"%s\" É)\n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <pro-ÆÁÊÌ> (ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ: \"%s\")\n"
+"\t -M <ÍÎÏÖ>     ÕÓÔÁÎÏ×ËÁ ÍÎÏÖÉÔÅÌÑ ÐÒÏÆÉÌÉÒÏ×ÁÎÉÑ × <ÍÎÏÖ>\n"
+"\t -i            ÔÏÌØËÏ ×Ù×ÏÄ ÉÎÆÏÒÍÁÃÉÉ Ï ÛÁÇÅ ÄÉÓËÒÅÔÉÚÁÃÉÉ\n"
+"\t -v            ×Ù×ÏÄ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ\n"
+"\t -a            ×Ù×ÏÄ ×ÓÅÈ ÓÉÍ×ÏÌÏ×, ÄÁÖÅ ÅÓÌÉ ÉÈ ÞÉÓÌÏ ÎÅÎÕÌÅ×ÏÅ\n"
+"\t -b            ×Ù×ÏÄ ÉÎÄÉ×ÉÄÕÁÌØÎÙÈ ÓÞÅÔÞÉËÏ× histogram-bin\n"
+"\t -r            ÓÂÒÏÓ ×ÓÅÈ ÓÞÅÔÞÉËÏ× (ÔÏÌØËÏ root)\n"
+"\t -n            ÏÔËÌÀÞÅÎÉÅ Á×ÔÏÏÐÒÅÄÅÌÅÎÉÑ ÐÏÒÑÄËÁ ÂÁÊÔÏ×\n"
+"\t -V            ×Ù×ÏÄ ÎÏÍÅÒÁ ×ÅÒÓÉÉ ×ÙÈÏÄ\n"
 
-#: sys-utils/readprofile.c:81
-msgid "out of memory"
-msgstr ""
-
-#: sys-utils/readprofile.c:142
+#: sys-utils/readprofile.c:188
 #, c-format
-msgid "%s Version %s\n"
-msgstr ""
+msgid "%s version %s\n"
+msgstr "%s ×ÅÒÓÉÑ %s\n"
 
-#: sys-utils/readprofile.c:226
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
-msgstr ""
+msgstr "ûÁÇ_ÄÉÓËÒÅÔÉÚÁÃÉÉ: %i\n"
 
-#: sys-utils/readprofile.c:239 sys-utils/readprofile.c:262
+#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
-msgstr ""
+msgstr "%s: %s(%i): ÎÅ×ÅÒÎÁÑ ÓÔÒÏËÁ map\n"
 
-#: sys-utils/readprofile.c:250
+#: sys-utils/readprofile.c:308
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ \"_stext\" × %s\n"
 
-#: sys-utils/readprofile.c:273
+#: sys-utils/readprofile.c:334
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
-msgstr ""
+msgstr "%s: ÁÄÒÅÓ profile ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ. îÅ×ÅÒÎÙÊ ÆÁÊÌ map?\n"
 
-#: sys-utils/readprofile.c:299
+#: sys-utils/readprofile.c:375
 msgid "total"
-msgstr ""
+msgstr "×ÓÅÇÏ"
 
 #: sys-utils/renice.c:68
-msgid ""
-"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
-msgstr ""
+msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: renice ÐÒÉÏÒÉÔÅÔ [ [ -p ] pid'Ù ] [ [ -g ] pgrp'Ù ] [ [ -u ] ÐÏÌØÚÏ×ÁÔÅÌÉ ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
 msgid "renice: %s: unknown user\n"
-msgstr ""
+msgstr "renice: %s: ÎÅÉÚ×ÅÓÔÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ\n"
 
 #: sys-utils/renice.c:105
 #, c-format
 msgid "renice: %s: bad value\n"
-msgstr ""
+msgstr "renice: %s: ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ\n"
 
 #: sys-utils/renice.c:123 sys-utils/renice.c:135
 msgid "getpriority"
-msgstr ""
+msgstr "getpriority"
 
 #: sys-utils/renice.c:128
 msgid "setpriority"
-msgstr ""
+msgstr "setpriority"
 
 #: sys-utils/renice.c:139
 #, c-format
 msgid "%d: old priority %d, new priority %d\n"
-msgstr ""
+msgstr "%d: ÓÔÁÒÙÊ ÐÒÉÏÒÉÔÅÔ %d, ÎÏ×ÙÊ ÐÒÉÏÒÉÔÅÔ %d\n"
 
 #: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s ÐÒÏÇÒÁÍÍÁ [ÁÒÇÕÍÅÎÔ ...]\n"
 
-#: sys-utils/tunelp.c:78
+#: sys-utils/tunelp.c:75
 #, c-format
 msgid ""
 "Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
+"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s <ÕÓÔÒÏÊÓÔ×Ï> [ -i <ðòåòù÷áîéå> | -t <÷òåíñ> | -c <óéí÷ïìù> | -w <ïöéäáîéå> | \n"
+"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"          -T [on|off] ]\n"
 
-#: sys-utils/tunelp.c:94
+#: sys-utils/tunelp.c:91
 msgid "malloc error"
-msgstr ""
+msgstr "ÏÛÉÂËÁ malloc"
 
-#: sys-utils/tunelp.c:106
+#: sys-utils/tunelp.c:103
 #, c-format
 msgid "%s: bad value\n"
-msgstr ""
+msgstr "%s: ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ\n"
 
-#: sys-utils/tunelp.c:245
+#: sys-utils/tunelp.c:242
 #, c-format
 msgid "%s: %s not an lp device.\n"
-msgstr ""
+msgstr "%s: %s ÎÅ lp-ÕÓÔÒÏÊÓÔ×Ï.\n"
 
-#: sys-utils/tunelp.c:266
+#: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
-msgstr ""
+msgstr "%s ÓÏÓÔÏÑÎÉÅ - %d"
 
-#: sys-utils/tunelp.c:267
+#: sys-utils/tunelp.c:264
 msgid ", busy"
-msgstr ""
+msgstr ", ÚÁÎÑÔ"
 
-#: sys-utils/tunelp.c:268
+#: sys-utils/tunelp.c:265
 msgid ", ready"
-msgstr ""
+msgstr ", ÇÏÔÏ×"
 
-#: sys-utils/tunelp.c:269
+#: sys-utils/tunelp.c:266
 msgid ", out of paper"
-msgstr ""
+msgstr ", ÎÅÔ ÂÕÍÁÇÉ"
 
-#: sys-utils/tunelp.c:270
+#: sys-utils/tunelp.c:267
 msgid ", on-line"
-msgstr ""
+msgstr ", ÏÎÌÁÊÎ"
 
-#: sys-utils/tunelp.c:271
+#: sys-utils/tunelp.c:268
 msgid ", error"
-msgstr ""
+msgstr ", ÏÛÉÂËÁ"
 
-#: sys-utils/tunelp.c:288
+#: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
-msgstr ""
+msgstr "ÏÛÉÂËÁ LPGETIRQ"
 
-#: sys-utils/tunelp.c:294
+#: sys-utils/tunelp.c:291
 #, c-format
 msgid "%s using IRQ %d\n"
-msgstr ""
+msgstr "%s ÉÓÐÏÌØÚÕÅÔ ÐÒÅÒÙ×ÁÎÉÅ %d\n"
 
-#: sys-utils/tunelp.c:296
+#: sys-utils/tunelp.c:293
 #, c-format
 msgid "%s using polling\n"
-msgstr ""
+msgstr "%s ÉÓÐÏÌØÚÕÅÔ ÏÐÒÏÓ\n"
 
-#: text-utils/col.c:155
+#: text-utils/col.c:153
 #, c-format
 msgid "col: bad -l argument %s.\n"
-msgstr ""
+msgstr "col: ÎÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ -l %s.\n"
 
-#: text-utils/col.c:537
+#: text-utils/col.c:535
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: col [-bfpx] [-l ËÏÌ-×Ï_ÓÔÒÏË]\n"
 
-#: text-utils/col.c:543
+#: text-utils/col.c:541
 msgid "col: write error.\n"
-msgstr ""
+msgstr "col: ÏÛÉÂËÁ ÚÁÐÉÓÉ.\n"
 
-#: text-utils/col.c:550
+#: text-utils/col.c:548
 #, c-format
 msgid "col: warning: can't back up %s.\n"
-msgstr ""
+msgstr "col: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÄÄÅÒÖÁÔØ %s.\n"
 
-#: text-utils/col.c:551
+#: text-utils/col.c:549
 msgid "past first line"
-msgstr ""
+msgstr "ÐÏÓÌÅÄÎÑÑ ÐÅÒ×ÁÑ ÓÔÒÏËÁ"
 
-#: text-utils/col.c:551
+#: text-utils/col.c:549
 msgid "-- line already flushed"
-msgstr ""
+msgstr "-- ÓÔÒÏËÁ ÕÖÅ ×ÙÒÏ×ÎÅÎÁ"
 
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ - ] [ -2 ] [ ÆÁÊÌ ... ]\n"
 
-#: text-utils/column.c:300
+#: text-utils/column.c:297
 msgid "line too long"
-msgstr ""
+msgstr "ÓÔÒÏËÁ ÓÌÉÛËÏÍ ÄÌÉÎÎÁÑ"
 
-#: text-utils/column.c:377
+#: text-utils/column.c:374
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: column [-tx] [-c ÓÔÏÌÂÃÙ] [ÆÁÊÌ ...]\n"
 
-#: text-utils/hexsyntax.c:80
+#: text-utils/hexsyntax.c:82
 msgid "hexdump: bad length value.\n"
-msgstr ""
+msgstr "hexdump: ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÄÌÉÎÙ.\n"
 
-#: text-utils/hexsyntax.c:91
+#: text-utils/hexsyntax.c:93
 msgid "hexdump: bad skip value.\n"
-msgstr ""
+msgstr "hexdump: ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ÐÒÏÐÕÓËÁ.\n"
 
-#: text-utils/hexsyntax.c:129
-msgid ""
-"hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-msgstr ""
+#: text-utils/hexsyntax.c:131
+msgid "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr "hexdump: [-bcCdovx] [-e ÓÔÒÏËÁ_ÆÏÒÍÁÔÁ] [-f ÆÁÊÌ_ÆÏÒÍÁÔÁ] [-n ÄÌÉÎÁ] [-s ÐÒÏÐÕÓË] [ÆÁÊÌ ...]\n"
 
 #: text-utils/more.c:263
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-dflpcsu] [+ÎÏÍÅÒ_ÓÔÒÏËÉ | +/ÛÁÂÌÏÎ] ÉÍÑ1 ÉÍÑ2 ...\n"
 
 #: text-utils/more.c:521
 #, c-format
@@ -8485,6 +9266,9 @@ msgid ""
 "*** %s: directory ***\n"
 "\n"
 msgstr ""
+"\n"
+"*** %s: ËÁÔÁÌÏÇ ***\n"
+"\n"
 
 #. simple ELF detection
 #: text-utils/more.c:564
@@ -8494,185 +9278,335 @@ msgid ""
 "******** %s: Not a text file ********\n"
 "\n"
 msgstr ""
+"\n"
+"******** %s: îÅ ÔÅËÓÔÏ×ÙÊ ÆÁÊÌ ********\n"
+"\n"
 
 #: text-utils/more.c:667
 msgid "[Use q or Q to quit]"
-msgstr ""
+msgstr "[éÓÐÏÌØÚÕÊÔÅ q ÉÌÉ or Q ÄÌÑ ×ÙÈÏÄÁ]"
 
 #: text-utils/more.c:847
 msgid "--More--"
-msgstr ""
+msgstr "--äÁÌÅÅ--"
 
 #: text-utils/more.c:849
 #, c-format
 msgid "(Next file: %s)"
-msgstr ""
+msgstr "(óÌÅÄÕÀÝÉÊ ÆÁÊÌ: %s)"
 
 #: text-utils/more.c:855
 msgid "[Press space to continue, 'q' to quit.]"
-msgstr ""
+msgstr "[îÁÖÍÉÔÅ ÐÒÏÂÅÌ ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ, 'q' ÄÌÑ ×ÙÈÏÄÁ.]"
 
-#: text-utils/more.c:1190
+#: text-utils/more.c:1269
 #, c-format
 msgid "...back %d pages"
-msgstr ""
+msgstr "...ÎÁÚÁÄ ÎÁ %d ÓÔÒÁÎÉÃ"
 
-#: text-utils/more.c:1192
+#: text-utils/more.c:1271
 msgid "...back 1 page"
-msgstr ""
+msgstr "...ÎÁÚÁÄ ÎÁ 1 ÓÔÒÁÎÉÃÕ"
+
+#: text-utils/more.c:1314
+msgid "...skipping one line"
+msgstr "...ÐÒÏÐÕÓËÁÅÔÓÑ ÏÄÎÁ ÓÔÒÏËÁ"
 
-#: text-utils/more.c:1233
+#: text-utils/more.c:1316
 #, c-format
-msgid "...skipping %d line"
-msgstr ""
+msgid "...skipping %d lines"
+msgstr "...ÐÒÏÐÕÓËÁÅÔÓÑ %d ÓÔÒÏË"
 
-#: text-utils/more.c:1274
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
 "\n"
 msgstr ""
+"\n"
+"***îÁÚÁÄ***\n"
+"\n"
 
-#: text-utils/more.c:1331
-msgid "Can't open help file"
+#: text-utils/more.c:1391
+msgid ""
+"\n"
+"Most commands optionally preceded by integer argument k.  Defaults in brackets.\n"
+"Star (*) indicates argument becomes new default.\n"
 msgstr ""
-
-#: text-utils/more.c:1361 text-utils/more.c:1365
+"\n"
+"âÏÌØÛÉÎÓÔ×Õ ËÏÍÁÎÄ ÏÐÃÉÏÎÁÌØÎÏ ÐÒÅÄÛÅÓÔ×ÕÅÔ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ k. úÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ × ËÁ×ÙÞËÁÈ.\n"
+"ú×ÅÚÄÏÞËÁ (*) ÏÚÎÁÞÁÅÔ, ÞÔÏ ÁÒÇÕÍÅÎÔ ÓÔÁÎÏ×ÉÔÓÑ ÎÏ×ÙÍ ÚÎÁÞÅÎÉÅÍ ÐÏ ÕÍÏÌÞÁÎÉÀ.\n"
+
+#: text-utils/more.c:1398
+msgid ""
+"<space>                 Display next k lines of text [current screen size]\n"
+"z                       Display next k lines of text [current screen size]*\n"
+"<return>                Display next k lines of text [1]*\n"
+"d or ctrl-D             Scroll k lines [current scroll size, initially 11]*\n"
+"q or Q or <interrupt>   Exit from more\n"
+"s                       Skip forward k lines of text [1]\n"
+"f                       Skip forward k screenfuls of text [1]\n"
+"b or ctrl-B             Skip backwards k screenfuls of text [1]\n"
+"'                       Go to place where previous search started\n"
+"=                       Display current line number\n"
+"/<regular expression>   Search for kth occurrence of regular expression [1]\n"
+"n                       Search for kth occurrence of last r.e [1]\n"
+"!<cmd> or :!<cmd>       Execute <cmd> in a subshell\n"
+"v                       Start up /usr/bin/vi at current line\n"
+"ctrl-L                  Redraw screen\n"
+":n                      Go to kth next file [1]\n"
+":p                      Go to kth previous file [1]\n"
+":f                      Display current file name and line number\n"
+".                       Repeat previous command\n"
+msgstr ""
+"<ÐÒÏÂÅÌ>                ÷Ù×ÏÄ ÓÌÅÄÕÀÝÉÈ k ÓÔÒÏË ÔÅËÓÔÁ [ÔÅËÕÝÉÊ ÒÁÚÍÅÒ ÜËÒÁÎÁ]\n"
+"z                       ÷Ù×ÏÄ ÓÌÅÄÕÀÝÉÈ k ÓÔÒÏË ÔÅËÓÔÁ [ÔÅËÕÝÉÊ ÒÁÚÍÅÒ ÜËÒÁÎÁ]*\n"
+"<return>                ÷Ù×ÏÄ ÓÌÅÄÕÀÝÉÈ k ÓÔÒÏË ÔÅËÓÔÁ [1]*\n"
+"d ÉÌÉ ctrl-D            ðÒÏËÒÕÔËÁ k ÓÔÒÏË [ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ ÐÒÏËÒÕÔËÉ, ÉÚÎÁÞÁÌØÎÏ 11]*\n"
+"q ÉÌÉ Q ÉÌÉ <ÐÒÅÒÙ×.>   ÷ÙÈÏÄ ÉÚ more\n"
+"s                       ðÒÏÐÕÓË ×ÐÅÒÅÄ k ÓÔÒÏË ÔÅËÓÔÁ [1]\n"
+"f                       ðÒÏÐÕÓË ×ÐÅÒÅÄ k ÐÏÌÎÙÈ ÜËÒÁÎÏ× ÔÅËÓÔÁ [1]\n"
+"b ÉÌÉ ctrl-B            ðÒÏÐÕÓË ÎÁÚÁÄ k ÐÏÌÎÙÈ ÜËÒÁÎÏ× ÔÅËÓÔÁ [1]\n"
+"'                       ðÅÒÅÈÏÄ × ÍÅÓÔÏ, Ó ËÏÔÏÒÏÇÏ ÂÙÌ ÎÁÞÁÔ ÐÒÅÄÙÄÕÝÉÊ ÐÏÉÓË\n"
+"=                       ïÔÏÂÒÁÖÅÎÉÅ ÎÏÍÅÒÁ ÔÅËÕÝÅÊ ÓÔÒÏËÉ\n"
+"/<ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ> ðÏÉÓË k-ÇÏ ×ÈÏÖÄÅÎÉÑ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ [1]\n"
+"n                       ðÏÉÓË k-ÇÏ ×ÈÏÖÄÅÎÉÑ ÐÏÓÌÅÄÎÅÇÏ Ò.×. [1]\n"
+"!<cmd> ÉÌÉ :!<cmd>      ÷ÙÐÏÌÎÅÎÉÅ <cmd> × ÓÕÂÏÂÏÌÏÞËÅ\n"
+"v                       úÁÐÕÓË /usr/bin/vi Ó ÔÅËÕÝÅÊ ÓÔÒÏËÉ\n"
+"ctrl-L                  ðÅÒÅÒÉÓÏ×Ù×ÁÎÉÅ ÜËÒÁÎÁ\n"
+":n                      ðÅÒÅÈÏÄ Ë k-ÍÕ ÓÌÅÄÕÀÝÅÍÕ ÆÁÊÌÕ [1]\n"
+":p                      ðÅÒÅÈÏÄ Ë k-ÍÕ ÐÒÅÄÙÄÕÝÅÍÕ ÆÁÊÌÕ [1]\n"
+":f                      ïÔÏÂÒÁÖÅÎÉÅ ÉÍÅÎÉ ÔÅËÕÝÅÇÏ ÆÁÊÌÁ É ÎÏÍÅÒÁ ÓÔÒÏËÉ\n"
+".                       ðÏ×ÔÏÒÅÎÉÅ ÐÒÅÄÙÄÕÝÅÊ ËÏÍÁÎÄÙ\n"
+
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
-msgstr ""
+msgstr "[îÁÖÍÉÔÅ 'h' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÉÎÓÔÒÕËÃÉÊ.]"
 
-#: text-utils/more.c:1399
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
-msgstr ""
+msgstr "\"%s\" ÓÔÒÏËÁ %d"
 
-#: text-utils/more.c:1401
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
-msgstr ""
+msgstr "[îÅ ÆÁÊÌ] ÓÔÒÏËÁ %d"
 
-#: text-utils/more.c:1485
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
-msgstr ""
+msgstr "  ðÅÒÅÐÏÌÎÅÎÉÅ\n"
 
-#: text-utils/more.c:1532
+#: text-utils/more.c:1642
 msgid "...skipping\n"
-msgstr ""
+msgstr "...ÐÒÏÐÕÓËÁÅÔÓÑ\n"
 
-#: text-utils/more.c:1562
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
-msgstr ""
+msgstr "îÅËÏÒÒÅËÔÎÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ"
 
-#: text-utils/more.c:1574
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
+"\n"
+"ûÁÂÌÏÎ ÎÅ ÎÁÊÄÅÎ\n"
 
-#: text-utils/more.c:1577
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
-msgstr ""
+msgstr "ûÁÂÌÏÎ ÎÅ ÎÁÊÄÅÎ"
 
-#: text-utils/more.c:1638
+#: text-utils/more.c:1748
 msgid "can't fork\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ\n"
 
-#: text-utils/more.c:1677
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
+"\n"
+"...ðÒÏÐÕÓËÁÅÔÓÑ "
 
-#: text-utils/more.c:1682
+#: text-utils/more.c:1792
 msgid "...Skipping to file "
-msgstr ""
+msgstr "...ðÒÏÐÕÓËÁÅÔÓÑ ÄÏ ÆÁÊÌÁ "
 
-#: text-utils/more.c:1684
+#: text-utils/more.c:1794
 msgid "...Skipping back to file "
-msgstr ""
+msgstr "...ðÒÏÐÕÓËÁÅÔÓÑ ÏÂÒÁÔÎÏ ÄÏ ÆÁÊÌÁ "
 
-#: text-utils/more.c:1918
+#: text-utils/more.c:2074
 msgid "Line too long"
-msgstr ""
+msgstr "óÔÒÏËÁ ÓÌÉÛËÏÍ ÄÌÉÎÎÁÑ"
 
-#: text-utils/more.c:1961
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
-msgstr ""
+msgstr "îÅÔ ÐÒÅÄÙÄÕÝÅÊ ËÏÍÁÎÄÙ ÄÌÑ ÚÁÍÅÎÙ"
 
-#: text-utils/odsyntax.c:133
+#: text-utils/odsyntax.c:130
 msgid "od: od(1) has been deprecated for hexdump(1).\n"
-msgstr ""
+msgstr "od: od(1) ËÒÁÊÎÅ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÄÌÑ hexdump(1).\n"
 
-#: text-utils/odsyntax.c:136
+#: text-utils/odsyntax.c:133
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr ""
+msgstr "od: ÓÏ×ÍÅÓÔÉÍÏÓÔØ hexdump(1) ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ -%c ÏÐÃÉÀ %s\n"
 
-#: text-utils/odsyntax.c:137
+#: text-utils/odsyntax.c:134
 msgid "; see strings(1)."
-msgstr ""
+msgstr "; ÓÍÏÔÒÉ strings(1)."
 
 #: text-utils/parse.c:63
 #, c-format
 msgid "hexdump: can't read %s.\n"
-msgstr ""
+msgstr "hexdump: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s.\n"
 
 #: text-utils/parse.c:68
 msgid "hexdump: line too long.\n"
-msgstr ""
+msgstr "hexdump: ÓÔÒÏËÁ ÓÌÉÛËÏÍ ÄÌÉÎÎÁÑ.\n"
 
-#: text-utils/parse.c:406
+#: text-utils/parse.c:401
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr ""
+msgstr "hexdump: ÞÉÓÌÏ ÂÁÊÔ Ó ÍÎÏÇÏÞÉÓÌÅÎÎÙÍÉ ÓÉÍ×ÏÌÁÍÉ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ.\n"
 
-#: text-utils/parse.c:490
+#: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
-msgstr ""
+msgstr "hexdump: ÎÅ×ÅÒÎÏÅ ÞÉÓÌÏ ÂÁÊÔ ÄÌÑ ÓÉÍ×ÏÌÁ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ %s.\n"
 
-#: text-utils/parse.c:497
+#: text-utils/parse.c:490
+#, c-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
-msgstr ""
+msgstr "hexdump: ÄÌÑ %%s ÔÒÅÂÕÅÔÓÑ ÔÏÞÎÏÓÔØ ÉÌÉ ÞÉÓÌÏ ÂÁÊÔ.\n"
 
-#: text-utils/parse.c:503
+#: text-utils/parse.c:496
 #, c-format
 msgid "hexdump: bad format {%s}\n"
-msgstr ""
+msgstr "hexdump: ÎÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ {%s}\n"
 
-#: text-utils/parse.c:509
+#: text-utils/parse.c:502
+#, c-format
 msgid "hexdump: bad conversion character %%%s.\n"
-msgstr ""
+msgstr "hexdump: ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ %%%s.\n"
+
+#: text-utils/pg.c:257
+#, c-format
+msgid "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr "%s: éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [-ÞÉÓÌÏ] [-p ÓÔÒÏËÁ] [-cefnrs] [+ÓÔÒÏËÁ] [+/ÛÁÂÌÏÎ/] [ÆÁÊÌÙ]\n"
+
+#: text-utils/pg.c:266
+#, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "%s: ÄÌÑ ÏÐÃÉÉ ÔÒÅÂÕÅÔÓÑ ÁÒÇÕÍÅÎÔ -- %s\n"
+
+#: text-utils/pg.c:274
+#, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "%s: ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ -- %s\n"
+
+#: text-utils/pg.c:391
+msgid "...skipping forward\n"
+msgstr "...ÐÒÏÐÕÓËÁÅÔÓÑ ×ÐÅÒÅÄ\n"
+
+#: text-utils/pg.c:393
+msgid "...skipping backward\n"
+msgstr "...ÐÒÏÐÕÓËÁÅÔÓÑ ÎÁÚÁÄ\n"
+
+#: text-utils/pg.c:415
+msgid "No next file"
+msgstr "îÅÔ ÓÌÅÄÕÀÝÅÇÏ ÆÁÊÌÁ"
+
+#: text-utils/pg.c:419
+msgid "No previous file"
+msgstr "îÅÔ ÐÒÅÄÙÄÕÝÅÇÏ ÆÁÊÌÁ"
+
+#: text-utils/pg.c:949
+#, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: ïÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:955
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr "%s: îÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ × ÆÁÊÌÅ %s\n"
+
+#: text-utils/pg.c:958
+#, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "%s: îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ × ÆÁÊÌÅ %s\n"
+
+#: text-utils/pg.c:1053
+#, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ\n"
+
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
+msgid "RE error: "
+msgstr "ïÛÉÂËÁ RE: "
+
+#: text-utils/pg.c:1219
+msgid "(EOF)"
+msgstr "(ËÏÎÅÃ ÆÁÊÌÁ)"
+
+#: text-utils/pg.c:1245
+msgid "No remembered search string"
+msgstr "îÅÔ ÚÁÐÏÍÎÅÎÎÙÈ ÓÔÒÏË ÐÏÉÓËÁ"
+
+#: text-utils/pg.c:1328
+msgid "Cannot open "
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ "
+
+#: text-utils/pg.c:1376
+msgid "saved"
+msgstr "ÓÏÈÒÁÎÅÎ"
+
+#: text-utils/pg.c:1483
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ": !ËÏÍÁÎÄÁ ÎÅ ÒÁÚÒÅÛÅÎÁ × ÒÅÖÉÍÅ rflag.\n"
+
+#: text-utils/pg.c:1515
+msgid "fork() failed, try again later\n"
+msgstr "fork() ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ, ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ ÐÏÐÏÚÖÅ\n"
+
+#: text-utils/pg.c:1720
+msgid "(Next file: "
+msgstr "(óÌÅÄÕÀÝÉÊ ÆÁÊÌ: "
 
 #: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÂÕÆÅÒÎÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï\n"
 
 #: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
-msgstr ""
+msgstr "ÉÓÐÏÌØÚÏ×ÁÎÉÅ: rev [ÆÁÊÌ ...]\n"
 
-#: text-utils/ul.c:143
+#: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ -i ] [ -t ÔÅÒÍÉÎÁÌ ] ÆÁÊÌ...\n"
 
-#: text-utils/ul.c:154
+#: text-utils/ul.c:152
 msgid "trouble reading terminfo"
-msgstr ""
+msgstr "ÐÒÏÂÌÅÍÁ ÞÔÅÎÉÑ terminfo"
 
-#: text-utils/ul.c:244
+#: text-utils/ul.c:242
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
-msgstr ""
+msgstr "îÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ×Ï ×ÈÏÄÎÙÈ ÄÁÎÎÙÈ: %o, %o\n"
 
-#: text-utils/ul.c:427
+#: text-utils/ul.c:425
 msgid "Unable to allocate buffer.\n"
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÂÕÆÅÒ.\n"
 
-#: text-utils/ul.c:588
+#: text-utils/ul.c:586
 msgid "Input line too long.\n"
-msgstr ""
+msgstr "óÔÒÏËÁ ×ÈÏÄÎÙÈ ÄÁÎÎÙÈ ÓÌÉÛËÏÍ ÄÌÉÎÎÁÑ.\n"
 
-#: text-utils/ul.c:601
+#: text-utils/ul.c:599
 msgid "Out of memory when growing buffer.\n"
-msgstr ""
+msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ ÐÒÉ Õ×ÅÌÉÞÅÎÉÉ ÂÕÆÅÒÁ.\n"
diff --git a/po/sl.po b/po/sl.po
index 04b4dc3a..6f354036 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11y\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
 "PO-Revision-Date: 2003-01-28 16:30+0100\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -19,94 +19,98 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "nastavi samo za branje"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "nastavi za pisanje in branje"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr ""
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr ""
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr ""
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
 msgstr ""
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
 msgstr ""
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:81
+msgid "get size in bytes"
+msgstr ""
+
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr ""
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr ""
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr ""
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "ponovno preberi tabelo razdelkov"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
 msgstr "Uporaba:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr "  %s --report [naprave]\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "  %s [-v|-q] ukazi naprave\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Ukazi na razpolago:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: Neznan ukaz: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s zahteva argument\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr "%s uspelo.\n"
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: ni moè odpreti %s\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: napaka ioctl na %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr ""
 
@@ -149,12 +153,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "uporaba: %s [ -n ] naprava\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s iz %s\n"
@@ -286,354 +290,354 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s je priklopljen.      "
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Ali res ¾elite nadaljevati"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "preverjanje prekinjeno.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Odstrani blok"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Napaka pri pisanju: slab blok v datoteki ,%s`\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
 "\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Poèisti"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Blok %d v datoteki ,%s` je oznaèen kot prost."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Popravi"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr "Odstrani"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "interna napaka"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr ""
 "Obmoèje %d: oznaèeno kot uporabljeno, vendar ga nobena datoteka ne uporablja."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Odznaèi"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Nastavi"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "slaba velikost inoda"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "ni mogoèe odpreti ,%s`"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s je èist, preverjanje ni potrebno.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -647,7 +651,7 @@ msgid ""
 "%6d files\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -733,7 +737,7 @@ msgstr ""
 msgid "not enough space, need at least %lu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Naprava %s\n"
@@ -806,7 +810,7 @@ msgstr ""
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Uporaba: mkfs [-V] [-t tip] [izbire] naprava [velikost]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -941,118 +945,113 @@ msgid ""
 "that some device files will be wrong.\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr ""
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
 "\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr ""
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr ""
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "ni mogoèe odpreti %s"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr ""
@@ -1092,45 +1091,45 @@ msgid "one bad page\n"
 msgstr "ena slaba stran\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d slabih strani\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: napaka: Ni prostora za izmenjalni prostor?\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: napaka: velikost %ld je veèja od velikosti naprave %d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: napaka: neznana izdaja %d\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: napaka: velikost izmenjalnega prostora mora biti vsaj %ld KB\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: opozorilo: meja izmenjalnega prostora postavljena na %ld KB\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Izmenjalnega prostora ne bomo posku¹ali napraviti na ,%s`"
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "usodna napaka: prva stran neberljiva"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1146,24 +1145,24 @@ msgstr ""
 "varnostno\n"
 "preverjanje.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Izmenjalnega prostora ni mogoèe pripraviti: branje ni mogoèe"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Pripravljamo izmenjalni prostor izdaje %d, velikost = %llu kB\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "izmenjalne naprave ni mogoèe previti"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "strani s podpisom ni mogoèe zapisati"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync() ni uspel"
 
@@ -1203,57 +1202,56 @@ msgstr ""
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Neuporabljen prostor"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "Disk je bil zamenjan.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Ponovno za¾enite sistem, da bo razdelitvena tabela pravilno a¾urirana.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1261,764 +1259,777 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "USODNA NAPAKA"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Pritisnike katerokoli tipko za izhod iz cfdisk"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Diskovnega pogona ni moè prebrati"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Na diskovni pogon ni moè pisati"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Preveè razdelkov"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "Razdelek se zaène pred stezo 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "Razdelek se konèa pred stezo 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "Razdelek se zaène onkraj konca diska"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "Razdelek se konèa onkraj konca diska"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "logièni razdelki niso v diskovnem vrstnem redu"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "logièni razdelki se prekrivajo"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "raz¹irjeni logièni razdelki se prekrivajo"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!! Interna napaka: ustvarjanje logiènega pogona brez raz¹irjenega "
 "razdelka !!!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr ""
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr ""
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr ""
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Pritisnite katerokoli tipko za nadaljevanje"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primaren"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Ustvari nov primaren razdelek"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Logièen"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Ustvari nov logièen razdelek"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Preklièi"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Ne ustvari razdelka"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Interna napaka !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Velikost (v MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Zaèetek"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Dodaj razdelek na zaèetek prostega obmoèja"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Dodaj razdelek na konec prostega obmoèja"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Ni prostora za ustvarjanje raz¹irjenega razdelka"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Velikosti diska ni mogoèe ugotoviti"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Slab primarni razdelek"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Slab logièni razdelek"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Opozorilo! To lahko unièi podatke na disku!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Ste preprièani, da ¾elite zapisati tabelo razdelkov na disk? (da ali ne): "
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "ne"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Tabela razdelkov ni bila zapisana"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "da"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Prosim, odgovorite ,da` ali ,ne`"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Tabelo razdelkov zapisujemo na disk..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Tabela razdelkov zapisana na disku"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Tabela razdelkov zapisana, a¾uriranje tabele neuspe¹no. Ponovno za¾enite "
 "sistem."
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Noben primarni razdelek ni oznaèen kot zagonski. DOS MBR se ne more zagnati."
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Veè kot en primarni razdelek je oznaèen kot zagonski. DOS MBR se ne more "
 "zagnati."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Vnesite ime datoteke ali pritisnite ENTER za prikaz na zaslonu: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ni moè odpreti datoteke ,%s`"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disk: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Brez   "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "  Primaren"
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Logièen"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Neznano"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Zagonski (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr ""
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
-#, c-format
-msgid "Unknown (%02X)"
-msgstr "Neznano (%02X)"
+#: fdisk/cfdisk.c:2007
+#, fuzzy, c-format
+msgid "(%02X)"
+msgstr "Zagonski (%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Brez (%02X)"
+#: fdisk/cfdisk.c:2009
+#, fuzzy
+msgid "None"
+msgstr "Opravljeno"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
-msgstr ""
+#: fdisk/cfdisk.c:2046
+#, fuzzy
+msgid "               First       Last\n"
+msgstr "parametri\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
+#, fuzzy
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
-msgstr ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
+#: fdisk/cfdisk.c:2131
+#, fuzzy
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Zaèetni---      ----Konèni----  Zaèetni  ©tevilo\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
+#: fdisk/cfdisk.c:2132
+#, fuzzy
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
 msgstr " #   Ozn Glav Sekt Stz   ID  Glav Sekt Stz    sektor sektorjev\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+#, fuzzy
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Direktno"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Izpis tabele v surovi obliki"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Sektorji"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Izpis tabele, urejene po sektorjih"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabela"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Enostaven izpis tabele razdelkov"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Brez izpisa tabele razdelkov"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Osnovna navodila za cfdisk"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Cfdisk je tekstovni program za urejanje diskovnih razdelkov,"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "s katerim lahko ustvarjate, bri¹ete ali spreminjate razdelke"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "na va¹em disku."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "  Ukaz        Pomen"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr ""
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr ""
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr ""
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr ""
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             ,ne`"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr ""
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr ""
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr ""
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Opravljeno"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr ""
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr ""
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr ""
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
 #, c-format
-msgid "Disk Drive: %s"
-msgstr ""
+msgid "Unknown (%02X)"
+msgstr "Neznano (%02X)"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2573
 #, c-format
-msgid "Size: %lld bytes, %ld MB"
+msgid "Disk Drive: %s"
 msgstr ""
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2580
 #, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
+msgid "Size: %lld bytes, %lld MB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2583
 #, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
+msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2587
+#, fuzzy, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "%d glav, %d sektorjev/stezo, %d stez"
+
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Ime"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Oznake"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Tip Razd."
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "Dat. sistem"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Oznaka]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
-msgstr ""
+#: fdisk/cfdisk.c:2597
+#, fuzzy
+msgid "    Sectors"
+msgstr "Sektorji"
+
+#: fdisk/cfdisk.c:2599
+#, fuzzy
+msgid "  Cylinders"
+msgstr "steza"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
+#: fdisk/cfdisk.c:2601
+#, fuzzy
+msgid "  Size (MB)"
 msgstr "Vel. (MB)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
+#: fdisk/cfdisk.c:2603
+#, fuzzy
+msgid "  Size (GB)"
 msgstr "Vel. (GB)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Zagonski"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Oznaèi, ali je razdelek zagonski"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Izbri¹i"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Izbri¹i ta razdelek"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometr."
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Nastavi geometrijo diska (samo poznavalci)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Pomoè"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Izpi¹i stran z navodili"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Razpni"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Raz¹iri trenutni razdelek èez celotno prosto obmoèje (samo poznavalci)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Ustvari nov razdelek na prostem obmoèju diska"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Natisni"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Izpi¹i tabelo razdelkov na zaslon ali shrani v datoteko"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Izhod"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Izhod iz programa brez zapisa tabele razdelkov"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Tip"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Enote"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Pi¹i"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr ""
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr ""
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2038,7 +2049,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2050,7 +2061,7 @@ msgid ""
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2060,233 +2071,233 @@ msgid ""
 "  ...\n"
 msgstr ""
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Ni mogoèe odpreti %s\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Ni mogoèe prebrati %s\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Ni mogoèe pisati na %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Pomnilnika ni veè mogoèe rezervirati\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Usodna napaka\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "  Ukaz  dejanje"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   preklopi samo za branje"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr ""
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   zbri¹i razdelek"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   izpi¹i znane vrste razdelkov"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   izpi¹i ta menu"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   dodaj nov razdelek"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   ustvari novo prazno tabelo razdelkov MS-DOS"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   izpi¹i tabelo razdelkov"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   konèaj, ne da bi shranil spremembe"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   ustvari novo prazno Sunovo oznako diska"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   spremeni sistemski ID razdelka"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr ""
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   preveri tabelo razdelkov"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   zapi¹i tabelo razdelkov in konèaj"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   posebne mo¾nosti (samo za poznavalce)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   doloèi razdelek kot zagonski"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr ""
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr ""
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr ""
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr ""
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr ""
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr ""
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr ""
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr ""
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr ""
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr ""
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr ""
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " in "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2298,26 +2309,26 @@ msgid ""
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2325,121 +2336,121 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Interna napaka\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr ""
 
-#: fdisk/fdisk.c:1069
+#: fdisk/fdisk.c:1094
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr ""
 
-#: fdisk/fdisk.c:1136
+#: fdisk/fdisk.c:1161
 #, c-format
 msgid "Using default value %u\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr ""
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Izbrani razdelek %d\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 msgid "No partition is defined yet!\n"
 msgstr "Noben razdelek ¹e ni doloèen!\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr "Vsi primarni razdelki so ¾e doloèeni!\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "steza"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Enote prikaza/vnosa spremenjene na %s\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "OPOZORILO: Razdelek %d je raz¹irjeni razdelek\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "Nastavljena je zdru¾ljivost z DOS.\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Zdru¾ljivost z DOS ni nastavljena.\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Razdelek %d ¹e ne obstaja!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2451,7 +2462,7 @@ msgstr ""
 "razdelkov tipa 0. Razdelek lahko zbri¹ete z\n"
 "ukazom ,d`.\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2459,7 +2470,7 @@ msgstr ""
 "Razdelka ne morete pretvoriti v raz¹irjenega ali obratno.\n"
 "Najprej ga morate zbrisati.\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2469,7 +2480,7 @@ msgstr ""
 "Tak je dogovor v SunOS/Solaris, Linux pa ga spo¹tuje.\n"
 "\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2479,52 +2490,52 @@ msgstr ""
 "razdelek 11 pa kot celotni del (6), kot prièakuje IRIX.\n"
 "\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Tip razdelka %d spremenjen v %x (%s)\n"
 
-#: fdisk/fdisk.c:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Fizièni zaèetek razdelka %d ni enak logiènemu (ne-Linux?):\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "  fizièni=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logièni=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Fizièni konec razdelka %d ni enak logiènemu:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Razdelek %i se ne zaène na meji stez:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "mora biti (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Razdelek %i se ne konèa na meji stez.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "mora biti (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -2533,7 +2544,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB, %lld bajtov\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, c-format
 msgid ""
 "\n"
@@ -2542,17 +2553,17 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d glav, %d sektorjev/stezo, %d stez"
 
-#: fdisk/fdisk.c:1503
-#, c-format
-msgid ", total %lu sectors"
+#: fdisk/fdisk.c:1529
+#, fuzzy, c-format
+msgid ", total %llu sectors"
 msgstr ", skupno %lu sektorjev"
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2561,28 +2572,28 @@ msgstr ""
 "Enote = %s od %d x %d = %d bajtov\n"
 "\n"
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1678
+#: fdisk/fdisk.c:1704
 #, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Naprava"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2590,91 +2601,92 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
-msgstr ""
+#: fdisk/fdisk.c:1754
+#, fuzzy
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr " #   Ozn Glav Sekt Stz   ID  Glav Sekt Stz    sektor sektorjev\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1856
+#: fdisk/fdisk.c:1883
 #, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1859
+#: fdisk/fdisk.c:1886
 #, c-format
-msgid "%d unallocated sectors\n"
+msgid "%lld unallocated sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr ""
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr ""
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2682,15 +2694,25 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "logièni razdelki niso v diskovnem vrstnem redu"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Slab primarni razdelek"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2698,30 +2720,30 @@ msgid ""
 "   p   primary partition (1-4)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr ""
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr ""
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2730,7 +2752,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2738,102 +2760,102 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ne morem odpreti %s\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "ne morem odpreti %s\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3175,8 +3197,7 @@ msgstr ""
 msgid "SGI xvm"
 msgstr ""
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr ""
 
@@ -3364,7 +3385,7 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "DA\n"
 
@@ -3511,15 +3532,15 @@ msgstr ""
 msgid "Physical cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr ""
 
@@ -3569,14 +3590,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3585,7 +3606,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3597,7 +3618,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3606,16 +3627,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -3666,20 +3687,20 @@ msgstr ""
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
+msgid "W95 FAT32"
 msgstr ""
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
+msgid "W95 FAT32 (LBA)"
 msgstr ""
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
+msgid "W95 FAT16 (LBA)"
 msgstr ""
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
+msgid "W95 Ext'd (LBA)"
 msgstr ""
 
 #: fdisk/i386_sys_types.c:21
@@ -3711,15 +3732,15 @@ msgid "AST SmartSleep"
 msgstr ""
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
+msgid "Hidden W95 FAT32"
 msgstr ""
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
+msgid "Hidden W95 FAT32 (LBA)"
 msgstr ""
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
+msgid "Hidden W95 FAT16 (LBA)"
 msgstr ""
 
 #: fdisk/i386_sys_types.c:31
@@ -3828,6 +3849,11 @@ msgstr ""
 msgid "Minix / old Linux"
 msgstr ""
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+msgid "Linux swap / Solaris"
+msgstr ""
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr ""
@@ -3982,89 +4008,89 @@ msgstr ""
 msgid "BBT"
 msgstr ""
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "pomankanje pomnilnika?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "napaka pri branju %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4072,56 +4098,56 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
 "lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4129,104 +4155,104 @@ msgstr ""
 "Ime id\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4234,474 +4260,474 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 #, fuzzy
 msgid "start"
 msgstr "stanje"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 #, fuzzy
 msgid "end"
 msgstr "po¹lji"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
-msgstr ""
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
+msgstr "ponovno preberi tabelo razdelkov"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr ""
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "razlièica"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Uporaba:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
-msgstr ""
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
+msgstr ", skupno %lu sektorjev"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -4709,42 +4735,42 @@ msgstr ""
 "Opravljeno\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -4752,66 +4778,66 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "V REDU\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5343,7 +5369,7 @@ msgstr ""
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr ""
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr ""
 
@@ -5368,57 +5394,67 @@ msgstr ""
 msgid "KDGHWCLK ioctl failed"
 msgstr ""
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr ""
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr ""
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr ""
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr ""
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr ""
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr ""
+
+#: hwclock/rtc.c:258
+#, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr ""
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr ""
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr ""
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr ""
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5426,17 +5462,17 @@ msgid ""
 "this system.\n"
 msgstr ""
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr ""
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
@@ -5444,23 +5480,23 @@ msgstr ""
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr ""
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr ""
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr ""
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr ""
@@ -5630,61 +5666,77 @@ msgstr ""
 msgid "Login on %s from %s denied.\n"
 msgstr ""
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr ""
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr ""
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+#, fuzzy
+msgid "Unknown user context"
+msgstr "neznana napaka v kljuèu"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr ""
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr ""
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Geslo: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Napaèno geslo."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr ""
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[pomoè razlièica]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -5692,115 +5744,127 @@ msgstr ""
 "\n"
 "Prekinjeno.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr ""
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr ""
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr ""
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr ""
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr ""
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr ""
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr ""
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr ""
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr ""
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr ""
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr ""
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr ""
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr ""
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr ""
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr ""
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr ""
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr ""
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr ""
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr ""
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr ""
 
@@ -5990,78 +6054,78 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Hkrati teèe preveè va¹ih procesov.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "TELEFONSKA PRIJAVA Z LINIJE %s, UPORABNIK %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "SKRBNI©KA PRIJAVA Z RAÈUNALNIKA %s, UPORABNIK %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "SKRBNI©KA PRIJAVA NA LINIJI %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "PRIJAVA NA LINIJI %s UPORABNIKA %s Z RAÈUNALNIKA %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "PRIJAVA NA LINIJI %s UPORABNIKA %s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "Èaka vas nova po¹ta.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "Èaka vas po¹ta.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: vejitev ni mogoèa: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr ""
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr ""
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr ""
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr ""
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: skripta ukazne lupine ni moè pognati: %s.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ni ukazne lupine: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6070,62 +6134,62 @@ msgstr ""
 "\n"
 "%s prijava: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "Prijavno ime je veliko predolgo.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "IME je predolgo"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "Prijavna imena se ne morejo zaèeti z znakom ,-`.\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr ""
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr ""
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Prijava je potekla po %d sekundah.\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Zadnja prijava: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "z raèunalnika %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "z linije %.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "NEUSPE©NA PRIJAVA Z RAÈUNALNIKA %s, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "NEUSPE©NA PRIJAVA NA LINIJI %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d NEUSPE©NIH PRIJAV Z RAÈUNALNIKA %s, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d NEUSPE©NIH PRIJAV NA LINIJI %s, %s"
@@ -6523,55 +6587,65 @@ msgstr ""
 msgid "%s: BAD ERROR"
 msgstr ""
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
 msgstr ""
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
 msgstr ""
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr ""
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr ""
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, c-format
+msgid "%s: Can't get context for %s"
+msgstr ""
+
+#: login-utils/vipw.c:208
+#, c-format
+msgid "%s: Can't set context for %s"
+msgstr ""
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr ""
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr ""
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr ""
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr ""
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr ""
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr ""
@@ -6762,7 +6836,7 @@ msgstr ""
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -6770,37 +6844,37 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr ""
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr ""
 
@@ -7069,214 +7143,150 @@ msgstr ""
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr ""
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "èas se je iztekel"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr ""
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr ""
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
+msgid ", offset %lld"
 msgstr ""
 
-#: mount/lomount.c:184
+#: mount/lomount.c:104
 #, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr ""
-
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr ""
-
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
+msgid ", sizelimit %lld"
 msgstr ""
 
-#: mount/lomount.c:253
+#: mount/lomount.c:112
 #, 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'.)"
+msgid ", encryption %s (type %d)"
 msgstr ""
 
-#: mount/lomount.c:259
-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?"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:263
-msgid "mount: could not find any free loop device"
+#: mount/lomount.c:129
+#, c-format
+msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:359
-#, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "ni mogoèe odpreti %s"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Ponovno vnesite novo geslo: "
-
-#: mount/lomount.c:456
-msgid "Error: gpg key file decryption failed\n"
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "Geslo mora biti dolgo vsaj 6 znakov, poskusite ¹e enkrat.\n"
-
-#: mount/lomount.c:472
-#, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Pomnilnika ni veè mogoèe rezervirati\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
 msgstr ""
 
-#: mount/lomount.c:490
-#, c-format
+#: mount/lomount.c:192
 msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
+"mount: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
+#: mount/lomount.c:197
+msgid "mount: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr ""
-
-#: mount/lomount.c:661
+#: mount/lomount.c:340
 #, c-format
-msgid "Non-hex digit '%c'.\n"
+msgid "set_loop(%s,%s,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:764
+#: mount/lomount.c:356
+#, fuzzy, c-format
+msgid "loop: can't delete device %s: %s\n"
+msgstr "Ni moè pognati %s: %s\n"
+
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
+msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "premalo pomnilnika"
-
-#: mount/lomount.c:945
-msgid "Error: unable to open /etc/fstab for reading\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
 
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "premalo pomnilnika"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
-
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 
 #: mount/mntent.c:168
@@ -7293,41 +7303,41 @@ msgstr ""
 msgid "; rest of file ignored"
 msgstr ""
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: po evidenci mtab je %s ¾e priklopljeno na %s"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: po evidenci mtab je %s priklopljeno na %s<"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: enote %s ni moè odpreti za pisanje: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: napaka pri pisanju na %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr ""
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "priklop ni uspel"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: samo sistemski skrbnik lahko priklopi %s na %s"
@@ -7349,257 +7359,234 @@ msgstr ""
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr ""
+
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr ""
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr ""
 
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: priklopna toèka %s ni imenik"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: dostop zavrnjen"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr "mount: ukaz mount lahko uporablja samo sistemski skrbnik"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s je v rabi"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr ""
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr ""
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "bloèna enota"
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s ni moè priklopiti v bralnem naèinu"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s je za¹èitena pred pisanjem, priklapljamo v bralnem naèinu"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr ""
-
-#: mount/mount.c:1124
-#, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr ""
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr ""
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "oznaka"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr ""
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1386
+#: mount/mount.c:1362
 #, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -7621,7 +7608,7 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Uporaba: mount -V               : izpis izdaje\n"
@@ -7651,73 +7638,72 @@ msgstr ""
 "Druge izbire: [-nfFrsvw] [-o izbire].\n"
 "Podrobnosti lahko poi¹èete v priroèniku z ukazom: man 8 mount\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: to lahko izvede samo sistemski skrbnik"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: priklapljamo %s\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr ""
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr ""
@@ -7811,7 +7797,7 @@ msgstr ""
 msgid "bug in xstrndup call"
 msgstr ""
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -7820,7 +7806,7 @@ msgid ""
 "       %s [-s]\n"
 msgstr ""
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -7828,94 +7814,31 @@ msgid ""
 "       %s [-v] special ...\n"
 msgstr ""
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "zmanjkalo je pomnilnika"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr ""
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr ""
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-msgid "swapon: invalid loop device name\n"
-msgstr ""
-
-#: mount/swapon.c:309
-msgid "swapon: invalid encryption type\n"
-msgstr ""
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "ni mogoèe odpreti %s"
-
-#: mount/swapon.c:322
-#, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr ""
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "izmenjalne naprave ni mogoèe previti"
-
-#: mount/swapon.c:379
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr ""
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "strani s podpisom ni mogoèe zapisati"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-msgid "swapon: fork failed\n"
-msgstr ""
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Spreminjamo geslo za %s\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr ""
@@ -7980,77 +7903,77 @@ msgstr ""
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:602
-#, c-format
-msgid "umount: only root can unmount %s from %s"
-msgstr ""
+#: mount/umount.c:616
+#, fuzzy, c-format
+msgid "umount: only %s can unmount %s from %s"
+msgstr "mount: samo sistemski skrbnik lahko priklopi %s na %s"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8180,7 +8103,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr ""
@@ -8332,22 +8255,22 @@ msgstr "omejitve deljenega pomnilnika\n"
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
 #, c-format
-msgid "max number of segments = %ld\n"
+msgid "max number of segments = %lu\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:280
 #, c-format
-msgid "max seg size (kbytes) = %ld\n"
+msgid "max seg size (kbytes) = %lu\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:282
 #, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+msgid "max total shared memory (pages) = %lu\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:284
 #, c-format
-msgid "min seg size (bytes) = %ld\n"
+msgid "min seg size (bytes) = %lu\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:289
@@ -8855,7 +8778,11 @@ msgstr ""
 msgid "missing comma"
 msgstr ""
 
-#: sys-utils/readprofile.c:115
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "zmanjkalo je pomnilnika"
+
+#: sys-utils/readprofile.c:118
 #, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
@@ -8867,37 +8794,38 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, fuzzy, c-format
 msgid "%s version %s\n"
 msgstr "%s Razlièica %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "skupno"
 
@@ -9382,5 +9310,46 @@ msgstr ""
 msgid "Out of memory when growing buffer.\n"
 msgstr ""
 
+#~ msgid "None (%02X)"
+#~ msgstr "Brez (%02X)"
+
+#, fuzzy
+#~ msgid "Error: unable to open %s for reading\n"
+#~ msgstr "ni mogoèe odpreti %s"
+
+#, fuzzy
+#~ msgid "Retype password: "
+#~ msgstr "Ponovno vnesite novo geslo: "
+
+#, fuzzy
+#~ msgid "Error: Password must be at least %d characters.\n"
+#~ msgstr "Geslo mora biti dolgo vsaj 6 znakov, poskusite ¹e enkrat.\n"
+
+#, fuzzy
+#~ msgid "Error: Unable to allocate memory\n"
+#~ msgstr "Pomnilnika ni veè mogoèe rezervirati\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "oznaka"
+
+#, fuzzy
+#~ msgid "swapon: unable to open loop device %s\n"
+#~ msgstr "ni mogoèe odpreti %s"
+
+#, fuzzy
+#~ msgid "swapon: unable to open swap device %s\n"
+#~ msgstr "izmenjalne naprave ni mogoèe previti"
+
+#, fuzzy
+#~ msgid "swapon: unable to create pipe\n"
+#~ msgstr "strani s podpisom ni mogoèe zapisati"
+
+#, fuzzy
+#~ msgid "swapon: random password for %s is %s"
+#~ msgstr "Spreminjamo geslo za %s\n"
+
 #~ msgid "Can't open help file"
 #~ msgstr "Datoteke s pomoèjo ni mogoèe odpreti"
diff --git a/po/sv.po b/po/sv.po
index f055b53d..eb76658c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,103 +9,108 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11z\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
-"PO-Revision-Date: 2003-02-19 23:50+0100\n"
+"Project-Id-Version: util-linux 2.12\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
+"PO-Revision-Date: 2003-08-01 01:33+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "ställ som skrivskyddad"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "ställ som läs och skriv"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "hämta skrivskyddad"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "hämta sektorstorlek"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr "hämta blockstorlek"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
 msgstr "ställ in blockstorlek"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "hämta storlek"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "ställ förinläsning"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "hämta förvägsläsning"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "töm buffertar"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "läs om partitionstabellen"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr "  %s --report [enheter]\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "  %s [-v|-q] kommandon enheter\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Tillgängliga kommandon:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: Okänt kommando: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s kräver ett argument\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr "%s lyckades.\n"
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: kan inte öppna %s\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: ioctl-fel på %s\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA   SSZ   BSZ   Startsektor  Storlek Enhet\n"
 
@@ -148,12 +153,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "användning: %s [ -n ] enhet\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s från %s\n"
@@ -290,49 +295,49 @@ msgstr "%s: ogiltigt cramfs--katalogdataslut (%ld) != fildatab
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: ogiltigt cramfs--ogiltigt fildataavstånd\n"
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Användning: %s [-larvsmf] /dev/namn\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s är monterad.\t "
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Vill du verkligen fortsätta"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "kontroll avbruten.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zonnummer < \"FIRSTZONE\" i filen \"%s\"."
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zonnummer >= \"ZONES\" i filen \"%s\"."
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Ta bort block"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Läsfel: kan inte söka till blocket i filen \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Läsfel: felaktigt block i filen \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -340,122 +345,122 @@ msgstr ""
 "Internt fel: försöker att skriva felaktigt block\n"
 "Skrivbegäran ignoreras\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "sökning misslyckades i \"write_block\""
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Skrivfel: felaktigt block i filen \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "sökning misslyckades i \"write_super_block\""
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "kan inte skriva superblock"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "Kan inte skriva inodstabell"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "Kan inte skriva zontabell"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "Kan inte skriva inoder"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "sökning misslyckades"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "kan inte läsa superblock"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "felaktig magisk siffra i superblocket"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Endast 1 kB stora block/zoner stöds"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "felaktigt \"s_imap_blocks\"-fält i superblocket"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "felaktigt \"s_zmap_blocks\"-fält i superblocket"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "Kan inte allokera buffert för inodstabell"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "Kan inte allokera buffert för inoder"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "Kan inte allokera buffert för inodsräknare"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "Kan inte allokera buffert för zonräknare"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "Kan inte läsa inodstabell"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "Kan inte läsa zontabell"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "Kan inte läsa inoder"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Varning: \"Firstzone\" != \"Norm_firstzone\"\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inoder\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld block\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "\"Firstdatazone\"=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonstorlek=%d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxstorlek=%ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Filsystemstillstånd=%d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -464,172 +469,172 @@ msgstr ""
 "\"namelen\"=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inod %d är markerad som oanvänd, men används för filen \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Märk som använd"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Filen \"%s\" har rättigheterna %05o\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "Varning: antalet inoder är för stort.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "rotinoden är inte en katalog"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Blocket har använts tidigare. Nu i filen \"%s\"."
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Töm"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Block %d i filen \"%s\" är markerat som oanvänt."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Korrigera"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "Katalogen \"%s\" innehåller ett felaktigt inodsnummer för filen \"%.*s\"."
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " Ta bort"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr "\"%s\": felaktig katalog: \".\" kommer inte först\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr "\"%s\": felaktig katalog: \"..\" kommer inte på andra plats\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: felaktig katalog: \".\" kommer inte först\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: felaktig katalog: \"..\" kommer inte på andra plats\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "internt fel"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: felaktig katalog: storlek < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "sökning misslyckades i \"bad_zone\""
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Inod %d är inte tömd."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "Inod %d är oanvänd, markerad som använd i bittabellen."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "Inod %d är använd, markerad som oanvänd i bittabellen."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inod %d (rättighet = %07o), i_nlinks=%d, räknade=%d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "Ställ i_nlinks till räknat antal"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zon %d: markerad som använd, ingen fil använder den."
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Avmarkera"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Zon %d: används, räknade=%d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Zon %d: används inte, räknade=%d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Ställ in"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "felaktig storlek på inod"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "felaktig storlek på v2-inod"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "behöver terminal för interaktiva reparationer"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "kan inte öppna \"%s\""
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s är rent, ingen kontroll.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Tvingar filsystemskontroll på %s.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Filsystemet på %s är smutsigt, behöver kontroll.\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -638,12 +643,12 @@ msgstr ""
 "\n"
 "%6ld inoder används (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zoner används (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -666,7 +671,7 @@ msgstr ""
 "------\n"
 "%6d filer\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -757,7 +762,7 @@ msgstr "f
 msgid "not enough space, need at least %lu blocks"
 msgstr "inte tillräckligt med utrymme, behöver minst %lu block"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhet: %s\n"
@@ -832,7 +837,7 @@ msgstr ""
 "Användning: mkfs [-V] [-t filsystemstyp] [filsystemsflaggor] enhet "
 "[storlek]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -959,7 +964,7 @@ msgstr "ROM-avbildsskrivning misslyckades (%d %d)\n"
 #. bytes, not chars: think UTF8.
 #: disk-utils/mkfs.cramfs.c:912
 msgid "warning: filenames truncated to 255 bytes.\n"
-msgstr "varning: filnamn trunkerade till 255 byte.\n"
+msgstr "varning: filnamn avkortade till 255 byte.\n"
 
 #: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
@@ -993,63 +998,63 @@ msgstr ""
 "VARNING: enhetsnummer avkortade till %u bitar. Detta betyder med största\n"
 "sannolikhet att en del enhetsfiler kommer att vara felaktiga.\n"
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Användning: %s [-c | -l filnamn] [-nXX] [-iXX] /dev/namn [block]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s är monterad; kommer inte att skapa ett filsystem här!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "sökning till startblock misslyckades i \"write_tables\""
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "kan inte tömma startsektor"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "sökning misslyckades i \"write_tables\""
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "kan inte skriva inodstabell"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "kan inte skriva zontabell"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "kan inte skriva inoder"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "skrivning misslyckades i \"write_block\""
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "för många felaktiga block"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "inte tillräckligt med korrekta block"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "kan inte allokera buffertar för tabeller"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "kan inte allokera buffert för inoder"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1058,55 +1063,50 @@ msgstr ""
 "Maxstorlek=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "sökning misslyckades under test av block"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Konstiga värden i \"do_check\": troligtvis programfel\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "sökning misslyckades i \"check_blocks\""
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "felaktiga block före dataområde: kan inte skapa filsystem"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d felaktiga block\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "ett felaktigt block\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "kan inte öppna fil med felaktiga block"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s: inte kompilerad med stöd för minix v2\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol-fel: antalet block är inte angivet"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "kan inte öppna %s"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "kan inte ta status på %s"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "kommer inte att försöka skapa filsystem på \"%s\""
@@ -1147,45 +1147,45 @@ msgid "one bad page\n"
 msgstr "en felaktig sida\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d felaktiga sidor\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fel: Ingenstans att skapa växlingsutrymme?\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: fel: storleken %ld är större än enhetsstorleken %d\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: fel: version %d är okänd\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: fel: växlingsutrymmet måste vara minst %ld kB\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
-msgstr "%s: varning: trunkerar växlingsutrymmet till %ld kB\n"
+msgstr "%s: varning: avkortar växlingsutrymmet till %ld kB\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Kommer inte att försöka skapa växlingsenhet på \"%s\""
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "ödesdigert: första sidan är oläsbar"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1200,24 +1200,24 @@ msgstr ""
 "växlingsutrymme på den enheten kan du använda flaggan -f för att tvinga\n"
 "fram det.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Kan inte ställa in växlingsutrymme: oläsbart"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Ställer in växlingsutrymme version %d, storlek = %llu kB\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "kan inte spola tillbaka växlingsenheten"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "kan inte skriva signatursida"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync misslyckades"
 
@@ -1259,58 +1259,57 @@ msgstr "   %s [ -c | -y | -n | -d ] enhet\n"
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] enhet\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Oanvändbar"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Ledigt utrymme"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "Disken har ändrats.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Starta om systemet för att försäkra dig om att partitionstabellen har\n"
 "uppdaterats korrekt.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1322,316 +1321,315 @@ msgstr ""
 "partitioner bör du titta i manualen för cfdisk\n"
 "för ytterligare information.\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "ÖDESDIGERT FEL"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "Tryck valfri tangent för att avsluta cfdisk"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "Kan inte söka på diskenhet"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Kan inte inte läsa diskenhet"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Kan inte skriva diskenhet"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "För många partitioner"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "Partitionen börjar före sektor 0"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "Partitionen slutar före sektor 0"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "Partitonen börjar efter slutet på disken"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "Partitionen slutar efter slutet på disken"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partitionen slutar i den slutliga partiella cylindern"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "logiska partitioner är inte i diskordning"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "logiska partitioner överlappar varandra"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "förstorade logiska partitioner överlappar varandra"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Internt fel vid skapande av logisk enhet utan utökad partition !!!!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Kan inte skapa logisk enhet här -- det skulle skapa två utökade partitioner"
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menyposten är för lång. Menyn kan se konstig ut."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Meny utan riktning. Använder standardvärdet vågrät."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Ogiltig tangent"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Tryck en tangent för att fortsätta"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Primär"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Skapa en ny primär partition"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Logisk"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Skapa en ny logisk partition"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Skapa inte någon partition"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! Internt fel !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Storlek (i MB): "
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Början"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Lägg till partition i början av det lediga utrymmet"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Slutet"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Lägg till partition i slutet av det lediga utrymmet"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Ingen plats att skapa den utökade partitionen"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr "Ingen partitionstabell eller okänd signatur på partitionstabell"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Vill du börja med en tom tabell [j/N]?"
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "Du angav fler cylindrar än som ryms på disken"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "Kan inte öppna diskenhet"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Öppnade disken skrivskyddat - du har ingen rättighet att skriva"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Kan inte hämta diskstorlek"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Felaktig primär partition"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Felaktig logisk partition"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Varning!! Detta kan förstöra data på din disk!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Är du säker på att du vill skriva partitionstabellen till disk? (ja eller "
 "nej): "
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "nej"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Skrev inte partitionstabellen till disk"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Ange \"ja\" eller \"nej\""
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Skriver partitionstabell till disk..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Skrev partitionstabell till disk"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Skrev partitionstabellen, men omläsning av tabellen misslyckades. Starta om "
 "för att uppdatera tabellen."
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Inga primära partitioner är markerade som startbara. DOS huvudstartpost\n"
 "(MBR) kan inte starta detta."
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Mer än en primär partition är markerad som startbar. DOS huvudstartpost\n"
 "(MBR) kan inte starta detta."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Ange filnamnet eller tryck RETUR för att visa på skärmen: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan inte öppna filen \"%s\""
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Diskenhet: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Ingen  "
 
 # Primär/Logisk antar jag
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Primär "
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Logisk "
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Okänd"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Start (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Start"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
+#: fdisk/cfdisk.c:2007
 #, c-format
-msgid "Unknown (%02X)"
-msgstr "Okänd (%02X)"
+msgid "(%02X)"
+msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Ingen (%02X)"
+#: fdisk/cfdisk.c:2009
+msgid "None"
+msgstr "Ingen"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabell för %s\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
-msgstr "            Första   Sista\n"
+#: fdisk/cfdisk.c:2046
+msgid "               First       Last\n"
+msgstr "               Första      Sista\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
-" # Typ      Sektor   Sektor   Avstånd  Längd   Filsystemstyp (ID)     "
-"Flaggor\n"
+" # Typ        Sektor      Sektor   Avstånd   Längd    Filsystemstyp (ID)   "
+"Flagga\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
-"-- ------- -------- --------- ------- -------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------- ---------- -------------------- "
+"----\n"
 
 # This is broken
 #
@@ -1646,466 +1644,470 @@ msgstr ""
 # (the one from the line below in the source).
 #
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
+#: fdisk/cfdisk.c:2131
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
 msgstr "         ----Start-----      -----Slut-----   Start-    Antal\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
-msgstr " # Flggr  Hvd Sekt  Cyl  ID   Hvd Sekt  Cyl   sektor  sektorer\n"
+#: fdisk/cfdisk.c:2132
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr " # Flggr  Hvd Sekt Cyl   ID  Hvd  Sekt Cyl     sektor    sektorer\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Rått"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Visa tabellen i rått dataformat"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Sektorer"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Visa tabellen sorterad efter sektorer"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabell"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Visa bara partitionstabellen"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Visa inte tabellen"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Hjälpskärm för cfdisk"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Det här är cfdisk, ett curses-baserat diskpartitioneringsprogram som"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "låter dig skapa, ta bort och ändra partitioner på din"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "hårddisk."
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright © 1994-1999 Kevin E. Martin och aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Kommando     Betydelse"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "--------     ---------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Slå på/av startbarhetsflaggan på aktuell partition"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          Ta bort aktuell partition"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Ändra parametrarna för cylindrar, huvuden, sektorer-per-spår"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             VARNING: Denna flagga bör endast användas av personer som"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             vet vad de gör."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          Visa denna hjälpskärm"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximera diskanvändandet på aktuell partition"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Obs: Detta kan komma att göra partitionen inkompatibel med"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          Skapa en ny partition från ledigt utrymme"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          Visa partitionstabellen på skärmen eller skriv den till en fil"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "             Det finns flera olika format på partitionen"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             som du kan välja mellan:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Rå data (exakt det som skulle skrivas till disken)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabell sorterad efter sektorer"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - Tabell i rått format"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Avsluta programmet utan att skriva partitionstabellen"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          Byt filsystemstypen"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Byt enheter på visningen av partitionsstorlek"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Byter mellan MB, sektorer och cylindrar"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Skriv partitionstabellen till disk (måste vara ett stort W)"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Eftersom detta kan förstöra data på disken måste du"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             antingen bekräfta eller avvisa detta genom att ange \"ja\""
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             eller \"nej\""
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Uppil        Flytta markören till föregående partition"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nerpil       Flytta markören till nästa partition"
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL+L       Rita om skärmen"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Visa denna skärm"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Obs: Alla kommandon kan anges antingen med små eller stora bokstäver"
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "(utom för skrivningar med W)."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cylindrar"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Ändra cylindergeometri"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Huvuden"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Ändra huvudgeometri"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Ändra sektorgeometri"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Klar"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "Färdig med geometriändring"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Ange antalet cylindrar: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Ogiltigt antal cylindrar"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Ange antalet huvuden: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Ogiltigt antal huvuden"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Ange antalet sektorer per spår: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "Ogiltigt antal sektorer"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Ange typen av filsystem: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "Kan inte ändra filsystemstypen till ett tomt värde"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "Kan inte ändra filsystemstypen till utökad"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Start"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Okänd(%02X)"
 
 # Vad är detta?
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Okänd (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Diskenhet: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, c-format
-msgid "Size: %lld bytes, %ld MB"
-msgstr "Storlek: %lld byte, %ld MB"
+msgid "Size: %lld bytes, %lld MB"
+msgstr "Storlek: %lld byte, %lld MB"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
-msgstr "Storlek: %lld byte, %ld,%ld GB"
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "Storlek: %lld byte, %lld,%lld GB"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2587
 #, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
-msgstr "Huvuden: %d   Sektorer per spår: %d   Cylindrar: %d"
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "Huvuden: %d   Sektorer per spår: %d   Cylindrar: %lld"
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Namn"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Flaggor"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Part.-typ"
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "FS-typ"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Etikett]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
-msgstr "  Sektorer"
+#: fdisk/cfdisk.c:2597
+msgid "    Sectors"
+msgstr "    Sektorer"
+
+#: fdisk/cfdisk.c:2599
+msgid "  Cylinders"
+msgstr "  Cylindrar"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
-msgstr "Storlek (MB)"
+#: fdisk/cfdisk.c:2601
+msgid "  Size (MB)"
+msgstr "  Storlek (MB)"
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
-msgstr "Storlek (GB)"
+#: fdisk/cfdisk.c:2603
+msgid "  Size (GB)"
+msgstr "  Storlek (GB)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Startbar"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Slå på/av startbarhetsflaggan på aktuell partition"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Ta bort"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Ta bort aktuell partition"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Ändra diskgeometri (endast experter)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Hjälp"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Visa hjälpskärm"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Maximera"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximera diskanvändningen för aktuell partition (endast experter)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Ny"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Skapa ny partition från ledigt utrymme"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Visa"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Visa partitionstabellen på skärmen eller skriv den till en fil"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Avsluta"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Avsluta programmet utan att skriva partitionstabellen"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Ändra filsystemstypen (DOS, Linux, OS/2 och så vidare)"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Enheter"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Byt enheter på visningen av partitionsstorleken (MB, sektorer, cylindrar)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Skriv"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Skriv partitionstabellen till disk (detta kan förstöra data)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "Kan inte göra denna partition startbar"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "Kan inte ta bort en tom partition"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "Kan inte maximera denna partition"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Denna partition är oanvändbar"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Denna partition används redan"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan inte ändra typen på en tom partition"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "Inge fler partitioner"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Ogiltigt kommando"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright © 1994-2002 Kevin E. Martin och aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2140,7 +2142,7 @@ msgstr ""
 "-c C -h H -s S: Åsidosätt kärnans uppfattning om antalet cylindrar,\n"
 "                antalet huvuden och antalet sektorer per spår.\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2160,7 +2162,7 @@ msgstr ""
 "-u: visa början och slut i sektorer (istället för cylindrar)\n"
 "-b 2048: (för vissa MO-enheter) använd 2048-bytessektorer\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2177,222 +2179,222 @@ msgstr ""
 "enheter)\n"
 "     ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kan inte läsa %s\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kan inte söka på %s\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kan inte skriva %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE-ioctl:en misslyckades på %s\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Kan inte allokera mer minne\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Ödesdigert fel\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr "Kommandoåtgärd"
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   slå på/av en flagga för skrivskydd"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b   redigera bsd-disketikett"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   slå på/av monterbarhetsflaggan"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   ta bort en partition"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   lista kända partitionstyper"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   visa denna meny"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   lägg till en ny partition"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   skapa en ny tom DOS-partitionstabell"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   visa partitionstabellen"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   avsluta utan att spara ändringar"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   skapa en ny tom Sun-disketikett"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   ändra en partitions system-id"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   ändra visnings-/postenheter"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   verifiera partitionstabellen"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   skriv tabellen till disk och avsluta"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   extra funktionalitet (endast experter)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   välj startbar partition"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b   redigera startfilspost"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   välj sgi-växlingspartition"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a   slå på/av en startbarhetsflagga"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   slå på/av dos-kompatibilitetsflaggan"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   ändra antalet alternativa cylindrar"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   ändra antalet cylindrar"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   skriv ut den råa datan i partitionstabellen"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   ändra antalet extra sektorer per cylinder"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   ändra antalet huvuden"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   ändra mellanrumsfaktor"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   ändra rotationshastighet (varv per minut)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   återgå till huvudmenyn"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   ändra antalet sektorer/spår"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ändra antalet fysiska cylindrar"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   flytta början på data i en partition"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   lista utökade partitioner"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   skapa en IRIX-partitionstabell (SGI)"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f   fixa partitionsordningen"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "Du måste ställa in"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "huvuden"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "sektorer"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "cylindrar"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2401,11 +2403,11 @@ msgstr ""
 "%s%s.\n"
 "Du kan göra detta från menyn extra funktionalitet.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " och "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2425,26 +2427,26 @@ msgstr ""
 "2) start- och partitioneringsprogramvara från andra operativsystem\n"
 "   (exemeplvis DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Felaktigt avstånd i primär utökad partition\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Varning: tar bort partitioner efter %d\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Varning: extra länkpekare i partitionstabell %d\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Varning: ignorerar extra data i partitionstabell %d\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2456,16 +2458,16 @@ msgstr ""
 "inte det tidigare innehållet att kunna återställas.\n"
 "\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Observera: sektorstorleken är %d (inte %d)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr "Du kommer inte att kunna skriva partitionstabellen.\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
@@ -2473,7 +2475,7 @@ msgstr ""
 "Denna disk har både magiska DOS- och BSD-siffror.\n"
 "Ge kommandot \"b\" för att gå till BSD-läge.\n"
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
@@ -2481,16 +2483,16 @@ msgstr ""
 "Enheten innehåller varken en giltig DOS-partitionstabell eller en Sun-, SGI- "
 "eller OSF-disketikett\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "Internt fel\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorerar extra utökad partition %d\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2499,7 +2501,7 @@ msgstr ""
 "Varning: ogiltiga flaggan 0x%04x i partitionstabell %d kommer ett korrigeras "
 "vid skrivning med w\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2507,78 +2509,78 @@ msgstr ""
 "\n"
 "mottog EOF tre gånger - avslutar...\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Hexadecimal kod (tryck L för att se koder): "
 
-#: fdisk/fdisk.c:1069
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1094
+#, c-format
 msgid "%s (%u-%u, default %u): "
-msgstr "%s (%d-%d, standardvärde %d): "
+msgstr "%s (%u-%u, standardvärde %u): "
 
-#: fdisk/fdisk.c:1136
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1161
+#, c-format
 msgid "Using default value %u\n"
-msgstr "Använder standardvärdet %d\n"
+msgstr "Använder standardvärdet %u\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "Värdet är utanför intervallet.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Varning: partition %d har tom typ\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Valde partition %d\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 msgid "No partition is defined yet!\n"
 msgstr "Ingen partition är definierad än!\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alla primära partitioner har redan definierats!\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Ändrar visnings-/inmatningsenheter till %s\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VARNING: Partition %d är en utökad partition\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-kompatibilitetsflagga är satt\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-kompatibilitetsflagga är inte satt\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d finns inte än!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2591,7 +2593,7 @@ msgstr ""
 "oklokt. Du kan ta bort en partition\n"
 "genom att använda kommandot \"d\".\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2599,7 +2601,7 @@ msgstr ""
 "Du kan inte ändra en partition till en utökad partition eller tvärtom\n"
 "Ta bort den först.\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2610,7 +2612,7 @@ msgstr ""
 "gillar det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2621,52 +2623,52 @@ msgstr ""
 "förväntar sig det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Ändrade systemtypen för partition %d till %x (%s)\n"
 
-#: fdisk/fdisk.c:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Partition %d har olika fysiska/logiska början (icke-Linux?):\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisk=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d har olika fysiska/logiska slut:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i börjar inte på cylindergräns:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "borde vara (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partition %i slutar inte på cylindergräns.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "borde vara (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -2675,7 +2677,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB, %lld byte\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, c-format
 msgid ""
 "\n"
@@ -2684,17 +2686,17 @@ msgstr ""
 "\n"
 "Disk %s: %ld,%ld GB, %lld byte\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d huvuden, %d sektorer/spår, %d cylindrar"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
-msgstr ", totalt %lu sektorer"
+msgid ", total %llu sectors"
+msgstr ", totalt %llu sektorer"
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2703,7 +2705,7 @@ msgstr ""
 "Enheter = %s av %d × %d = %d byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2711,16 +2713,16 @@ msgstr ""
 "Ingenting att göra. Ordningen är redan korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
+#: fdisk/fdisk.c:1704
 #, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
-msgstr "%*s Start   Början      Slut   Block    Id  System\n"
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s Start     Början        Slut     Block    Id  System\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Enhet"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2728,7 +2730,7 @@ msgstr ""
 "\n"
 "Posterna i partitionstabellen är inte i diskordning\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2739,94 +2741,94 @@ msgstr ""
 "Disk %s: %d huvuden, %d sektorer, %d cylindrar\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
-msgstr "Nr AF  Hd Sek  Cyl  Hd Sek  Cyl    Början    Strl ID\n"
+#: fdisk/fdisk.c:1754
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "Nr AF  Hd Sek  Cyl  Hd Sek  Cyl     Början     Strl ID\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varning: partition %d innehåller sektor 0\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: huvud %d är större än maximala %d\n"
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: sektor %d är större än maximala %d\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partitioner %d: cylinder %d är större än maximala %d\n"
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partition %d: tidigare sektorer %d stämmer inte överens med totala %d\n"
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varning: felaktig databörjan på partition %d\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Varning: partition %d överlappar med partition %d.\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varning: partition %d är tom\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logisk partition %d är inte helt inuti partition %d\n"
 
-#: fdisk/fdisk.c:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr "Totala antalet allokerade sektorer %d större än maximala %d\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d oallokerade sektorer\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "Partition %d är redan definierad. Ta bort den innan du lägger till den "
 "igen.\n"
 
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Första %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d är redan allokerad\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "Inga lediga sektorer är tillgängliga\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Sista %s eller +storlek eller +storlekM eller +storlekK"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2839,16 +2841,26 @@ msgstr ""
 "\tVARNING: Detta kommer att förstöra det nuvarande innehållet\n"
 "\tpå disken.\n"
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "Det maximala antalet partitioner har skapats\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Du måste ta bort en partition och lägga till en utökad partition först\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "logiska partitioner är inte i diskordning"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Felaktig primär partition"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2859,20 +2871,20 @@ msgstr ""
 "   %s\n"
 "   p   primär partition (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l   logisk (5 eller högre)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e   utökad"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ogiltigt partitionsnummer för typen \"%c\"\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2880,11 +2892,11 @@ msgstr ""
 "Partitionstabellen har ändrats!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Anropar ioctl() för att läsa om partitionstabellen.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2897,7 +2909,7 @@ msgstr ""
 "Kärnan använder fortfarande den gamla tabellen.\n"
 "Den nya tabellen kommer att användas vid nästa omstart.\n"
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2908,64 +2920,64 @@ msgstr ""
 "VARNING: Om du har skapat eller ändrat någon DOS 6.x-partition\n"
 "bör du läsa fdisk-manualsidan för ytterligare information.\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Synkroniserar hårddiskar.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har inget dataområde\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Ny början utav data"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Expertkommando (m för hjälp): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Antal cylindrar"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Antal huvuden"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varning: ställer in sektoravstånd för DOS-kompatibilitet\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disk %s innehåller inte en giltig partitionstabell\n"
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: okänt kommando\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Denna kärna hittar själv sektorstorleken - flaggan -b ignoreras\n"
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2974,16 +2986,16 @@ msgstr ""
 "enhet\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Upptäckte en OSF/1-disketikett på %s, går in i disketikettsläge.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Kommando (m för hjälp): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2992,15 +3004,15 @@ msgstr ""
 "\n"
 "Aktuell startfil är: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Ange namnet på den nya startfilen: "
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "Startfilen oförändrad\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3011,7 +3023,7 @@ msgstr ""
 "partitionstabeller.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3371,8 +3383,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux växling"
 
@@ -3556,9 +3567,9 @@ msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Partition %d och %d överlappar varandra med %d sektorer.\n"
 
 #: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "Oanvänt mellanrum på %8d sektorer - sektorerna %8d-%d\n"
+msgstr "Oanvänt mellanrum på %8u sektorer - sektorerna %8u-%u\n"
 
 #: fdisk/fdisksgilabel.c:523
 msgid ""
@@ -3608,7 +3619,7 @@ msgstr ""
 "får lov att bryta mot detta. Skriv in JA om du är säker på att\n"
 "du vill ge denna partition en annan tagg.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "JA\n"
 
@@ -3667,6 +3678,9 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
+"Varning: BLKGETSIZE-ioctl misslyckades på %s. Använder\n"
+"geometricylindervärdet %d.\n"
+"Detta värde kan vara avkortat för enheter > 33,8 GB.\n"
 
 #: fdisk/fdisksgilabel.c:738
 #, c-format
@@ -3775,15 +3789,15 @@ msgstr "Alternativa cylindrar"
 msgid "Physical cylinders"
 msgstr "Fysiska cylindrar"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Rotationshastighet (varv per minut)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Mellanrumsfaktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektorer per cylinder"
 
@@ -3837,7 +3851,7 @@ msgstr ""
 "Du har inte täckt hela hårddisken med den tredje partitionen, men ditt\n"
 "värde %d %s täcker en annan partition. Din inmatning har ändrats till %d %s\n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3846,7 +3860,7 @@ msgstr ""
 "Om du vill behålla kompatibilitet med SunOS/Solaris bör du lämna denna\n"
 "partition som Hela disken (5), med början på 0, och med %u sektorer\n"
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3861,7 +3875,7 @@ msgstr ""
 "Skiv in JA om du är väldigt säker på att du vill att\n"
 "denna partition ska ha taggen 82 (Linux växling): "
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3881,7 +3895,7 @@ msgstr ""
 "Enheter = %s av %d × 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3894,16 +3908,16 @@ msgstr ""
 "Enheter = %s av %d × 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flagga  Början      Slut   Block    Id  System\n"
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Antal alternerande cylindrar"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Antal fysiska cylindrar"
 
@@ -3954,21 +3968,21 @@ msgstr "OS/2 Boot Manager"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
-msgstr "Win95 FAT32"
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA)"
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA)"
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
-msgstr "Win95 Utökad (LBA)"
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 Utökad (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -3999,16 +4013,16 @@ msgid "AST SmartSleep"
 msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
-msgstr "Dold Win95 FAT32"
+msgid "Hidden W95 FAT32"
+msgstr "Dold W95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
-msgstr "Dold Win95 FAT32 (LBA)"
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "Dold W95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
-msgstr "Dold Win95 FAT16 (LBA)"
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "Dold W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4116,6 +4130,12 @@ msgstr "Gammal Minix"
 msgid "Minix / old Linux"
 msgstr "Minix / gammal Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux växling"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 dold C:-enhet"
@@ -4270,89 +4290,89 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "sökfel på %s - kan inte spola till %lu\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "sökfel: ville ha 0x%08x%08x, fick 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "slut på minne - ger upp\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "läsfel på %s - kan inte läsa sektor %lu\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "FEL: sektor %lu har ingen msdos-signatur\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "skrivfel på %s - kan inte skriva sektor %lu\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "kan inte öppna partitionssektorsparfil (%s)\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "skrivfel på %s\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "kan inte ta status på partitionsåterställningsfil (%s)\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "partitionsåterställningsfilen har fel storlek - återställer inte\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "slut på minne?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "kan inte öppna partitionsåterställningsfilen (%s)\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "fel vid läsning av %s\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "kan inte öppna enhet %s för skrivning\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "fel vid skrivning av sektor %lu på %s\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: kan inte få tag i storlek\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: kan inte få tag i geometri\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4363,22 +4383,22 @@ msgstr ""
 "hela disken. Att använda fdisk på det är troligtvis meningslöst.\n"
 "[Använd flaggan --force om du verkligen vill detta]\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Varning: HDIO_GETGEO säger att det finns %lu huvuden\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Varning: HDIO_GETGEO säger att det finns %lu sektorer\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Varning: BLKGETSIZE/HDIO_GETGEO säger att det finns %lu cylindrar\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4388,7 +4408,7 @@ msgstr ""
 "Detta kommer att ge problem med all programvara som använder C/H/S-"
 "adressering.\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4397,7 +4417,7 @@ msgstr ""
 "\n"
 "Disk %s: %lu cylindrar, %lu huvuden, %lu sektorer/spår\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4405,7 +4425,7 @@ msgstr ""
 "%s på partition %s har omöjligt värde på huvud: %lu (måste vara mellan 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4414,7 +4434,7 @@ msgstr ""
 "%s på partition %s har omöjligt värde på sektor: %lu (måste vara mellan 1-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4423,7 +4443,7 @@ msgstr ""
 "%s på partition %s har omöjligt värde på cylinder: %lu (måste vara mellan 0-%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4431,11 +4451,11 @@ msgstr ""
 "Id  Namn\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Läser om partitionstabellen...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4443,31 +4463,31 @@ msgstr ""
 "Kommandot för att läsa om partitionstabellen misslyckades\n"
 "Starta om ditt system nu, innan du använder mkfs\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fel vid stängning av %s\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: det finns ingen sådan partition\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "okänt format - använder sektorer\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# partitionstabell för %s\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "oimplementerat format - använder %s\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4476,11 +4496,11 @@ msgstr ""
 "Enheter = cylindrar med %lu byte, block med 1024 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Enhet Start Början   Slut     Cyl.     Block   Id  System\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4489,11 +4509,11 @@ msgstr ""
 "Enheter = sektorer med 512 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Enhet Start   Början      Slut   Sektorer  Id  System\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4502,11 +4522,11 @@ msgstr ""
 "Enheter = block med 1024 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Enhet Start  Början      Slut      Block   Id  System\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4515,30 +4535,30 @@ msgstr ""
 "Enheter = mebibyte med 1048576 byte, block med 1024 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Enhet Start Början Slut    MiB      Block   Id  System\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tbörjan: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) hittades\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tslut: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) hittades\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitionen slutar på cylinder %ld, utanför slutet på hårddisken\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "Inga partitioner hittades\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4549,51 +4569,51 @@ msgstr ""
 "  för C/H/S=*/%ld/%ld (istället för %ld/%ld/%ld).\n"
 "I denna visning kommer jag att antaga den geometrin.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "ingen partitionstabell finns tillgänglig.\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "konstigt, endast %d partitioner är angivna.\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Varning: partition %s har storlek 0 men är inte markerad tom\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Varning: partition %s har storlek 0 och är startbar\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varning: partition %s har storlek 0 och en början som inte är 0\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Varning: partition %s "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "är inte innesluten i partition %s\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Varning: partitionerna %s "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "och %s överlappar varandra\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4602,17 +4622,17 @@ msgstr ""
 "Varning: partition %s innehåller en del av partitionstabellen (sektor %lu),\n"
 "och kommer att förstöra den då den fylls\n"
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varning: partition %s börjar på sektor 0\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varning: partition %s fortsätter utanför hårddisken\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4620,17 +4640,17 @@ msgstr ""
 "Endast en av de primära partitionerna kan vara utökad\n"
 " (även om detta inte är ett problem under Linux)\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varning: partition %s börjar inte på en jämn cylindergräns\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varning: partition %s slutar inte på en jämn cylindergräns\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4639,7 +4659,7 @@ msgstr ""
 "LILO bryr sig inte om detta, men DOS huvudstartpost (MBR) kommer inte att\n"
 "kunna starta denna disk.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4647,7 +4667,7 @@ msgstr ""
 "Varning: normalt kan man endast starta från primära partitioner\n"
 "LILO ignorerar startbarhetsflaggan.\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 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"
@@ -4656,11 +4676,11 @@ msgstr ""
 "LILO bryr sig inte om detta, men DOS huvudstartpost (MBR) kommer inte att\n"
 "kunna starta denna disk.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 msgid "start"
 msgstr "början"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4668,23 +4688,23 @@ msgstr ""
 "partition %s: början: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) "
 "hittades\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 msgid "end"
 msgstr "slut"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: slut: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) "
 "hittades\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partition %s slutar på cylinder %ld, utanför slutet på hårddisken\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4693,7 +4713,7 @@ msgstr ""
 "Varning: ändrade början på extd-partitionen från %ld till %ld\n"
 "(Endast för listningsändamål. Ändra inte dess innehåll).\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4701,133 +4721,133 @@ msgstr ""
 "Varning: utökad partition börjar inte på jämn cylindergräns.\n"
 "DOS och Linux kommer att tolka innehållet annorlunda.\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "för många partitioner - ignorerar de efter nummer (%d)\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "träd med partitioner?\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "upptäckte Disk Manager - kan inte hantera det\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6-signatur hittades - ger upp\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "konstigt, en utökad partition med storlek 0?\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "konstigt, en BSD-partition med storlek 0?\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " %s: okänd partition\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Flaggan -n angavs: Inget ändrades\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Misslyckades med att spara de gamla sektorerna - avbryter\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Misslyckades med att skriva partitionen på %s\n"
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "lång eller ofullständig indatarad - avslutar\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "indatafel: \"=\" förväntas efter %s-fält\n"
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "indatafel: oväntat tecken %c efter %s-fält\n"
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "okänd indata: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "talet är för stort\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "eftersläpande skräp efter tal\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "ingen plats för partitionshandtag\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan inte bygga omgivande utökad partition\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr "för många indatafield\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "Inte plats för mer\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "Ogiltig typ\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Varning: angiven storlek (%lu) överskrider största tillåtna storleken (%lu)\n"
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "Varning: tom partition\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varning: felaktig början på partition (första %lu)\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "okänd startbarhetsflagga - välj - eller *\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s-specifikation ofullständig?\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "Utökad partition finns inte där den förväntades\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "felaktig indata\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "för många partitioner\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 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"
@@ -4837,46 +4857,46 @@ msgstr ""
 "<början> <storlek> <typ [E,S,L,X,hex]> <startbar [-,*]> <c,h,s> <c,h,s>\n"
 "Vanlligtvis behöver du bara ange <början> och <storlek> (och kanske <typ>).\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "version"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "enhet: någonting liknande /dev/hda eller /dev/sda"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "användbara flaggor:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [eller --show-size]: visa storlek på en partition"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [eller --id]:     visa eller ändra partitionsid"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [eller --list]:   visa partitioner på varje enhet"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [eller --dump]:   samma, men i format lämpligt för senare inmatning"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [eller --increment]: numrera cylindrar osv från 1 istället för från 0"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4884,55 +4904,55 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  acceptera/rapportera i enheter om sektorer/block/"
 "cylindrar/MB"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [eller --list-types]:visa de kända partitionstyperna"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [eller --DOS]:    för DOS-kompatibilitet: slösa lite utrymme"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [eller --re-read]: gör så att kärnan läser om partitionstabellen"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N<nummer>:          ändra endast partitionen med numret <nummer>"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 skriv inte till hårddisken"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O fil :             spara sektorerna som kommer att skrivas över till "
 "fil"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fil :             återställ dessa sektorer igen"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [eller --version]: visa versionsinformation"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [eller --help]:   visa detta meddelande"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "farliga flaggor:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [eller --show-geometry]: visa kärnans bild av geometrin"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4940,117 +4960,117 @@ msgstr ""
 "    -x [eller --show-extended]: visa även utökade partitioner i utdata\n"
 "                                eller förvänta handtag för dem som indata"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [eller --Linux]:   klaga inte på saker som är irrelevanta för Linux"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [eller --quiet]:   undertryck varningsmeddelanden"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "    Du kan åsidosätta den detekterade geometrin genom att använda:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C<tal> [eller --cylinders <tal>]:ställ in antalet cylindrar att använda"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H<tal> [eller --heads <tal>]:ställ in antalet huvuden att använda"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 "    -S<tal> [eller --sectors <tal>]:ställ in antalet sektorer att använda"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "Du kan stänga av all konsekvenskontroll med:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [eller --force]:   gör vad jag säger även om det är dumt"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Användning:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s enhet\t\t visa aktiva partitioner på enhet\n"
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s enhet n1 n2 ... aktivera partitioner n1 ..., deaktivera resten\n"
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An enhet\t aktivera partition n, deaktivera de andra\n"
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "inget kommando?\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "totalt: %d block\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "användning: sfdisk --print-id enhet partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "användning: sfdisk --change-id enhet partitionsnummer Id\n"
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "användning: sfdisk --id enhet partitionsnummer [Id]\n"
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "kan endast ange en enhet (utom med -l eller -s)\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan inte öppna %s för läsning och skrivning\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan inte öppna %s för läsning\n"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindrar, %ld huvuden, %ld sektorer/spår\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE-ioctl misslyckades för %s\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "felaktig aktiv byte: 0x%x istället för 0x80\n"
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -5058,7 +5078,7 @@ msgstr ""
 "Färdig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5068,35 +5088,35 @@ msgstr ""
 "DOS huvudstartpost (MBR) kan endast starta en hårddisk med 1 aktiv\n"
 "partition.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partition %s har id %x och är inte dold\n"
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Felaktigt Id %lx\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Denna hårddisk används för tillfället.\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ödesdigert fel: kan inte hitta %s\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varning: %s är ingen blockenhet\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Kontrollerar att ingen använder hårddisken just nu...\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5109,28 +5129,28 @@ msgstr ""
 "på denna disk är utväxlade. Använd flaggan --no-reread för att\n"
 "undertrycka denna kontroll.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Använd flaggan --force för att undertrycka alla kontroller.\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Tidigare situation:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partition %d finns inte, kan inte ändra den\n"
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Ny situation:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5138,19 +5158,19 @@ msgstr ""
 "Jag gillar inte dessa partitioner - ingenting ändrades.\n"
 "(Om du verkligen vill göra detta bör du använda flaggan --force).\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Jag gillar inte detta - du bör nog svara nej\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Är du nöjd med detta? [ynq] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Vill du skriva detta till disk? [ynq] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5158,15 +5178,15 @@ msgstr ""
 "\n"
 "sfdisk: för tidigt slut på indata\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "Avslutar - ingenting ändrades\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "Svara med ett av y, n eller q\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5174,7 +5194,7 @@ msgstr ""
 "Lyckades skapa den nya partitionstabellen\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5780,7 +5800,7 @@ msgstr "V
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK-ioctl för att läsa tid misslyckades"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "Gjorde time-out under väntan på att tiden skulle ändras.\n"
 
@@ -5805,57 +5825,67 @@ msgstr "Kan inte 
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK-ioctl misslyckades"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "open() på %s misslyckades"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "ioctl() till %s för att läsa tid misslyckades.\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "Väntar i slingan på att tiden från %s ska ändras\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s har inga avbrottsfunktioner. "
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "read() på %s för att vänta på klocktick misslyckades"
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "read() på %s för att vänta på klocktick misslyckades"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "read() på %s för att vänta på klocktick misslyckades"
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "ioctl() på %s för att slå av uppdateringsavbrott misslyckades"
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr "ioctl() på %s för att slå på uppdateringsavbrott misslyckades oväntat"
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "ioctl() på %s för att ställa tiden misslyckades.\n"
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) lyckades.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "Öppning av %s misslyckades"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5865,17 +5895,17 @@ msgstr ""
 "För att ändra epokvärdet i kärnan måste vi komma åt Linux \"rtc\"-drivrutin "
 "via specialenhetsfilen %s. Denna fil finns inte på detta system.\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "Kan inte öppna %s"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) på %s misslyckades"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "vi har läst epoken %ld från %s med RTC_EPOCH_READ-ioctl.\n"
@@ -5883,23 +5913,23 @@ msgstr "vi har l
 #. 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:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "Epokvärdet får inte vara mindre än 1900. Du begärde %ld\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr "ställer epoken till %ld med RTC_EPOCH_SET-ioctl på %s.\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "Kärndrivrutinen för %s har inte RTC_EPOCH_SET-ioctl:en.\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) på %s misslyckades"
@@ -6074,51 +6104,67 @@ msgstr "Inloggning p
 msgid "Login on %s from %s denied.\n"
 msgstr "Inloggning på %s från %s nekas.\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: du (användare %d) finns inte.\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: användaren \"%s\" finns inte.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr "%s: kan endast ändra lokala poster; använd yp%s istället.\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+#, fuzzy
+msgid "Unknown user context"
+msgstr "okänt fel i nyckel"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Ändrar fingerinformation för %s.\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Lösenordsfel."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Lösenord: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Felaktigt lösenord."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "Fingerinformationen ändrades inte.\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Användning: %s [ -f fullständigt-namn ] [ -o jobb ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6126,11 +6172,11 @@ msgstr ""
 "[ -p jobbtelefon ]\n"
 "\t[ -h hemtelefon ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6138,58 +6184,70 @@ msgstr ""
 "\n"
 "Avbröts.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "fältet är för långt.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "\"%c\" är inte tillåtet.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Kontrolltecken är inte tillåtna.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr "Fingerinformationen ändrades *INTE*. Försök igen senare.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "Fingerinformationen ändrades.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "minnesallokering misslyckades"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" finns inte med i /etc/shells.\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr "%s: Ditt skal är inte i /etc/shells, skalbyte nekades\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Byter skal för %s.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Nytt skal"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "Skalet byttes inte.\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Skalet byttes *INTE*. Försök igen senare.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Skalet byttes.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
@@ -6198,57 +6256,57 @@ msgstr ""
 "Användning: %s [ -s skal ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ användarnamn ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: skalet måste vara en fullständig sökväg.\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" finns inte.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" är inte körbar.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: \"%c\" är inte tillåtet.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Kontrolltecken är inte tillåtna.\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Varning: \"%s\" finns inte med i /etc/shells\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" finns inte med i /etc/shells.\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: använd flaggan -l för att se listan\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Varning: \"%s\" finns inte med i /etc/shells.\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Använd %s -l för att se listan.\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "Inga kända skal.\n"
 
@@ -6446,78 +6504,78 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Du har för många processer körande.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "UPPRINGNING PÅ %s AV %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT-INLOGGNING PÅ %s FRÅN %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT-INLOGGNING PÅ %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "INLOGGNING PÅ %s AV %s FRÅN %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "INLOGGNING PÅ %s AV %s"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "Du har ny post.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "Du har post.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: grenande misslyckades: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY misslyckades: %m"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() misslyckades"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Katalogen %s finns inte!\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Loggar in med hemkatalog = \"/\".\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: inget minne för skalskript.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kunde inte köra skalskript: %s.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: inget skal: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6526,62 +6584,62 @@ msgstr ""
 "\n"
 "%s användarnamn: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "användarnamnet är alldeles för långt.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "NAMNET är för långt"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "användarnamn får inte börja med \"-\".\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "för många tomma nyrader.\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "FÖR MÅNGA nyrader"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Inloggning gjorde time-out efter %d sekunder\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Senaste inloggning: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "från %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "på %.*s\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "MISSLYCKAD INLOGGNING FRÅN %s, %s"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "MISSLYCKAD INLOGGNING PÅ %s, %s"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR FRÅN %s, %s"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR PÅ %s, %s"
@@ -6984,12 +7042,12 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: ALLVARLIGT FEL"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
 msgstr "%s: lösenordsfilen är upptagen.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
 msgstr "%s: gruppfilen är upptagen.\n"
@@ -7005,45 +7063,55 @@ msgstr "%s: gruppfilen 
 # -
 # Never split a sentence like this, use two full messages instead
 #
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: filen %s är upptagen (%s finns)\n"
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: kan inte länka %s: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "Kan inte få time-out för %s: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "Kan inte få time-out för %s: %s\n"
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: kan inte låsa upp %s: %s (dina ändringar är fortfarande i %s)\n"
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: Kan inte grena\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s är oförändrad\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: inga ändringar gjordes\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr "Du använder skuggrupper på detta system.\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr "Du använder skugglösenord på detta system.\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "Vill du redigera %s nu [y/n]? "
@@ -7236,7 +7304,7 @@ msgstr "%s: namnbyte av %s till %s misslyckades: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "anropa: %s från till filer...\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7247,21 +7315,21 @@ msgstr ""
 "Använd \"%s [flaggor] %s\" om du verkligen vill använda den.\n"
 "Skriptet startades inte.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "användning: script [-a] [-f] [-q] [-t] [fil]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skriptet startades, filen är %s\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "Skriptet startades %s"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7270,16 +7338,16 @@ msgstr ""
 "\n"
 "Skriptet färdigt %s"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skriptet färdigt, filen är %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "openpty misslyckades\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "Slut på pty:er\n"
 
@@ -7548,36 +7616,36 @@ msgstr "mount: kunde inte 
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr "kan inte skapa låsfilen %s: %s (använd flaggan -n för att åsidosätta)"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr "kan inte länka låsfilen %s: %s (använd flaggan -n för att åsidosätta)"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr "kan inte öppna låsfilen %s: %s (använd flaggan -n för att åsidosätta)"
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Kan inte låsa låsfilen %s: %s\n"
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "kan inte låsa låsfilen %s: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "gjorde time-out"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7586,189 +7654,124 @@ msgstr ""
 "Kan inte skapa länken %s\n"
 "Det finns kanske en kvarglömd låsfil?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "kan inte öppna %s (%s) - mtab uppdaterades inte"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "fel vid skrivning av %s: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "fel vid byte av rättigheter på %s: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "kan inte byta namn på %s till %s: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kan inte öppna enheten %s: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: kan inte få tag i information om enheten %s: %s\n"
+msgid ", offset %lld"
+msgstr ", avstånd %lld"
 
-#: mount/lomount.c:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) avstånd %d, kryptering: %s\n"
+#: mount/lomount.c:104
+#, c-format
+msgid ", sizelimit %lld"
+msgstr ", storleksgräns %lld"
 
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: kunde inte hitta någon /dev/loop#-enhet"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", kryptering %s (typ %d)"
 
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
-msgstr ""
-"mount: Kunde inte hitta någon slingenhet.\n"
-"       Kanske /dev/loop# har ett felaktigt huvudnummer?"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ", avstånd %d"
 
-#: mount/lomount.c:253
+#: mount/lomount.c:129
 #, 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: Kunde inte hitta någon slingenhet, och enligt %s\n"
-"       vet denna kärna inte om slingenheten.\n"
-"       (Om det är så bör du kompilera om eller \"insmod loop.o\")."
+msgid ", encryption type %d\n"
+msgstr ", krypteringstyp %d\n"
+
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: kan inte få tag i information om enheten %s: %s\n"
 
-#: mount/lomount.c:259
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: kunde inte hitta någon /dev/loop#-enhet"
+
+#: mount/lomount.c:192
 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?"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: Kunde inte hitta någon slingenhet. Denna kärna vet kanske inte\n"
-"       om slingenheten (om det är så bör du kompilera om eller\n"
-"       \"insmod loop.o\"), eller kanske /dev/loop# har fel huvudnummer?"
+"mount: Kunde inte hitta någon slingenhet. Denna kärna känner kanske inte\n"
+"       till slingenheten? (Om det är så bör du kompilera om eller\n"
+"       \"modprobe loop\")."
 
-#: mount/lomount.c:263
+#: mount/lomount.c:197
 msgid "mount: could not find any free loop device"
 msgstr "mount: kunde inte hitta någon ledig slingenhet"
 
-#: mount/lomount.c:359
-#, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "kan inte öppna %s för läsning\n"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Ange nya lösenordet på nytt: "
-
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "öppnande av katalog misslyckades\n"
-
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "Lösenordet måste ha minst 6 tecken, försök igen.\n"
-
-#: mount/lomount.c:472
-#, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Kan inte allokera mer minne\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
-msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-msgstr ""
-
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
-
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kunde inte låsa i minne, avslutar.\n"
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Init (upp till 16 hexadecimala siffror): "
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): lyckades\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "Icke-hexadecimal siffra \"%c\".\n"
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: kan inte ta bort enheten %s: %s\n"
 
-#: mount/lomount.c:764
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
-msgstr "Vet inte hur jag ska få tag i nyckel för krypteringssystem %d\n"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): lyckades\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): lyckades\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr "Denna mount kompilerades utan stöd för slingor. Du bör kompilera om.\n"
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "inte tillräckligt med minne"
-
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "kan inte öppna %s för läsning\n"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"användning:\n"
+"  %s slingenhet                                        # ge information\n"
+"  %s -d slingenhet                                     # ta bort\n"
+"  %s [ -e kryptering ] [ -o avstånd ] slingenhet fil   # konfiguration\n"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "inte tillräckligt med minne"
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
+"Inget stöd för slingor fanns tillgängligt vid kompileringen. Du bör\n"
+"kompilera om.\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7784,41 +7787,41 @@ msgstr "[mntent]: rad %d i %s 
 msgid "; rest of file ignored"
 msgstr "; resten av filen ignoreras"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: enligt mtab är %s redan monterat på %s"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: enligt mtab är %s monterat på %s"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kan inte öppna %s för skrivning: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fel vid skrivning av %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: fel vid byte av rättigheter på %s: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ser ut som växlingsutrymme - monteras inte"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "montering misslyckades"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: endast root kan montera %s på %s"
@@ -7840,104 +7843,108 @@ msgstr "mount: hoppar 
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: kommer att använda slingenheten %s\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: misslyckades konfigurera slingenheten\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: lyckades konfigurera slingenheten\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kan inte öppna %s: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: argument till -p eller --pass-fd måste vara ett tal"
+
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: kan inte öppna %s för inställning av hastighet"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kan inte ställa in hastighet: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kan inte grena: %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr "mount: denna version kompilerades utan stöd för typen \"nfs\""
 
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 "mount: misslyckades med montering av nfs version 4, försöker med 3...\n"
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Jag kunde inte avgöra filsystemstypen, och ingen angavs"
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: du måste ange filsystemstypen"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr "mount: montering misslyckades"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: monteringspunkten %s är inte en katalog"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: åtkomst nekas"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr "mount: måste vara superanvändaren för att använda mount"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s är upptagen"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc är redan monterad"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s är redan monterad eller %s är upptagen"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: monteringspunkten %s finns inte"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: monteringspunkten %s är en symbolisk länk till ingenstans"
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: specialenheten %s finns inte"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7946,12 +7953,12 @@ msgstr ""
 "mount: specialenheten %s finns inte\n"
 "       (ett sökvägsprefix är inte en katalog)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s är inte redan monterad, eller felaktig flagga"
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7960,46 +7967,46 @@ msgstr ""
 "mount: fel filsystemstyp, felaktig flagga, felaktigt superblock\n"
 "       på %s, eller för många monterade filsystem"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "monteringstabellen full"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kan inte läsa superblock"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: okänd enhet"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: filsystemstypen %s stöds inte av kärnan"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: du menade troligtvis %s"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: du menade kanske iso9660?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr "mount: %s har fel enhetsnummer eller så stöds filsystemstypen %s inte"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s är inte en blockenhet, och statustagning misslyckas?"
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8008,75 +8015,48 @@ msgstr ""
 "mount: kärnan känner inte igen %s som en blockenhet\n"
 "       (kanske \"insmod drivrutin\"?)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s är ingen blockenhet (försök kanske med \"-o loop\"?)"
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s är ingen blockenhet"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s är ingen giltig blockenhet"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "blockenhet "
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kan inte montera %s%s som endast läsbar"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s är skrivskyddad med en explicit \"-w\"-flagga angavs"
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s är skrivskyddad, monterar som endast läsbar"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr "mount: etiketten %s förekommer både på %s och %s\n"
-
-#: mount/mount.c:1124
-#, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "mount: %s dubblerad - inte monterad"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: kommer att montera %s med %s\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "etikett"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: ingen sådan partition hittades"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: ingen typ angavs - jag kommer att anta nfs på grund av kolonet\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: ingen typ angavs - jag kommer att anta smbfs på grund //-prefixet\n"
@@ -8084,23 +8064,22 @@ msgstr ""
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: förlägger \"%s\" till bakgrunden\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: ger upp \"%s\"\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s är redan monterad på %s\n"
 
-#: mount/mount.c:1386
-#, fuzzy
+#: mount/mount.c:1362
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8121,7 +8100,7 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Användning: mount -V                  : visa version\n"
@@ -8143,43 +8122,43 @@ msgstr ""
 "       mount --move gammalkatalog nykatalog\n"
 "En enhet kan anges med namn, exempelvis /dev/hda1 eller /dev/cdrom,\n"
 "eller med etikett, genom att använda  -L etikett  eller med uuid,\n"
-"genom att använda  -U uuid . Andra flaggor: [-nfFrsvw] [-o flaggor].\n"
+"genom att använda  -U uuid.\n"
+"Andra flaggor: [-nfFrsvw] [-o flaggor] [-p lösenordfd].\n"
 "Säg  man 8 mount  för många fler detaljer.\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: endast root kan göra det"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ingen %s hittades - skapar den...\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr "mount: etiketten %s förekommer på både %s och %s - inte monterad\n"
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: ingen sådan partition hittades"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: monterar %s\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr "ingenting monterades"
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: kan inte hitta %s i %s"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kan inte hitta %s i %s eller %s"
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8187,34 +8166,34 @@ msgstr ""
 "mount: kunde inte öppna %s, så UUID och ETIKETT-konvertering kan inte "
 "utföras.\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: felaktig UUID"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: fel vid gissning av filsystemstypen\n"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: du angav ingen filsystemstyp för %s\n"
 
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Jag kommer att försöka med alla typer nämnda i %s eller %s\n"
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr "       och det verkar som om detta är växlingsutrymme\n"
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Jag kommer att försöka med typen %s\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "Försöker med %s\n"
@@ -8308,7 +8287,7 @@ msgstr "ok
 msgid "bug in xstrndup call"
 msgstr "programfel i xstrndup-anrop"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8321,7 +8300,7 @@ msgstr ""
 "            %s [-v] [-p prioritet] special ...\n"
 "            %s [-s]\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8332,98 +8311,31 @@ msgstr ""
 "            %s -a [-v]\n"
 "            %s [-v] special ...\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "slut på minne"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s på %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: kan inte ta status på %s: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr "swapon: varning: %s har osäkra rättigheter %04o, föreslår %04o\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: Hoppar över filen %s - den verkar ha hål.\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr "Inte superanvändare.\n"
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s: ogiltig blockenhet"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "Krypteringstypen %s stöds inte\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: kommer att använda slingenheten %s\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Denna partition används redan"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "kan inte spola tillbaka växlingsenheten"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "kunde inte öppna /dev/urandom"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "kan inte skriva inoder"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "grening misslyckades\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "Byter lösenordet för %s\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: kan inte öppna %s: %s\n"
@@ -8488,35 +8400,35 @@ msgstr "umount: %s: blockenheter 
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, försöker med umount...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "kunde inte avmontera %s - försöker med %s istället\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s är upptagen - monterade om som endast läsbar\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kunde inte montera om %s som endast läsbar\n"
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s avmonterad\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan inte hitta lista med filsystem att avmontera"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
@@ -8526,42 +8438,42 @@ msgstr ""
 "            umount -a [-f] [-r] [-n] [-v] [-t vfs-typer] [-O alternativ]\n"
 "            umount [-f] [-r] [-n] [-v] special | nod...\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Försöker avmontera %s\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunde inte hitta %s i mtab\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s är inte monterad (enligt mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: det verkar som om %s är monterad flera gånger"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s är inte i fstab (och du är inte root)"
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montering av %s stämmer inte överens med fstab"
 
-#: mount/umount.c:602
+#: mount/umount.c:616
 #, c-format
-msgid "umount: only root can unmount %s from %s"
-msgstr "umount: endast root kan avmontera %s från %s"
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: endast %s kan avmontera %s från %s"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr "umount: endast root kan göra det"
 
@@ -8702,7 +8614,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f avbrott/sek; %f mott. (tecken/s)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Användning: %s [-c] [-n nivå] [-s buffertstorlek]\n"
@@ -8868,23 +8780,23 @@ msgstr "------ Gr
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
 msgstr "maximalt antal segment = %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "maximal segmentstorlek (kilobyte) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "maximalt totalt delat minne (kilobyte) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "minimal segmentstorlek (byte) = %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9404,8 +9316,12 @@ msgstr ""
 msgid "missing comma"
 msgstr "komma saknas"
 
-#: sys-utils/readprofile.c:115
-#, c-format
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "slut på minne"
+
+#: sys-utils/readprofile.c:118
+#, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9416,6 +9332,7 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
@@ -9433,32 +9350,32 @@ msgstr ""
 "\t -n              deaktivera automatisk detektering av byteordning\n"
 "\t -V              visa versionsinformation och avsluta\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s version %s\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Samplingssteg: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): felaktig tabellrad\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: kan inte hitta \"_stext\" i %s\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: profiladressen är utanför intervallet. Fel tabellfil?\n"
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "totalt"
 
@@ -9982,31 +9899,90 @@ msgstr "Indataraden 
 msgid "Out of memory when growing buffer.\n"
 msgstr "Slut på minne vid växande av buffert.\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: kan inte ta bort enheten %s: %s\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: inte kompilerad med stöd för minix v2\n"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): lyckades\n"
+#~ msgid "mount: the label %s occurs on both %s and %s\n"
+#~ msgstr "mount: etiketten %s förekommer både på %s och %s\n"
 
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
-#~ msgstr ""
-#~ "Denna mount kompilerades utan stöd för slingor. Du bör kompilera om.\n"
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "mount: %s dubblerad - inte monterad"
+
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: kommer att montera %s med %s\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "etikett"
+
+#~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
+#~ msgstr "mount: etiketten %s förekommer på både %s och %s - inte monterad\n"
+
+#~ msgid "umount: only root can unmount %s from %s"
+#~ msgstr "umount: endast root kan avmontera %s från %s"
+
+#~ msgid "Size (MB)"
+#~ msgstr "Storlek (MB)"
+
+#~ msgid "Size (GB)"
+#~ msgstr "Storlek (GB)"
+
+#~ msgid "Win95 FAT32"
+#~ msgstr "Win95 FAT32"
+
+#~ msgid "Win95 FAT32 (LBA)"
+#~ msgstr "Win95 FAT32 (LBA)"
+
+#~ msgid "Win95 FAT16 (LBA)"
+#~ msgstr "Win95 FAT16 (LBA)"
+
+#~ msgid "Win95 Ext'd (LBA)"
+#~ msgstr "Win95 Utökad (LBA)"
+
+#~ msgid "Hidden Win95 FAT32"
+#~ msgstr "Dold Win95 FAT32"
+
+#~ msgid "Hidden Win95 FAT32 (LBA)"
+#~ msgstr "Dold Win95 FAT32 (LBA)"
+
+#~ msgid "Hidden Win95 FAT16 (LBA)"
+#~ msgstr "Dold Win95 FAT16 (LBA)"
+
+#~ msgid "Boot (%02X)"
+#~ msgstr "Start (%02X)"
+
+#~ msgid "None (%02X)"
+#~ msgstr "Ingen (%02X)"
+
+#~ msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) avstånd %d, kryptering: %s\n"
 
 #~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "användning:\n"
-#~ "  %s slingenhet                                        # ge information\n"
-#~ "  %s -d slingenhet                                     # ta bort\n"
-#~ "  %s [ -e kryptering ] [ -o avstånd ] slingenhet fil   # konfiguration\n"
+#~ "mount: Kunde inte hitta någon slingenhet.\n"
+#~ "       Kanske /dev/loop# har ett felaktigt huvudnummer?"
 
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ 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 ""
-#~ "Inget stöd för slingor fanns tillgängligt vid kompileringen. Du bör\n"
-#~ "kompilera om.\n"
+#~ "mount: Kunde inte hitta någon slingenhet. Denna kärna vet kanske inte\n"
+#~ "       om slingenheten (om det är så bör du kompilera om eller\n"
+#~ "       \"insmod loop.o\"), eller kanske /dev/loop# har fel huvudnummer?"
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Init (upp till 16 hexadecimala siffror): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Icke-hexadecimal siffra \"%c\".\n"
+
+#~ msgid "Don't know how to get key for encryption system %d\n"
+#~ msgstr "Vet inte hur jag ska få tag i nyckel för krypteringssystem %d\n"
 
 #~ msgid ""
 #~ "Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %"
@@ -10054,9 +10030,6 @@ msgstr "Slut p
 #~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
 #~ msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
 
-#~ msgid "umount: only %s can unmount %s from %s"
-#~ msgstr "umount: endast %s kan avmontera %s från %s"
-
 #~ msgid "'."
 #~ msgstr "\"."
 
diff --git a/po/tr.po b/po/tr.po
index a636dcd4..4e5bf70c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,112 +1,117 @@
 # Turkish translations for util-linux messages.
 # Copyright (C) 2003 Nilgün Belma Bugüner.
-# Nilgün Belma Bugüner <nilgun@superonline.com>, 2001, 2002, 2003.
 #
 # 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. No warranty.
+# Nilgün Belma Bugüner <nilgun@superonline.com>, 2001, 2002, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11z\n"
-"POT-Creation-Date: 2003-06-13 00:50+0200\n"
-"PO-Revision-Date: 2003-02-06 09:56+0200\n"
+"Project-Id-Version: util-linux 2.12\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
+"PO-Revision-Date: 2003-08-03 13:18+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.6\n"
+"X-Generator: KBabel 1.0\n"
 
-#: disk-utils/blockdev.c:60
+#: disk-utils/blockdev.c:62
 msgid "set read-only"
 msgstr "salt-okunur ayarlanır"
 
-#: disk-utils/blockdev.c:61
+#: disk-utils/blockdev.c:63
 msgid "set read-write"
 msgstr "oku-yaz ayarlanır"
 
-#: disk-utils/blockdev.c:64
+#: disk-utils/blockdev.c:66
 msgid "get read-only"
 msgstr "salt-okunur ise 1 verir"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:69
 msgid "get sectorsize"
 msgstr "sektör uzunluğunu verir"
 
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:72
 msgid "get blocksize"
 msgstr "blok uzunluğunu verir"
 
-#: disk-utils/blockdev.c:73
+#: disk-utils/blockdev.c:75
 msgid "set blocksize"
 msgstr "blok uzunluğu belirtilir"
 
-#: disk-utils/blockdev.c:76
-msgid "get size"
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
 msgstr "aygıtın 512 baytlık sektör sayısı"
 
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:84
 msgid "set readahead"
 msgstr "readahead ayarlanır - sektör sayısı ile"
 
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:87
 msgid "get readahead"
 msgstr "readahead okunur - sektör sayısı olarak"
 
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:90
 msgid "flush buffers"
 msgstr "tamponları boşaltır"
 
-#: disk-utils/blockdev.c:89
+#: disk-utils/blockdev.c:94
 msgid "reread partition table"
 msgstr "bölümleme tablosu yeniden okunur"
 
-#: disk-utils/blockdev.c:98
+#: disk-utils/blockdev.c:103
 msgid "Usage:\n"
 msgstr "Kullanımı:\n"
 
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:105
 #, c-format
 msgid "  %s --report [devices]\n"
 msgstr "  %s --report [AYGITLAR]\n"
 
-#: disk-utils/blockdev.c:101
+#: disk-utils/blockdev.c:106
 #, c-format
 msgid "  %s [-v|-q] commands devices\n"
 msgstr "  %s [-v|-q] KOMUTLAR AYGITLAR\n"
 
-#: disk-utils/blockdev.c:102
+#: disk-utils/blockdev.c:107
 msgid "Available commands:\n"
 msgstr "Mümkün komutlar:\n"
 
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:254
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: Bilinmeyen komut: %s\n"
 
-#: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s bir argümanla kullanılır\n"
 
-#: disk-utils/blockdev.c:278
+#: disk-utils/blockdev.c:323
 #, c-format
 msgid "%s succeeded.\n"
 msgstr "%s başarıldı.\n"
 
-#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
 #, c-format
 msgid "%s: cannot open %s\n"
 msgstr "%s: %s açılamıyor\n"
 
-#: disk-utils/blockdev.c:338
+#: disk-utils/blockdev.c:384
 #, c-format
 msgid "%s: ioctl error on %s\n"
 msgstr "%s: %s üzerinde G/Ç hatası\n"
 
-#: disk-utils/blockdev.c:345
+#: disk-utils/blockdev.c:391
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
 msgstr "RO    RA  Sboyu  Bboyu BaşlSkt      Boyut   Aygıt\n"
 
@@ -149,12 +154,12 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "kullanımı: %s [ -n ] AYGIT\n"
 
-#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:638
-#: disk-utils/mkswap.c:461 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
 #: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
-#: misc-utils/rename.c:79 misc-utils/script.c:132
+#: misc-utils/rename.c:79 misc-utils/script.c:143
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s (%s den)\n"
@@ -293,49 +298,49 @@ msgstr ""
 msgid "%s: invalid cramfs--invalid file data offset\n"
 msgstr "%s: geçersiz cramfs -- geçersiz dosya verisi başlangıcı\n"
 
-#: disk-utils/fsck.minix.c:200
+#: disk-utils/fsck.minix.c:186
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "kullanımı: %s [-larvsmf] /dev/İSİM\n"
 
-#: disk-utils/fsck.minix.c:307
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s bağlı.\t"
 
-#: disk-utils/fsck.minix.c:309
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Gerçekten devam etmek istiyor musunuz?"
 
-#: disk-utils/fsck.minix.c:313
+#: disk-utils/fsck.minix.c:299
 msgid "check aborted.\n"
 msgstr "denetim durdu.\n"
 
-#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "`%s' dosyasındaki bölge No < İLKBÖLGE."
 
-#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "`%s' dosyasındaki bölge No >= BÖLGE sayısı."
 
-#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "blok kaldırılsın mı?"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Okuma hatası: '%s' dosyasındaki bloğa erişilemiyor\n"
 
-#: disk-utils/fsck.minix.c:390
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Okuma hatası: '%s' dosyasındaki bir blok bozuk\n"
 
-#: disk-utils/fsck.minix.c:405
+#: disk-utils/fsck.minix.c:389
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -343,122 +348,122 @@ msgstr ""
 "Bozuk bloğa yazmaya çalışılırken iç hata oluştu:\n"
 "Yazma isteği yoksayıldı\n"
 
-#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
 msgid "seek failed in write_block"
 msgstr "write_block işleminde erişim sağlanamadı"
 
-#: disk-utils/fsck.minix.c:414
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Yazma hatası: '%s' dosyasındaki bir blok bozuk\n"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "super-blok yazma işleminde erişim sağlanamadı"
 
-#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
 msgid "unable to write super-block"
 msgstr "super-bloka yazılamadı"
 
-#: disk-utils/fsck.minix.c:544
+#: disk-utils/fsck.minix.c:526
 msgid "Unable to write inode map"
 msgstr "düğüm eşlemi yazılamıyor"
 
-#: disk-utils/fsck.minix.c:546
+#: disk-utils/fsck.minix.c:528
 msgid "Unable to write zone map"
 msgstr "bölge tablosu yazılamıyor"
 
-#: disk-utils/fsck.minix.c:548
+#: disk-utils/fsck.minix.c:530
 msgid "Unable to write inodes"
 msgstr "Düğümler yazılamıyor"
 
-#: disk-utils/fsck.minix.c:577
+#: disk-utils/fsck.minix.c:557
 msgid "seek failed"
 msgstr "erişim başarısız"
 
-#: disk-utils/fsck.minix.c:579
+#: disk-utils/fsck.minix.c:559
 msgid "unable to read super block"
 msgstr "super blok okunamıyor"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:577
 msgid "bad magic number in super-block"
 msgstr "super-bloktaki betimleyici numara hatalı"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:579
 msgid "Only 1k blocks/zones supported"
 msgstr "Sadece 1k blok/bölge desteği var"
 
-#: disk-utils/fsck.minix.c:603
+#: disk-utils/fsck.minix.c:581
 msgid "bad s_imap_blocks field in super-block"
 msgstr "super-bloktaki s_imap_blocks alanı bozuk"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:583
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "super-bloktaki s_zmap_blocks alanı bozuk"
 
-#: disk-utils/fsck.minix.c:612
+#: disk-utils/fsck.minix.c:590
 msgid "Unable to allocate buffer for inode map"
 msgstr "düğüm eşlemi için tampon bellek ayrılamıyor"
 
-#: disk-utils/fsck.minix.c:620
+#: disk-utils/fsck.minix.c:598
 msgid "Unable to allocate buffer for inodes"
 msgstr "Düğümler için tampon bellek ayrılamıyor"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inode count"
 msgstr "Düğüm sayısı kadar tampon bellek ayrılamıyor"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for zone count"
 msgstr "bölge sayısı kadar tampon bellek ayrılamıyor"
 
-#: disk-utils/fsck.minix.c:628
+#: disk-utils/fsck.minix.c:606
 msgid "Unable to read inode map"
 msgstr "Düğüm eşlemi okunamıyor"
 
-#: disk-utils/fsck.minix.c:630
+#: disk-utils/fsck.minix.c:608
 msgid "Unable to read zone map"
 msgstr "bölge tablosu okunamıyor"
 
-#: disk-utils/fsck.minix.c:632
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to read inodes"
 msgstr "Düğümler okunamıyor"
 
-#: disk-utils/fsck.minix.c:634
+#: disk-utils/fsck.minix.c:612
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Uyarı: İlkBölge != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld düğüm\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blok\n"
 
-#: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "İlkVeriBölgesi = %ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "BölgeUzunluğu = %d\n"
 
-#: disk-utils/fsck.minix.c:643
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "EnFazlaUzunluk = %ld\n"
 
-#: disk-utils/fsck.minix.c:644
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "DosyaSistemi durumu = %d\n"
 
-#: disk-utils/fsck.minix.c:645
+#: disk-utils/fsck.minix.c:623
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -467,171 +472,171 @@ msgstr ""
 "isimUzunluğu = %d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "%d. düğüm serbest olarak imli ama '%s' dosyası için kullanılmış\n"
 
-#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
 msgid "Mark in use"
 msgstr "Kullanımda olarak imlensin mi?"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "`%s' %05o kipe sahip\n"
 
-#: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
 msgid "Warning: inode count too big.\n"
 msgstr "Uyarı: düğüm sayısı çok büyük.\n"
 
-#: disk-utils/fsck.minix.c:755
+#: disk-utils/fsck.minix.c:731
 msgid "root inode isn't a directory"
 msgstr "kök düğümü bir dizin değil"
 
-#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Blok `%s' dosyası için kullanılıyor."
 
-#: disk-utils/fsck.minix.c:781 disk-utils/fsck.minix.c:815
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1158
-#: disk-utils/fsck.minix.c:1205 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
 msgid "Clear"
 msgstr "Temizlensin mi?"
 
-#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "`%2$s' dosyasının %1$d. bloğu kullanımda değil olarak imli."
 
-#: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
 msgid "Correct"
 msgstr "Doğru mu?"
 
-#: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "'%s' dizini '%.*s' dosyası için bir hatalı düğüm numarası içeriyor."
 
-#: disk-utils/fsck.minix.c:976 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
 msgid " Remove"
 msgstr " Silinsin mi?"
 
-#: disk-utils/fsck.minix.c:990
+#: disk-utils/fsck.minix.c:956
 #, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
 msgstr "`%s': dizin hatalı: '.' ilk değil\n"
 
-#: disk-utils/fsck.minix.c:998
+#: disk-utils/fsck.minix.c:964
 #, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
 msgstr "`%s': dizin hatalı: '..' ikinci değil\n"
 
-#: disk-utils/fsck.minix.c:1058
+#: disk-utils/fsck.minix.c:1023
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: dizin hatalı: '.' ilk değil\n"
 
-#: disk-utils/fsck.minix.c:1067
+#: disk-utils/fsck.minix.c:1032
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: dizin hatalı: '..' ikinci değil\n"
 
-#: disk-utils/fsck.minix.c:1102
+#: disk-utils/fsck.minix.c:1066
 msgid "internal error"
 msgstr "iç hata"
 
-#: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: dizin hatalı: uzunluk < 32"
 
-#: disk-utils/fsck.minix.c:1138
+#: disk-utils/fsck.minix.c:1100
 msgid "seek failed in bad_zone"
 msgstr "bad_zone'da erişim başarısız"
 
-#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "%d.düğümde kip temiz değil."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "%d. düğüm kullanımda değil ama biteşlemde kullanımda olarak imli."
 
-#: disk-utils/fsck.minix.c:1163 disk-utils/fsck.minix.c:1219
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "%d.düğüm kullanımda ama biteşlemde kullanımda değil olarak imli."
 
-#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Düğüm %d (kip = %07o), i_nlinks = %d, sayılan = %d."
 
-#: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
 msgid "Set i_nlinks to count"
 msgstr "i_nlinks bu sayıya ayarlansın mı?"
 
-#: disk-utils/fsck.minix.c:1183 disk-utils/fsck.minix.c:1238
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Bölge %d: kullanımda olarak imli ama hiçbir dosya kullanmıyor"
 
-#: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "İm kaldırılsın mı?"
 
-#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
 msgstr "Bölge %d: kullanımda, sayılan = %d\n"
 
-#: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
 #, c-format
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr "Bölge %d: kullanım dışı, sayılan = %d\n"
 
-#: disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1181
 msgid "Set"
 msgstr "Ä°mlensin mi?"
 
-#: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
-#: disk-utils/mkfs.minix.c:646
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
 msgid "bad inode size"
 msgstr "düğüm sayısı hatalı"
 
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "v2 düğüm sayısı hatalı"
 
-#: disk-utils/fsck.minix.c:1325
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "etkileşimli onarım için terminal gerekli"
 
-#: disk-utils/fsck.minix.c:1329
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "'%s' açılamıyor"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s temiz, denetim gereksiz.\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "%s için dosya sistemi denetimi şart.\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "%s üzerindeki dosya sistemi düzensiz, denetlenmesi gerekiyor.\n"
 
-#: disk-utils/fsck.minix.c:1379
+#: disk-utils/fsck.minix.c:1333
 #, c-format
 msgid ""
 "\n"
@@ -640,12 +645,12 @@ msgstr ""
 "\n"
 "%6ld düğüm kullanımda (%%%ld)\n"
 
-#: disk-utils/fsck.minix.c:1384
+#: disk-utils/fsck.minix.c:1338
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld bölge kullanımda (%%%ld)\n"
 
-#: disk-utils/fsck.minix.c:1386
+#: disk-utils/fsck.minix.c:1340
 #, c-format
 msgid ""
 "\n"
@@ -668,7 +673,7 @@ msgstr ""
 "------\n"
 "%6d dosya\n"
 
-#: disk-utils/fsck.minix.c:1399
+#: disk-utils/fsck.minix.c:1353
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -759,7 +764,7 @@ msgstr "düğüm sayısı çok fazla - en çok 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "yer yetersiz, en az %lu blok gerekiyor"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
 #, c-format
 msgid "Device: %s\n"
 msgstr "Aygıt: %s\n"
@@ -833,7 +838,7 @@ msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "Kullanımı: mkfs [-V] [-t dsySistTürü] [dsySist-seçenekleri] aygıt [uzunluk]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
 #: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -996,64 +1001,64 @@ msgstr ""
 "UYARI: aygıt numaraları %u bitle sınırlandı. Bu işlem bazı aygıt "
 "dosyalarının isimlerinin yanlış olmasına sebep olacak.\n"
 
-#: disk-utils/mkfs.minix.c:175
+#: disk-utils/mkfs.minix.c:163
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr ""
 "Kullanımı: %s [-c | -l dosyaismi] [-nXX] [-iXX] /dev/isim [blokSayısı]\n"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:187
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s bağlı; burada bir dosya sistemi yapılmayacak!"
 
-#: disk-utils/mkfs.minix.c:260
+#: disk-utils/mkfs.minix.c:248
 msgid "seek to boot block failed in write_tables"
 msgstr "write_tables içinde başlatma bloğuna erişilemedi"
 
-#: disk-utils/mkfs.minix.c:262
+#: disk-utils/mkfs.minix.c:250
 msgid "unable to clear boot sector"
 msgstr "başlatma sektörü temizlenemiyor"
 
-#: disk-utils/mkfs.minix.c:264
+#: disk-utils/mkfs.minix.c:252
 msgid "seek failed in write_tables"
 msgstr "write_tables içinde erişim başarısız"
 
-#: disk-utils/mkfs.minix.c:268
+#: disk-utils/mkfs.minix.c:256
 msgid "unable to write inode map"
 msgstr "düğüm eşlemi yazılamıyor"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:258
 msgid "unable to write zone map"
 msgstr "bölge tablosu yazılamıyor"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:260
 msgid "unable to write inodes"
 msgstr "düğümler yazılamıyor"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:269
 msgid "write failed in write_block"
 msgstr "write_block içine yazma başarısız"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:289 disk-utils/mkfs.minix.c:363
-#: disk-utils/mkfs.minix.c:413
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
 msgid "too many bad blocks"
 msgstr "çok fazla hatalı blok var"
 
-#: disk-utils/mkfs.minix.c:297
+#: disk-utils/mkfs.minix.c:285
 msgid "not enough good blocks"
 msgstr "iyi bloklar yetersiz"
 
-#: disk-utils/mkfs.minix.c:509
+#: disk-utils/mkfs.minix.c:497
 msgid "unable to allocate buffers for maps"
 msgstr "tablolar için tampon bellek ayrılamıyor"
 
-#: disk-utils/mkfs.minix.c:518
+#: disk-utils/mkfs.minix.c:506
 msgid "unable to allocate buffer for inodes"
 msgstr "düğümler için tampon bellek ayrılamıyor"
 
-#: disk-utils/mkfs.minix.c:524
+#: disk-utils/mkfs.minix.c:512
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1062,55 +1067,50 @@ msgstr ""
 "En çok uzunluk = %ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:526
 msgid "seek failed during testing of blocks"
 msgstr "bloklar denetlenirken erişim başarısız"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:534
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check yapılırken tuhaf değerler: yazılım hatası olabilir\n"
 
-#: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
 msgstr "check_blocks işleminde erişim başarısız"
 
-#: disk-utils/mkfs.minix.c:586
+#: disk-utils/mkfs.minix.c:574
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "veri alanından önceki bloklar hatalı: dosya sistemi yapılamıyor"
 
-#: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d bozuk blok\n"
 
-#: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
 msgid "one bad block\n"
 msgstr "bir bozuk blok\n"
 
-#: disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:592
 msgid "can't open file of bad blocks"
 msgstr "bozuk bloklar dosyası açılamıyor"
 
 #: disk-utils/mkfs.minix.c:674
-#, c-format
-msgid "%s: not compiled with minix v2 support\n"
-msgstr "%s: minix v2 desteğiyle derlenmemiş\n"
-
-#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol hatası: blok sayısı belirtilmemiş"
 
-#: disk-utils/mkfs.minix.c:725
+#: disk-utils/mkfs.minix.c:704
 #, c-format
 msgid "unable to open %s"
 msgstr "%s açılamıyor"
 
-#: disk-utils/mkfs.minix.c:727
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr "%s durum bilgileri alınamıyor"
 
-#: disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:710
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "'%s' üzerinde dosya sistemi oluşturmaya çalışılmayacak"
@@ -1152,45 +1152,45 @@ msgid "one bad page\n"
 msgstr "1 bozuk sayfa\n"
 
 #: disk-utils/mkswap.c:382
-#, c-format
-msgid "%d bad pages\n"
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
 msgstr "%d bozuk sayfa\n"
 
-#: disk-utils/mkswap.c:501
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: hata: Takas alanını koyacak yer yok mu?\n"
 
-#: disk-utils/mkswap.c:519
-#, c-format
-msgid "%s: error: size %ld is larger than device size %d\n"
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
 msgstr "%s: hata: %ld aygıttaki yerden büyük (aygıtta: %d)\n"
 
-#: disk-utils/mkswap.c:538
+#: disk-utils/mkswap.c:539
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: hata: sürüm %d bilinmiyor\n"
 
-#: disk-utils/mkswap.c:545
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: hata: takas alanı için en az %ldkB gerekiyor\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:563
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: uyarı: takas alanı %ldkB ile sınırlanıyor\n"
 
-#: disk-utils/mkswap.c:576
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "'%s' üzerinde takas aygıtı oluşturulmayacak"
 
-#: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
 msgid "fatal: first page unreadable"
 msgstr "ölümcül: ilk sayfa okunabilir değil"
 
-#: disk-utils/mkswap.c:591
+#: disk-utils/mkswap.c:592
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1203,24 +1203,24 @@ msgstr ""
 "takas alanı oluşturulmadı. Burada mutlaka bir v0 takas alanı oluşturmak\n"
 "istiyorsanız -f seçeneği ile bunu yapabilirsiniz.\n"
 
-#: disk-utils/mkswap.c:615
+#: disk-utils/mkswap.c:616
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Takas alanı oluşturulamıyor: okunabilir değil"
 
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:617
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
 msgstr "Takas alanı sürüm %d, uzunluk = %llu kB olarak ayarlanıyor\n"
 
-#: disk-utils/mkswap.c:622
+#: disk-utils/mkswap.c:623
 msgid "unable to rewind swap-device"
 msgstr "takas alanında başa gidilemiyor"
 
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:626
 msgid "unable to write signature page"
 msgstr "imza sayfası yazılamıyor"
 
-#: disk-utils/mkswap.c:633
+#: disk-utils/mkswap.c:634
 msgid "fsync failed"
 msgstr "fsync hata verdi"
 
@@ -1262,58 +1262,57 @@ msgstr "   %s [ -c | -y | -n | -d ] aygıt\n"
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] aygıt\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Kullanışsız"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Boş Alan"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:375
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
-#: fdisk/cfdisk.c:402
+#: fdisk/cfdisk.c:377
 msgid "Linux ext3"
 msgstr "Linux ext3"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:379
 msgid "Linux XFS"
 msgstr "Linux XFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:381
 msgid "Linux ReiserFS"
 msgstr "Linux ReiserFS"
 
-#. also Solaris
-#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:386
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:413
+#: fdisk/cfdisk.c:388
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:392
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:428
+#: fdisk/cfdisk.c:403
 msgid "Disk has been changed.\n"
 msgstr "Disk değiştirildi.\n"
 
-#: fdisk/cfdisk.c:429
+#: fdisk/cfdisk.c:404
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Bölümleme tablosunun doğru olarak güncellendiğinden emin olabilmek için\n"
 "sistemi yeniden başlatın.\n"
 
-#: fdisk/cfdisk.c:432
+#: fdisk/cfdisk.c:407
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1325,776 +1324,779 @@ msgstr ""
 "değişiklik yaptıysanız, lütfen cfdisk man sayfalarındaki\n"
 "ek bilgileri okuyun.\n"
 
-#: fdisk/cfdisk.c:527
+#: fdisk/cfdisk.c:502
 msgid "FATAL ERROR"
 msgstr "ÖLÜMCÜL HATA"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:503
 msgid "Press any key to exit cfdisk"
 msgstr "cfdisk'ten çıkmak için herhangi bir tuşa basınız"
 
-#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
 msgid "Cannot seek on disk drive"
 msgstr "Disk sürücü üzerinde arama yapılamıyor"
 
-#: fdisk/cfdisk.c:577
+#: fdisk/cfdisk.c:552
 msgid "Cannot read disk drive"
 msgstr "Disk sürücüsü okunamıyor"
 
-#: fdisk/cfdisk.c:585
+#: fdisk/cfdisk.c:560
 msgid "Cannot write disk drive"
 msgstr "Disk sürücüsüne yazılamıyor"
 
-#: fdisk/cfdisk.c:885
+#: fdisk/cfdisk.c:858
 msgid "Too many partitions"
 msgstr "Disk bölümü sayısı çok fazla"
 
-#: fdisk/cfdisk.c:890
+#: fdisk/cfdisk.c:863
 msgid "Partition begins before sector 0"
 msgstr "Disk bölümü sıfırıncı sektörden önce başlıyor"
 
-#: fdisk/cfdisk.c:895
+#: fdisk/cfdisk.c:868
 msgid "Partition ends before sector 0"
 msgstr "Disk bölümü sıfırıncı sektörden önce bitiyor"
 
-#: fdisk/cfdisk.c:900
+#: fdisk/cfdisk.c:873
 msgid "Partition begins after end-of-disk"
 msgstr "Disk bölümü disk sonundan sonra başlıyor"
 
-#: fdisk/cfdisk.c:905
+#: fdisk/cfdisk.c:878
 msgid "Partition ends after end-of-disk"
 msgstr "Disk bölümü disk sonundan sonra bitiyor"
 
-#: fdisk/cfdisk.c:910
+#: fdisk/cfdisk.c:883
 msgid "Partition ends in the final partial cylinder"
 msgstr "Disk bölümü son kısmî silindir içinde bitiyor"
 
-#: fdisk/cfdisk.c:934
+#: fdisk/cfdisk.c:907
 msgid "logical partitions not in disk order"
 msgstr "mantıksal bölümler sıralamaya uygun değil"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:910
 msgid "logical partitions overlap"
 msgstr "mantıksal bölümler içiçe geçmiş"
 
-#: fdisk/cfdisk.c:939
+#: fdisk/cfdisk.c:912
 msgid "enlarged logical partitions overlap"
 msgstr "büyütülen mantıksal bölümler içiçe geçiyor"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:942
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Ek disk bölümü içermeyen mantıksal bölüm oluşturulurken iç hata !!!!"
 
-#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr "Burada mantıksal bölüm oluşturulamıyor -- iki ek bölüm oluşacaktı"
 
-#: fdisk/cfdisk.c:1140
+#: fdisk/cfdisk.c:1113
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menü öğesi çok uzun. Menü tuhaf görünebilir."
 
-#: fdisk/cfdisk.c:1193
+#: fdisk/cfdisk.c:1169
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menü yönsüz. Yatay olarak öntanımlanıyor."
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1300
 msgid "Illegal key"
 msgstr "Kuraldışı tuş"
 
-#: fdisk/cfdisk.c:1347
+#: fdisk/cfdisk.c:1323
 msgid "Press a key to continue"
 msgstr "Devam etmek için bir tuşa basınız"
 
-#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
 msgid "Primary"
 msgstr "Birincil"
 
-#: fdisk/cfdisk.c:1394
+#: fdisk/cfdisk.c:1370
 msgid "Create a new primary partition"
 msgstr "Yeni birincil disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
-#: fdisk/cfdisk.c:2512
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
 msgid "Logical"
 msgstr "Mantıksal"
 
-#: fdisk/cfdisk.c:1395
+#: fdisk/cfdisk.c:1371
 msgid "Create a new logical partition"
 msgstr "Yeni mantıksal disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Vazgeç"
 
-#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
 msgid "Don't create a partition"
 msgstr "Bir disk bölümü oluşturulmaz"
 
-#: fdisk/cfdisk.c:1412
+#: fdisk/cfdisk.c:1388
 msgid "!!! Internal error !!!"
 msgstr "!!! İç hata !!!"
 
-#: fdisk/cfdisk.c:1415
+#: fdisk/cfdisk.c:1391
 msgid "Size (in MB): "
 msgstr "Alan (MB):"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Beginning"
 msgstr "Başlangıç"
 
-#: fdisk/cfdisk.c:1449
+#: fdisk/cfdisk.c:1425
 msgid "Add partition at beginning of free space"
 msgstr "Disk bölümünü boş alanın başlangıcına ekler"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "End"
 msgstr "Son"
 
-#: fdisk/cfdisk.c:1450
+#: fdisk/cfdisk.c:1426
 msgid "Add partition at end of free space"
 msgstr "Disk bölümnü boş alanın sonuna ekler"
 
-#: fdisk/cfdisk.c:1468
+#: fdisk/cfdisk.c:1444
 msgid "No room to create the extended partition"
 msgstr "Ek disk bölümünü oluşturacak yer yok"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1503
 msgid "No partition table or unknown signature on partition table"
 msgstr ""
 "Ya disk bölümleme tablosu yok ya da disk bölümleme tablosunda bilinmeyen "
 "imza var"
 
-#: fdisk/cfdisk.c:1529
+#: fdisk/cfdisk.c:1505
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Temiz bir tablo ile başlamak ister misiniz [e/H] ?"
 
-#: fdisk/cfdisk.c:1581
+#: fdisk/cfdisk.c:1557
 msgid "You specified more cylinders than fit on disk"
 msgstr "Diskte bulunan silindir sayısından büyük bir sayı belirttiniz"
 
-#: fdisk/cfdisk.c:1611
+#: fdisk/cfdisk.c:1589
 msgid "Cannot open disk drive"
 msgstr "Disk açılamıyor"
 
-#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Açılan disk salt-okunur - yazma izniniz yok"
 
-#: fdisk/cfdisk.c:1634
+#: fdisk/cfdisk.c:1617
 msgid "Cannot get disk size"
 msgstr "Diskin toplam alanı hesaplanamıyor"
 
-#: fdisk/cfdisk.c:1659
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Birincil disk bölümü bozuk"
 
-#: fdisk/cfdisk.c:1689
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Mantıksal disk bölümü bozuk"
 
-#: fdisk/cfdisk.c:1804
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Uyarı!! Bu işlem disk üzerindeki veriyi yokedebilir!"
 
-#: fdisk/cfdisk.c:1808
+#: fdisk/cfdisk.c:1793
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Disk bölümleme tablosu yazılacak, emin misiniz? (evet ya da hayır): "
 
-#: fdisk/cfdisk.c:1814
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "hayır"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Disk bölümleme tablosu diske yazılmadı"
 
-#: fdisk/cfdisk.c:1817
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "evet"
 
-#: fdisk/cfdisk.c:1820
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Lütfen ya `evet´ ya da `hayır´ yazınız"
 
-#: fdisk/cfdisk.c:1824
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Disk bölümleme tablosu diske yazılıyor..."
 
-#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Disk bölümleme tablosu diske yazıldı"
 
-#: fdisk/cfdisk.c:1851
+#: fdisk/cfdisk.c:1836
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Bölümleme tablosu yazıldı ama tablo yeniden okunamadı. Sistemi yeniden "
 "başlatın."
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1846
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Önyükleme için imlenmiş hiç birincil disk bölümü yok. DOS MBR bunu "
 "başlatamayabilir."
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1848
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Önyükleme için imlenmiş çok sayıda birincil disk bölümü var. DOS MBR bunu "
 "başlatamayabilir."
 
-#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Dosya ismini girin ya da ENTER tuşuna basın: "
 
-#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "'%s' dosyası açılamıyor"
 
-#: fdisk/cfdisk.c:1941
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Sabit Disk: %s\n"
 
-#: fdisk/cfdisk.c:1943
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sektör 0:\n"
 
-#: fdisk/cfdisk.c:1950
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektör %d:\n"
 
-#: fdisk/cfdisk.c:1970
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Yok    "
 
-#: fdisk/cfdisk.c:1972
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Bir/Man"
 
-#: fdisk/cfdisk.c:1974
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "  Birincil "
 
-#: fdisk/cfdisk.c:1976
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr " Mantıksal "
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: fdisk/cfdisk.c:2020
-#, c-format
-msgid "Boot (%02X)"
-msgstr "Boot (%02X)"
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Açılış"
 
-#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
+#: fdisk/cfdisk.c:2007
 #, c-format
-msgid "Unknown (%02X)"
-msgstr "Bilinmeyen (%02X)"
+msgid "(%02X)"
+msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2024
-#, c-format
-msgid "None (%02X)"
-msgstr "Yok (%02X)"
+#: fdisk/cfdisk.c:2009
+msgid "None"
+msgstr "Hiçbiri"
 
-#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s için Disk Bölümleme Tablosu\n"
 
-#: fdisk/cfdisk.c:2061
-msgid "            First    Last\n"
-msgstr " Bölüm       İlk      Son              Sektör     Dosya\n"
+#: fdisk/cfdisk.c:2046
+msgid "               First       Last\n"
+msgstr " Bölüm         İlk          Son              Sektör    Dosya\n"
 
-#: fdisk/cfdisk.c:2062
+#: fdisk/cfdisk.c:2047
 msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
 msgstr ""
-" # Türü     Sektör   Sektör    Başl    Sayısı    Sistemi     Kimlik   "
-"Flamalar\n"
+" # Türü       Sektör      Sektör    Başl     Sayısı    Sistemi   Türü    "
+"Flama\n"
 
-#: fdisk/cfdisk.c:2063
+#: fdisk/cfdisk.c:2048
 msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
 msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+"-- -------   --------    --------- ------  ---------  ---------  -----  "
+"------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2146
-msgid "         ---Starting---      ----Ending----    Start Number of\n"
-msgstr "         --Başlangıç---      ----Bitiş----- Başlangıç  Sektör\n"
+#: fdisk/cfdisk.c:2131
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
+msgstr "         --Başlangıç---      ----Bitiş-----   Başlangıç  Sektör\n"
 
-#: fdisk/cfdisk.c:2147
-msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
-msgstr " # Flama Kafa Sekt Sld  Kiml Kafa Sekt Sld   Sektörü   Sayısı\n"
+#: fdisk/cfdisk.c:2132
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr " # Flama Kafa Sekt Sld  Kiml Kafa Sekt Sld    Sektörü   Sayısı\n"
 
-#: fdisk/cfdisk.c:2148
-msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
-msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+#: fdisk/cfdisk.c:2133
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ----  --------- ---------\n"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
-msgstr "Temel"
+msgstr "Ham"
 
-#: fdisk/cfdisk.c:2181
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Tablo temel veri biçemi olarak yazılır"
 
-#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
 msgid "Sectors"
 msgstr "Sektör"
 
-#: fdisk/cfdisk.c:2182
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Tabloyu sektörlere dağılımına göre yazar"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tablo"
 
-#: fdisk/cfdisk.c:2183
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Disk bölümleme tablosunu yazar"
 
-#: fdisk/cfdisk.c:2184
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Tablo yazılamıyor"
 
-#: fdisk/cfdisk.c:2212
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk Yardım Ekranı"
 
-#: fdisk/cfdisk.c:2214
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 "Sabit diskinizdeki disk bölümlerini oluşturabilmenizi, silebilmenizi ve"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 "değiştirebilmenizi sağlayan etkileşimli bir disk bölümleme uygulamasıdır."
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr " "
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2203
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Telif Hakkı (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr " Komut       Anlamı"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr " -----       ------"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Seçilen disk bölümünün açılış flamasını kaldırır/indirir"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          Seçilen disk bölümünü siler"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Silindir, kafa, sektör/İz parametrelerini değiştirir"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             UYARI: Bu seçenek sadece ne yaptığını iyi bilen kişilerce"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             kullanılabilir."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          Bu yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Seçilen disk bölümünü kalan boş yere sığdırır"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Bilgi: Disk bölümünü DOS, OS/2 ve benzeri sistemlerle"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             uyumsuzluk oluşturabilir."
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          Boş alanda yeni bir disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2217
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Disk bölümleme tablosunu ekrana ya da bir dosyaya yazar"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr ""
 "             Disk bölümleme tablosunu farklı biçemlerde elde edebilirsiniz."
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             Bu biçemler:"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2220
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Temel veri (verinin diske yazılan biçemi)"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Disk bölümlerinin sektörlere dağılımını gösterir"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - Geleneksel disk bölümleme tablosu"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Disk bölümleme tablosu diskteki yerine kaydedilmeden çıkılır"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          Dosya sistemi türünü değiştirir"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2225
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Disk bölümü boyunun birimini değiştirir"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, sektör, silindir birimleri sırayla yer değiştirir"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2227
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Disk bölümleme tablosunu diskteki yerine yazar. (Büyük W)"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2228
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Diskteki veriyi yanlışlıkla kaybetmemek için "
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2229
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             'evet' ya da 'hayır' yazmanız istenerek veriyi diske yazdırıp,"
 
-#: fdisk/cfdisk.c:2245
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             yazdırmayacağınıza kesin karar verebilirsiniz"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Yukarı Ok    Kürsörü önceki disk bölümüne kaydırır"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Aşağı Ok     Kürsörü sonraki disk bölümüne kaydırır"
 
-#: fdisk/cfdisk.c:2248
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Ekranı tazeler"
 
-#: fdisk/cfdisk.c:2249
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Bu yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2251
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Bilgi: Kaydet (W) komutu dışında tüm komutları büyük ya da küçük harf"
 
-#: fdisk/cfdisk.c:2252
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "olarak kullanabilirsiniz."
 
-#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Silindir"
 
-#: fdisk/cfdisk.c:2282
+#: fdisk/cfdisk.c:2268
 msgid "Change cylinder geometry"
 msgstr "Silindir geometrisini değiştirir"
 
-#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Kafa"
 
-#: fdisk/cfdisk.c:2283
+#: fdisk/cfdisk.c:2269
 msgid "Change head geometry"
 msgstr "Kafa geometrisini değiştirir"
 
-#: fdisk/cfdisk.c:2284
+#: fdisk/cfdisk.c:2270
 msgid "Change sector geometry"
 msgstr "Sektör geometrisini değiştirir"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done"
 msgstr "Tamam"
 
-#: fdisk/cfdisk.c:2285
+#: fdisk/cfdisk.c:2271
 msgid "Done with changing geometry"
 msgstr "Geometri değişikliği yapıldı"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2284
 msgid "Enter the number of cylinders: "
 msgstr "Silindir sayısını verin: "
 
-#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
 msgid "Illegal cylinders value"
 msgstr "Silindir sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Kafa sayısını verin: "
 
-#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
 msgid "Illegal heads value"
 msgstr "Kafa sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "sektör/iz sayısını verin: "
 
-#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
 msgid "Illegal sectors value"
 msgstr "sektör sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2439
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Dosya sistemi türünü verin: "
 
-#: fdisk/cfdisk.c:2457
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "Dosya sistemi türü boş olarak değiştirilemez"
 
-#: fdisk/cfdisk.c:2459
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "Dosya sistemi türü ek olarak değiştirilemez"
 
-#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
-msgid "Boot"
-msgstr "Açılış"
-
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2475
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ne?(%02X)"
 
-#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2511
+#: fdisk/cfdisk.c:2497
 msgid "Pri/Log"
 msgstr "Bir/Man"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Bilinmeyen (%02X)"
+
+#: fdisk/cfdisk.c:2573
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Sabit Disk: %s"
 
-#: fdisk/cfdisk.c:2593
+#: fdisk/cfdisk.c:2580
 #, c-format
-msgid "Size: %lld bytes, %ld MB"
-msgstr "Toplam: %lld bayt, %ld MB"
+msgid "Size: %lld bytes, %lld MB"
+msgstr "Boyut: %lld bayt, %lld MB"
 
-#: fdisk/cfdisk.c:2596
+#: fdisk/cfdisk.c:2583
 #, c-format
-msgid "Size: %lld bytes, %ld.%ld GB"
-msgstr "Toplam: %lld bayt, %ld.%ld GB"
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "Boyut: %lld bayt, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2587
 #, c-format
-msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
-msgstr "Kafa: %d        Sektör/İz: %d       Silindir: %d  "
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "Kafa: %d        Sektör/İz: %d       Silindir: %lld  "
 
-#: fdisk/cfdisk.c:2604
+#: fdisk/cfdisk.c:2591
 msgid "Name"
 msgstr "Ä°sim"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2592
 msgid "Flags"
 msgstr "Flama"
 
-#: fdisk/cfdisk.c:2606
+#: fdisk/cfdisk.c:2593
 msgid "Part Type"
 msgstr "Bölüm Türü"
 
-#: fdisk/cfdisk.c:2607
+#: fdisk/cfdisk.c:2594
 msgid "FS Type"
 msgstr "DS Türü"
 
-#: fdisk/cfdisk.c:2608
+#: fdisk/cfdisk.c:2595
 msgid "[Label]"
 msgstr "[Etiket]"
 
-#: fdisk/cfdisk.c:2610
-msgid "  Sectors"
-msgstr "  Sektör  "
+#: fdisk/cfdisk.c:2597
+msgid "    Sectors"
+msgstr "   Sektör  "
+
+#: fdisk/cfdisk.c:2599
+msgid "  Cylinders"
+msgstr "  Silindir"
 
-#: fdisk/cfdisk.c:2614
-msgid "Size (MB)"
-msgstr " Boy (MB) "
+#: fdisk/cfdisk.c:2601
+msgid "  Size (MB)"
+msgstr "  Boy (MB) "
 
-#: fdisk/cfdisk.c:2616
-msgid "Size (GB)"
-msgstr " Boy (GB) "
+#: fdisk/cfdisk.c:2603
+msgid "  Size (GB)"
+msgstr "  Boy (GB) "
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Bootable"
 msgstr "Açılış"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2657
 msgid "Toggle bootable flag of the current partition"
 msgstr "Seçilen disk bölümünde Açılış flamasını kaldırır/indirir"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete"
 msgstr "Sil"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2658
 msgid "Delete the current partition"
 msgstr "Seçilen disk bölümünü kaldırır"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2659
 msgid "Change disk geometry (experts only)"
 msgstr "Disk geometrisini değiştirir (uzmanlar için)"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Help"
 msgstr "Yardım"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2660
 msgid "Print help screen"
 msgstr "Yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize"
 msgstr "Sığdır"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2661
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Seçilen disk bölümünü kalan yere göre ayarlar (uzmanlar için)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "New"
 msgstr "Yeni"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2662
 msgid "Create new partition from free space"
 msgstr "Boş alanda yeni bir disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print"
 msgstr "Yaz"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2663
 msgid "Print partition table to the screen or to a file"
 msgstr "Disk bölümleme tablosunu ekrana ya da bir dosyaya yazar"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit"
 msgstr "Çık"
 
-#: fdisk/cfdisk.c:2678
+#: fdisk/cfdisk.c:2664
 msgid "Quit program without writing partition table"
 msgstr "Disk bölümleme tablosunu diske kaydetmeden çıkar"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Type"
 msgstr "Türü"
 
-#: fdisk/cfdisk.c:2679
+#: fdisk/cfdisk.c:2665
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Dosya sistemi türünü değiştirir (DOS, Linux, OS/2,..,vs)"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Units"
 msgstr "Birim"
 
-#: fdisk/cfdisk.c:2680
+#: fdisk/cfdisk.c:2666
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Gösterilecek boy birimini değiştirir (MB, sekt, sld)"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write"
 msgstr "Kaydet"
 
-#: fdisk/cfdisk.c:2681
+#: fdisk/cfdisk.c:2667
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "Disk bölümleme tablosunu diske kaydeder (bu işlem verilerin kaybına sebep "
 "olur)"
 
-#: fdisk/cfdisk.c:2727
+#: fdisk/cfdisk.c:2713
 msgid "Cannot make this partition bootable"
 msgstr "Bu disk bölümüne açılış kaydı yapılamaz"
 
-#: fdisk/cfdisk.c:2737
+#: fdisk/cfdisk.c:2723
 msgid "Cannot delete an empty partition"
 msgstr "Bir boş disk bölümü silinemez"
 
-#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
 msgid "Cannot maximize this partition"
 msgstr "Bu disk bölümü sığdırılamıyor"
 
-#: fdisk/cfdisk.c:2767
+#: fdisk/cfdisk.c:2753
 msgid "This partition is unusable"
 msgstr "Bu disk bölümü kullanışsız"
 
-#: fdisk/cfdisk.c:2769
+#: fdisk/cfdisk.c:2755
 msgid "This partition is already in use"
 msgstr "Bu disk bölümü zaten kullanımda"
 
-#: fdisk/cfdisk.c:2786
+#: fdisk/cfdisk.c:2772
 msgid "Cannot change the type of an empty partition"
 msgstr "Bir boş disk bölümünün türü değiştirilemez"
 
-#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
 msgid "No more partitions"
 msgstr "Başka disk bölümü yok"
 
-#: fdisk/cfdisk.c:2826
+#: fdisk/cfdisk.c:2812
 msgid "Illegal command"
 msgstr "Kuraldışı komut"
 
-#: fdisk/cfdisk.c:2836
+#: fdisk/cfdisk.c:2822
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Telif Hakkı © 1994-2002 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2829
 #, c-format
 msgid ""
 "\n"
@@ -2129,7 +2131,7 @@ msgstr ""
 "                sektör/iz sayısı(S) değerlerini değiştirir.\n"
 "\n"
 
-#: fdisk/fdisk.c:197
+#: fdisk/fdisk.c:188
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2151,7 +2153,7 @@ msgstr ""
 "-u: Başlangıç ve bitiş sektörlerini (silindir değil) verir\n"
 "-b 2048: 2048 baytlık sektörler kullanılır\n"
 
-#: fdisk/fdisk.c:209
+#: fdisk/fdisk.c:200
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2169,222 +2171,222 @@ msgstr ""
 "   fdisk /dev/ida/c0d0  (RAID aygıtları)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:218
+#: fdisk/fdisk.c:209
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:222
+#: fdisk/fdisk.c:213
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s okunamıyor\n"
 
-#: fdisk/fdisk.c:226
+#: fdisk/fdisk.c:217
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "%s üzerinde erişim olanaksız\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:221
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s yazılamıyor\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "%s üzerinde BLKGETSIZE ioctl hata verdi\n"
 
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:229
 msgid "Unable to allocate any more memory\n"
 msgstr "Daha fazla bellek ayrılamıyor\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:232
 msgid "Fatal error\n"
 msgstr "Ölümcül Hata\n"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:362 fdisk/fdisk.c:369
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
 msgstr " Komut  yaptığı iş "
 
-#: fdisk/fdisk.c:326
+#: fdisk/fdisk.c:317
 msgid "   a   toggle a read only flag"
 msgstr "   a   salt-okunur flamasını kaldırır/indirir"
 
 #. sun
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd disk etiketini düzenler"
 
-#: fdisk/fdisk.c:328
+#: fdisk/fdisk.c:319
 msgid "   c   toggle the mountable flag"
 msgstr "   c   bağlanabilir flamasını kaldırır/indirir"
 
 #. sun
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
 msgid "   d   delete a partition"
 msgstr "   d   bir disk bölümünü siler"
 
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
 msgid "   l   list known partition types"
 msgstr "   l   bilinen disk bölümü türlerini listeler"
 
 #. sun
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:363 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
 msgstr "   m   bu menüyü gösterir"
 
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   n   add a new partition"
 msgstr "   n   yeni bir disk bölümü ekler"
 
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   yeni bir DOS disk bölümü oluşturur"
 
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 fdisk/fdisk.c:401
-#: fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   p   print the partition table"
 msgstr "   p   disk bölümleme tablosunu gösterir"
 
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:365 fdisk/fdisk.c:379
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
 msgstr "   q   değişiklikleri kaydetmeden çıkar"
 
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   yeni bir Sun disk etiketi oluşturur"
 
 #. sun
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
 msgid "   t   change a partition's system id"
 msgstr "   t   disk bölümünün sistem kimliğini değiştirir"
 
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   u   change display/entry units"
 msgstr "   u   gösterme/girdi birimini değiştirir"
 
-#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:405
-#: fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 msgid "   v   verify the partition table"
 msgstr "   v   disk bölümleme tablosunu doğrular"
 
-#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:384 fdisk/fdisk.c:406
-#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   w   write table to disk and exit"
 msgstr "   w   tabloyu diskteki yerine yazar ve çıkar"
 
-#: fdisk/fdisk.c:341 fdisk/fdisk.c:385
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   fazladan işlevsellik (uzmanlar için)"
 
-#: fdisk/fdisk.c:345
+#: fdisk/fdisk.c:336
 msgid "   a   select bootable partition"
 msgstr "   a   açılış disk bölümünü seçer"
 
 #. sgi flavour
-#: fdisk/fdisk.c:346
+#: fdisk/fdisk.c:337
 msgid "   b   edit bootfile entry"
 msgstr "   b   açılış dosyası girdilerini düzenler"
 
 #. sgi
-#: fdisk/fdisk.c:347
+#: fdisk/fdisk.c:338
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi takas bölümü seçilir"
 
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:361
 msgid "   a   toggle a bootable flag"
 msgstr "   a   açılış flamasını indirir/kaldırır"
 
-#: fdisk/fdisk.c:372
+#: fdisk/fdisk.c:363
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   dos uyumluluk flamasını indirir/kaldırır"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:384
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   almaşık silindirlerin sayısını değiştirir"
 
 #. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 msgid "   c   change number of cylinders"
 msgstr "   c   silindir sayısını değiştirir"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   disk bölümleme tablosunun temel verisini gösterir"
 
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:387
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   silindir başına fazladan sektör sayısını değiştirir"
 
 #. sun
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   h   change number of heads"
 msgstr "   h   kafa sayısını değiştirir"
 
-#: fdisk/fdisk.c:398
+#: fdisk/fdisk.c:389
 msgid "   i   change interleave factor"
 msgstr "   i   serpiştirme etkenini değiştirir"
 
 #. sun
-#: fdisk/fdisk.c:399
+#: fdisk/fdisk.c:390
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   devir sayısını değiştirir (rpm)"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 #: fdisk/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
 msgstr "   r   ana menüye döner"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 msgid "   s   change number of sectors/track"
 msgstr "   s   sektör/iz sayısını değiştirir"
 
-#: fdisk/fdisk.c:407
+#: fdisk/fdisk.c:398
 msgid "   y   change number of physical cylinders"
 msgstr "   y   fiziksel silindir sayısını değiştirir"
 
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   disk bölümü içindeki verinin başlanıcına gider"
 
-#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   e   list extended partitions"
 msgstr "   e   ek disk bölümlerini listeler"
 
 #. !sun
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   IRIX (SGI) disk bölümleme tablosu oluşturur"
 
 #. !sun
-#: fdisk/fdisk.c:447
+#: fdisk/fdisk.c:438
 msgid "   f   fix partition order"
 msgstr "   f   disk bölümleme sırasını düzeltir"
 
-#: fdisk/fdisk.c:564
+#: fdisk/fdisk.c:556
 msgid "You must set"
 msgstr "Belirtilmeli"
 
-#: fdisk/fdisk.c:578
+#: fdisk/fdisk.c:570
 msgid "heads"
 msgstr "kafa"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
 msgid "sectors"
 msgstr "sektör"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
-#: fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
 msgid "cylinders"
 msgstr "silindir"
 
-#: fdisk/fdisk.c:586
+#: fdisk/fdisk.c:578
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2393,11 +2395,11 @@ msgstr ""
 "%s%s.\n"
 "Bunu fazladan işlevler menüsünden yapabilirsiniz.\n"
 
-#: fdisk/fdisk.c:587
+#: fdisk/fdisk.c:579
 msgid " and "
 msgstr " ve "
 
-#: fdisk/fdisk.c:604
+#: fdisk/fdisk.c:596
 #, c-format
 msgid ""
 "\n"
@@ -2416,26 +2418,26 @@ msgstr ""
 "2) diğer işletim sistemlerinin önyükleme ve disk bölümleme yazılımları\n"
 "   (örn. DOS FDISK, OS/2 FDISK)\n"
 
-#: fdisk/fdisk.c:627
+#: fdisk/fdisk.c:619
 msgid "Bad offset in primary extended partition\n"
 msgstr "Birincil ek disk bölümünde hizalama hatalı\n"
 
-#: fdisk/fdisk.c:641
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Uyarı: %d bölümden sonra disk bölümleri siliniyor\n"
 
-#: fdisk/fdisk.c:658
+#: fdisk/fdisk.c:650
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Uyarı: %d disk bölümleme tablosunda fazladan bağ imleyici\n"
 
-#: fdisk/fdisk.c:666
+#: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Uyarı: %d disk bölümleme tablosundaki fazladan veri yoksayılıyor\n"
 
-#: fdisk/fdisk.c:711
+#: fdisk/fdisk.c:703
 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"
@@ -2446,16 +2448,16 @@ msgstr ""
 "değişiklikler\n"
 "bellekte bekleyecek. Aksi takdirde, önceki içerik kurtarılamayacak.\n"
 
-#: fdisk/fdisk.c:755
+#: fdisk/fdisk.c:747
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Bilgi: sektör uzunluğu %d (%d değil)\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:912
 msgid "You will not be able to write the partition table.\n"
 msgstr "Disk bölümleme tablosunu diskteki yerine kaydetme yetkiniz yok.\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:941
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
@@ -2463,7 +2465,7 @@ msgstr ""
 "Bu disk hem DOS hem de BSD olarak imli.\n"
 "BSD kipine geçmek için 'b' komutunu verin.\n"
 
-#: fdisk/fdisk.c:927
+#: fdisk/fdisk.c:951
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
@@ -2471,16 +2473,16 @@ msgstr ""
 "Aygıt ne geçerli bir DOS disk bölümleme tablosu ne de Sun, SGI ya da OSF "
 "disk etiketleri içeriyor.\n"
 
-#: fdisk/fdisk.c:944
+#: fdisk/fdisk.c:968
 msgid "Internal error\n"
 msgstr "İç hata\n"
 
-#: fdisk/fdisk.c:957
+#: fdisk/fdisk.c:981
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Fazladan ek disk bölümü %d yoksayılıyor\n"
 
-#: fdisk/fdisk.c:969
+#: fdisk/fdisk.c:993
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2489,7 +2491,7 @@ msgstr ""
 "Uyarı: geçersiz bayrak 0x%04x %d. disk bölümleme tablosunda w(yaz) ile "
 "düzeltilmiş olacak\n"
 
-#: fdisk/fdisk.c:991
+#: fdisk/fdisk.c:1015
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2497,78 +2499,78 @@ msgstr ""
 "\n"
 "Dosya sonuna rastlandı - çıkılıyor..\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1054
 msgid "Hex code (type L to list codes): "
 msgstr "Onaltılık kod (kod listesi için L tuşlayın):"
 
-#: fdisk/fdisk.c:1069
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1094
+#, c-format
 msgid "%s (%u-%u, default %u): "
-msgstr "%s (%d-%d, öntanımlı %d): "
+msgstr "%s (%u-%u, öntanımlı %u): "
 
-#: fdisk/fdisk.c:1136
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1161
+#, c-format
 msgid "Using default value %u\n"
-msgstr "Öntanımlı değer %d kullanılıyor\n"
+msgstr "Öntanımlı değer %u kullanılıyor\n"
 
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1165
 msgid "Value out of range.\n"
 msgstr "Değer kapsamdışı.\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1175
 msgid "Partition number"
 msgstr "Disk bölümü numarası"
 
-#: fdisk/fdisk.c:1161
+#: fdisk/fdisk.c:1186
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Uyarı: %d disk bölümünün türü boş görünüyor\n"
 
-#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Seçilen disk bölümü %d\n"
 
-#: fdisk/fdisk.c:1186
+#: fdisk/fdisk.c:1211
 msgid "No partition is defined yet!\n"
 msgstr "Tanımlı bir disk bölümü henüz yok!\n"
 
-#: fdisk/fdisk.c:1212
+#: fdisk/fdisk.c:1237
 msgid "All primary partitions have been defined already!\n"
 msgstr "Tüm birincil bölümler zaten tanımlı!\n"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "cylinder"
 msgstr "silindir"
 
-#: fdisk/fdisk.c:1222
+#: fdisk/fdisk.c:1247
 msgid "sector"
 msgstr "sektör"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1256
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "gösterme/girdi birimi %s olarak değiştiriliyor\n"
 
-#: fdisk/fdisk.c:1242
+#: fdisk/fdisk.c:1267
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "UYARI: %d disk bölümü bir ek disk bölümü\n"
 
-#: fdisk/fdisk.c:1253
+#: fdisk/fdisk.c:1278
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS uyumluluk flaması etkin\n"
 
-#: fdisk/fdisk.c:1257
+#: fdisk/fdisk.c:1282
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS uyumluluk flaması etkin değil\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1382
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "%d disk bölümü henüz yok!\n"
 
-#: fdisk/fdisk.c:1362
+#: fdisk/fdisk.c:1387
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2580,7 +2582,7 @@ msgstr ""
 "muhtemelen pek uygun olmayacaktır. 'd' komutunu\n"
 "kullanarak bir disk bölümünü silebilirsiniz.\n"
 
-#: fdisk/fdisk.c:1371
+#: fdisk/fdisk.c:1396
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2588,7 +2590,7 @@ msgstr ""
 "Bir disk bölümünü bir ek bölümün içinde ya da herhangi bir yerde\n"
 "değiştiremezsiniz. Önce silmeniz gerekir.\n"
 
-#: fdisk/fdisk.c:1380
+#: fdisk/fdisk.c:1405
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2597,7 +2599,7 @@ msgstr ""
 "Linux'a uygun olsa da SunOS/Solaris gerektirdiğinden,\n"
 "3. disk bölümünün diskin tamamı (5) olarak bırakıldığı kabul ediliyor.\n"
 
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1411
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2606,54 +2608,54 @@ msgstr ""
 "IRIX gerektirdiğinden, 11. disk bölümü tüm 'volume' (6) ve\n"
 "9. disk bölümü 'volume' başlığı (6) olarak bırakıldığı kabul ediliyor.\n"
 
-#: fdisk/fdisk.c:1399
+#: fdisk/fdisk.c:1424
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "%d disk bölümünün sistem türü %x (%s) olarak değiştirildi\n"
 
-#: fdisk/fdisk.c:1453
+#: fdisk/fdisk.c:1479
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "%d disk bölümü farklı fiziksel/mantıksal başlangıçlara sahip (Linux "
 "değil?):\n"
 
-#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " fiziksel=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "mantıksal=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1461
+#: fdisk/fdisk.c:1487
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "%d disk bölümü farklı fiziksel/mantıksal bitişlere sahip:\n"
 
-#: fdisk/fdisk.c:1470
+#: fdisk/fdisk.c:1496
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "%i disk bölümünün başlangıcı silindir sınırları dışında:\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1499
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "(%d, %d, 1) olmalıydı\n"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "%i. disk bölümü silindir sınırında bitmiyor.\n"
 
-#: fdisk/fdisk.c:1483
+#: fdisk/fdisk.c:1509
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "(%d, %d, %d) olmalıydı\n"
 
-#: fdisk/fdisk.c:1495
+#: fdisk/fdisk.c:1521
 #, c-format
 msgid ""
 "\n"
@@ -2662,7 +2664,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB %lld bayt\n"
 
-#: fdisk/fdisk.c:1498
+#: fdisk/fdisk.c:1524
 #, c-format
 msgid ""
 "\n"
@@ -2671,17 +2673,17 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bayt\n"
 
-#: fdisk/fdisk.c:1500
+#: fdisk/fdisk.c:1526
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d kafa, %d sektör/iz, %d silindir"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1529
 #, c-format
-msgid ", total %lu sectors"
-msgstr ", toplam %lu sektör"
+msgid ", total %llu sectors"
+msgstr ", toplam %llu sektör"
 
-#: fdisk/fdisk.c:1506
+#: fdisk/fdisk.c:1532
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2690,7 +2692,7 @@ msgstr ""
 "Birimler = %s / %d * %d = %d bayt\n"
 "\n"
 
-#: fdisk/fdisk.c:1614
+#: fdisk/fdisk.c:1640
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2698,16 +2700,16 @@ msgstr ""
 "Hiçbir şey yapılmadı. Sıralama zaten doğru.\n"
 "\n"
 
-#: fdisk/fdisk.c:1678
+#: fdisk/fdisk.c:1704
 #, c-format
-msgid "%*s Boot    Start       End    Blocks   Id  System\n"
-msgstr "%*s Açılış Başlangıç  Bitiş  BlokSayısı Kml Sistem\n"
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s Açılış    Başlangıç     Bitiş  BlokSayısı Kml Sistem\n"
 
-#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
 msgid "Device"
 msgstr "Aygıt"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1742
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2715,7 +2717,7 @@ msgstr ""
 "\n"
 "Disk bölümleme tablosu girdileri diskteki sırasında değil\n"
 
-#: fdisk/fdisk.c:1726
+#: fdisk/fdisk.c:1752
 #, c-format
 msgid ""
 "\n"
@@ -2726,95 +2728,95 @@ msgstr ""
 "Disk %s: %d kafa, %d sektör, %d silindir\n"
 "\n"
 
-#: fdisk/fdisk.c:1728
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
-msgstr "No AF  Hd Skt  Sln  Hd Skt  Sld  Başlangıç   Boy  Kml\n"
+#: fdisk/fdisk.c:1754
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "No AF  Hd Skt  Sln  Hd Skt  Sld    Başlangıç   Boy  Kml\n"
 
-#: fdisk/fdisk.c:1772
+#: fdisk/fdisk.c:1799
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Uyarı: %d disk bölümü 0. sektörü içeriyor\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1802
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 "%d disk bölümü: kafa sayısı %d en çok olabileceği %d değerinden büyük\n"
 
-#: fdisk/fdisk.c:1778
+#: fdisk/fdisk.c:1805
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr ""
 "%d disk bölümü: sektör sayısı %d en çok olabileceği %d değerinden büyük\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 "%d disk bölümü: silindir sayısı %d en çok olabileceği %d değerinden büyük\n"
 
-#: fdisk/fdisk.c:1785
+#: fdisk/fdisk.c:1812
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "%d disk bölümü: önceki sektör sayısı %d toplam %d ile çelişiyor\n"
 
-#: fdisk/fdisk.c:1817
+#: fdisk/fdisk.c:1844
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Uyarı: %d disk bölümünün veri-başlangıcı hatalı\n"
 
-#: fdisk/fdisk.c:1825
+#: fdisk/fdisk.c:1852
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Uyarı: %d ile %d disk bölümleri birbirine girmiş.\n"
 
-#: fdisk/fdisk.c:1845
+#: fdisk/fdisk.c:1872
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Uyarı: %d disk bölümü boş\n"
 
-#: fdisk/fdisk.c:1850
+#: fdisk/fdisk.c:1877
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Mantıksal disk bölümü %d tamamen %d disk bölümünün içinde değil\n"
 
-#: fdisk/fdisk.c:1856
-#, c-format
-msgid "Total allocated sectors %d greater than the maximum %d\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
 msgstr ""
 "Tahsis edilen sektör sayısı %d en fazla olması gereken %d değerinden büyük\n"
 
-#: fdisk/fdisk.c:1859
-#, c-format
-msgid "%d unallocated sectors\n"
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
 msgstr "%d sektör kullanılmadı\n"
 
-#: fdisk/fdisk.c:1872 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "%d disk bölümü zaten atanmış. Yeniden eklemeden önce silmelisiniz.\n"
 
-#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
 #: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Ä°lk %s"
 
-#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: fdisk/fdisk.c:1947
+#: fdisk/fdisk.c:1979
 msgid "No free sectors available\n"
 msgstr "Boşta sektör yok\n"
 
-#: fdisk/fdisk.c:1956 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Son %s, +size, +sizeM veya +sizeK"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2053
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2826,16 +2828,26 @@ msgstr ""
 "\tbir DOS disk bölümleme tablosu oluşturun. (o ile)\n"
 "\tUYARI: Bu işlem ile diskteki tüm bilgile kaybalacaktır.\n"
 
-#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "Oluşturulabilecek disk bölümlerinin tümü oluşturuldu\n"
 
-#: fdisk/fdisk.c:2041
+#: fdisk/fdisk.c:2073
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Önce bazı disk bölümlerini silip ondan sonra ek disk bölümünü eklemelisiniz\n"
 
-#: fdisk/fdisk.c:2046
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "mantıksal bölümler sıralamaya uygun değil"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Birincil disk bölümü bozuk"
+
+#: fdisk/fdisk.c:2082
 #, c-format
 msgid ""
 "Command action\n"
@@ -2846,20 +2858,20 @@ msgstr ""
 "   %s\n"
 "   p   birincil disk bölümü (1-4)\n"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "l   logical (5 or over)"
 msgstr "l   mantıksal (5 veya üzeri)"
 
-#: fdisk/fdisk.c:2048
+#: fdisk/fdisk.c:2084
 msgid "e   extended"
 msgstr "e   ek"
 
-#: fdisk/fdisk.c:2067
+#: fdisk/fdisk.c:2103
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Tür '%c' için disk bölümü numarası geçersiz\n"
 
-#: fdisk/fdisk.c:2103
+#: fdisk/fdisk.c:2139
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2867,11 +2879,11 @@ msgstr ""
 "Disk bölümleme tablosu zaten değişmişti!\n"
 "\n"
 
-#: fdisk/fdisk.c:2112
+#: fdisk/fdisk.c:2148
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Disk bölümleme tablosunu yeniden okumak için ioctl() çağrılıyor.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2164
 #, c-format
 msgid ""
 "\n"
@@ -2884,7 +2896,7 @@ msgstr ""
 "Çekirdek hala eski tabloyu kullanıyor.\n"
 "Yeni tablo makinayı yeniden başlattığınızda geçerli olacak.\n"
 
-#: fdisk/fdisk.c:2138
+#: fdisk/fdisk.c:2174
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2896,65 +2908,65 @@ msgstr ""
 "değişiklik yaptıysanız, lütfen fdisk man sayfalarındaki\n"
 "ek bilgileri okuyun.\n"
 
-#: fdisk/fdisk.c:2145
+#: fdisk/fdisk.c:2181
 msgid "Syncing disks.\n"
 msgstr "Diskler eşzamanlanıyor.\n"
 
-#: fdisk/fdisk.c:2192
+#: fdisk/fdisk.c:2228
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "%d disk bölümü veri alanına sahip değil\n"
 
-#: fdisk/fdisk.c:2197
+#: fdisk/fdisk.c:2233
 msgid "New beginning of data"
 msgstr "Yeni veri başlangıcı"
 
-#: fdisk/fdisk.c:2213
+#: fdisk/fdisk.c:2249
 msgid "Expert command (m for help): "
 msgstr "Uzman komutları (yardım için m): "
 
-#: fdisk/fdisk.c:2226
+#: fdisk/fdisk.c:2262
 msgid "Number of cylinders"
 msgstr "Silindir sayısı"
 
-#: fdisk/fdisk.c:2253
+#: fdisk/fdisk.c:2289
 msgid "Number of heads"
 msgstr "Kafa sayısı"
 
-#: fdisk/fdisk.c:2278
+#: fdisk/fdisk.c:2314
 msgid "Number of sectors"
 msgstr "Sektör sayısı"
 
-#: fdisk/fdisk.c:2281
+#: fdisk/fdisk.c:2317
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Uyarı: Sektör hizalaması DOS uyumlu olarak yapılıyor\n"
 
-#: fdisk/fdisk.c:2356
+#: fdisk/fdisk.c:2389
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "%s diski geçerli bir disk bölümleme tablosu içermiyor\n"
 
-#: fdisk/fdisk.c:2370
+#: fdisk/fdisk.c:2400
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2408
+#: fdisk/fdisk.c:2438
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: komut bilinmiyor\n"
 
-#: fdisk/fdisk.c:2476
+#: fdisk/fdisk.c:2506
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Bu çekirdek sektör uzunluğunu kendisi bulur. - -b seçeneği yoksayıldı\n"
 
-#: fdisk/fdisk.c:2480
+#: fdisk/fdisk.c:2510
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2963,17 +2975,17 @@ msgstr ""
 "olmalıydı\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2569
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "%s üzerinde OSF/1 disk etiketi saptandı, disk etiketi kipine giriliyor.\n"
 
-#: fdisk/fdisk.c:2549
+#: fdisk/fdisk.c:2579
 msgid "Command (m for help): "
 msgstr "Komut (yardım için m): "
 
-#: fdisk/fdisk.c:2565
+#: fdisk/fdisk.c:2595
 #, c-format
 msgid ""
 "\n"
@@ -2982,15 +2994,15 @@ msgstr ""
 "\n"
 "Şu anki önyükleme dosyası: %s\n"
 
-#: fdisk/fdisk.c:2567
+#: fdisk/fdisk.c:2597
 msgid "Please enter the name of the new boot file: "
 msgstr "Lütfen yeni açılış dosyasının ismini giriniz:"
 
-#: fdisk/fdisk.c:2569
+#: fdisk/fdisk.c:2599
 msgid "Boot file unchanged\n"
 msgstr "Açılış dosyası değiştirilmedi\n"
 
-#: fdisk/fdisk.c:2642
+#: fdisk/fdisk.c:2672
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3000,7 +3012,7 @@ msgstr ""
 "\tSGI disk bölümleme tablosu için uzman menüsü yok.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:28
+#: fdisk/fdiskaixlabel.c:27
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3318,7 +3330,7 @@ msgstr "SGI secrepl"
 
 #: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
-msgstr "SGI temel"
+msgstr "SGI ham"
 
 #: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
@@ -3360,8 +3372,7 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux swap"
 msgstr "Linux takas"
 
@@ -3544,9 +3555,9 @@ msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "%d disk bölümü ile %d birbirinin %d sektör içine giriyor.\n"
 
 #: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
-msgstr "%8d sektörlük boşluk kullanılmadı -  %8d-%d sektörleri\n"
+msgstr "%8u sektörlük boşluk kullanılmadı -  %8u-%u sektörleri\n"
 
 #: fdisk/fdisksgilabel.c:523
 msgid ""
@@ -3595,7 +3606,7 @@ msgstr ""
 "\"SGI volume\" onunla çelişebilir. Bu disk bölümünü farklı\n"
 "oluşturmak istiyorsanız EVET yazın.\n"
 
-#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
 msgid "YES\n"
 msgstr "EVET\n"
 
@@ -3658,6 +3669,9 @@ msgid ""
 "d.\n"
 "This value may be truncated for devices > 33.8 GB.\n"
 msgstr ""
+"Uyarı:  BLKGETSIZE ioctl %s üzerinde başarısız.  Silindir geometrisi için %"
+"d\n"
+"değeri kullanılıyor. Bu değer 33.8 GB'dan büyük aygıtlarda kırpılabilir.\n"
 
 #: fdisk/fdisksgilabel.c:738
 #, c-format
@@ -3765,15 +3779,15 @@ msgstr "Almaşık silindirler"
 msgid "Physical cylinders"
 msgstr "Fiziksel silindirler"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
 msgid "Rotation speed (rpm)"
 msgstr "Devir sayısı (rpm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
 msgid "Interleave factor"
 msgstr "Serpiştirme etkeni"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
 msgid "Extra sectors per cylinder"
 msgstr "Silindir başına fazladan sektörler"
 
@@ -3829,7 +3843,7 @@ msgstr ""
 "diğer disk bölümlerine de geçiyor. Girdiğiniz değer %d %s olarak\n"
 "değiştirildi.\n"
 
-#: fdisk/fdisksunlabel.c:609
+#: fdisk/fdisksunlabel.c:611
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3838,7 +3852,7 @@ msgstr ""
 "SunOS/Solaris uyumluluğu sağlamak isterseniz, bu disk bölümünü 0 dan\n"
 "başlayan %u sektörlük tüm disk (5) olarak bırakmayı gözönüne alabilirsiniz\n"
 
-#: fdisk/fdisksunlabel.c:622
+#: fdisk/fdisksunlabel.c:623
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3852,7 +3866,7 @@ msgstr ""
 "82 etiketli (Linux takas) olmasını istediğinizden eminseniz lütfen\n"
 "EVET yazınız: "
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:654
 #, c-format
 msgid ""
 "\n"
@@ -3871,7 +3885,7 @@ msgstr ""
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:668
 #, c-format
 msgid ""
 "\n"
@@ -3884,16 +3898,16 @@ msgstr ""
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:672
+#: fdisk/fdisksunlabel.c:673
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flama Başlangıç    Bitiş   Blok#   Kiml Sistem\n"
 
-#: fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:698
 msgid "Number of alternate cylinders"
 msgstr "Almaşık silindirlerin sayısı"
 
-#: fdisk/fdisksunlabel.c:730
+#: fdisk/fdisksunlabel.c:731
 msgid "Number of physical cylinders"
 msgstr "Fiziksel silindirlerin sayısı"
 
@@ -3944,21 +3958,21 @@ msgstr "OS/2 Önyükleme Yöneticisi"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
-msgid "Win95 FAT32"
-msgstr "Win95 FAT32"
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
 
 #: fdisk/i386_sys_types.c:18
-msgid "Win95 FAT32 (LBA)"
-msgstr "Win95 FAT32 (LBA)"
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
 
 #. LBA really is `Extended Int 13h'
 #: fdisk/i386_sys_types.c:19
-msgid "Win95 FAT16 (LBA)"
-msgstr "Win95 FAT16 (LBA)"
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:20
-msgid "Win95 Ext'd (LBA)"
-msgstr "Win95 Ext'd (LBA)"
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 Ext'd (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -3989,16 +4003,16 @@ msgid "AST SmartSleep"
 msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
-msgid "Hidden Win95 FAT32"
-msgstr "Gizli Win95 FAT32"
+msgid "Hidden W95 FAT32"
+msgstr "Gizli W95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
-msgid "Hidden Win95 FAT32 (LBA)"
-msgstr "Gizli Win95 FAT32 (LBA)"
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "Gizli W95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
-msgid "Hidden Win95 FAT16 (LBA)"
-msgstr "Gizli Win95 FAT16 (LBA)"
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "Gizli W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4106,6 +4120,12 @@ msgstr "Eski Minix"
 msgid "Minix / old Linux"
 msgstr "Minix / eski Linux"
 
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux takas"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 gizli C: aygıtı"
@@ -4260,91 +4280,91 @@ msgstr "LANstep"
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:151
+#: fdisk/sfdisk.c:164
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "%s üzerinde erişim hatası - %lu ya erişilemiyor\n"
 
-#: fdisk/sfdisk.c:156
+#: fdisk/sfdisk.c:169
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "erişim hatası: 0x%08x%08x istendi, 0x%08x%08x alındı\n"
 
-#: fdisk/sfdisk.c:202
+#: fdisk/sfdisk.c:215
 msgid "out of memory - giving up\n"
 msgstr "bellek yetersiz - bırakılıyor\n"
 
-#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "%s üzerinde okuma hatası - %lu sektörü okunamıyor\n"
 
-#: fdisk/sfdisk.c:225
+#: fdisk/sfdisk.c:238
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "HATA: %lu sektörü msdos imzası taşımıyor\n"
 
-#: fdisk/sfdisk.c:240
+#: fdisk/sfdisk.c:253
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "%s üzerinde yazma hatası - %lu sektörüne yazılamıyor\n"
 
-#: fdisk/sfdisk.c:278
+#: fdisk/sfdisk.c:291
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "disk bölümü sektör kayıt dosyası (%s) açılamıyor\n"
 
-#: fdisk/sfdisk.c:296
+#: fdisk/sfdisk.c:309
 #, c-format
 msgid "write error on %s\n"
 msgstr "%s üzerinde yazma hatası\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:327
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "disk bölümü tekrar oluşturma dosyası (%s) durum bilgileri alınamıyor\n"
 
-#: fdisk/sfdisk.c:319
+#: fdisk/sfdisk.c:332
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "disk bölümü tekrar oluşturma dosyasının uzunluğu hatalı - tekrar "
 "oluşturulamıyor\n"
 
-#: fdisk/sfdisk.c:323
+#: fdisk/sfdisk.c:336
 msgid "out of memory?\n"
 msgstr "bellek yetersiz?\n"
 
-#: fdisk/sfdisk.c:329
+#: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "disk bölümü tekrar oluşturma dosyası (%s) açılamıyor\n"
 
-#: fdisk/sfdisk.c:335
+#: fdisk/sfdisk.c:348
 #, c-format
 msgid "error reading %s\n"
 msgstr "%s okunurken hata\n"
 
-#: fdisk/sfdisk.c:342
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "%s aygıtı yazılmak üzere açılamıyor\n"
 
-#: fdisk/sfdisk.c:354
+#: fdisk/sfdisk.c:367
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "%lu sektörünü %s üzerine yazmada hata\n"
 
-#: fdisk/sfdisk.c:405
+#: fdisk/sfdisk.c:418
 #, c-format
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: boyu alınamıyor\n"
 
-#: fdisk/sfdisk.c:410
+#: fdisk/sfdisk.c:423
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
 msgstr "Disk %s: geometri alınamıyor\n"
 
-#: fdisk/sfdisk.c:434
+#: fdisk/sfdisk.c:447
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4355,22 +4375,22 @@ msgstr ""
 "gibi görünüyor. fdisk kullanmak anlamlı olmayacak.\n"
 "[Bunu mutlaka yapmak istiyorsanız --force seçeneğini kullanabilirsiniz]\n"
 
-#: fdisk/sfdisk.c:441
+#: fdisk/sfdisk.c:454
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Uyarı: HDIO_GETGEO %lu kafa bildiriyor\n"
 
-#: fdisk/sfdisk.c:444
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Uyarı: HDIO_GETGEO %lu sektör bildiriyor\n"
 
-#: fdisk/sfdisk.c:448
+#: fdisk/sfdisk.c:461
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Uyarı: BLKGETSIZE/HDIO_GETGEO %lu silindir bildiriyor\n"
 
-#: fdisk/sfdisk.c:452
+#: fdisk/sfdisk.c:465
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -4380,7 +4400,7 @@ msgstr ""
 "sayısına benzemiyor. Bu chs adresleme kullanılan yazılımlarla sorun "
 "çıkarır.\n"
 
-#: fdisk/sfdisk.c:456
+#: fdisk/sfdisk.c:469
 #, c-format
 msgid ""
 "\n"
@@ -4389,7 +4409,7 @@ msgstr ""
 "\n"
 "Disk %s: %lu silindir, %lu kafa, %lu sektör/iz\n"
 
-#: fdisk/sfdisk.c:538
+#: fdisk/sfdisk.c:551
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -4397,7 +4417,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış kafa sayısı içeriyor: %lu (0-%lu arasında "
 "olmalıydı)\n"
 
-#: fdisk/sfdisk.c:543
+#: fdisk/sfdisk.c:556
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-%"
@@ -4406,7 +4426,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış sektör sayısı içeriyor: %lu (1-%lu arasında "
 "olmalıydı)\n"
 
-#: fdisk/sfdisk.c:548
+#: fdisk/sfdisk.c:561
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
@@ -4415,7 +4435,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış silindir sayısı içeriyor: %lu (0-%lu "
 "arasında olmalıydı)\n"
 
-#: fdisk/sfdisk.c:588
+#: fdisk/sfdisk.c:601
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4423,11 +4443,11 @@ msgstr ""
 "Kiml Ä°sim\n"
 "\n"
 
-#: fdisk/sfdisk.c:741
+#: fdisk/sfdisk.c:754
 msgid "Re-reading the partition table ...\n"
 msgstr "Disk bölümleme tablosu yeniden okunuyor ...\n"
 
-#: fdisk/sfdisk.c:747
+#: fdisk/sfdisk.c:760
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4435,31 +4455,31 @@ msgstr ""
 "Disk bölümleme tablosunun yeniden okunması başarılamadı\n"
 "mkfs kullanabilmek için sistemi yeniden başlatmalısınız.\n"
 
-#: fdisk/sfdisk.c:752
+#: fdisk/sfdisk.c:765
 #, c-format
 msgid "Error closing %s\n"
 msgstr "%s kapatılırken hata\n"
 
-#: fdisk/sfdisk.c:790
+#: fdisk/sfdisk.c:803
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: böyle bir disk bölümü yok\n"
 
-#: fdisk/sfdisk.c:813
+#: fdisk/sfdisk.c:826
 msgid "unrecognized format - using sectors\n"
 msgstr "biçem bilinmiyor - sektör sayısı kullanılıyor\n"
 
-#: fdisk/sfdisk.c:852
+#: fdisk/sfdisk.c:865
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s disk bölümleme tablosu\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:876
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "desteklenmeyen biçem - %s kullanılıyor\n"
 
-#: fdisk/sfdisk.c:867
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4468,13 +4488,13 @@ msgstr ""
 "birimler = %lu baytlık silindir, 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:870
+#: fdisk/sfdisk.c:883
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 "                              silindir   blok\n"
 "   Aygıt Önykl Balangıç Bitiş sayısı   sayısı\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:888
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4483,13 +4503,13 @@ msgstr ""
 "birimler = 512 baytlık sektör, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:877
+#: fdisk/sfdisk.c:890
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 "    Aygıt Önyükl Başlangıç   Bitiş   sektör  Kiml Sistem\n"
 "                                     sayısı\n"
 
-#: fdisk/sfdisk.c:880
+#: fdisk/sfdisk.c:893
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4498,13 +4518,13 @@ msgstr ""
 "birim = 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:882
+#: fdisk/sfdisk.c:895
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 "   Aygıt Önyükl Başlangıç   Bitiş    blok    Kiml Sistem\n"
 "                                    sayısı\n"
 
-#: fdisk/sfdisk.c:885
+#: fdisk/sfdisk.c:898
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4513,35 +4533,35 @@ msgstr ""
 "birimler = 1048576 baytlık mebibayt, 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:887
+#: fdisk/sfdisk.c:900
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 "   Aygıt Önyük Başl   Bitiş    MiB     blok    Kiml Sistem\n"
 "                                     sayısı\n"
 
-#: fdisk/sfdisk.c:1047
+#: fdisk/sfdisk.c:1060
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tbaşlangıç: (sld,kafa,sekt) (%ld,%ld,%ld) gerekirken (%ld,%ld,%ld) "
 "bulundu\n"
 
-#: fdisk/sfdisk.c:1054
+#: fdisk/sfdisk.c:1067
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tbitiş: (sld,kafa,sekt) (%ld,%ld,%ld) gerekirken (%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1057
+#: fdisk/sfdisk.c:1070
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "disk bölümü disk sonundan sonra, %ld. silindirde bitiyor\n"
 
-#: fdisk/sfdisk.c:1067
+#: fdisk/sfdisk.c:1080
 msgid "No partitions found\n"
 msgstr "Disk bölümü bulunamadı\n"
 
-#: fdisk/sfdisk.c:1071
+#: fdisk/sfdisk.c:1084
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -4552,51 +4572,51 @@ msgstr ""
 "(%ld/%ld/%ld yerine) yapılmış görünüyor.\n"
 "Bu listeleme bu geometriyle kabul ediliyor.\n"
 
-#: fdisk/sfdisk.c:1120
+#: fdisk/sfdisk.c:1133
 msgid "no partition table present.\n"
 msgstr "disk bölümleme tablosu yok.\n"
 
-#: fdisk/sfdisk.c:1122
+#: fdisk/sfdisk.c:1135
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "tuhaf, sadece %d disk bölümü atanmış.\n"
 
-#: fdisk/sfdisk.c:1131
+#: fdisk/sfdisk.c:1144
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ama boş olarak imli değil\n"
 
-#: fdisk/sfdisk.c:1134
+#: fdisk/sfdisk.c:1147
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ve önyüklenebilir\n"
 
-#: fdisk/sfdisk.c:1137
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ve başlangıcı 0 da değil\n"
 
-#: fdisk/sfdisk.c:1148
+#: fdisk/sfdisk.c:1161
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Uyarı: %s disk bölümü "
 
-#: fdisk/sfdisk.c:1149
+#: fdisk/sfdisk.c:1162
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "%s disk bölümünde değil\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1173
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Uyarı: %s disk bölümü "
 
-#: fdisk/sfdisk.c:1161
+#: fdisk/sfdisk.c:1174
 #, c-format
 msgid "and %s overlap\n"
 msgstr "ve %s birbirine girmiş\n"
 
-#: fdisk/sfdisk.c:1172
+#: fdisk/sfdisk.c:1185
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -4605,17 +4625,17 @@ msgstr ""
 "Uyarı: %s disk bölümleme tablosunun bir kısmını içerdiğinden (sektör %lu)\n"
 "dolduğunda onu bozacak\n"
 
-#: fdisk/sfdisk.c:1184
+#: fdisk/sfdisk.c:1197
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Uyarı: %s disk bölümü 0. sektörde başlıyor\n"
 
-#: fdisk/sfdisk.c:1188
+#: fdisk/sfdisk.c:1201
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Uyarı: %s disk bölümü disk sonunu aşıyor\n"
 
-#: fdisk/sfdisk.c:1203
+#: fdisk/sfdisk.c:1216
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -4623,17 +4643,17 @@ msgstr ""
 "Birincil disk bölümlerinden en çok biri ek disk bölümünde bulunabilir.\n"
 " (Şüphesiz Linux altında bu bir sorun değildir)\n"
 
-#: fdisk/sfdisk.c:1221
+#: fdisk/sfdisk.c:1234
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Uyarı: %s disk bölümü bir silindir sınırından başlamıyor\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1240
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Uyarı: %s disk bölümü bir silindir sınırında bitmiyor\n"
 
-#: fdisk/sfdisk.c:1245
+#: fdisk/sfdisk.c:1258
 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"
@@ -4641,7 +4661,7 @@ msgstr ""
 "Uyarı: birden fazla disk bölümü önyükleme flaması içeriyor.\n"
 "Bu LILO için sorun yaratmaz ama DOS MBR bu diski çalıştıramaz.\n"
 
-#: fdisk/sfdisk.c:1252
+#: fdisk/sfdisk.c:1265
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4649,7 +4669,7 @@ msgstr ""
 "Uyarı: birincil disk bölümlerinden sadece bir tanesi önyüklenebilir,\n"
 "LILO `bootable' flamasına aldırmaz.\n"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1271
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4657,11 +4677,11 @@ msgstr ""
 "Uyarı hiçbir disk bölümü önyükleme bayrağı içermiyor\n"
 "Bu LILO için sorun oluşturmaz ama DOS MBR bu diski çalıştıramaz.\n"
 
-#: fdisk/sfdisk.c:1272
+#: fdisk/sfdisk.c:1285
 msgid "start"
 msgstr "başlangıç"
 
-#: fdisk/sfdisk.c:1275
+#: fdisk/sfdisk.c:1288
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4669,23 +4689,23 @@ msgstr ""
 "%s: başlangıç: (sld,kafa,sekt) sırasıyla (%ld,%ld,%ld) olmalıydı\n"
 "(%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1281
+#: fdisk/sfdisk.c:1294
 msgid "end"
 msgstr "bitiş"
 
-#: fdisk/sfdisk.c:1284
+#: fdisk/sfdisk.c:1297
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "%s: bitiş: (sld,kafa,sekt) sırasıyla (%ld,%ld,%ld) olmalıydı\n"
 "(%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1287
+#: fdisk/sfdisk.c:1300
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "%s diskin sonunu aşarak %ld. silindirde bitiyor\n"
 
-#: fdisk/sfdisk.c:1312
+#: fdisk/sfdisk.c:1325
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -4694,7 +4714,7 @@ msgstr ""
 "Uyarı: ek disk bölümünün başlangıcı %ld den %ld ye kaydırıldı\n"
 "(Sadece liste uyumluluğu için. İçeriği değişmiyor.)\n"
 
-#: fdisk/sfdisk.c:1318
+#: fdisk/sfdisk.c:1331
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -4702,132 +4722,132 @@ msgstr ""
 "Uyarı: ek disk bölümü bir silindir sınırında başlamıyor.\n"
 "DOS ve Linux içerikleri farklı yorumlayacaktır.\n"
 
-#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "disk bölümü sayısı çok fazla - Bu sonuncusu (%d) disk bölümü\n"
 
-#: fdisk/sfdisk.c:1351
+#: fdisk/sfdisk.c:1364
 msgid "tree of partitions?\n"
 msgstr "ağacında yok sayılsın mı?\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1485
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk yöneticisi saptadı - bulunan DM6 imzası\n"
 
-#: fdisk/sfdisk.c:1479
+#: fdisk/sfdisk.c:1492
 msgid "DM6 signature found - giving up\n"
 msgstr "ile çalışılamıyor - bırakılıyor\n"
 
-#: fdisk/sfdisk.c:1499
+#: fdisk/sfdisk.c:1512
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "tuhaf..., sıfır uzunlukta bir ek disk bölümü?\n"
 
-#: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "tuhaf..., sıfır uzunlukta bir BSD disk bölümü?\n"
 
-#: fdisk/sfdisk.c:1551
-#, c-format
-msgid " %s: unrecognized partition\n"
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
 msgstr " %s: disk bölümü tanınmıyor\n"
 
-#: fdisk/sfdisk.c:1563
+#: fdisk/sfdisk.c:1576
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n flaması verilmiş: Hiçbir şey değişmedi\n"
 
-#: fdisk/sfdisk.c:1579
+#: fdisk/sfdisk.c:1592
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Eski sektörlere yazmada başarısızlık - çıkılıyor\n"
 
-#: fdisk/sfdisk.c:1584
+#: fdisk/sfdisk.c:1597
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: fdisk/sfdisk.c:1661
+#: fdisk/sfdisk.c:1674
 msgid "long or incomplete input line - quitting\n"
 msgstr "uzun ve eksik girdi satırı - çıkılıyor\n"
 
-#: fdisk/sfdisk.c:1697
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "girdi hatası: %s alanından sonra bir `=' gerekli\n"
 
-#: fdisk/sfdisk.c:1704
+#: fdisk/sfdisk.c:1717
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "girdi hatası: %c karakteri gereksiz (%s alanından sonra)\n"
 
-#: fdisk/sfdisk.c:1710
+#: fdisk/sfdisk.c:1723
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "anlaşılmayan girdi: %s\n"
 
-#: fdisk/sfdisk.c:1752
+#: fdisk/sfdisk.c:1765
 msgid "number too big\n"
 msgstr "sayı çok büyük\n"
 
-#: fdisk/sfdisk.c:1756
+#: fdisk/sfdisk.c:1769
 msgid "trailing junk after number\n"
 msgstr "sayıdan sonrasında süprüntü\n"
 
-#: fdisk/sfdisk.c:1877
+#: fdisk/sfdisk.c:1890
 msgid "no room for partition descriptor\n"
 msgstr "disk bölümü betimleyici için yer yok\n"
 
-#: fdisk/sfdisk.c:1910
+#: fdisk/sfdisk.c:1923
 msgid "cannot build surrounding extended partition\n"
 msgstr "kuşatan ek disk bölümü kurgulanamıyor\n"
 
-#: fdisk/sfdisk.c:1961
+#: fdisk/sfdisk.c:1974
 msgid "too many input fields\n"
 msgstr "girdi alanları çok fazla\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:2008
 msgid "No room for more\n"
 msgstr "Daha fazla yer yok\n"
 
-#: fdisk/sfdisk.c:2014
+#: fdisk/sfdisk.c:2027
 msgid "Illegal type\n"
 msgstr "Kuraldışı tür\n"
 
-#: fdisk/sfdisk.c:2046
+#: fdisk/sfdisk.c:2059
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Uyarı: belirtilen (%lu) uzunluk, izin verilen (%lu) uzunluktan fazla\n"
 
-#: fdisk/sfdisk.c:2052
+#: fdisk/sfdisk.c:2065
 msgid "Warning: empty partition\n"
 msgstr "Uyarı: boş disk bölümü\n"
 
-#: fdisk/sfdisk.c:2066
+#: fdisk/sfdisk.c:2079
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Uyarı: disk bölümü başlangıcı hatalı (en erken %lu)\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2092
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "anlaşılmayan önyükleme flaması; - ya da * seçiniz\n"
 
-#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
 msgid "partial c,h,s specification?\n"
 msgstr "kısmi sld,kafa,sekt özellikleri?\n"
 
-#: fdisk/sfdisk.c:2120
+#: fdisk/sfdisk.c:2133
 msgid "Extended partition not where expected\n"
 msgstr "Ek disk bölümü gereken yerde değil\n"
 
-#: fdisk/sfdisk.c:2152
+#: fdisk/sfdisk.c:2165
 msgid "bad input\n"
 msgstr "girdi hatalı\n"
 
-#: fdisk/sfdisk.c:2174
+#: fdisk/sfdisk.c:2187
 msgid "too many partitions\n"
 msgstr "çok fazla disk bölümü var\n"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2220
 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"
@@ -4840,46 +4860,46 @@ msgstr ""
 "Genellikle <başlangıç> ve <uzunluk> değerleri (ve tabii ki <türü>)\n"
 "belirtmek yeterlidir.\n"
 
-#: fdisk/sfdisk.c:2227
+#: fdisk/sfdisk.c:2240
 msgid "version"
 msgstr "sürüm"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2246
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2247
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "aygıt: /dev/hda veya /dev/sda gibi"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2248
 msgid "useful options:"
 msgstr "kullanışlı seçenekler:"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2249
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s  --show-size     disk bölümü uzunlukları listelenir"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2250
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c  --id            disk bölümü kimliği değiştirilir ya da gösterilir"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2251
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l  --list          aygıtların disk bölümlerini listeler"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2252
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d  --dump          dökümler, ama sonraki girdiler için uygun biçemde"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2253
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i  --increment     silindir sayısı v.s. 0 yerine 1 den itibaren"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2254
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4887,53 +4907,53 @@ msgstr ""
 "    -uS, -uB, -uC, -uM  sektör/blok/silindir/MB birimleriyle değer alır/"
 "gösterir"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2255
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T  --list-types    bilinen disk bölümü türlerini listeler"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2256
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D  --DOS           DOS-uyumluluğu için: bir disk bölümünü çoraklaştırır"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2257
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R  --re-read       çekirdek yeniden okuma tablosu yapar"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2258
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N#                 sadece # numaralı disk alanı değiştirilir"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2259
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n                  gerçekte diske yazılmaz"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2260
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O dosya            üstüne yazarak sektörleri dosyaya kaydeder"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2261
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I dosya            sektörleri bu dosyadan tekrar oluşturur"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2262
 msgid "    -v [or --version]:   print version"
 msgstr "    -v  --version       sürüm bilgilerini gösterir"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2263
 msgid "    -? [or --help]:      print this message"
 msgstr "    -?  --help          bu yardım iletisini gösterir ve çıkar"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2264
 msgid "dangerous options:"
 msgstr "tehlikeli seçenekler:"
 
-#: fdisk/sfdisk.c:2252
+#: fdisk/sfdisk.c:2265
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g  --show-geometry çekirdeğin geometri bilgisini gösterir"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2266
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4941,119 +4961,119 @@ msgstr ""
 "    -x  --show-extended ek disk bölümlerini gösterir ve\n"
 "                        betimleyicileri için girdi bekler"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2268
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  --Linux         Linux ile alakasız şeyler hakkında hata üretmez"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2269
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  --quiet         uyarıları engeller"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2270
 msgid "    You can override the detected geometry using:"
 msgstr "Saptanan geometriyi aşmak için seçenekler:"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2271
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C#  --cylinders #  kullanılacak silindir sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2272
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H#  --heads #      kulanılacak kafa sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2273
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S#  --sectors #    kullanılacak sektör sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2261
+#: fdisk/sfdisk.c:2274
 msgid "You can disable all consistency checking with:"
 msgstr "Kararlılık denetimlerini etkisizleştirme seçenekleri:"
 
-#: fdisk/sfdisk.c:2262
+#: fdisk/sfdisk.c:2275
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  --force         yapılacak işlem hatalı da olsa yapılır"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2281
 msgid "Usage:"
 msgstr "Kullanımı:"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2282
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s aygıt\t\t aygıt üstündeki etkin disk bölümlerini gösterir\n"
 
-#: fdisk/sfdisk.c:2270
+#: fdisk/sfdisk.c:2283
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s aygıt n1 n2 ... n1, n2 ile belirtilen disk bölümleri etkinleştirilir,\n"
 "                   diğerleri etkisizleştirilir\n"
 
-#: fdisk/sfdisk.c:2271
+#: fdisk/sfdisk.c:2284
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 "%s -An aygıt\t n. disk bölümünü etkinleştirilir, diğerlerini "
 "etkisizleştirilir\n"
 
-#: fdisk/sfdisk.c:2423
+#: fdisk/sfdisk.c:2436
 msgid "no command?\n"
 msgstr "Komut?\n"
 
-#: fdisk/sfdisk.c:2541
-#, c-format
-msgid "total: %d blocks\n"
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
 msgstr "toplam: %d blok\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2591
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Kullanımı: sfdisk --print-id aygıt disk-bölümü-numarası\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2593
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "kullanımı: sfdisk --change-id aygıt disk-bölümü-numarası kimlik\n"
 
-#: fdisk/sfdisk.c:2582
+#: fdisk/sfdisk.c:2595
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "kullanımı: sfdisk --id aygıt disk-bölümü-numarası [kimlik]\n"
 
-#: fdisk/sfdisk.c:2589
+#: fdisk/sfdisk.c:2602
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "sadece bir aygıt belirtilebilir (-l ya da -s ile gerekir)\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2628
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s oku-yaz açılamıyor\n"
 
-#: fdisk/sfdisk.c:2617
+#: fdisk/sfdisk.c:2630
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s okumak için açılamıyor\n"
 
-#: fdisk/sfdisk.c:2642
+#: fdisk/sfdisk.c:2655
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: TAMAM\n"
 
-#: fdisk/sfdisk.c:2659
+#: fdisk/sfdisk.c:2672
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld silindir, %ld kafa, %ld sektör/iz\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2689
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE ioctl %s için başarısız\n"
 
-#: fdisk/sfdisk.c:2754
+#: fdisk/sfdisk.c:2767
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "hatalı etkin bayt: 0x80 yerine 0x%x\n"
 
-#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
 msgid ""
 "Done\n"
 "\n"
@@ -5061,7 +5081,7 @@ msgstr ""
 "Bitti\n"
 "\n"
 
-#: fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2794
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5070,35 +5090,35 @@ msgstr ""
 "%d etkin birincil disk bölümü var. Bu LILO için sorun olmamakla beraber\n"
 "DOS MBR sadece 1 etkin disk bölümü önyüklemesi yapabilir.\n"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2808
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "%s disk bölümünün kimliği %x ve gizli değil\n"
 
-#: fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2865
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Kimlik %lx hatalı\n"
 
-#: fdisk/sfdisk.c:2867
+#: fdisk/sfdisk.c:2880
 msgid "This disk is currently in use.\n"
 msgstr "Bu disk şu an kullanılıyor.\n"
 
-#: fdisk/sfdisk.c:2884
+#: fdisk/sfdisk.c:2897
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ölümcül hata: %s bulunamıyor\n"
 
-#: fdisk/sfdisk.c:2887
+#: fdisk/sfdisk.c:2900
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Uyarı: %s bir blok aygıtı değil\n"
 
-#: fdisk/sfdisk.c:2893
+#: fdisk/sfdisk.c:2906
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Diskin kullanımda olup olmadığı denetleniyor...\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2908
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5111,28 +5131,28 @@ msgstr ""
 "alanlarını swapoff ile kapatın. --no-reread bayrağını kullanarak\n"
 "yeniden okuma işlemini engelleyin.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2912
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Tüm denetimleri kaldırmak için --force seçeneğini kullanın.\n"
 
-#: fdisk/sfdisk.c:2903
+#: fdisk/sfdisk.c:2916
 msgid "OK\n"
 msgstr "TAMAM\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2925
 msgid "Old situation:\n"
 msgstr "Eski durum:\n"
 
-#: fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2929
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "%d. disk bölümü olmadığından geçilemiyor\n"
 
-#: fdisk/sfdisk.c:2924
+#: fdisk/sfdisk.c:2937
 msgid "New situation:\n"
 msgstr "Yeni durum:\n"
 
-#: fdisk/sfdisk.c:2929
+#: fdisk/sfdisk.c:2942
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5140,19 +5160,19 @@ msgstr ""
 "Bu disk bölümlerinde hiç bir değişiklik yapılmadı.\n"
 "(Bunu gerçekten istiyorsanız --force seçeneğini kullanın.)\n"
 
-#: fdisk/sfdisk.c:2932
+#: fdisk/sfdisk.c:2945
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Uygulanamıyor - siz de Hayır derdiniz, büyük ihtimalle\n"
 
-#: fdisk/sfdisk.c:2937
+#: fdisk/sfdisk.c:2950
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bundan memnun musunuz? [ehs] "
 
-#: fdisk/sfdisk.c:2939
+#: fdisk/sfdisk.c:2952
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Bunu diske yazmak ister misiniz? [ehs] "
 
-#: fdisk/sfdisk.c:2944
+#: fdisk/sfdisk.c:2957
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5160,15 +5180,15 @@ msgstr ""
 "\n"
 "sfdisk: girdi sonu eksik\n"
 
-#: fdisk/sfdisk.c:2946
+#: fdisk/sfdisk.c:2959
 msgid "Quitting - nothing changed\n"
 msgstr "Çıkılıyor - Değişiklik yok\n"
 
-#: fdisk/sfdisk.c:2952
+#: fdisk/sfdisk.c:2965
 msgid "Please answer one of y,n,q\n"
 msgstr "Lütfen e, h, s harflerinden biri ile yanıtlayın\n"
 
-#: fdisk/sfdisk.c:2960
+#: fdisk/sfdisk.c:2973
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5176,7 +5196,7 @@ msgstr ""
 "Yeni disk bölümleme tablosu başarıyla yazıldı\n"
 "\n"
 
-#: fdisk/sfdisk.c:2966
+#: fdisk/sfdisk.c:2979
 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"
@@ -5783,7 +5803,7 @@ msgstr "KDGHWCLK zaman değiştirilmek üzere çevrim içinde bekleniyor.\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK ioctl zamanı okumada başarısız"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:186
+#: hwclock/kd.c:67 hwclock/rtc.c:187
 msgid "Timed out waiting for time change.\n"
 msgstr "Zamanı değiştirmek için zamanaşımı bekleniyor.\n"
 
@@ -5808,57 +5828,67 @@ msgstr "/dev/tty1 veya /dev/vc/1 açılamıyor"
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK ioctl başarısız"
 
-#: hwclock/rtc.c:114 hwclock/rtc.c:207
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
 #, c-format
 msgid "open() of %s failed"
 msgstr "%s için open() işlevi hata verdi"
 
-#: hwclock/rtc.c:148
+#: hwclock/rtc.c:149
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "ioctl() %s den zaman okumada başarısız\n"
 
-#: hwclock/rtc.c:170
+#: hwclock/rtc.c:171
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "%s den zamanı değiştirmek için çevrim içinde bekleniyor\n"
 
-#: hwclock/rtc.c:225
+#: hwclock/rtc.c:226
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s için kesme işlevleri yok."
 
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:237
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "read() %s den saat darbesi beklerken hata verdi"
 
-#: hwclock/rtc.c:243
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "read() %s den saat darbesi beklerken hata verdi"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "read() %s den saat darbesi beklerken hata verdi"
+
+#: hwclock/rtc.c:267
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "ioctl() %s den güncelleme kesmelerini durduramadı"
 
-#: hwclock/rtc.c:246
+#: hwclock/rtc.c:270
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr "ioctl() %s den güncelleme kesmelerini açması gerekirken hata verdi"
 
-#: hwclock/rtc.c:305
+#: hwclock/rtc.c:329
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "ioctl() %s den zamanı ayarlayamadı.\n"
 
-#: hwclock/rtc.c:311
+#: hwclock/rtc.c:335
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) başarıldı.\n"
 
-#: hwclock/rtc.c:340
+#: hwclock/rtc.c:364
 #, c-format
 msgid "Open of %s failed"
 msgstr "%s açılamadı"
 
-#: hwclock/rtc.c:358 hwclock/rtc.c:404
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5869,17 +5899,17 @@ msgstr ""
 "üzerinden Linux 'rtc' aygıt sürücüsüne erişilmelidir.   Bu dosya sistemde "
 "yok.\n"
 
-#: hwclock/rtc.c:363 hwclock/rtc.c:409
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
 #, c-format
 msgid "Unable to open %s"
 msgstr "%s açılamıyor"
 
-#: hwclock/rtc.c:370
+#: hwclock/rtc.c:394
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) %s için başarısız"
 
-#: hwclock/rtc.c:376
+#: hwclock/rtc.c:400
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr "RTC_EPOCH_READ ioctl ile dönemsellik %ld %s den okunabilir.\n"
@@ -5887,24 +5917,24 @@ msgstr "RTC_EPOCH_READ ioctl ile dönemsellik %ld %s den okunabilir.\n"
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:396
+#: hwclock/rtc.c:420
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr ""
 "Dönemsellik değerinin başlangıcı 1900 yılından önce olamaz.  %ld istendi.\n"
 
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:438
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr "RTC_EPOCH_SET ioctl ile dönemsellik %ld %s den ayarlanıyor.\n"
 
-#: hwclock/rtc.c:419
+#: hwclock/rtc.c:443
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "%s için çekirdek aygıt sürücüsünde RTC_EPOCH_SET ioctl yok.\n"
 
-#: hwclock/rtc.c:422
+#: hwclock/rtc.c:446
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) %s için hata verdi"
@@ -6080,51 +6110,67 @@ msgstr "%s üzerinden %s makinasına girişe öntanımlı olarak izin verilmedi.
 msgid "Login on %s from %s denied.\n"
 msgstr "%s üzerinden %s makinasına girişe izin verilmedi.\n"
 
-#: login-utils/chfn.c:122 login-utils/chsh.c:107
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: Siz (%d) yoksunuz.\n"
 
-#: login-utils/chfn.c:129 login-utils/chsh.c:114
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" yok.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:119
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr "%s: sadece yerel girdileri değiştirebilir; yerine yp%s kullanın.\n"
 
-#: login-utils/chfn.c:146
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+#, fuzzy
+msgid "Unknown user context"
+msgstr "anahtarda bilinmeyen hata"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "%s için kullanıcı bilgileri değiştiriliyor.\n"
 
-#: 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
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
 msgid "Password error."
 msgstr "Parola hatası."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:774
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:431
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
 msgid "Password: "
 msgstr "Parola: "
 
-#: login-utils/chfn.c:179 login-utils/chsh.c:170
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
 msgid "Incorrect password."
 msgstr "Parola yanlış."
 
-#: login-utils/chfn.c:190
+#: login-utils/chfn.c:217
 msgid "Finger information not changed.\n"
 msgstr "Kullanıcı bilgileri değişmedi.\n"
 
-#: login-utils/chfn.c:292
+#: login-utils/chfn.c:319
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Kullanımı: %s [ -f ad-soyadı ] [ -o iş yeri ] "
 
-#: login-utils/chfn.c:293
+#: login-utils/chfn.c:320
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -6132,11 +6178,11 @@ msgstr ""
 "[ -p iş-telefonu ]\n"
 "\t[ -h ev-telefonu ] "
 
-#: login-utils/chfn.c:294
+#: login-utils/chfn.c:321
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:278
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
 msgid ""
 "\n"
 "Aborted.\n"
@@ -6144,58 +6190,70 @@ msgstr ""
 "\n"
 "Bırakıldı.\n"
 
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:425
 msgid "field is too long.\n"
 msgstr "alan çok uzun.\n"
 
-#: login-utils/chfn.c:406
+#: login-utils/chfn.c:433
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' kullanılamaz.\n"
 
-#: login-utils/chfn.c:411
+#: login-utils/chfn.c:438
 msgid "Control characters are not allowed.\n"
 msgstr "Kontrol karakterleri kullanılamaz.\n"
 
-#: login-utils/chfn.c:476
+#: login-utils/chfn.c:503
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr "Kullanıcı bilgileri değiştirilemedi. Daha sonra tekrar deneyin.\n"
 
-#: login-utils/chfn.c:479
+#: login-utils/chfn.c:506
 msgid "Finger information changed.\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
 msgid "malloc failed"
 msgstr "bellek ayrılamadı"
 
-#: login-utils/chsh.c:130
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\"  /etc/shells dosyasında yok.\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr "%s: Bu kabuk /etc/shells dosyasında yok, kabuk değiştirilemedi\n"
 
-#: login-utils/chsh.c:137
+#: login-utils/chsh.c:170
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "%s için kabuk değiştiriliyor.\n"
 
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:211
 msgid "New shell"
 msgstr "Yeni kabuk"
 
-#: login-utils/chsh.c:185
+#: login-utils/chsh.c:218
 msgid "Shell not changed.\n"
 msgstr "Kabuk değiştirilmedi,\n"
 
-#: login-utils/chsh.c:192
+#: login-utils/chsh.c:225
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Kabuk değiştirilemedi. Daha sonra tekrar deneyin.\n"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:228
 msgid "Shell changed.\n"
 msgstr "Kabuk değiştirildi.\n"
 
-#: login-utils/chsh.c:260
+#: login-utils/chsh.c:293
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
@@ -6204,57 +6262,57 @@ msgstr ""
 "Kullanımı: %s [ -s kabuk ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ kullanıcı_ismi ]\n"
 
-#: login-utils/chsh.c:303
+#: login-utils/chsh.c:336
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: kabuk tam bir dosya yolu içermeli.\n"
 
-#: login-utils/chsh.c:307
+#: login-utils/chsh.c:340
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" yok.\n"
 
-#: login-utils/chsh.c:311
+#: login-utils/chsh.c:344
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" çalıştırılabilir değil.\n"
 
-#: login-utils/chsh.c:318
+#: login-utils/chsh.c:351
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' kullanılamaz.\n"
 
-#: login-utils/chsh.c:322
+#: login-utils/chsh.c:355
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Kontrol karakterleri kullanılamaz.\n"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:362
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Uyarı: \"%s\" /etc/shells dosyasında yok.\n"
 
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\"  /etc/shells dosyasında yok.\n"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:366
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: listeyi görmek için  -l seçeneğini kullanın\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:372
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Uyarı: \"%s\" /etc/shells dosyasında yok.\n"
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:373
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Listeyi görmek için %s -l kullanın.\n"
 
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:393
 msgid "No known shells.\n"
 msgstr "Kullanılabilecek kabuklar belirlenmemiş.\n"
 
@@ -6452,78 +6510,78 @@ msgstr ""
 msgid "You have too many processes running.\n"
 msgstr "Çalıştırabileceğiniz uygulama sayısını aştınız.\n"
 
-#: login-utils/login.c:1064
+#: login-utils/login.c:1063
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "%s ÜZERİNDEN %s İSMİYLE DIALUP"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1070
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "%s ÜZERİNDEN %s MAKİNASINA ROOT GİRİŞİ"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "%s ÜZERİNDE ROOT GİRİŞİ"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1076
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "%s ÜZERİNDEN %s, %s MAKİNASINA GİRDİ"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "%s ÜZERİNDEN %s SİSTEME GİRDİ"
 
-#: login-utils/login.c:1092
+#: login-utils/login.c:1091
 msgid "You have new mail.\n"
 msgstr "Yeni e-postanız var.\n"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1093
 msgid "You have mail.\n"
 msgstr "E-postanız var.\n"
 
 #. error in fork()
-#: login-utils/login.c:1112
+#: login-utils/login.c:1111
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: ast süreç oluşturma başarısız: %s"
 
-#: login-utils/login.c:1149
+#: login-utils/login.c:1148
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY başarısız: %m"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1154
 msgid "setuid() failed"
 msgstr "setuid() başarısız"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1160
 #, c-format
 msgid "No directory %s!\n"
 msgstr "%s dizini yok!\n"
 
-#: login-utils/login.c:1165
+#: login-utils/login.c:1164
 msgid "Logging in with home = \"/\".\n"
 msgstr "Ev dizini \"/\" ile giriş.\n"
 
-#: login-utils/login.c:1173
+#: login-utils/login.c:1172
 msgid "login: no memory for shell script.\n"
 msgstr "login: kabuk betiği için bellek yetersiz.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1199
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kabuk betiği çalıştırılamadı: %s.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1202
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: kabuk yok: %s.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1217
 #, c-format
 msgid ""
 "\n"
@@ -6532,62 +6590,62 @@ msgstr ""
 "\n"
 "%s kullanıcı ismi: "
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1228
 msgid "login name much too long.\n"
 msgstr "Kullanıcı adınız çok uzun.\n"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1229
 msgid "NAME too long"
 msgstr "İSİM çok uzun"
 
-#: login-utils/login.c:1237
+#: login-utils/login.c:1236
 msgid "login names may not start with '-'.\n"
 msgstr "kullanıcı isimleri bir '-' ile başlayamaz.\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1246
 msgid "too many bare linefeeds.\n"
 msgstr "çok fazla boş geçildi.\n"
 
-#: login-utils/login.c:1248
+#: login-utils/login.c:1247
 msgid "EXCESSIVE linefeeds"
 msgstr "HADDİNDEN FAZLA boş giriş"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1279
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Giriş %d saniye sonra zaman aşımına uğradı\n"
 
-#: login-utils/login.c:1348
+#: login-utils/login.c:1367
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Son giriş: %.*s "
 
-#: login-utils/login.c:1352
+#: login-utils/login.c:1371
 #, c-format
 msgid "from %.*s\n"
 msgstr "sularında %.*s makinasına yapıldı\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1374
 #, c-format
 msgid "on %.*s\n"
 msgstr "sularında %.*s konsoluna yapıldı\n"
 
-#: login-utils/login.c:1375
+#: login-utils/login.c:1394
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s MAKİNASINDAN %s GİRİŞİ BAŞARISIZ"
 
-#: login-utils/login.c:1378
+#: login-utils/login.c:1397
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s ÜZERİNDEN %s GİRİŞİ BAŞARISIZ"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1401
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%3$s %2$s MAKÄ°NASINDAN %1$d KERE GÄ°REMEDÄ°"
 
-#: login-utils/login.c:1385
+#: login-utils/login.c:1404
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%3$s %2$s ÜZERİNDEN %1$d KERE GİREMEDİ"
@@ -6990,56 +7048,66 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: BÄ°LÄ°NMEYEN HATA"
 
-#: login-utils/vipw.c:139
+#: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
 msgstr "%s: parola dosyası meşgul.\n"
 
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
 msgstr "%s: grup dosyası meşgul.\n"
 
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: %s dosyası meşgul. (%s hazır)\n"
 
-#: login-utils/vipw.c:164
+#: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: %s için bağ oluşturulamıyor: %s\n"
 
-#: login-utils/vipw.c:195
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "%s için zaman aşımı değeri alınamıyor: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "%s için zaman aşımı değeri alınamıyor: %s\n"
+
+#: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 "%s: %s için bağ kaldırılamıyor: %s (değişiklikleriniz hala %s içinde)\n"
 
-#: login-utils/vipw.c:218
+#: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: Ast süreç oluşturulamıyor\n"
 
-#: login-utils/vipw.c:254
+#: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s değişmedi\n"
 
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: yapılan değişiklik yok\n"
 
-#: login-utils/vipw.c:328
+#: login-utils/vipw.c:352
 msgid "You are using shadow groups on this system.\n"
 msgstr "Bu sistemde gölge gruplar kullanılıyor.\n"
 
-#: login-utils/vipw.c:329
+#: login-utils/vipw.c:353
 msgid "You are using shadow passwords on this system.\n"
 msgstr "Bu sistemde gölge parolalar kullanılıyor.\n"
 
-#: login-utils/vipw.c:330
+#: login-utils/vipw.c:354
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "%s dosyasını şimdi düzenlemek ister misiniz [e/h]? "
@@ -7232,7 +7300,7 @@ msgstr "%s: %s  %s olarak değiştirilemedi: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "çağrı: %s hangi dosyalarla çalışacak?\n"
 
-#: misc-utils/script.c:106
+#: misc-utils/script.c:107
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7243,21 +7311,21 @@ msgstr ""
 "Gerçekten kullanmak istiyorsanız `%s [seçenekler] %s' ile kullanın.\n"
 "Betik başlatılmadı.\n"
 
-#: misc-utils/script.c:155
+#: misc-utils/script.c:169
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr "kullanımı: script [-a] [-f] [-q] [-t] [dosya]\n"
 
-#: misc-utils/script.c:178
+#: misc-utils/script.c:192
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Betik başlatıldı, dosyası %s\n"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:278
 #, c-format
 msgid "Script started on %s"
 msgstr "%s de betik başlatıldı"
 
-#: misc-utils/script.c:338
+#: misc-utils/script.c:362
 #, c-format
 msgid ""
 "\n"
@@ -7266,16 +7334,16 @@ msgstr ""
 "\n"
 "%s üzerinde betik tamamlandı"
 
-#: misc-utils/script.c:345
+#: misc-utils/script.c:369
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Betik tamamlandı, dosyası %s\n"
 
-#: misc-utils/script.c:356
+#: misc-utils/script.c:380
 msgid "openpty failed\n"
 msgstr "openpty başarısız\n"
 
-#: misc-utils/script.c:390
+#: misc-utils/script.c:414
 msgid "Out of pty's\n"
 msgstr "pty sayısı yetersiz\n"
 
@@ -7544,39 +7612,39 @@ msgstr "mount: %s açılamadı - yerine %s kullanılıyor\n"
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:415
+#: mount/fstab.c:451
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "kilit dosyası %s oluşturulamıyor: %s (zorlamak için -n seçeneğini kullanın)"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:466
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "%s kilit dosyası için bağ oluşturulamıyor: %s (zorlamak için -n seçeneğini "
 "kullanın)"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:478
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr "%s kilit dosyası açılamıyor: %s (zorlamak için -n seçeneğini kullanın)"
 
-#: mount/fstab.c:454
+#: mount/fstab.c:493
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "%s kilit dosyası kilitlenemiyor: %s\n"
 
-#: mount/fstab.c:467
+#: mount/fstab.c:505
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "%s kilit dosyası kilitlenemiyor: %s"
 
-#: mount/fstab.c:469
+#: mount/fstab.c:507
 msgid "timed out"
 msgstr "zaman aşımı"
 
-#: mount/fstab.c:476
+#: mount/fstab.c:514
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7585,192 +7653,122 @@ msgstr ""
 "%s bağı oluşturulamıyor\n"
 "Kalmış bir kilit dosyası olabilir mi?\n"
 
-#: mount/fstab.c:525 mount/fstab.c:561
+#: mount/fstab.c:563 mount/fstab.c:599
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "%s açılamıyor (%s) - mtab güncel değil"
 
-#: mount/fstab.c:569
+#: mount/fstab.c:607
 #, c-format
 msgid "error writing %s: %s"
 msgstr "%s yazılırken hata: %s"
 
-#: mount/fstab.c:577
+#: mount/fstab.c:615
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "%s için kip değiştirilirken hata: %s\n"
 
-#: mount/fstab.c:595
+#: mount/fstab.c:633
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s %s olarak değiştirilemiyor: %s\n"
 
-#: mount/lomount.c:173
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: %s aygıtı açılamıyor: %s\n"
 
-#: mount/lomount.c:179
+#: mount/lomount.c:101
 #, c-format
-msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: %s aygıtı hakkında bilgi alınamıyor: %s\n"
+msgid ", offset %lld"
+msgstr ", başl %lld"
 
-#: mount/lomount.c:184
-#, fuzzy, c-format
-msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) göreli konum %d, %s şifreleme\n"
+#: mount/lomount.c:104
+#, c-format
+msgid ", sizelimit %lld"
+msgstr ", boysınırı %lld"
 
-#: mount/lomount.c:245
-msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: hiç bir /dev/loop# aygıtı bulunamadı"
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", %s şifreleme türü (%d) bilinmiyor"
 
-#: mount/lomount.c:249
-msgid ""
-"mount: Could not find any loop device.\n"
-"       Maybe /dev/loop# has a wrong major number?"
-msgstr ""
-"mount: Hiç bir loop aygıtı bulunamadı.\n"
-"       /dev/loop# bir yanlış major numarası içeriyor olabilir mi?"
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ", başl %d"
 
-#: mount/lomount.c:253
+#: mount/lomount.c:129
 #, 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: Hiç bir loop aygıtı bulunamadı ve %s e göre,\n"
-"       bu çekirdek loop aygıtı hakkında bilgiye sahip değil.\n"
-"       (`insmod loop.o' deneyin, sonuç alamazsanız çekirdeği\n"
-"        yeniden derleyin.)"
+msgid ", encryption type %d\n"
+msgstr ", şifreleme türü %d bilinmiyor\n"
 
-#: mount/lomount.c:259
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: %s aygıtı hakkında bilgi alınamıyor: %s\n"
+
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: hiç bir /dev/loop# aygıtı bulunamadı"
+
+#: mount/lomount.c:192
 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?"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
-"mount: Hiç bir loop aygıtı bulunamadı. Bu çekirdek ya loop aygıtı hakkında\n"
-"       bilgiye sahip değil (`insmod loop.o' deneyin, sonuç alamazsanız\n"
-"       çekirdeği yeniden derleyin.) ya da /dev/loop# yanlış majör "
-"numarasına\n"
-"       sahip olabilir?"
+"mount: Hiç bir loop aygıtı bulunamadı. Bu çekirdek loop aygıtı hakkında\n"
+"       bilgiye sahip değil. (`modprobe loop' deneyin, sonuç alamazsanız\n"
+"       çekirdeği yeniden derleyin.)"
 
-#: mount/lomount.c:263
+#: mount/lomount.c:197
 msgid "mount: could not find any free loop device"
 msgstr "mount: hiç serbest loop aygıtı yok"
 
-#: mount/lomount.c:359
-#, fuzzy, c-format
-msgid "Error: unable to open %s for reading\n"
-msgstr "%s okumak için açılamıyor\n"
-
-#: mount/lomount.c:444 mount/lomount.c:478
-#, fuzzy
-msgid "Retype password: "
-msgstr "Yeni parolanızı tekrar yazınız: "
-
-#: mount/lomount.c:456
-#, fuzzy
-msgid "Error: gpg key file decryption failed\n"
-msgstr "dizine geçilemedi\n"
-
-#: mount/lomount.c:463
-#, fuzzy, c-format
-msgid "Error: Password must be at least %d characters.\n"
-msgstr "Parola en az 6 karakter uzunlukta olmalıdır, tekrar deneyin.\n"
-
-#: mount/lomount.c:472
-#, fuzzy
-msgid "Error: Unable to allocate memory\n"
-msgstr "Daha fazla bellek ayrılamıyor\n"
-
-#: mount/lomount.c:483
-msgid "Error: Passwords are not identical\n"
-msgstr ""
-
-#: mount/lomount.c:490
-#, c-format
-msgid ""
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-"Passwords shorter than %d characters are considered too short and insecure.\n"
-"Use of rmd160 password hash permits use of such short passwords for\n"
-"compatibility with other systems that do not enforce minimum length.\n"
-"Hopefully this message is annoying enough that you discontinue using such\n"
-"short passwords.\n"
-"\n"
-"WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n"
-"\n"
-msgstr ""
-
-#: mount/lomount.c:611
-#, c-format
-msgid "Error: keybits= option is incompatible with encryption type %s\n"
-msgstr ""
-
-#: mount/lomount.c:631
+#: mount/lomount.c:294
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Bellek içinde kilitlenemedi, çıkılıyor.\n"
 
-#: mount/lomount.c:654
-msgid "Init (up to 16 hex digits): "
-msgstr "Başlangıç (16 taneye kadar onaltılık rakam): "
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): başarılı\n"
 
-#: mount/lomount.c:661
+#: mount/lomount.c:356
 #, c-format
-msgid "Non-hex digit '%c'.\n"
-msgstr "'%c' onaltılık bir rakam değil.\n"
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: %s aygıtı silinemiyor: %s\n"
 
-#: mount/lomount.c:764
+#: mount/lomount.c:366
 #, c-format
-msgid "Don't know how to get key for encryption system %d\n"
-msgstr "%d şifreleme sistemi için nasıl anahtar alınacağı bilinmiyor\n"
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): başarılı\n"
 
-#: mount/lomount.c:802
-#, c-format
-msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d): başarılı\n"
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr "Bu mount loop desteği olmaksızın derlenmiş. Lütfen yeniden derleyin.\n"
 
-#: mount/lomount.c:831
+#: mount/lomount.c:411
 #, c-format
 msgid ""
 "usage:\n"
-"  %s [-e encryption] [options] loop_device file  # setup\n"
-"  %s -F [options] loop_device [file]   # setup, read /etc/fstab\n"
-"  %s loop_device                       # give info\n"
-"  %s -a                                # give info of all loops\n"
-"  %s -d loop_device                    # delete\n"
-"options:  -o offset  -p num  -S pseed  -H phash  -I loinit  -T\n"
-"          -K gpgkey  -G gpghome  -C itercountk  -v  -k keybits\n"
-"          -b blockmode\n"
-msgstr ""
-
-#: mount/lomount.c:853 mount/lomount.c:870 mount/sundries.c:30
-#: mount/sundries.c:45 mount/sundries.c:244
-msgid "not enough memory"
-msgstr "yeterli bellek yok"
-
-#: mount/lomount.c:945
-#, fuzzy
-msgid "Error: unable to open /etc/fstab for reading\n"
-msgstr "%s okumak için açılamıyor\n"
-
-#: mount/lomount.c:966
-#, c-format
-msgid "Error: multiple loop=%s options found in /etc/fstab\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
+"kullanımı:\n"
+"  %s loop_aygıtı                                           # bilgi verilir\n"
+"  %s -d loop_aygıtı                                        # silme\n"
+"  %s [ -e şifreleme ] [ -o göreliKonum ] loop_aygıtı dosya # ayarlama\n"
 
-#: mount/lomount.c:977
-#, c-format
-msgid "using %s%s from /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "yeterli bellek yok"
 
-#: mount/lomount.c:985
-#, c-format
-msgid "Error: loop=%s option not found in /etc/fstab\n"
-msgstr ""
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
+msgstr "Derleme sırasında loop desteği verilmemiş. Lütfen yeniden derleyin.\n"
 
 #: mount/mntent.c:168
 #, c-format
@@ -7786,41 +7784,41 @@ msgstr "[mntent]: %d satırı %s dosyasında hatalı%s\n"
 msgid "; rest of file ignored"
 msgstr "; dosyanın kalanı yoksayıldı"
 
-#: mount/mount.c:396
+#: mount/mount.c:395
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: mtab'a göre, %s zaten %s üzerinde bağlı"
 
-#: mount/mount.c:400
+#: mount/mount.c:399
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: mtab'a göre, %s %s üzerinde bağlı"
 
-#: mount/mount.c:421
+#: mount/mount.c:420
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s yazmak için açılamıyor: %s"
 
-#: mount/mount.c:436 mount/mount.c:660
+#: mount/mount.c:435 mount/mount.c:661
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: %s yazılırken hata: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:442
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: %s kipi değiştirilirken hata: %s"
 
-#: mount/mount.c:494
+#: mount/mount.c:493
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s takas alanı gibi görünüyor - bağlanmadı"
 
-#: mount/mount.c:554
+#: mount/mount.c:553
 msgid "mount failed"
 msgstr "mount başarısız"
 
-#: mount/mount.c:556
+#: mount/mount.c:555
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: %s %s üzerinde sadece root tarafından bağlanabilir"
@@ -7842,103 +7840,107 @@ msgstr "mount: loop aygıtı ayarları atlanıyor\n"
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: %s loop aygıtının kullanımına gidiliyor\n"
 
-#: mount/mount.c:614
+#: mount/mount.c:615
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop aygıtı ayarları yapılamadı\n"
 
-#: mount/mount.c:618
+#: mount/mount.c:619
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop aygıtı ayarları tamamlandı\n"
 
-#: mount/mount.c:655
+#: mount/mount.c:656
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s açılamıyor: %s"
 
-#: mount/mount.c:678
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: -p ve --pass-fd seçeneklerinin argümanı bir sayı olmalıdır"
+
+#: mount/mount.c:687
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: hızı ayarlamak için %s açılamıyor"
 
-#: mount/mount.c:681
+#: mount/mount.c:690
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/mount.c:735 mount/mount.c:1309
+#: mount/mount.c:744 mount/mount.c:1284
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ast süreç oluşturulamıyor: %s"
 
-#: mount/mount.c:815
+#: mount/mount.c:825
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr "mount: bu sürüm `nfs' türü için destek olmaksızın derlenmiş"
 
-#: mount/mount.c:854
+#: mount/mount.c:864
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: nfs mount sürüm 4 ile başarısız, 3 deneniyor...\n"
 
-#: mount/mount.c:865
+#: mount/mount.c:875
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Dosya sistemi türü saptanamadı ve belirtilmemiş"
 
-#: mount/mount.c:868
+#: mount/mount.c:878
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: dosya sistemi türünü belirtmelisiniz"
 
 #. should not happen
-#: mount/mount.c:871
+#: mount/mount.c:881
 msgid "mount: mount failed"
 msgstr "mount: bağlanamadı"
 
-#: mount/mount.c:877 mount/mount.c:912
+#: mount/mount.c:887 mount/mount.c:922
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: bağlama noktası %s bir dizin değil"
 
-#: mount/mount.c:879
+#: mount/mount.c:889
 msgid "mount: permission denied"
 msgstr "mount: erişim engellendi"
 
-#: mount/mount.c:881
+#: mount/mount.c:891
 msgid "mount: must be superuser to use mount"
 msgstr "mount: root tarafından kullanılmalı"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:885 mount/mount.c:889
+#: mount/mount.c:895 mount/mount.c:899
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s meşgul"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:891
+#: mount/mount.c:901
 msgid "mount: proc already mounted"
 msgstr "mount: proc zaten bağlı"
 
-#: mount/mount.c:893
+#: mount/mount.c:903
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: ya %s zaten bağlı ya da %s meşgul"
 
-#: mount/mount.c:899
+#: mount/mount.c:909
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: bağlama noktası %s yok"
 
-#: mount/mount.c:901
+#: mount/mount.c:911
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: bağlama noktası %s hiçbir yere sembolik bağ sağlamıyor"
 
-#: mount/mount.c:904
+#: mount/mount.c:914
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: özel aygıt %s yok"
 
-#: mount/mount.c:914
+#: mount/mount.c:924
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7947,12 +7949,12 @@ msgstr ""
 "mount: özel aygıt %s yok\n"
 "       (dosya yolu öneki bir dizin değil)\n"
 
-#: mount/mount.c:927
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s zaten bağlı değil, ya da seçenek yanlış"
 
-#: mount/mount.c:929
+#: mount/mount.c:939
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7961,35 +7963,35 @@ msgstr ""
 "mount: dosya sistemi türü yanlış, seçenek yanlış, %s üzerinde superblok\n"
 "       hatalı ya da çok sayıda bağlı dosya sistemi olabilir"
 
-#: mount/mount.c:963
+#: mount/mount.c:973
 msgid "mount table full"
 msgstr "bağ tablosu dolu"
 
-#: mount/mount.c:965
+#: mount/mount.c:975
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok okunamıyor"
 
-#: mount/mount.c:969
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: aygıt bilinmiyor"
 
-#: mount/mount.c:974
+#: mount/mount.c:984
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: dosya sistemi türü %s çekirdek tarafından desteklenmiyor"
 
-#: mount/mount.c:986
+#: mount/mount.c:996
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: herhalde %s kastettiniz"
 
-#: mount/mount.c:988
+#: mount/mount.c:998
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: iso9660 kastetmiş olabilir misiniz?"
 
-#: mount/mount.c:991
+#: mount/mount.c:1001
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -7997,14 +7999,14 @@ msgstr ""
 "desteklenmiyor"
 
 #. strange ...
-#: mount/mount.c:997
+#: mount/mount.c:1007
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 "mount: %s bir blok aygıtı olmayabilir mi ve durum bilgileri alınamayabilir "
 "mi?"
 
-#: mount/mount.c:999
+#: mount/mount.c:1009
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8013,75 +8015,48 @@ msgstr ""
 "mount: çekirdek %s aygıtını bir blok aygıtı olarak tanımıyor\n"
 "       (`insmod sürücü' denenebilir?)"
 
-#: mount/mount.c:1002
+#: mount/mount.c:1012
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s bir blok aygıtı değil ( `-o loop' denenebilir mi?)"
 
-#: mount/mount.c:1005
+#: mount/mount.c:1015
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s bir blok aygıtı değil"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1018
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s geçerli bir blok aygıtı değil"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:1011
+#: mount/mount.c:1021
 msgid "block device "
 msgstr "blok aygıtı "
 
-#: mount/mount.c:1013
+#: mount/mount.c:1023
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s salt-okunur bağlanamıyor"
 
-#: mount/mount.c:1017
+#: mount/mount.c:1027
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s yazma korumalı olduğu halde alenen `-w' seçeneği belirtilmiş"
 
-#: mount/mount.c:1033
+#: mount/mount.c:1043
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s yazma korumalı, salt-okunur olarak bağlanıyor"
 
-#: mount/mount.c:1120
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr "mount: etiket %s hem %s hem de %s için görünüyor\n"
-
-#: mount/mount.c:1124
-#, c-format
-msgid "mount: %s duplicate - not mounted"
-msgstr "mount: %s yinelendi - bağlanmadı"
-
-#: mount/mount.c:1134
-#, c-format
-msgid "mount: going to mount %s by %s\n"
-msgstr "mount: %s %s tarafından bağlanıyor\n"
-
-#: mount/mount.c:1135
-msgid "UUID"
-msgstr "UUID"
-
-#: mount/mount.c:1135
-msgid "label"
-msgstr "yafta"
-
-#: mount/mount.c:1137 mount/mount.c:1587
-msgid "mount: no such partition found"
-msgstr "mount: böyle bir disk bölümü yok"
-
-#: mount/mount.c:1145
+#: mount/mount.c:1126
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: tür belirtilmemiş - ':' içerdiğinden nfs varsayılıyor\n"
 
-#: mount/mount.c:1150
+#: mount/mount.c:1131
 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 "mount: tür belirtilmemiş - '//' öneki içerdiğinden smbfs varsayılıyor\n"
@@ -8089,23 +8064,22 @@ msgstr ""
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1166
+#: mount/mount.c:1147
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: \"%s\" artalana alınıyor\n"
 
-#: mount/mount.c:1177
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: \"%s\" bırakılıyor\n"
 
-#: mount/mount.c:1254
+#: mount/mount.c:1229
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s zaten %s üzerinde bağlı\n"
 
-#: mount/mount.c:1386
-#, fuzzy
+#: mount/mount.c:1362
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8126,12 +8100,12 @@ msgid ""
 "       mount --move olddir newdir\n"
 "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
 "or by label, using  -L label  or by uuid, using  -U uuid .\n"
-"Other options: [-nfFrsvw] [-o options] [-p fd].\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Kullanımı: mount [seçenekler] [aygıt] [dizin]\n"
 "Bilgilendirme:\n"
-"Seçeneksiz kullanıldığında bağlı dosya sistemlerini gösterir.\n"
+"  mount                 bağlı dosya sistemlerini gösterir.\n"
 "  mount -l              üsttekine ek olarak bölüm etiketlerini gösterir\n"
 "  mount -V              sürüm bilgilerini gösterir\n"
 "  mount -h              bu yardım iletisini gösterir\n"
@@ -8140,8 +8114,6 @@ msgstr ""
 "  mount -a [-t|-O] ... /etc/fstab'da bulunanların tamamını bağlar\n"
 "  mount aygıt          bu aygıtı /etc/fstab'da belirtilmiş dizine bağlar\n"
 "  mount dizin          bu dizine /etc/fstab'da belirtilmiş aygıtı bağlar\n"
-"  mount -L etiket      dosya sistemi etiketi belirtilen aygıtı bağlar\n"
-"  mount -U uuid        evrende tek kimliği(uuid) verilen aygıtı bağlar\n"
 "  mount -t TÜR AYGIT DİZİN     TÜR türündeki AYGITı DİZİNe bağlar\n"
 "\n"
 "Bağlı bir dosya sistemindeki işlemler:\n"
@@ -8151,80 +8123,79 @@ msgstr ""
 "                 ESKİDİZİNde bağlı olan aygıtın dosya sistemindeki yerini\n"
 "                 YENİDİZİN olarak değiştirir.\n"
 "\n"
-"Diğer seçenekler: [-nfFrsvw] [-o seçenekler].\n"
+"Diğer seçenekler: [-nfFrsvw] [-o seçenekler] [-p parola].\n"
 "  mount -o remount,ro DİZİN     DİZİNi salt-okunur olarak yeniden bağlar.\n"
 "  mount -o remount,rw DİZİN     DİZİNi oku-yaz olarak yeniden bağlar.\n"
 "\n"
 "Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
 "Daha fazla bilgi edinmek için 'man 8 mount' yazabilirsiniz.\n"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1544
 msgid "mount: only root can do that"
 msgstr "mount: bunu sadece root yapabilir"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1549
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s yok - oluşturuluyor...\n"
 
-#: mount/mount.c:1582
-#, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr "mount: etiket %s hem %s hem de %s için görünüyor - bağlanmadı\n"
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: böyle bir disk bölümü yok"
 
-#: mount/mount.c:1589
+#: mount/mount.c:1563
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: %s bağlanıyor\n"
 
-#: mount/mount.c:1598
+#: mount/mount.c:1572
 msgid "nothing was mounted"
 msgstr "hiçbir şey bağlanmadı"
 
-#: mount/mount.c:1613
+#: mount/mount.c:1587
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s  %s içinde bulunamıyor"
 
-#: mount/mount.c:1628
+#: mount/mount.c:1603
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s  %s ya da %s içinde bulunamıyor"
 
-#: mount/mount_by_label.c:189
+#: mount/mount_by_label.c:190
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr "mount: %s açılamadı, UUID ve ETİKET dönüşümü yapılmış olmayabilir.\n"
 
-#: mount/mount_by_label.c:309
+#: mount/mount_by_label.c:310
 msgid "mount: bad UUID"
 msgstr "mount: UUID hatalı"
 
-#: mount/mount_guess_fstype.c:483
+#: mount/mount_guess_fstype.c:468
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: dosya sistemi türü belirlenirken hata\n"
 
-#: mount/mount_guess_fstype.c:492
+#: mount/mount_guess_fstype.c:520
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: %s için bir dosya sistemi türü belirtilmemiş\n"
 
-#: mount/mount_guess_fstype.c:495
+#: mount/mount_guess_fstype.c:523
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       %s ya da %s içindeki anılan tüm türler denenecek\n"
 
-#: mount/mount_guess_fstype.c:498
+#: mount/mount_guess_fstype.c:526
 msgid "       and it looks like this is swapspace\n"
 msgstr "       ve bu takas alanı gibi görünüyor\n"
 
-#: mount/mount_guess_fstype.c:500
+#: mount/mount_guess_fstype.c:528
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       %s türü denenecek\n"
 
-#: mount/mount_guess_fstype.c:588
+#: mount/mount_guess_fstype.c:616
 #, c-format
 msgid "Trying %s\n"
 msgstr "%s deneniyor\n"
@@ -8318,7 +8289,7 @@ msgstr "bilinmeyen nfs durum sonuç değeri: %d"
 msgid "bug in xstrndup call"
 msgstr "xstrndup çağrısında yazılım hatası"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:64
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8337,7 +8308,7 @@ msgstr ""
 "  -p öncelik  öncelik 0 ile 32767 arasında bir değerdir.\n"
 "Takas öncelikleri için: 'man 2 swapon'\n"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8348,98 +8319,31 @@ msgstr ""
 "           %s -a [-v]\n"
 "           %s [-v] özel ...\n"
 
-#: mount/swapon.c:120 sys-utils/readprofile.c:69
-msgid "out of memory"
-msgstr "bellek yetersiz"
-
-#: mount/swapon.c:201 mount/swapon.c:265
+#: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s %s üzerinde\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: %s durum bilgileri alınamıyor: %s\n"
 
-#: mount/swapon.c:216
+#: mount/swapon.c:193
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr "swapon: uyarı: %s güvencesiz izinler (%04o) içeriyor, %04o önerilir\n"
 
-#: mount/swapon.c:228
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: %s atlanıyor - delikler içeriyor gibi görünüyor.\n"
 
-#: mount/swapon.c:271
+#: mount/swapon.c:248
 msgid "Not superuser.\n"
 msgstr "root değil.\n"
 
-#: mount/swapon.c:301
-msgid "swapon: invalid swap device name\n"
-msgstr ""
-
-#: mount/swapon.c:305
-#, fuzzy
-msgid "swapon: invalid loop device name\n"
-msgstr "umount: %s: blok aygıtı geçersiz"
-
-#: mount/swapon.c:309
-#, fuzzy
-msgid "swapon: invalid encryption type\n"
-msgstr "%s şifreleme türü bilinmiyor\n"
-
-#: mount/swapon.c:317 mount/swapon.c:466
-#, fuzzy, c-format
-msgid "swapon: unable to open loop device %s\n"
-msgstr "mount: %s loop aygıtının kullanımına gidiliyor\n"
-
-#: mount/swapon.c:322
-#, fuzzy, c-format
-msgid "swapon: loop device %s already in use\n"
-msgstr "Bu disk bölümü zaten kullanımda"
-
-#: mount/swapon.c:335
-#, fuzzy, c-format
-msgid "swapon: unable to open swap device %s\n"
-msgstr "takas alanında başa gidilemiyor"
-
-#: mount/swapon.c:379
-#, fuzzy
-msgid "swapon: unable to open /dev/urandom\n"
-msgstr "/dev/urandom açılamadı"
-
-#: mount/swapon.c:412
-#, fuzzy
-msgid "swapon: unable to create pipe\n"
-msgstr "düğümler yazılamıyor"
-
-#: mount/swapon.c:434
-msgid "swapon: unable to execute losetup\n"
-msgstr ""
-
-#: mount/swapon.c:439 mount/swapon.c:501
-#, fuzzy
-msgid "swapon: fork failed\n"
-msgstr "ast süreç oluşturulamadı\n"
-
-#: mount/swapon.c:447
-#, c-format
-msgid "swapon: losetup failed to initialize %s\n"
-msgstr ""
-
-#: mount/swapon.c:454
-#, fuzzy, c-format
-msgid "swapon: random password for %s is %s"
-msgstr "%s için parola değiştiriliyor\n"
-
-#. error to stdout, stderr is directed to /dev/null
-#: mount/swapon.c:497
-msgid "swapon: unable to execute mkswap\n"
-msgstr ""
-
-#: mount/swapon.c:578 mount/swapon.c:726
+#: mount/swapon.c:312 mount/swapon.c:402
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s açılamıyor: %s\n"
@@ -8504,35 +8408,35 @@ msgstr "umount: %s: dosya sisteminde blok aygıtlara izin yok"
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:285
+#: mount/umount.c:287
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 yok, umount deneniyor...\n"
 
-#: mount/umount.c:301
+#: mount/umount.c:303
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "umount %s gerçekleştirilemedi- yerine %s deneniyor\n"
 
-#: mount/umount.c:319
+#: mount/umount.c:321
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s meşgul- salt-okunur olarak yeniden bağlandı\n"
 
-#: mount/umount.c:329
+#: mount/umount.c:331
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s salt okunur olarak yeniden bağlanamıyor\n"
 
-#: mount/umount.c:338
+#: mount/umount.c:340
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s sistemden ayrıldı\n"
 
-#: mount/umount.c:426
+#: mount/umount.c:436
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ayrılacak dosya sistemlerinin listesi bulunamıyor"
 
-#: mount/umount.c:457
+#: mount/umount.c:467
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
@@ -8557,42 +8461,42 @@ msgstr ""
 "Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz\n"
 "Daha fazla bilgi edinmek için 'man 8 umount' yazınız.\n"
 
-#: mount/umount.c:539
+#: mount/umount.c:548
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s sistemden ayrılmaya çalışılıyor\n"
 
-#: mount/umount.c:543
+#: mount/umount.c:554
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab içinde %s bulunamadı\n"
 
-#: mount/umount.c:547
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s bağlı değil (mtab içinde yok)"
 
-#: mount/umount.c:549
+#: mount/umount.c:565
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s defalarca bağlanmış görünüyor"
 
-#: mount/umount.c:561
+#: mount/umount.c:578
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s fstab içinde yok (ve siz root değilsiniz)"
 
-#: mount/umount.c:566
+#: mount/umount.c:582
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s bağı fstab ile çelişiyor"
 
-#: mount/umount.c:602
-#, c-format
-msgid "umount: only root can unmount %s from %s"
+#: mount/umount.c:616
+#, fuzzy, c-format
+msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: sadece root %s aygıtını %s dizininden ayırabilir"
 
-#: mount/umount.c:671
+#: mount/umount.c:688
 msgid "umount: only root can do that"
 msgstr "umount: bu sadece root tarafından yapılabilir"
 
@@ -8734,7 +8638,7 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f kesme/sec; %f kayıt (karkt/s)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:56
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Kullanımı: %s [-c] [-n seviye] [-s tamponBoyu]\n"
@@ -8901,23 +8805,23 @@ msgstr "---- Paylaşımlı Bellek Sınırları ----\n"
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, c-format
-msgid "max number of segments = %ld\n"
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
 msgstr "en fazla segman sayısı = %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, c-format
-msgid "max seg size (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
 msgstr "en fazla segman boyu (kb) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, c-format
-msgid "max total shared memory (kbytes) = %ld\n"
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
 msgstr "en fazla toplam paylaşımlı bellek (kb) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, c-format
-msgid "min seg size (bytes) = %ld\n"
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
 msgstr "en az segman boyu (bayt) = %ld\n"
 
 #: sys-utils/ipcs.c:289
@@ -9434,8 +9338,12 @@ msgstr "      kökü salt-okunur bağlamak için -R 1, oku-yaz için -R 0 kullan
 msgid "missing comma"
 msgstr "virgül eksik"
 
-#: sys-utils/readprofile.c:115
-#, c-format
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "bellek yetersiz"
+
+#: sys-utils/readprofile.c:118
+#, fuzzy, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (defaults: \"%s\" and\n"
@@ -9446,6 +9354,7 @@ msgid ""
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
@@ -9463,34 +9372,34 @@ msgstr ""
 "\t -n                 bayt sıralamasının saptanmasını önler\n"
 "\t -V                 sürüm bilgilerini gösterir ve çıkar\n"
 
-#: sys-utils/readprofile.c:188
+#: sys-utils/readprofile.c:197
 #, c-format
 msgid "%s version %s\n"
 msgstr ""
 "%s sürüm %s\n"
 "Çeviri hatalarını <gnu-tr-u12a@listssourceforge.net> adresine bildiriniz\n"
 
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Örnekleme_adımı: %i\n"
 
-#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): eşlem satırı yanlış\n"
 
-#: sys-utils/readprofile.c:308
+#: sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: \"_stext\" %s içinde bulunamıyor\n"
 
-#: sys-utils/readprofile.c:334
+#: sys-utils/readprofile.c:343
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: profil adresi kapsamdışı. Eşlem dosyası yanlış olabilir mi?\n"
 
-#: sys-utils/readprofile.c:375
+#: sys-utils/readprofile.c:397
 msgid "total"
 msgstr "toplam"
 
@@ -10014,31 +9923,63 @@ msgstr "Girdi satırı çok uzun.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Tampon büyütülürken bellek yetmedi.\n"
 
-#~ msgid "loop: can't delete device %s: %s\n"
-#~ msgstr "loop: %s aygıtı silinemiyor: %s\n"
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: minix v2 desteğiyle derlenmemiş\n"
 
-#~ msgid "del_loop(%s): success\n"
-#~ msgstr "del_loop(%s): başarılı\n"
+#~ msgid "mount: the label %s occurs on both %s and %s\n"
+#~ msgstr "mount: etiket %s hem %s hem de %s için görünüyor\n"
 
-#~ msgid "This mount was compiled without loop support. Please recompile.\n"
-#~ msgstr ""
-#~ "Bu mount loop desteği olmaksızın derlenmiş. Lütfen yeniden derleyin.\n"
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "mount: %s yinelendi - bağlanmadı"
+
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: %s %s tarafından bağlanıyor\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "yafta"
+
+#~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
+#~ msgstr "mount: etiket %s hem %s hem de %s için görünüyor - bağlanmadı\n"
+
+#~ msgid "Boot (%02X)"
+#~ msgstr "Boot (%02X)"
+
+#~ msgid "None (%02X)"
+#~ msgstr "Yok (%02X)"
+
+#~ msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) göreli konum %d, %s şifreleme\n"
 
 #~ msgid ""
-#~ "usage:\n"
-#~ "  %s loop_device                                      # give info\n"
-#~ "  %s -d loop_device                                   # delete\n"
-#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
 #~ msgstr ""
-#~ "kullanımı:\n"
-#~ "  %s loop_aygıtı                                           # bilgi "
-#~ "verilir\n"
-#~ "  %s -d loop_aygıtı                                        # silme\n"
-#~ "  %s [ -e şifreleme ] [ -o göreliKonum ] loop_aygıtı dosya # ayarlama\n"
+#~ "mount: Hiç bir loop aygıtı bulunamadı.\n"
+#~ "       /dev/loop# bir yanlış major numarası içeriyor olabilir mi?"
 
-#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ 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 ""
-#~ "Derleme sırasında loop desteği verilmemiş. Lütfen yeniden derleyin.\n"
+#~ "mount: Hiç bir loop aygıtı bulunamadı. Bu çekirdek ya loop aygıtı "
+#~ "hakkında\n"
+#~ "       bilgiye sahip değil (`insmod loop.o' deneyin, sonuç alamazsanız\n"
+#~ "       çekirdeği yeniden derleyin.) ya da /dev/loop# yanlış majör "
+#~ "numarasına\n"
+#~ "       sahip olabilir?"
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Başlangıç (16 taneye kadar onaltılık rakam): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "'%c' onaltılık bir rakam değil.\n"
+
+#~ msgid "Don't know how to get key for encryption system %d\n"
+#~ msgstr "%d şifreleme sistemi için nasıl anahtar alınacağı bilinmiyor\n"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "%i disk bölümünün bitişi silindir sınırları dışında:\n"
diff --git a/po/uk.po b/po/uk.po
new file mode 100644
index 00000000..bae70816
--- /dev/null
+++ b/po/uk.po
@@ -0,0 +1,9953 @@
+# Ukrainian translation to util-linux.
+# Copyright (C) 2004 Free Software Foundation
+# This file is put in the public domain.
+# Maxim V. Dziumanenko <mvd@mylinux.com.ua>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.12\n"
+"POT-Creation-Date: 2004-08-25 01:58+0200\n"
+"PO-Revision-Date: 2004-02-24 10:45+0200\n"
+"Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
+"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
+
+#: disk-utils/blockdev.c:62
+msgid "set read-only"
+msgstr "встановити як лише-для-читання"
+
+#: disk-utils/blockdev.c:63
+msgid "set read-write"
+msgstr "встановити для читання-запису"
+
+#: disk-utils/blockdev.c:66
+msgid "get read-only"
+msgstr "отримати стан лише-для-читання"
+
+#: disk-utils/blockdev.c:69
+msgid "get sectorsize"
+msgstr "отримати розмір сектору"
+
+#: disk-utils/blockdev.c:72
+msgid "get blocksize"
+msgstr "отримати розмір блоку"
+
+#: disk-utils/blockdev.c:75
+msgid "set blocksize"
+msgstr "встановити розмір блоку"
+
+#: disk-utils/blockdev.c:78
+msgid "get 32-bit sector count"
+msgstr ""
+
+#: disk-utils/blockdev.c:81
+#, fuzzy
+msgid "get size in bytes"
+msgstr "отримати розмір"
+
+#: disk-utils/blockdev.c:84
+msgid "set readahead"
+msgstr "встановити режим попереднього читання"
+
+#: disk-utils/blockdev.c:87
+msgid "get readahead"
+msgstr "отримати стан режиму попереднього читання"
+
+#: disk-utils/blockdev.c:90
+msgid "flush buffers"
+msgstr "скинути буфери"
+
+#: disk-utils/blockdev.c:94
+msgid "reread partition table"
+msgstr "перечитати таблицю розділів"
+
+#: disk-utils/blockdev.c:103
+msgid "Usage:\n"
+msgstr "Використання:\n"
+
+#: disk-utils/blockdev.c:105
+#, c-format
+msgid "  %s --report [devices]\n"
+msgstr "  %s --report [пристрої]\n"
+
+#: disk-utils/blockdev.c:106
+#, c-format
+msgid "  %s [-v|-q] commands devices\n"
+msgstr "  %s [-v|-q] команди пристрої\n"
+
+#: disk-utils/blockdev.c:107
+msgid "Available commands:\n"
+msgstr "Доступні команди:\n"
+
+#: disk-utils/blockdev.c:254
+#, c-format
+msgid "%s: Unknown command: %s\n"
+msgstr "%s: Невідома команда: %s\n"
+
+#: disk-utils/blockdev.c:266 disk-utils/blockdev.c:275
+#, c-format
+msgid "%s requires an argument\n"
+msgstr "%s вимагає вказування аргументу\n"
+
+#: disk-utils/blockdev.c:323
+#, c-format
+msgid "%s succeeded.\n"
+msgstr "%s виконано.\n"
+
+#: disk-utils/blockdev.c:341 disk-utils/blockdev.c:367
+#, c-format
+msgid "%s: cannot open %s\n"
+msgstr "%s: не вдається відкрити %s\n"
+
+#: disk-utils/blockdev.c:384
+#, c-format
+msgid "%s: ioctl error on %s\n"
+msgstr "%s: помилка ioctl для %s\n"
+
+#: disk-utils/blockdev.c:391
+msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
+msgstr "Чт  ПоЧт  РзмС РзмБл    ПочСект    Розмір  Пристрій\n"
+
+#: disk-utils/elvtune.c:46 disk-utils/setfdprm.c:100
+msgid "usage:\n"
+msgstr "Використання:\n"
+
+#: disk-utils/fdformat.c:31
+msgid "Formatting ... "
+msgstr "Форматування ... "
+
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
+msgid "done\n"
+msgstr "виконано\n"
+
+#: disk-utils/fdformat.c:60
+msgid "Verifying ... "
+msgstr "Перевірка ... "
+
+#: disk-utils/fdformat.c:71
+msgid "Read: "
+msgstr "Читання: "
+
+#: disk-utils/fdformat.c:73
+#, c-format
+msgid "Problem reading cylinder %d, expected %d, read %d\n"
+msgstr "Помилка зчитування циліндру %d, очікувалось %d, прочитано %d\n"
+
+#: disk-utils/fdformat.c:79
+#, c-format
+msgid ""
+"bad data in cyl %d\n"
+"Continuing ... "
+msgstr ""
+"пошкоджені дані у циліндрі %d\n"
+"Продовження ... "
+
+#: disk-utils/fdformat.c:94
+#, c-format
+msgid "usage: %s [ -n ] device\n"
+msgstr "використання: %s [ -n ] пристрій\n"
+
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175
+#: misc-utils/cal.c:248 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:143
+#, c-format
+msgid "%s from %s\n"
+msgstr "%s з %s\n"
+
+#: disk-utils/fdformat.c:130
+#, c-format
+msgid "%s: not a block device\n"
+msgstr "%s: не є блочним пристроєм\n"
+
+#: disk-utils/fdformat.c:140
+msgid "Could not determine current format type"
+msgstr "не вдається визначити поточний тип формату"
+
+#: disk-utils/fdformat.c:141
+#, c-format
+msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
+msgstr "%s-сторони, %d доріжок, %d сект/доріжку. Загальний об'єм %d кб.\n"
+
+#: disk-utils/fdformat.c:142
+msgid "Double"
+msgstr "Дві"
+
+#: disk-utils/fdformat.c:142
+msgid "Single"
+msgstr "Одна"
+
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h         print this help\n"
+" -x dir     extract into dir\n"
+" -v         be more verbose\n"
+" file       file to test\n"
+msgstr ""
+"використання: %s [-hv] [-x каталог] файл\n"
+" -h         вивести цю довідку\n"
+" -x каталог розпакувати у каталог\n"
+" -v         більше подробиць\n"
+" файл       файл для перевірки\n"
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr "%s: помилка %d при декомпресії! %p(%d)\n"
+
+#: disk-utils/fsck.cramfs.c:243
+#, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: помилковий розмір у символічному посиланні `%s'\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid "  uncompressing block at %ld to %ld (%ld)\n"
+msgstr "  розтискається блок з %ld до %ld (%ld)\n"
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr "%s: фіктивні права на `%s' (%o)\n"
+
+#: disk-utils/fsck.cramfs.c:319
+#, c-format
+msgid "  hole at %ld (%d)\n"
+msgstr "  дірка на %ld (%d)\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr "%s: Не-блочні (%ld) байти\n"
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr "%s: Безрозмірні (%ld проти %ld) байти\n"
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr "%s: неправильний cramfs - помилкова довжина шляху\n"
+
+#: disk-utils/fsck.cramfs.c:472
+#, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s: скомпільовано без підтримки -x\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr "%s: попередження - не вдається визначити розмір файлової системи\n"
+
+#: disk-utils/fsck.cramfs.c:508
+#, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s не є блочним пристроєм чи файлом\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr "%s: неправильний cramfs - довжина файлу надто коротка\n"
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr "%s: неправильний cramfs - неправильна сигнатура\n"
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr "%s: попередження - довжина файлу надто велика, доповнений образ?\n"
+
+#: disk-utils/fsck.cramfs.c:564
+#, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: неправильний cramfs - помилка контрольної суми\n"
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr "%s: попередження - старий тип cramfs образу, немає контрольної суми\n"
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr "%s: неправильний cramfs - неправильний суперблок\n"
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+"%s: неправильний cramfs - кінець даних каталогу (%ld) != початку файлових "
+"даних (%ld)\n"
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr "%s: неправильний cramfs - неправильний зсув файлових даних\n"
+
+#: disk-utils/fsck.minix.c:186
+#, c-format
+msgid "Usage: %s [-larvsmf] /dev/name\n"
+msgstr "Використання: %s [-larvsmf] /dev/назва\n"
+
+#: disk-utils/fsck.minix.c:293
+#, c-format
+msgid "%s is mounted.\t "
+msgstr "%s підключено.\t "
+
+#: disk-utils/fsck.minix.c:295
+msgid "Do you really want to continue"
+msgstr "Ви дійсно бажаєте продовжити"
+
+#: disk-utils/fsck.minix.c:299
+msgid "check aborted.\n"
+msgstr "перевірку перервано.\n"
+
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
+#, c-format
+msgid "Zone nr < FIRSTZONE in file `%s'."
+msgstr "nr зони < FIRSTZONE у файлі `%s'."
+
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
+#, c-format
+msgid "Zone nr >= ZONES in file `%s'."
+msgstr "nr зони >= ZONES у файлі `%s'."
+
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
+msgid "Remove block"
+msgstr "Видалити блок"
+
+#: disk-utils/fsck.minix.c:368
+#, c-format
+msgid "Read error: unable to seek to block in file '%s'\n"
+msgstr "Помилка читання: помилка при позиціюванні на блок у файлі '%s'\n"
+
+#: disk-utils/fsck.minix.c:374
+#, c-format
+msgid "Read error: bad block in file '%s'\n"
+msgstr "Помилка читання: неправильний блок у файлі '%s'\n"
+
+#: disk-utils/fsck.minix.c:389
+msgid ""
+"Internal error: trying to write bad block\n"
+"Write request ignored\n"
+msgstr ""
+"Внутрішня помилка: спроба запису у пошкоджений блок\n"
+"Операція запису проігнорована\n"
+
+#: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267
+msgid "seek failed in write_block"
+msgstr "помилка при позиціюванні у функції write_block"
+
+#: disk-utils/fsck.minix.c:398
+#, c-format
+msgid "Write error: bad block in file '%s'\n"
+msgstr "Помилка запису: пошкоджений блок у файлі '%s'\n"
+
+#: disk-utils/fsck.minix.c:514
+msgid "seek failed in write_super_block"
+msgstr "помилка при позиціюванні у функції write_super_block"
+
+#: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254
+msgid "unable to write super-block"
+msgstr "помилка запису суперблоку"
+
+#: disk-utils/fsck.minix.c:526
+msgid "Unable to write inode map"
+msgstr "Не вдається записати мапу вузлів"
+
+#: disk-utils/fsck.minix.c:528
+msgid "Unable to write zone map"
+msgstr "Не вдається записати мапу зон"
+
+#: disk-utils/fsck.minix.c:530
+msgid "Unable to write inodes"
+msgstr "Не вдається записати вузли"
+
+#: disk-utils/fsck.minix.c:557
+msgid "seek failed"
+msgstr "помилка при позиціюванні"
+
+#: disk-utils/fsck.minix.c:559
+msgid "unable to read super block"
+msgstr "не вдається прочитати суперблок"
+
+#: disk-utils/fsck.minix.c:577
+msgid "bad magic number in super-block"
+msgstr "неправильна сигнатура суперблока"
+
+#: disk-utils/fsck.minix.c:579
+msgid "Only 1k blocks/zones supported"
+msgstr "Підтримуються лише 1k блоки/зону"
+
+#: disk-utils/fsck.minix.c:581
+msgid "bad s_imap_blocks field in super-block"
+msgstr "неправильне s_imap_blocks поле у суперблоці"
+
+#: disk-utils/fsck.minix.c:583
+msgid "bad s_zmap_blocks field in super-block"
+msgstr "неправильне s_zmap_blocks поле у суперблоці"
+
+#: disk-utils/fsck.minix.c:590
+msgid "Unable to allocate buffer for inode map"
+msgstr "Не вдається виділити буфер для мапи вузлів"
+
+#: disk-utils/fsck.minix.c:598
+msgid "Unable to allocate buffer for inodes"
+msgstr "Не вдається виділити буфер для вузлів"
+
+#: disk-utils/fsck.minix.c:601
+msgid "Unable to allocate buffer for inode count"
+msgstr "Не вдається виділити буфер для лічильника вузлів"
+
+#: disk-utils/fsck.minix.c:604
+msgid "Unable to allocate buffer for zone count"
+msgstr "Не вдається виділити буфер для лічильника зон"
+
+#: disk-utils/fsck.minix.c:606
+msgid "Unable to read inode map"
+msgstr "Не вдається прочитати мапу вузлів"
+
+#: disk-utils/fsck.minix.c:608
+msgid "Unable to read zone map"
+msgstr "Не вдається прочитати мапу зон"
+
+#: disk-utils/fsck.minix.c:610
+msgid "Unable to read inodes"
+msgstr "Не вдається прочитати вузли"
+
+#: disk-utils/fsck.minix.c:612
+msgid "Warning: Firstzone != Norm_firstzone\n"
+msgstr "Попередження: Firstzone != Norm_firstzone\n"
+
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508
+#, c-format
+msgid "%ld inodes\n"
+msgstr "%ld вузлів\n"
+
+#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509
+#, c-format
+msgid "%ld blocks\n"
+msgstr "%ld блоків\n"
+
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510
+#, c-format
+msgid "Firstdatazone=%ld (%ld)\n"
+msgstr "Перша зона даних=%ld (%ld)\n"
+
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511
+#, c-format
+msgid "Zonesize=%d\n"
+msgstr "Розмір зони=%d\n"
+
+#: disk-utils/fsck.minix.c:621
+#, c-format
+msgid "Maxsize=%ld\n"
+msgstr "Макс.розмір=%ld\n"
+
+#: disk-utils/fsck.minix.c:622
+#, c-format
+msgid "Filesystem state=%d\n"
+msgstr "Стан файлової системи=%d\n"
+
+#: disk-utils/fsck.minix.c:623
+#, c-format
+msgid ""
+"namelen=%d\n"
+"\n"
+msgstr ""
+"довж.назви=%d\n"
+"\n"
+
+#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689
+#, c-format
+msgid "Inode %d marked unused, but used for file '%s'\n"
+msgstr "Вузол %d позначений як вільний, але використовується у '%s'\n"
+
+#: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693
+msgid "Mark in use"
+msgstr "Позначити як використовуваний"
+
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713
+#, c-format
+msgid "The file `%s' has mode %05o\n"
+msgstr "Файл `%s' має права доступу %05o\n"
+
+#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
+msgid "Warning: inode count too big.\n"
+msgstr "Попередження: значення лічильника вузлів надто велике.\n"
+
+#: disk-utils/fsck.minix.c:731
+msgid "root inode isn't a directory"
+msgstr "кореневий вузол не є каталогом"
+
+#: disk-utils/fsck.minix.c:753 disk-utils/fsck.minix.c:786
+#, c-format
+msgid "Block has been used before. Now in file `%s'."
+msgstr "Блок вже використовується раніше. Тепер у файлі `%s'."
+
+#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:788
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1120
+#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1175
+msgid "Clear"
+msgstr "Очистити"
+
+#: disk-utils/fsck.minix.c:765 disk-utils/fsck.minix.c:798
+#, c-format
+msgid "Block %d in file `%s' is marked not in use."
+msgstr "Блок %d з файлу `%s' позначений вільним."
+
+#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:800
+msgid "Correct"
+msgstr "Виправити"
+
+#: disk-utils/fsck.minix.c:939 disk-utils/fsck.minix.c:1006
+#, c-format
+msgid "The directory '%s' contains a bad inode number for file '%.*s'."
+msgstr "Каталог '%s' містить неправильну кількість вузлів для файлу '%.*s'."
+
+#: disk-utils/fsck.minix.c:942 disk-utils/fsck.minix.c:1009
+msgid " Remove"
+msgstr " Видалити"
+
+#: disk-utils/fsck.minix.c:956
+#, c-format
+msgid "`%s': bad directory: '.' isn't first\n"
+msgstr "`%s': неправильний каталог: елемент '.' не перший\n"
+
+#: disk-utils/fsck.minix.c:964
+#, c-format
+msgid "`%s': bad directory: '..' isn't second\n"
+msgstr "`%s': неправильний каталог: елемент '..' не другий\n"
+
+#: disk-utils/fsck.minix.c:1023
+#, c-format
+msgid "%s: bad directory: '.' isn't first\n"
+msgstr "%s: неправильний каталог: елемент '.' не перший\n"
+
+#: disk-utils/fsck.minix.c:1032
+#, c-format
+msgid "%s: bad directory: '..' isn't second\n"
+msgstr "%s: неправильний каталог: елемент '..' не другий\n"
+
+#: disk-utils/fsck.minix.c:1066
+msgid "internal error"
+msgstr "внутрішня помилка"
+
+#: disk-utils/fsck.minix.c:1069 disk-utils/fsck.minix.c:1087
+#, c-format
+msgid "%s: bad directory: size < 32"
+msgstr "%s: неправильний каталог: розмір < 32"
+
+#: disk-utils/fsck.minix.c:1100
+msgid "seek failed in bad_zone"
+msgstr "помилка при позиціюванні у функції bad_zone"
+
+#: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165
+#, c-format
+msgid "Inode %d mode not cleared."
+msgstr "Права доступу вузла %d не очищені."
+
+#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174
+#, c-format
+msgid "Inode %d not used, marked used in the bitmap."
+msgstr ""
+"Вузол %d не використовується, але позначений використовуваним у бітовій мапі."
+
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1180
+#, c-format
+msgid "Inode %d used, marked unused in the bitmap."
+msgstr "Вузол %d використовується, але позначений вільним у бітовій мапі."
+
+#: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185
+#, c-format
+msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+msgstr "Вузол %d (права = %07o), i_nlinks=%d, лічильник=%d."
+
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187
+msgid "Set i_nlinks to count"
+msgstr "Встановити i_nlinks у значення лічильника"
+
+#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1199
+#, c-format
+msgid "Zone %d: marked in use, no file uses it."
+msgstr ""
+"Зона %d: позначена використовуваною, але вона не використовується файлами."
+
+#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1201
+msgid "Unmark"
+msgstr "Зняти позначення"
+
+#: disk-utils/fsck.minix.c:1151 disk-utils/fsck.minix.c:1206
+#, c-format
+msgid "Zone %d: in use, counted=%d\n"
+msgstr "Зона %d: використовується, лічильник=%d\n"
+
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209
+#, c-format
+msgid "Zone %d: not in use, counted=%d\n"
+msgstr "Зона %d: не використовується, лічильник=%d\n"
+
+#: disk-utils/fsck.minix.c:1181
+msgid "Set"
+msgstr "Встановити"
+
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
+#: disk-utils/mkfs.minix.c:633
+msgid "bad inode size"
+msgstr "неправильний розмір вузла"
+
+#: disk-utils/fsck.minix.c:1256
+msgid "bad v2 inode size"
+msgstr "неправильний номер вузла версії 2"
+
+#: disk-utils/fsck.minix.c:1282
+msgid "need terminal for interactive repairs"
+msgstr "для інтерактивного відновлення необхідний термінал"
+
+#: disk-utils/fsck.minix.c:1286
+#, c-format
+msgid "unable to open '%s'"
+msgstr "не вдається відкрити '%s'"
+
+#: disk-utils/fsck.minix.c:1301
+#, c-format
+msgid "%s is clean, no check.\n"
+msgstr "%s - чистий, перевірка не виконуватиметься.\n"
+
+#: disk-utils/fsck.minix.c:1305
+#, c-format
+msgid "Forcing filesystem check on %s.\n"
+msgstr "Примусова перевірка файлової системи на %s.\n"
+
+#: disk-utils/fsck.minix.c:1307
+#, c-format
+msgid "Filesystem on %s is dirty, needs checking.\n"
+msgstr "Файлова система на %s пошкоджена, потрібна перевірка.\n"
+
+#: disk-utils/fsck.minix.c:1333
+#, c-format
+msgid ""
+"\n"
+"%6ld inodes used (%ld%%)\n"
+msgstr ""
+"\n"
+"%6ld використаних вузлів (%ld%%)\n"
+
+#: disk-utils/fsck.minix.c:1338
+#, c-format
+msgid "%6ld zones used (%ld%%)\n"
+msgstr "%6ld використаних зон (%ld%%)\n"
+
+#: disk-utils/fsck.minix.c:1340
+#, c-format
+msgid ""
+"\n"
+"%6d regular files\n"
+"%6d directories\n"
+"%6d character device files\n"
+"%6d block device files\n"
+"%6d links\n"
+"%6d symbolic links\n"
+"------\n"
+"%6d files\n"
+msgstr ""
+"\n"
+"%6d звичайних файлів\n"
+"%6d каталогів\n"
+"%6d файлів символьних пристроїв\n"
+"%6d файлів блочних пристроїв\n"
+"%6d посилань\n"
+"%6d символьних посилань\n"
+"------\n"
+"%6d файлів\n"
+
+#: disk-utils/fsck.minix.c:1353
+msgid ""
+"----------------------------\n"
+"FILE SYSTEM HAS BEEN CHANGED\n"
+"----------------------------\n"
+msgstr ""
+"----------------------------\n"
+"ФАЙЛОВА СИСТЕМА ЗАЗНАЛА ЗМІН\n"
+"----------------------------\n"
+
+#: disk-utils/isosize.c:129
+#, c-format
+msgid "%s: failed to open: %s\n"
+msgstr "%s: не вдається відкрити: %s\n"
+
+#: disk-utils/isosize.c:135
+#, c-format
+msgid "%s: seek error on %s\n"
+msgstr "%s: помилка позиціювання на %s\n"
+
+#: disk-utils/isosize.c:141
+#, c-format
+msgid "%s: read error on %s\n"
+msgstr "%s: помилка позиціювання на %s\n"
+
+#: disk-utils/isosize.c:150
+#, c-format
+msgid "sector count: %d, sector size: %d\n"
+msgstr "кількість секторів: %d, розмір сектора: %d\n"
+
+#: disk-utils/isosize.c:198
+#, c-format
+msgid "%s: option parse error\n"
+msgstr "%s: помилка при аналізі параметра командного рядка\n"
+
+#: disk-utils/isosize.c:206
+#, c-format
+msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
+msgstr "Використання: %s [-x] [-d <кількість>] iso9660-образ\n"
+
+#: disk-utils/mkfs.bfs.c:88
+#, c-format
+msgid ""
+"Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
+"       [-F fsname] device [block-count]\n"
+msgstr ""
+"Використання: %s [-v] [-N nr-of-inodes] [-V назва-тому]\n"
+"       [-F назва.файл.сист] пристрій [кількість-блоків]\n"
+
+#: 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 "не вдається отримати інформацію про %s"
+
+#: disk-utils/mkfs.bfs.c:171
+#, c-format
+msgid "%s is not a block special device"
+msgstr "%s не є спеціальним файлом блочного пристрою"
+
+#: disk-utils/mkfs.bfs.c:176
+#, c-format
+msgid "cannot open %s"
+msgstr "не вдається відкрити %s"
+
+#: disk-utils/mkfs.bfs.c:187
+#, c-format
+msgid "cannot get size of %s"
+msgstr "не вдається отримати розмір %s"
+
+#: disk-utils/mkfs.bfs.c:192
+#, c-format
+msgid "blocks argument too large, max is %lu"
+msgstr "параметр кількості блоків надто великий, максимум %lu"
+
+#: disk-utils/mkfs.bfs.c:207
+msgid "too many inodes - max is 512"
+msgstr "надто багато вузлів - максимум 512"
+
+#: disk-utils/mkfs.bfs.c:216
+#, c-format
+msgid "not enough space, need at least %lu blocks"
+msgstr "не вистачає простору, потрібно принаймні %lu блоків"
+
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2212
+#, c-format
+msgid "Device: %s\n"
+msgstr "Пристрій: %s\n"
+
+#: disk-utils/mkfs.bfs.c:229
+#, c-format
+msgid "Volume: <%-6s>\n"
+msgstr "Том: <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:230
+#, c-format
+msgid "FSname: <%-6s>\n"
+msgstr "Назва ф.с.: <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:231
+#, c-format
+msgid "BlockSize: %d\n"
+msgstr "Розмір блоку: %d\n"
+
+#: disk-utils/mkfs.bfs.c:233
+#, c-format
+msgid "Inodes: %d (in 1 block)\n"
+msgstr "Вузлів: %d (у 1 блоці)\n"
+
+#: disk-utils/mkfs.bfs.c:236
+#, c-format
+msgid "Inodes: %d (in %ld blocks)\n"
+msgstr "Вузлів: %d (у %ld блоках)\n"
+
+#: disk-utils/mkfs.bfs.c:238
+#, c-format
+msgid "Blocks: %ld\n"
+msgstr "Блоків: %ld\n"
+
+#: disk-utils/mkfs.bfs.c:239
+#, c-format
+msgid "Inode end: %d, Data end: %d\n"
+msgstr "Кінець вузлів: %d, Кінець даних: %d\n"
+
+#: disk-utils/mkfs.bfs.c:244
+msgid "error writing superblock"
+msgstr "помилка запису суперблоку"
+
+#: 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
+#, c-format
+msgid "error closing %s"
+msgstr "помилка закривання %s"
+
+#: disk-utils/mkfs.c:76
+msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
+msgstr "Використання: mkfs [-V] [-t типФС] [параметри-ФС] пристрій [розмір]\n"
+
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:345 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
+#, c-format
+msgid "%s: Out of memory!\n"
+msgstr "%s: Недостатньо пам'яті!\n"
+
+#: disk-utils/mkfs.c:99
+#, c-format
+msgid "mkfs version %s (%s)\n"
+msgstr "mkfs версії %s (%s)\n"
+
+#: disk-utils/mkfs.cramfs.c:124
+#, c-format
+msgid ""
+"usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h         print this help\n"
+" -v         be verbose\n"
+" -E         make all warnings errors (non-zero exit status)\n"
+" -b blksz   use this blocksize, must equal page size\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file    insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name    set name of cramfs filesystem\n"
+" -p         pad by %d bytes for boot code\n"
+" -s         sort directory entries (old option, ignored)\n"
+" -z         make explicit holes (requires >= 2.3.39)\n"
+" dirname    root of the filesystem to be compressed\n"
+" outfile    output file\n"
+msgstr ""
+"використання: %s [-v] [-b розм_бл] [-e видання] [-i файл] [-n назва] "
+"назв_кат файл_вив\n"
+" -h         вивести цю довідку\n"
+" -v         докладніший вивід\n"
+" -E         вважати всі попередження помилками (ненульовий код завершення)\n"
+" -b розм_бл використовувати цей розмір блоку, повинен дорівнювати розміру "
+"сторінки\n"
+" -e видання встановити номер видання (частина від fsid)\n"
+" -i файл    вставити файл образу у файлову систему (вимагає >= 2.4.0)\n"
+" -n назва   встановити назву файлової системи cramfs\n"
+" -p         зарезервувати %d байт для коду завантажувача\n"
+" -s         сортувати елементи каталогу (застарілий параметр, ігнорується)\n"
+" -z         створювати явні дірки (вимагає >= 2.3.39)\n"
+" назв_кат   кореневий каталог майбутньої стиснутої файлової системи\n"
+" файл_вив   файл виводу\n"
+
+#: disk-utils/mkfs.cramfs.c:335
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
+msgstr ""
+"Знайдено надто довгі (%u байт) назви файлів `%s'.\n"
+" Збільште значення MAX_INPUT_NAMELEN у файлі mkcramfs.c та перекомпілюйте.\n"
+"Завершення.\n"
+
+#: disk-utils/mkfs.cramfs.c:463
+msgid "filesystem too big.  Exiting.\n"
+msgstr "файлова система надто велика. Завершення.\n"
+
+#: disk-utils/mkfs.cramfs.c:514
+msgid ""
+"Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
+"Exiting.\n"
+msgstr ""
+"Перевищено MAXENTRIES. Збільште це значення у mkcramfs.c та перекомпілюйте.\n"
+"Завершення.\n"
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:622
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr "AIEEE: блок \"стиснений\" > 2*blocklength (%ld)\n"
+
+#: disk-utils/mkfs.cramfs.c:641
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr "%6.2f%% (%+d байтів)\t%s\n"
+
+#: disk-utils/mkfs.cramfs.c:819
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB.  We might die prematurely.\n"
+msgstr ""
+"Попередження: очікуваний необхідний розмір (верхня межа) складає %LdМб, але "
+"максимальний розмір образу %uМб.  Можливе передчасне аварійне завершення.\n"
+
+#: disk-utils/mkfs.cramfs.c:860
+#, c-format
+msgid "Including: %s\n"
+msgstr "Включається: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:866
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr "Дані каталогу: %d байт\n"
+
+#: disk-utils/mkfs.cramfs.c:874
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr "Загалом: %d кілобайт\n"
+
+#: disk-utils/mkfs.cramfs.c:879
+#, c-format
+msgid "Super block: %d bytes\n"
+msgstr "Суперблок: %d байт\n"
+
+#: disk-utils/mkfs.cramfs.c:886
+#, c-format
+msgid "CRC: %x\n"
+msgstr "Контрольна сума: %x\n"
+
+#: disk-utils/mkfs.cramfs.c:891
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr "не вистачає простору для ROM образу (виділено %Ld, використано %d)\n"
+
+#: disk-utils/mkfs.cramfs.c:903
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr "помилка запису ROM обрізу (%d %d)\n"
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:912
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "Попередження: назва файлу обрізана до 255 байтів.\n"
+
+#: disk-utils/mkfs.cramfs.c:915
+msgid "warning: files were skipped due to errors.\n"
+msgstr "Попередження: файл пропущений внаслідок помилок.\n"
+
+#: disk-utils/mkfs.cramfs.c:918
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr "Попередження: розміри файлів обрізані до %luМб (мінус 1 байт).\n"
+
+#: disk-utils/mkfs.cramfs.c:923
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "Попередження: uid обрізані до %u біт. (Це може загрожувати безпеці.)\n"
+
+#: disk-utils/mkfs.cramfs.c:928
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "Попередження: gid обрізані до %u біт. (Це може загрожувати безпеці.)\n"
+
+#: disk-utils/mkfs.cramfs.c:933
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+"УВАГА: номери пристроїв обрізані до %u біт. Це майже завжди означає\n"
+"що деякі файли пристроїв будуть неправильними.\n"
+
+#: disk-utils/mkfs.minix.c:163
+#, c-format
+msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
+msgstr ""
+"Використання: %s [-c | -l назва_файлу] [-nXX] [-iXX] /dev/назва [блоки]\n"
+
+#: disk-utils/mkfs.minix.c:187
+#, c-format
+msgid "%s is mounted; will not make a filesystem here!"
+msgstr "%s підключений; тут не можна створювати файлову систему!"
+
+#: disk-utils/mkfs.minix.c:248
+msgid "seek to boot block failed in write_tables"
+msgstr "помилка позиціювання на завантажувальний блок у функції"
+
+#: disk-utils/mkfs.minix.c:250
+msgid "unable to clear boot sector"
+msgstr "не вдається очистити завантажувальний сектор"
+
+#: disk-utils/mkfs.minix.c:252
+msgid "seek failed in write_tables"
+msgstr "помилка позиціювання у функції write_tables"
+
+#: disk-utils/mkfs.minix.c:256
+msgid "unable to write inode map"
+msgstr "не вдається записати мапу вузлів"
+
+#: disk-utils/mkfs.minix.c:258
+msgid "unable to write zone map"
+msgstr "не вдається записати мапу зон"
+
+#: disk-utils/mkfs.minix.c:260
+msgid "unable to write inodes"
+msgstr "не вдається записати вузли"
+
+#: disk-utils/mkfs.minix.c:269
+msgid "write failed in write_block"
+msgstr "помилка запису у функції write_block"
+
+#. Could make triple indirect block here
+#: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351
+#: disk-utils/mkfs.minix.c:400
+msgid "too many bad blocks"
+msgstr "надто багато пошкоджених блоків"
+
+#: disk-utils/mkfs.minix.c:285
+msgid "not enough good blocks"
+msgstr "недостатньо непошкоджених блоків"
+
+#: disk-utils/mkfs.minix.c:497
+msgid "unable to allocate buffers for maps"
+msgstr "не вдається виділити буфери для мап"
+
+#: disk-utils/mkfs.minix.c:506
+msgid "unable to allocate buffer for inodes"
+msgstr "не вдається виділити буфер для вузлів"
+
+#: disk-utils/mkfs.minix.c:512
+#, c-format
+msgid ""
+"Maxsize=%ld\n"
+"\n"
+msgstr ""
+"Макс.розмір=%ld\n"
+"\n"
+
+#: disk-utils/mkfs.minix.c:526
+msgid "seek failed during testing of blocks"
+msgstr "помилка позиціювання при перевірці блоків"
+
+#: disk-utils/mkfs.minix.c:534
+msgid "Weird values in do_check: probably bugs\n"
+msgstr "Незрозуміле значення у функції do_check: можливо помилка\n"
+
+#: disk-utils/mkfs.minix.c:565 disk-utils/mkswap.c:372
+msgid "seek failed in check_blocks"
+msgstr "помилка позиціювання у функції check_blocks"
+
+#: disk-utils/mkfs.minix.c:574
+msgid "bad blocks before data-area: cannot make fs"
+msgstr "неправильні блоки перед областю даних: не вдається створити ФС"
+
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
+#, c-format
+msgid "%d bad blocks\n"
+msgstr "%d пошкоджених блоків\n"
+
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
+msgid "one bad block\n"
+msgstr "один пошкоджений блок\n"
+
+#: disk-utils/mkfs.minix.c:592
+msgid "can't open file of bad blocks"
+msgstr "не вдається відкрити файл пошкоджених блоків"
+
+#: disk-utils/mkfs.minix.c:674
+msgid "strtol error: number of blocks not specified"
+msgstr "strtol помилка: не вказано кількість блоків"
+
+#: disk-utils/mkfs.minix.c:704
+#, c-format
+msgid "unable to open %s"
+msgstr "не вдається відкрити %s"
+
+#: disk-utils/mkfs.minix.c:706
+#, c-format
+msgid "unable to stat %s"
+msgstr "не вдається запустити %s"
+
+#: disk-utils/mkfs.minix.c:710
+#, c-format
+msgid "will not try to make filesystem on '%s'"
+msgstr "файлова система не буде створена на '%s'"
+
+#: disk-utils/mkswap.c:178
+#, c-format
+msgid "Bad user-specified page size %d\n"
+msgstr "Неправильний вказаний користувачем розмір сторінки %d\n"
+
+#: disk-utils/mkswap.c:187
+#, c-format
+msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
+msgstr ""
+"Використовується вказаний користувачем розмір сторінки %d, замість системних "
+"значень %d/%d\n"
+
+#: disk-utils/mkswap.c:191
+#, c-format
+msgid "Assuming pages of size %d (not %d)\n"
+msgstr "Передбачається розмір сторінки %d (а не %d)\n"
+
+#: disk-utils/mkswap.c:326
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
+msgstr "Використання: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/назва [блоки]\n"
+
+#: disk-utils/mkswap.c:349
+msgid "too many bad pages"
+msgstr "надто багато пошкоджених сторінок"
+
+#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1145
+#: text-utils/more.c:2090 text-utils/more.c:2101
+msgid "Out of memory"
+msgstr "Недостатньо пам'яті"
+
+#: disk-utils/mkswap.c:380
+msgid "one bad page\n"
+msgstr "одна пошкоджена сторінка\n"
+
+#: disk-utils/mkswap.c:382
+#, fuzzy, c-format
+msgid "%lu bad pages\n"
+msgstr "%d пошкоджених сторінок\n"
+
+#: disk-utils/mkswap.c:502
+#, c-format
+msgid "%s: error: Nowhere to set up swap on?\n"
+msgstr "%s: помилка: Не вказано де створити підкачку?\n"
+
+#: disk-utils/mkswap.c:520
+#, fuzzy, c-format
+msgid "%s: error: size %lu is larger than device size %lu\n"
+msgstr "%s: помилка: розмір %ld більший ніж розмір пристрою %d\n"
+
+#: disk-utils/mkswap.c:539
+#, c-format
+msgid "%s: error: unknown version %d\n"
+msgstr "%s: помилка: невідома версія %d\n"
+
+#: disk-utils/mkswap.c:546
+#, c-format
+msgid "%s: error: swap area needs to be at least %ldkB\n"
+msgstr "%s: помилка: область підкачки повинна бути принаймні %ldкб\n"
+
+#: disk-utils/mkswap.c:563
+#, c-format
+msgid "%s: warning: truncating swap area to %ldkB\n"
+msgstr "%s: попередження: область підкачки відсікається до %ldкб\n"
+
+#: disk-utils/mkswap.c:577
+#, c-format
+msgid "Will not try to make swapdevice on '%s'"
+msgstr "Не буде створено пристрій підкачки на '%s'"
+
+#: disk-utils/mkswap.c:586 disk-utils/mkswap.c:607
+msgid "fatal: first page unreadable"
+msgstr "фатальна помилка: не вдається прочитати першу сторінку"
+
+#: disk-utils/mkswap.c:592
+#, c-format
+msgid ""
+"%s: Device '%s' contains a valid Sun disklabel.\n"
+"This probably means creating v0 swap would destroy your partition table\n"
+"No swap created. If you really want to create swap v0 on that device, use\n"
+"the -f option to force it.\n"
+msgstr ""
+"%s: Пристрій '%s' містить правильну Sun етикетку диску.\n"
+"Можливо це означає, що створення v0 підкачки зруйнує таблицю розділів.\n"
+"Розділ підкачки не створено. Якщо ви дійсно бажаєте створити v0 підкачку\n"
+"на цьому розділі, тоді використовуйте параметр -f для примусового "
+"створення.\n"
+
+#: disk-utils/mkswap.c:616
+msgid "Unable to set up swap-space: unreadable"
+msgstr "не вдається встановити простір підкачки: не вдається прочитати"
+
+#: disk-utils/mkswap.c:617
+#, c-format
+msgid "Setting up swapspace version %d, size = %llu kB\n"
+msgstr "Встановлюється область підкачки версії %d, розмір = %llu кб\n"
+
+#: disk-utils/mkswap.c:623
+msgid "unable to rewind swap-device"
+msgstr "помилка позиціювання на початок пристрою підкачки"
+
+#: disk-utils/mkswap.c:626
+msgid "unable to write signature page"
+msgstr "не вдається записати сторінку підпису"
+
+#: disk-utils/mkswap.c:634
+msgid "fsync failed"
+msgstr "помилка виконання fsync"
+
+#: disk-utils/setfdprm.c:31
+#, c-format
+msgid "Invalid number: %s\n"
+msgstr "Неправильне число: %s\n"
+
+#: disk-utils/setfdprm.c:81
+#, c-format
+msgid "Syntax error: '%s'\n"
+msgstr "Синтаксична помилка: '%s'\n"
+
+#: disk-utils/setfdprm.c:91
+#, c-format
+msgid "No such parameter set: '%s'\n"
+msgstr "Немає такого набору параметрів: '%s'\n"
+
+#: disk-utils/setfdprm.c:101
+#, c-format
+msgid "   %s [ -p ] dev name\n"
+msgstr "   %s [ -p ] пристрій назва\n"
+
+#: disk-utils/setfdprm.c:102
+#, c-format
+msgid ""
+"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+msgstr ""
+"   %s [ -p ] пристрій розмір сект головок доріжок stretch gap rate spec1 "
+"fmt_gap\n"
+
+#: disk-utils/setfdprm.c:105
+#, c-format
+msgid "   %s [ -c | -y | -n | -d ] dev\n"
+msgstr "   %s [ -c | -y | -n | -d ] пристрій\n"
+
+#: disk-utils/setfdprm.c:107
+#, c-format
+msgid "   %s [ -c | -y | -n ] dev\n"
+msgstr "   %s [ -c | -y | -n ] пристрій\n"
+
+#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:1993
+msgid "Unusable"
+msgstr "Не використано"
+
+#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:1995
+msgid "Free Space"
+msgstr "Вільний простір"
+
+#: fdisk/cfdisk.c:375
+msgid "Linux ext2"
+msgstr "Linux ext2"
+
+#: fdisk/cfdisk.c:377
+msgid "Linux ext3"
+msgstr "Linux ext3"
+
+#: fdisk/cfdisk.c:379
+msgid "Linux XFS"
+msgstr "Linux XFS"
+
+#: fdisk/cfdisk.c:381
+msgid "Linux ReiserFS"
+msgstr "Linux ReiserFS"
+
+#: fdisk/cfdisk.c:383 fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
+#: fdisk/cfdisk.c:386
+msgid "OS/2 HPFS"
+msgstr "OS/2 HPFS"
+
+#: fdisk/cfdisk.c:388
+msgid "OS/2 IFS"
+msgstr "OS/2 IFS"
+
+#: fdisk/cfdisk.c:392
+msgid "NTFS"
+msgstr "NTFS"
+
+#: fdisk/cfdisk.c:403
+msgid "Disk has been changed.\n"
+msgstr "Диск було змінено.\n"
+
+#: fdisk/cfdisk.c:404
+msgid "Reboot the system to ensure the partition table is correctly updated.\n"
+msgstr ""
+"Перезавантажте систему щоб впевнитись, що таблиця розділів коректно "
+"оновлена.\n"
+
+#: fdisk/cfdisk.c:407
+msgid ""
+"\n"
+"WARNING: If you have created or modified any\n"
+"DOS 6.x partitions, please see the cfdisk manual\n"
+"page for additional information.\n"
+msgstr ""
+"\n"
+"УВАГА: Якщо ви створили або змінити будь-які\n"
+"DOS 6.x розділи, перегляньте man сторінку з cfdisk\n"
+"щоб отримати докладнішу інформацію.\n"
+
+#: fdisk/cfdisk.c:502
+msgid "FATAL ERROR"
+msgstr "ФАТАЛЬНА ПОМИЛКА"
+
+#: fdisk/cfdisk.c:503
+msgid "Press any key to exit cfdisk"
+msgstr "Натисніть будь-яку клавішу для завершення cfdisk"
+
+#: fdisk/cfdisk.c:550 fdisk/cfdisk.c:558
+msgid "Cannot seek on disk drive"
+msgstr "Помилка позиціювання на дисковому пристрої"
+
+#: fdisk/cfdisk.c:552
+msgid "Cannot read disk drive"
+msgstr "не вдається прочитати дисковий пристрій"
+
+#: fdisk/cfdisk.c:560
+msgid "Cannot write disk drive"
+msgstr "не вдається записати на дисковий пристрій"
+
+#: fdisk/cfdisk.c:858
+msgid "Too many partitions"
+msgstr "Надто багато розділів"
+
+#: fdisk/cfdisk.c:863
+msgid "Partition begins before sector 0"
+msgstr "Розділ починається перед сектором 0"
+
+#: fdisk/cfdisk.c:868
+msgid "Partition ends before sector 0"
+msgstr "Розділ закінчується перед сектором 0"
+
+#: fdisk/cfdisk.c:873
+msgid "Partition begins after end-of-disk"
+msgstr "Розділ починається після кінця диску"
+
+#: fdisk/cfdisk.c:878
+msgid "Partition ends after end-of-disk"
+msgstr "Розділ закінчується після кінця диску"
+
+#: fdisk/cfdisk.c:883
+msgid "Partition ends in the final partial cylinder"
+msgstr "Розділ закінчується у останньому неповному циліндрі"
+
+#: fdisk/cfdisk.c:907
+msgid "logical partitions not in disk order"
+msgstr "логічні розділи не у тому порядку як на диску"
+
+#: fdisk/cfdisk.c:910
+msgid "logical partitions overlap"
+msgstr "логічні розділи перекриваються"
+
+#: fdisk/cfdisk.c:912
+msgid "enlarged logical partitions overlap"
+msgstr "збільшені логічні розділи перекриваються"
+
+#: fdisk/cfdisk.c:942
+msgid ""
+"!!!! Internal error creating logical drive with no extended partition !!!!"
+msgstr ""
+"!!!! Внутрішня помилка створення логічного пристрою без розширеного "
+"розділу !!!!"
+
+#: fdisk/cfdisk.c:953 fdisk/cfdisk.c:965
+msgid ""
+"Cannot create logical drive here -- would create two extended partitions"
+msgstr ""
+"не вдається створити тут логічний пристрій -- буде створено два розширених "
+"розділи"
+
+#: fdisk/cfdisk.c:1113
+msgid "Menu item too long. Menu may look odd."
+msgstr "Пункт меню надто довгий. Меню виглядатиме дивно."
+
+#: fdisk/cfdisk.c:1169
+msgid "Menu without direction. Defaulting horizontal."
+msgstr "Меню без орієнтації. Типова орієнтація - горизонтальна."
+
+#: fdisk/cfdisk.c:1300
+msgid "Illegal key"
+msgstr "Неправильний ключ"
+
+#: fdisk/cfdisk.c:1323
+msgid "Press a key to continue"
+msgstr "Натисніть будь-яку клавішу для продовження"
+
+#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2498
+msgid "Primary"
+msgstr "Первинний"
+
+#: fdisk/cfdisk.c:1370
+msgid "Create a new primary partition"
+msgstr "Створити новий розділ"
+
+#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2498
+msgid "Logical"
+msgstr "Логічний"
+
+#: fdisk/cfdisk.c:1371
+msgid "Create a new logical partition"
+msgstr "Створити новий логічний пристрій"
+
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2169
+msgid "Cancel"
+msgstr "Відмінити"
+
+#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427
+msgid "Don't create a partition"
+msgstr "Не створювати розділ"
+
+#: fdisk/cfdisk.c:1388
+msgid "!!! Internal error !!!"
+msgstr "!!! Внутрішня помилка !!!"
+
+#: fdisk/cfdisk.c:1391
+msgid "Size (in MB): "
+msgstr "Розмір (у MB): "
+
+#: fdisk/cfdisk.c:1425
+msgid "Beginning"
+msgstr "Початок"
+
+#: fdisk/cfdisk.c:1425
+msgid "Add partition at beginning of free space"
+msgstr "Додати розділ на початку вільного простору"
+
+#: fdisk/cfdisk.c:1426
+msgid "End"
+msgstr "Кінець"
+
+#: fdisk/cfdisk.c:1426
+msgid "Add partition at end of free space"
+msgstr "Додати розділ наприкінці вільного простору"
+
+#: fdisk/cfdisk.c:1444
+msgid "No room to create the extended partition"
+msgstr "Недостатньо простору для створення розширеного розділу"
+
+#: fdisk/cfdisk.c:1503
+msgid "No partition table or unknown signature on partition table"
+msgstr "Немає таблиці розділів або невідома сигнатура таблиці розділів"
+
+#: fdisk/cfdisk.c:1505
+msgid "Do you wish to start with a zero table [y/N] ?"
+msgstr "Бажаєте почати з нульової таблиці [y/N] ?"
+
+#: fdisk/cfdisk.c:1557
+msgid "You specified more cylinders than fit on disk"
+msgstr "Ви вказали більше циліндрів ніж є на диску"
+
+#: fdisk/cfdisk.c:1589
+msgid "Cannot open disk drive"
+msgstr "не вдається відкрити пристрій диску"
+
+#: fdisk/cfdisk.c:1591 fdisk/cfdisk.c:1777
+msgid "Opened disk read-only - you have no permission to write"
+msgstr "Відкритий диск лише для читання - у вас немає прав для запису"
+
+#: fdisk/cfdisk.c:1617
+msgid "Cannot get disk size"
+msgstr "не вдається отримати розмір диску"
+
+#: fdisk/cfdisk.c:1644
+msgid "Bad primary partition"
+msgstr "Неправильний первинний розділ"
+
+#: fdisk/cfdisk.c:1674
+msgid "Bad logical partition"
+msgstr "Неправильний логічний розділ"
+
+#: fdisk/cfdisk.c:1789
+msgid "Warning!!  This may destroy data on your disk!"
+msgstr "Увага!! Це може знищити дані на диску!"
+
+#: fdisk/cfdisk.c:1793
+msgid "Are you sure you want write the partition table to disk? (yes or no): "
+msgstr ""
+"Ви впевнені, що бажаєте записати таблицю розділів на диск? (yes або no): "
+
+#: fdisk/cfdisk.c:1799
+msgid "no"
+msgstr "no"
+
+#: fdisk/cfdisk.c:1800
+msgid "Did not write partition table to disk"
+msgstr "Не записувати таблицю розділів на диск"
+
+#: fdisk/cfdisk.c:1802
+msgid "yes"
+msgstr "yes"
+
+#: fdisk/cfdisk.c:1805
+msgid "Please enter `yes' or `no'"
+msgstr "Введіть `yes'(так) або `no'(ні)"
+
+#: fdisk/cfdisk.c:1809
+msgid "Writing partition table to disk..."
+msgstr "Записується таблиця розділів на диск..."
+
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
+msgid "Wrote partition table to disk"
+msgstr "Таблиця розділів записана на диск"
+
+#: fdisk/cfdisk.c:1836
+msgid ""
+"Wrote partition table, but re-read table failed.  Reboot to update table."
+msgstr ""
+"Таблиця розділів записана, але виникла помилка при її перечитуванні. "
+"Перезавантажтесь для оновлення таблиці."
+
+#: fdisk/cfdisk.c:1846
+msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"Немає первинних розділів позначених як завантажувальні. DOS MBR не зможе "
+"завантажуватись."
+
+#: fdisk/cfdisk.c:1848
+msgid ""
+"More than one primary partition is marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"Більш ніж один розділ позначений як завантажувальний. DOS MBR не зможе "
+"завантажуватись."
+
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
+msgid "Enter filename or press RETURN to display on screen: "
+msgstr "Введіть назву файлу або натисніть Enter, щоб відобразити екран: "
+
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
+#, c-format
+msgid "Cannot open file '%s'"
+msgstr "не вдається відкрити файл '%s'"
+
+#: fdisk/cfdisk.c:1926
+#, c-format
+msgid "Disk Drive: %s\n"
+msgstr "Дисковий пристій: %s\n"
+
+#: fdisk/cfdisk.c:1928
+msgid "Sector 0:\n"
+msgstr "Сектор 0:\n"
+
+#: fdisk/cfdisk.c:1935
+#, c-format
+msgid "Sector %d:\n"
+msgstr "Сектор %d:\n"
+
+#: fdisk/cfdisk.c:1955
+msgid "   None   "
+msgstr "   Немає    "
+
+#: fdisk/cfdisk.c:1957
+msgid "   Pri/Log"
+msgstr "   Перв/Лог "
+
+#: fdisk/cfdisk.c:1959
+msgid "   Primary"
+msgstr "   Первинний"
+
+#: fdisk/cfdisk.c:1961
+msgid "   Logical"
+msgstr "   Логічний "
+
+#. odd flag on end
+#. type id
+#. type name
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1427 fdisk/fdisk.c:1733
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:594
+msgid "Unknown"
+msgstr "Невідомий"
+
+#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2473 fdisk/fdisksunlabel.c:45
+msgid "Boot"
+msgstr "Заван."
+
+#: fdisk/cfdisk.c:2007
+#, c-format
+msgid "(%02X)"
+msgstr "(%02X)"
+
+#: fdisk/cfdisk.c:2009
+msgid "None"
+msgstr "Немає"
+
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
+#, c-format
+msgid "Partition Table for %s\n"
+msgstr "Таблиця розділів для %s\n"
+
+#: fdisk/cfdisk.c:2046
+msgid "               First       Last\n"
+msgstr "            Перший    Останній\n"
+
+#: fdisk/cfdisk.c:2047
+msgid ""
+" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
+"Flag\n"
+msgstr ""
+" # Тип      Сектор   Сектор   Зсув    Довжина  Тип файл. системи(ID) Ознаки\n"
+
+#: fdisk/cfdisk.c:2048
+msgid ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+msgstr ""
+"-- ------- ----------- ----------- ------ ----------- -------------------- "
+"----\n"
+
+#. Three-line heading. Read "Start Sector" etc vertically.
+#: fdisk/cfdisk.c:2131
+msgid "         ---Starting---      ----Ending----    Start     Number of\n"
+msgstr "         ---Початок---       ----Кінець----   Початк.   Кільк.\n"
+
+#: fdisk/cfdisk.c:2132
+msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"
+msgstr " # Ознак Гол  Сект Цил   ID  Гол  Сект Цил    Сектор  Секторів\n"
+
+#: fdisk/cfdisk.c:2133
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
+
+#: fdisk/cfdisk.c:2166
+msgid "Raw"
+msgstr "Неформатов."
+
+#: fdisk/cfdisk.c:2166
+msgid "Print the table using raw data format"
+msgstr "Вивести таблицю у 'неформатованому' вигляді"
+
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2270
+msgid "Sectors"
+msgstr "Сектори"
+
+#: fdisk/cfdisk.c:2167
+msgid "Print the table ordered by sectors"
+msgstr "Вивести таблицю сортовану за секторами"
+
+#: fdisk/cfdisk.c:2168
+msgid "Table"
+msgstr "Таблиця"
+
+#: fdisk/cfdisk.c:2168
+msgid "Just print the partition table"
+msgstr "Просто вивести таблицю розділів"
+
+#: fdisk/cfdisk.c:2169
+msgid "Don't print the table"
+msgstr "Не виводити таблицю"
+
+#: fdisk/cfdisk.c:2197
+msgid "Help Screen for cfdisk"
+msgstr "Екран з довідкою для cfdisk"
+
+#: fdisk/cfdisk.c:2199
+msgid "This is cfdisk, a curses based disk partitioning program, which"
+msgstr "Це cfdisk - консольна програма роботи з розділами на базі curses, яка"
+
+#: fdisk/cfdisk.c:2200
+msgid "allows you to create, delete and modify partitions on your hard"
+msgstr "дозволяє створювати, видаляти та змінювати розділи вашого"
+
+#: fdisk/cfdisk.c:2201
+msgid "disk drive."
+msgstr "жорсткого диску."
+
+#: fdisk/cfdisk.c:2203
+msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+
+#: fdisk/cfdisk.c:2205
+msgid "Command      Meaning"
+msgstr "Команда      Призначення"
+
+#: fdisk/cfdisk.c:2206
+msgid "-------      -------"
+msgstr "-------      -----------"
+
+#: fdisk/cfdisk.c:2207
+msgid "  b          Toggle bootable flag of the current partition"
+msgstr "  b          Перемикнути ознаку завантаження поточного розділу"
+
+#: fdisk/cfdisk.c:2208
+msgid "  d          Delete the current partition"
+msgstr "  d          Видалити поточний розділ"
+
+#: fdisk/cfdisk.c:2209
+msgid "  g          Change cylinders, heads, sectors-per-track parameters"
+msgstr "  g          Змінити параметри: циліндри, головки, сектори-на-доріжку"
+
+#: fdisk/cfdisk.c:2210
+msgid "             WARNING: This option should only be used by people who"
+msgstr "             УВАГА: Цей параметр повинен використовуватись лише людьми"
+
+#: fdisk/cfdisk.c:2211
+msgid "             know what they are doing."
+msgstr "             які знають, що вони роблять."
+
+#: fdisk/cfdisk.c:2212
+msgid "  h          Print this screen"
+msgstr "  h          Вивести цю довідку"
+
+#: fdisk/cfdisk.c:2213
+msgid "  m          Maximize disk usage of the current partition"
+msgstr "  m          Максимізувати використання диску поточним розділом"
+
+#: fdisk/cfdisk.c:2214
+msgid "             Note: This may make the partition incompatible with"
+msgstr "             Зауважте: це може зробити розділ несумісним з"
+
+#: fdisk/cfdisk.c:2215
+msgid "             DOS, OS/2, ..."
+msgstr "             DOS, OS/2, ..."
+
+#: fdisk/cfdisk.c:2216
+msgid "  n          Create new partition from free space"
+msgstr "  n          Створити новий розділ у вільному просторі"
+
+#: fdisk/cfdisk.c:2217
+msgid "  p          Print partition table to the screen or to a file"
+msgstr "  p          Вивести таблицю розділів на екран або у файл"
+
+#: fdisk/cfdisk.c:2218
+msgid "             There are several different formats for the partition"
+msgstr "             Є декілька форматів виводу розділів:"
+
+#: fdisk/cfdisk.c:2219
+msgid "             that you can choose from:"
+msgstr " "
+
+#: fdisk/cfdisk.c:2220
+msgid "                r - Raw data (exactly what would be written to disk)"
+msgstr ""
+"                r - не форматовані дані (у вигляді, в якому вони запишуться "
+"на диск)"
+
+#: fdisk/cfdisk.c:2221
+msgid "                s - Table ordered by sectors"
+msgstr "                s - Таблиця сортована по секторам"
+
+#: fdisk/cfdisk.c:2222
+msgid "                t - Table in raw format"
+msgstr "                t - таблиця не форматованих даних"
+
+#: fdisk/cfdisk.c:2223
+msgid "  q          Quit program without writing partition table"
+msgstr "  q          Вийти з програми без запису таблиці розділів"
+
+#: fdisk/cfdisk.c:2224
+msgid "  t          Change the filesystem type"
+msgstr "  t          Змінити тип файлової системи"
+
+#: fdisk/cfdisk.c:2225
+msgid "  u          Change units of the partition size display"
+msgstr "  u          Змінити одиниці вимірювання розміру розділів"
+
+#: fdisk/cfdisk.c:2226
+msgid "             Rotates through MB, sectors and cylinders"
+msgstr "             Перемикає між Мб, секторами та циліндрами"
+
+#: fdisk/cfdisk.c:2227
+msgid "  W          Write partition table to disk (must enter upper case W)"
+msgstr ""
+"  W          Записати таблицю розділів на диск ( W повинен бути в верхньому "
+"регістрі)"
+
+#: fdisk/cfdisk.c:2228
+msgid "             Since this might destroy data on the disk, you must"
+msgstr "             Це може зруйнувати дані на диску, тому необхідно або"
+
+#: fdisk/cfdisk.c:2229
+msgid "             either confirm or deny the write by entering `yes' or"
+msgstr "             підтвердити або відмовитись від запису набравши `yes' чи "
+
+#: fdisk/cfdisk.c:2230
+msgid "             `no'"
+msgstr "             `no'"
+
+#: fdisk/cfdisk.c:2231
+msgid "Up Arrow     Move cursor to the previous partition"
+msgstr "СтрілкаВгору Перемістити курсор на попередню позицію"
+
+#: fdisk/cfdisk.c:2232
+msgid "Down Arrow   Move cursor to the next partition"
+msgstr "СтрілкаВниз  Перемістити курсор у наступну позицію"
+
+#: fdisk/cfdisk.c:2233
+msgid "CTRL-L       Redraws the screen"
+msgstr "CTRL-L       Оновлює вміст екрану"
+
+#: fdisk/cfdisk.c:2234
+msgid "  ?          Print this screen"
+msgstr "  ?          Виводить цю довідку"
+
+#: fdisk/cfdisk.c:2236
+msgid "Note: All of the commands can be entered with either upper or lower"
+msgstr "Зауважте: Всі команди вводяться або у нижньому або у верхньому"
+
+#: fdisk/cfdisk.c:2237
+msgid "case letters (except for Writes)."
+msgstr "регістрах (за винятком (W)запису)."
+
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320
+msgid "Cylinders"
+msgstr "Циліндрів"
+
+#: fdisk/cfdisk.c:2268
+msgid "Change cylinder geometry"
+msgstr "Змінити геометрію циліндру"
+
+#: fdisk/cfdisk.c:2269 fdisk/fdisksunlabel.c:315
+msgid "Heads"
+msgstr "Головки"
+
+#: fdisk/cfdisk.c:2269
+msgid "Change head geometry"
+msgstr "Змінити геометрію головки"
+
+#: fdisk/cfdisk.c:2270
+msgid "Change sector geometry"
+msgstr "Змінити геометрію сектору"
+
+#: fdisk/cfdisk.c:2271
+msgid "Done"
+msgstr "Виконано"
+
+#: fdisk/cfdisk.c:2271
+msgid "Done with changing geometry"
+msgstr "Завершити зміну геометрії"
+
+#: fdisk/cfdisk.c:2284
+msgid "Enter the number of cylinders: "
+msgstr "Введіть кількість циліндрів: "
+
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2866
+msgid "Illegal cylinders value"
+msgstr "Недопустиме значення циліндрів"
+
+#: fdisk/cfdisk.c:2301
+msgid "Enter the number of heads: "
+msgstr "Введіть геометрію головок: "
+
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2876
+msgid "Illegal heads value"
+msgstr "Недопустиме значення головок"
+
+#: fdisk/cfdisk.c:2314
+msgid "Enter the number of sectors per track: "
+msgstr "Введіть кількість секторів на доріжку: "
+
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2883
+msgid "Illegal sectors value"
+msgstr "Недопустиме значення секторів"
+
+#: fdisk/cfdisk.c:2424
+msgid "Enter filesystem type: "
+msgstr "Введіть тип файлової системи: "
+
+#: fdisk/cfdisk.c:2442
+msgid "Cannot change FS Type to empty"
+msgstr "Тип ФС не може бути порожнім"
+
+#: fdisk/cfdisk.c:2444
+msgid "Cannot change FS Type to extended"
+msgstr "Не можна змінювати тип ФС на розширений"
+
+#: fdisk/cfdisk.c:2475
+#, c-format
+msgid "Unk(%02X)"
+msgstr "Невід(%02X)"
+
+#: fdisk/cfdisk.c:2478 fdisk/cfdisk.c:2481
+msgid ", NC"
+msgstr ", НК"
+
+#: fdisk/cfdisk.c:2486 fdisk/cfdisk.c:2489
+msgid "NC"
+msgstr "НК"
+
+#: fdisk/cfdisk.c:2497
+msgid "Pri/Log"
+msgstr "Перв/Лог"
+
+#: fdisk/cfdisk.c:2504
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Невідомий (%02X)"
+
+#: fdisk/cfdisk.c:2573
+#, c-format
+msgid "Disk Drive: %s"
+msgstr "Пристій диску: %s"
+
+#: fdisk/cfdisk.c:2580
+#, c-format
+msgid "Size: %lld bytes, %lld MB"
+msgstr "Розмір: %lld байт, %lld Мб"
+
+#: fdisk/cfdisk.c:2583
+#, c-format
+msgid "Size: %lld bytes, %lld.%lld GB"
+msgstr "Розмір: %lld байт, %lld.%lld Гб"
+
+#: fdisk/cfdisk.c:2587
+#, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
+msgstr "Головок: %d   Секторів на доріжку: %d   Циліндрів: %lld"
+
+#: fdisk/cfdisk.c:2591
+msgid "Name"
+msgstr "Назва"
+
+#: fdisk/cfdisk.c:2592
+msgid "Flags"
+msgstr "Ознаки"
+
+#: fdisk/cfdisk.c:2593
+msgid "Part Type"
+msgstr "Тип розд."
+
+#: fdisk/cfdisk.c:2594
+msgid "FS Type"
+msgstr "Тип ФС"
+
+#: fdisk/cfdisk.c:2595
+msgid "[Label]"
+msgstr "[Позначка]"
+
+#: fdisk/cfdisk.c:2597
+msgid "    Sectors"
+msgstr "   Секторів"
+
+#: fdisk/cfdisk.c:2599
+msgid "  Cylinders"
+msgstr "  Циліндрів"
+
+#: fdisk/cfdisk.c:2601
+msgid "  Size (MB)"
+msgstr "Розмір (Мб)"
+
+#: fdisk/cfdisk.c:2603
+msgid "  Size (GB)"
+msgstr "Розмір (Гб)"
+
+#: fdisk/cfdisk.c:2657
+msgid "Bootable"
+msgstr "Завантаж."
+
+#: fdisk/cfdisk.c:2657
+msgid "Toggle bootable flag of the current partition"
+msgstr "Перемикнути ознаку завантаження поточного розділу"
+
+#: fdisk/cfdisk.c:2658
+msgid "Delete"
+msgstr "Видалити"
+
+#: fdisk/cfdisk.c:2658
+msgid "Delete the current partition"
+msgstr "Видалити поточний розділ"
+
+#: fdisk/cfdisk.c:2659
+msgid "Geometry"
+msgstr "Геометрія"
+
+#: fdisk/cfdisk.c:2659
+msgid "Change disk geometry (experts only)"
+msgstr "Змінити геометрію диску (лише для фахівців)"
+
+#: fdisk/cfdisk.c:2660
+msgid "Help"
+msgstr "Довідка"
+
+#: fdisk/cfdisk.c:2660
+msgid "Print help screen"
+msgstr "Вивести вікно з довідкою"
+
+#: fdisk/cfdisk.c:2661
+msgid "Maximize"
+msgstr "Максимум"
+
+#: fdisk/cfdisk.c:2661
+msgid "Maximize disk usage of the current partition (experts only)"
+msgstr "Максимізувати використання диску поточним розділом (для фахівців)"
+
+#: fdisk/cfdisk.c:2662
+msgid "New"
+msgstr "Новий"
+
+#: fdisk/cfdisk.c:2662
+msgid "Create new partition from free space"
+msgstr "Створити новий розділ у вільному просторі"
+
+#: fdisk/cfdisk.c:2663
+msgid "Print"
+msgstr "Вивести"
+
+#: fdisk/cfdisk.c:2663
+msgid "Print partition table to the screen or to a file"
+msgstr "Вивести таблицю розділів на екран або у файл"
+
+#: fdisk/cfdisk.c:2664
+msgid "Quit"
+msgstr "Вихід"
+
+#: fdisk/cfdisk.c:2664
+msgid "Quit program without writing partition table"
+msgstr "Вийти з програми без запису таблиці розділів"
+
+#: fdisk/cfdisk.c:2665
+msgid "Type"
+msgstr "Тип"
+
+#: fdisk/cfdisk.c:2665
+msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
+msgstr "Змінити тип файлової системи (DOS, Linux, OS/2 та ін.)"
+
+#: fdisk/cfdisk.c:2666
+msgid "Units"
+msgstr "Одиниці"
+
+#: fdisk/cfdisk.c:2666
+msgid "Change units of the partition size display (MB, sect, cyl)"
+msgstr "Змінити одиниці вимірювання розмірів розділу (МБ. сект, цил)"
+
+#: fdisk/cfdisk.c:2667
+msgid "Write"
+msgstr "Записати"
+
+#: fdisk/cfdisk.c:2667
+msgid "Write partition table to disk (this might destroy data)"
+msgstr "Записати таблицю розділів на диск (може зіпсувати дані)"
+
+#: fdisk/cfdisk.c:2713
+msgid "Cannot make this partition bootable"
+msgstr "не вдається зробити розділ завантажувальним"
+
+#: fdisk/cfdisk.c:2723
+msgid "Cannot delete an empty partition"
+msgstr "не вдається видалити порожній розділ"
+
+#: fdisk/cfdisk.c:2743 fdisk/cfdisk.c:2745
+msgid "Cannot maximize this partition"
+msgstr "не вдається максимізувати цей розділ"
+
+#: fdisk/cfdisk.c:2753
+msgid "This partition is unusable"
+msgstr "Цей розділ не використовується"
+
+#: fdisk/cfdisk.c:2755
+msgid "This partition is already in use"
+msgstr "Цей розділ вже використовується"
+
+#: fdisk/cfdisk.c:2772
+msgid "Cannot change the type of an empty partition"
+msgstr "не вдається змінити тип порожнього розділу"
+
+#: fdisk/cfdisk.c:2799 fdisk/cfdisk.c:2805
+msgid "No more partitions"
+msgstr "Немає більше розділів"
+
+#: fdisk/cfdisk.c:2812
+msgid "Illegal command"
+msgstr "Неправильна команда"
+
+#: fdisk/cfdisk.c:2822
+msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
+msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
+
+#. Unfortunately, xgettext does not handle multi-line strings
+#. so, let's use explicit \n's instead
+#: fdisk/cfdisk.c:2829
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+"Print version:\n"
+"        %s -v\n"
+"Print partition table:\n"
+"        %s -P {r|s|t} [options] device\n"
+"Interactive use:\n"
+"        %s [options] device\n"
+"\n"
+"Options:\n"
+"-a: Use arrow instead of highlighting;\n"
+"-z: Start with a zero partition table, instead of reading the pt from disk;\n"
+"-c C -h H -s S: Override the kernel's idea of the number of cylinders,\n"
+"                the number of heads and the number of sectors/track.\n"
+"\n"
+msgstr ""
+"\n"
+"Використання:\n"
+"Вивід версії:\n"
+"        %s -v\n"
+"Вивід таблиці розділів:\n"
+"        %s -P {r|s|t} [параметри] пристрій\n"
+"Інтерактивне використання:\n"
+"        %s [параметри] пристрій\n"
+"\n"
+"Параметри:\n"
+"-a: використовувати стрілки замість підсвічування;\n"
+"-z: Почати з нульової таблиці розділів, а не читати її з диску;\n"
+"-c Ц -h Г -s С: Перевизначити отриману від ядра кількість циліндрів,\n"
+"                кількість головок та кількість секторів/доріжку.\n"
+"\n"
+
+#: fdisk/fdisk.c:188
+msgid ""
+"Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
+"       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
+"       fdisk -s PARTITION           Give partition size(s) in blocks\n"
+"       fdisk -v                     Give fdisk version\n"
+"Here DISK is something like /dev/hdb or /dev/sda\n"
+"and PARTITION is something like /dev/hda7\n"
+"-u: give Start and End in sector (instead of cylinder) units\n"
+"-b 2048: (for certain MO disks) use 2048-byte sectors\n"
+msgstr ""
+"Використання: fdisk [-b SSZ] [-u] ДИСК  Змінити таблицю розділів\n"
+"       fdisk -l [-b SSZ] [-u] ДИСК      Вивести таблицю розділів\n"
+"       fdisk -s РОЗДІЛ                  Вивести розмір розділів у блоках\n"
+"       fdisk -v                         Вивести версію fdisk\n"
+"Де ДИСК - щось на зразок /dev/hdb чи /dev/sda,\n"
+"а РОЗДІЛ - щось на зразок /dev/hda7\n"
+"-u: виводити початковий та кінцевий сектори (замість циліндрів)\n"
+"-b 2048: (для деяких MO дисків) використовуються 2048-байтові сектори\n"
+
+#: fdisk/fdisk.c:200
+msgid ""
+"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
+"E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
+"  or: fdisk /dev/sdc  (for the third SCSI disk)\n"
+"  or: fdisk /dev/eda  (for the first PS/2 ESDI drive)\n"
+"  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
+"  ...\n"
+msgstr ""
+"Використання: fdisk [-l] [-b SSZ] [-u] пристрій\n"
+"Напр.: fdisk /dev/hda  (перший IDE диск)\n"
+"  або: fdisk /dev/sdc  (третій SCSI диск)\n"
+"  або: fdisk /dev/eda  (перший PS/2 ESDI диск)\n"
+"  або: fdisk /dev/rd/c0d0  або: fdisk /dev/ida/c0d0  (RAID пристрої)\n"
+"  ...\n"
+
+#: fdisk/fdisk.c:209
+#, c-format
+msgid "Unable to open %s\n"
+msgstr "не вдається відкрити %s\n"
+
+#: fdisk/fdisk.c:213
+#, c-format
+msgid "Unable to read %s\n"
+msgstr "не вдається прочитати %s\n"
+
+#: fdisk/fdisk.c:217
+#, c-format
+msgid "Unable to seek on %s\n"
+msgstr "не вдається перейти на %s\n"
+
+#: fdisk/fdisk.c:221
+#, c-format
+msgid "Unable to write %s\n"
+msgstr "не вдається записати %s\n"
+
+#: fdisk/fdisk.c:225
+#, c-format
+msgid "BLKGETSIZE ioctl failed on %s\n"
+msgstr "помилка BLKGETSIZE ioctl на %s\n"
+
+#: fdisk/fdisk.c:229
+msgid "Unable to allocate any more memory\n"
+msgstr "не вдається виділити додаткову пам'ять\n"
+
+#: fdisk/fdisk.c:232
+msgid "Fatal error\n"
+msgstr "Фатальна помилка\n"
+
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
+#: fdisk/fdiskbsdlabel.c:129
+msgid "Command action"
+msgstr "Команда дія"
+
+#: fdisk/fdisk.c:317
+msgid "   a   toggle a read only flag"
+msgstr "   a   перемикнути ознаку лише-для-читання"
+
+#. sun
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:362
+msgid "   b   edit bsd disklabel"
+msgstr "   b   редагувати bsd етикетку диску"
+
+#: fdisk/fdisk.c:319
+msgid "   c   toggle the mountable flag"
+msgstr "   c   перемикнути ознаку монтування"
+
+#. sun
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364
+msgid "   d   delete a partition"
+msgstr "   d   видалити розділ"
+
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365
+msgid "   l   list known partition types"
+msgstr "   l   перелік відомих типів розділів"
+
+#. sun
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
+#: fdisk/fdiskbsdlabel.c:134
+msgid "   m   print this menu"
+msgstr "   m   вивести це меню"
+
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
+msgid "   n   add a new partition"
+msgstr "   n   додати новий пристрій"
+
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368
+msgid "   o   create a new empty DOS partition table"
+msgstr "   o   створити нову порожню DOS таблицю розділів"
+
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
+msgid "   p   print the partition table"
+msgstr "   p   вивести таблицю розділів"
+
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
+#: fdisk/fdiskbsdlabel.c:137
+msgid "   q   quit without saving changes"
+msgstr "   q   вийти без збереження змін"
+
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371
+msgid "   s   create a new empty Sun disklabel"
+msgstr "   s   створити нову порожню Sun етикетку диску"
+
+#. sun
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
+msgid "   t   change a partition's system id"
+msgstr "   t   змінити системний ідентифікатор розділу"
+
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+msgid "   u   change display/entry units"
+msgstr "   u   змінити одиниці відображення/вводу"
+
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+msgid "   v   verify the partition table"
+msgstr "   v   перевірити таблицю розділів"
+
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397
+#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
+msgid "   w   write table to disk and exit"
+msgstr "   w   записати таблицю на диск та вийти"
+
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:376
+msgid "   x   extra functionality (experts only)"
+msgstr "   x   додаткова функціональність (для фахівців)"
+
+#: fdisk/fdisk.c:336
+msgid "   a   select bootable partition"
+msgstr "   a   вибрати завантажувальний розділ"
+
+#. sgi flavour
+#: fdisk/fdisk.c:337
+msgid "   b   edit bootfile entry"
+msgstr "   b   редагувати елемент завантажувального файлу"
+
+#. sgi
+#: fdisk/fdisk.c:338
+msgid "   c   select sgi swap partition"
+msgstr "   c   вибрати sgi розділ підкачки"
+
+#: fdisk/fdisk.c:361
+msgid "   a   toggle a bootable flag"
+msgstr "   a   перемикнути ознаку завантаження"
+
+#: fdisk/fdisk.c:363
+msgid "   c   toggle the dos compatibility flag"
+msgstr "   c   перемикнути ознаку сумісності з dos"
+
+#: fdisk/fdisk.c:384
+msgid "   a   change number of alternate cylinders"
+msgstr "   a   змінити кількість запасних циліндрів"
+
+#. sun
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
+msgid "   c   change number of cylinders"
+msgstr "   c   змінити кількість циліндрів"
+
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
+msgid "   d   print the raw data in the partition table"
+msgstr "   d   вивести таблицю розділів у не форматованому вигляді"
+
+#: fdisk/fdisk.c:387
+msgid "   e   change number of extra sectors per cylinder"
+msgstr "   e  змінити кількість додаткових секторів на циліндр"
+
+#. sun
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
+msgid "   h   change number of heads"
+msgstr "   h   змінити кількість головок"
+
+#: fdisk/fdisk.c:389
+msgid "   i   change interleave factor"
+msgstr "   i   змінити фактор чергування"
+
+#. sun
+#: fdisk/fdisk.c:390
+msgid "   o   change rotation speed (rpm)"
+msgstr "   o   змінити швидкість обертання (rpm)"
+
+#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
+#: fdisk/fdiskbsdlabel.c:138
+msgid "   r   return to main menu"
+msgstr "   r   повернутись до головного меню"
+
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+msgid "   s   change number of sectors/track"
+msgstr "   s   змінити кількість секторів/доріжку"
+
+#: fdisk/fdisk.c:398
+msgid "   y   change number of physical cylinders"
+msgstr "   y   змінити кількість фізичних циліндрів"
+
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434
+msgid "   b   move beginning of data in a partition"
+msgstr "   b   перемістити початок даних розділу"
+
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
+msgid "   e   list extended partitions"
+msgstr "   e   вивести список розширених розділів"
+
+#. !sun
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
+msgid "   g   create an IRIX (SGI) partition table"
+msgstr "   g   створити IRIX (SGI) таблицю розділів"
+
+#. !sun
+#: fdisk/fdisk.c:438
+msgid "   f   fix partition order"
+msgstr "   f   виправити порядок розділів"
+
+#: fdisk/fdisk.c:556
+msgid "You must set"
+msgstr "Необхідно встановити"
+
+#: fdisk/fdisk.c:570
+msgid "heads"
+msgstr "головки"
+
+#: fdisk/fdisk.c:572 fdisk/fdisk.c:1249 fdisk/sfdisk.c:877
+msgid "sectors"
+msgstr "сектори"
+
+#: fdisk/fdisk.c:574 fdisk/fdisk.c:1249 fdisk/fdiskbsdlabel.c:470
+#: fdisk/sfdisk.c:877
+msgid "cylinders"
+msgstr "циліндри"
+
+#: fdisk/fdisk.c:578
+#, c-format
+msgid ""
+"%s%s.\n"
+"You can do this from the extra functions menu.\n"
+msgstr ""
+"%s%s.\n"
+"Ви можете зробити це з меню додаткових функцій.\n"
+
+#: fdisk/fdisk.c:579
+msgid " and "
+msgstr " та "
+
+#: fdisk/fdisk.c:596
+#, c-format
+msgid ""
+"\n"
+"The number of cylinders for this disk is set to %d.\n"
+"There is nothing wrong with that, but this is larger than 1024,\n"
+"and could in certain setups cause problems with:\n"
+"1) software that runs at boot time (e.g., old versions of LILO)\n"
+"2) booting and partitioning software from other OSs\n"
+"   (e.g., DOS FDISK, OS/2 FDISK)\n"
+msgstr ""
+"\n"
+"Кількість циліндрів на диску встановлено у %d.\n"
+"У цьому немає нічого страшного, але це більше ніж 1024,\n"
+"та у деяких випадках може спричинити проблеми з:\n"
+"1) ПЗ яке виконується при завантаженні (наприклад, старі версії LILO)\n"
+"2) завантаженням та зміною розділів з інших операційних систем\n"
+"   (наприклад, DOS FDISK, OS/2 FDISK)\n"
+
+#: fdisk/fdisk.c:619
+msgid "Bad offset in primary extended partition\n"
+msgstr "Неправильний зсув у головному розширеному розділі\n"
+
+#: fdisk/fdisk.c:633
+#, c-format
+msgid "Warning: deleting partitions after %d\n"
+msgstr "Попередження: видалення розділів після %d\n"
+
+#: fdisk/fdisk.c:650
+#, c-format
+msgid "Warning: extra link pointer in partition table %d\n"
+msgstr "Попередження: додатковий вказівник у таблиці розділів %d\n"
+
+#: fdisk/fdisk.c:658
+#, c-format
+msgid "Warning: ignoring extra data in partition table %d\n"
+msgstr "Попередження: додаткові дані у таблиці розділів проігноровано %d\n"
+
+#: fdisk/fdisk.c:703
+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 ""
+"Створюється нова етикетка DOS розділу. Зміни залишатимуться у пам'яті,\n"
+"доки ви не вирішите їх записати. Після чого, звичайно, попередній вміст\n"
+"буде втрачено.\n"
+"\n"
+
+#: fdisk/fdisk.c:747
+#, c-format
+msgid "Note: sector size is %d (not %d)\n"
+msgstr "Примітка: розмір сектору %d (не %d)\n"
+
+#: fdisk/fdisk.c:912
+msgid "You will not be able to write the partition table.\n"
+msgstr "Ви не зможете записати таблицю розділів.\n"
+
+#: fdisk/fdisk.c:941
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+"Цей диск має як DOS сигнатуру, так і BSD.\n"
+"Дайте команду 'b', щоб перейти у BSD режим.\n"
+
+#: fdisk/fdisk.c:951
+msgid ""
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
+"disklabel\n"
+msgstr ""
+"Пристрій не містить ані правильної DOS таблиці розділів, ані Sun, SGI чи OSF "
+"етикетки диску\n"
+
+#: fdisk/fdisk.c:968
+msgid "Internal error\n"
+msgstr "Внутрішня помилка\n"
+
+#: fdisk/fdisk.c:981
+#, c-format
+msgid "Ignoring extra extended partition %d\n"
+msgstr "Додаткові розширені розділи ігноруються %d\n"
+
+#: fdisk/fdisk.c:993
+#, c-format
+msgid ""
+"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
+"(rite)\n"
+msgstr ""
+"Попередження: неправильна ознака 0x%04x таблиці розділів %d буде виправлена "
+"при w(запису)\n"
+
+#: fdisk/fdisk.c:1015
+msgid ""
+"\n"
+"got EOF thrice - exiting..\n"
+msgstr ""
+"\n"
+"тричі отримано EOF - завершення..\n"
+
+#: fdisk/fdisk.c:1054
+msgid "Hex code (type L to list codes): "
+msgstr "Шістнадцятковий код (наберіть L щоб переглянути перелік кодів)"
+
+#: fdisk/fdisk.c:1094
+#, c-format
+msgid "%s (%u-%u, default %u): "
+msgstr "%s (%u-%u, типово %u): "
+
+#: fdisk/fdisk.c:1161
+#, c-format
+msgid "Using default value %u\n"
+msgstr "Використовується типове значення %u\n"
+
+#: fdisk/fdisk.c:1165
+msgid "Value out of range.\n"
+msgstr "Значення за межами діапазону.\n"
+
+#: fdisk/fdisk.c:1175
+msgid "Partition number"
+msgstr "Номер розділу"
+
+#: fdisk/fdisk.c:1186
+#, c-format
+msgid "Warning: partition %d has empty type\n"
+msgstr "Попередження: розділ %d має порожнє поле типу\n"
+
+#: fdisk/fdisk.c:1208 fdisk/fdisk.c:1234
+#, c-format
+msgid "Selected partition %d\n"
+msgstr "Вибраний розділ %d\n"
+
+#: fdisk/fdisk.c:1211
+msgid "No partition is defined yet!\n"
+msgstr "Ще не визначено жодного розділу!\n"
+
+#: fdisk/fdisk.c:1237
+msgid "All primary partitions have been defined already!\n"
+msgstr "Всі первинні розділи вже були визначені!\n"
+
+#: fdisk/fdisk.c:1247
+msgid "cylinder"
+msgstr "циліндр"
+
+#: fdisk/fdisk.c:1247
+msgid "sector"
+msgstr "сектор"
+
+#: fdisk/fdisk.c:1256
+#, c-format
+msgid "Changing display/entry units to %s\n"
+msgstr "Змінюються одиниці відображення/вводу на %s\n"
+
+#: fdisk/fdisk.c:1267
+#, c-format
+msgid "WARNING: Partition %d is an extended partition\n"
+msgstr "УВАГА: Розділ %d є розширеним розділом\n"
+
+#: fdisk/fdisk.c:1278
+msgid "DOS Compatibility flag is set\n"
+msgstr "Ознаку сумісності з DOS встановлено\n"
+
+#: fdisk/fdisk.c:1282
+msgid "DOS Compatibility flag is not set\n"
+msgstr "Ознаку сумісності з DOS не встановлено\n"
+
+#: fdisk/fdisk.c:1382
+#, c-format
+msgid "Partition %d does not exist yet!\n"
+msgstr "Розділ %d ще не існує!\n"
+
+#: fdisk/fdisk.c:1387
+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 ""
+"На багатьох системах тип 0 означає вільний простір\n"
+"(але не на Linux). Мати розділи з типом 0, \n"
+"можливо, нерозсудливо. Ви можете видалити\n"
+"розділ використовуючи команду `d'.\n"
+
+#: fdisk/fdisk.c:1396
+msgid ""
+"You cannot change a partition into an extended one or vice versa\n"
+"Delete it first.\n"
+msgstr ""
+"Не можна перетворювати первинний розділ у розширений, або навпаки\n"
+"Спочатку видаліть його.\n"
+
+#: fdisk/fdisk.c:1405
+msgid ""
+"Consider leaving partition 3 as Whole disk (5),\n"
+"as SunOS/Solaris expects it and even Linux likes it.\n"
+"\n"
+msgstr ""
+"Обміркуйте варіант розташування розділу 3 на весь дик (5),\n"
+"тому що на це покладаються SunOS/Solaris, та Linux також це сприймає.\n"
+"\n"
+
+#: fdisk/fdisk.c:1411
+msgid ""
+"Consider leaving partition 9 as volume header (0),\n"
+"and partition 11 as entire volume (6)as IRIX expects it.\n"
+"\n"
+msgstr ""
+"Обміркуйте розташування розділу 9 як заголовку тому (0),\n"
+"та розділу 11 на весь том (6), тому що IRIX на це покладається.\n"
+"\n"
+
+#: fdisk/fdisk.c:1424
+#, c-format
+msgid "Changed system type of partition %d to %x (%s)\n"
+msgstr "Змінено тип системи розділу %d на %x (%s)\n"
+
+#: fdisk/fdisk.c:1479
+#, c-format
+msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
+msgstr "У розділу %d відрізняються фізичний та логічний початок (не-Linux?):\n"
+
+#: fdisk/fdisk.c:1481 fdisk/fdisk.c:1489 fdisk/fdisk.c:1498 fdisk/fdisk.c:1508
+#, c-format
+msgid "     phys=(%d, %d, %d) "
+msgstr "     фіз=(%d, %d, %d) "
+
+#: fdisk/fdisk.c:1482 fdisk/fdisk.c:1490
+#, c-format
+msgid "logical=(%d, %d, %d)\n"
+msgstr "логічний=(%d, %d, %d)\n"
+
+#: fdisk/fdisk.c:1487
+#, c-format
+msgid "Partition %d has different physical/logical endings:\n"
+msgstr "У розділу %d відрізняються фізичний та логічний кінці:\n"
+
+#: fdisk/fdisk.c:1496
+#, c-format
+msgid "Partition %i does not start on cylinder boundary:\n"
+msgstr "Розділ %i не починається на межі циліндру:\n"
+
+#: fdisk/fdisk.c:1499
+#, c-format
+msgid "should be (%d, %d, 1)\n"
+msgstr "повинно бути (%d, %d, 1)\n"
+
+#: fdisk/fdisk.c:1505
+#, c-format
+msgid "Partition %i does not end on cylinder boundary.\n"
+msgstr "Розділ %i не закінчується на межі циліндру.\n"
+
+#: fdisk/fdisk.c:1509
+#, c-format
+msgid "should be (%d, %d, %d)\n"
+msgstr "повинно бути (%d, %d, %d)\n"
+
+#: fdisk/fdisk.c:1521
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %ld MB, %lld bytes\n"
+msgstr ""
+"\n"
+"Диск %s: %ld Мб, %lld байт\n"
+
+#: fdisk/fdisk.c:1524
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %ld.%ld GB, %lld bytes\n"
+msgstr ""
+"\n"
+"Диск %s: %ld.%ld Гб, %lld байт\n"
+
+#: fdisk/fdisk.c:1526
+#, c-format
+msgid "%d heads, %d sectors/track, %d cylinders"
+msgstr "%d головок, %d секторів/доріжку, %d циліндрів"
+
+#: fdisk/fdisk.c:1529
+#, c-format
+msgid ", total %llu sectors"
+msgstr ", загалом %llu секторів"
+
+#: fdisk/fdisk.c:1532
+#, c-format
+msgid ""
+"Units = %s of %d * %d = %d bytes\n"
+"\n"
+msgstr ""
+"Одиниці виміру = %s з %d * %d = %d байт\n"
+"\n"
+
+#: fdisk/fdisk.c:1640
+msgid ""
+"Nothing to do. Ordering is correct already.\n"
+"\n"
+msgstr ""
+"Немає що робити. Порядок вже коректний.\n"
+"\n"
+
+#: fdisk/fdisk.c:1704
+#, c-format
+msgid "%*s Boot      Start         End      Blocks   Id  System\n"
+msgstr "%*s Завант  Початок     Кінець     Блоків  Ід  Система\n"
+
+#: fdisk/fdisk.c:1705 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674
+msgid "Device"
+msgstr "Пристрій"
+
+#: fdisk/fdisk.c:1742
+msgid ""
+"\n"
+"Partition table entries are not in disk order\n"
+msgstr ""
+"\n"
+"Елементи таблиці розділів не у тому порядку, як на диску\n"
+
+#: fdisk/fdisk.c:1752
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %d heads, %d sectors, %d cylinders\n"
+"\n"
+msgstr ""
+"\n"
+"Диск %s: %d головок, %d секторів, %d циліндрів\n"
+"\n"
+
+#: fdisk/fdisk.c:1754
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
+msgstr "№ Акт Гол Сек Цил Гол Сек  Цил  Початок   Розмір Ід\n"
+
+#: fdisk/fdisk.c:1799
+#, c-format
+msgid "Warning: partition %d contains sector 0\n"
+msgstr "Попередження: розділ %d містить нульовий сектор\n"
+
+#: fdisk/fdisk.c:1802
+#, c-format
+msgid "Partition %d: head %d greater than maximum %d\n"
+msgstr "Розділ %d: головка %d перевищує максимум %d\n"
+
+#: fdisk/fdisk.c:1805
+#, c-format
+msgid "Partition %d: sector %d greater than maximum %d\n"
+msgstr "Розділ %d: сектор %d перевищує максимум %d\n"
+
+#: fdisk/fdisk.c:1808
+#, c-format
+msgid "Partitions %d: cylinder %d greater than maximum %d\n"
+msgstr "Розділ %d: циліндр %d перевищує максимум %d\n"
+
+#: fdisk/fdisk.c:1812
+#, c-format
+msgid "Partition %d: previous sectors %d disagrees with total %d\n"
+msgstr ""
+"Розділ %d: кількість попередніх секторів %d відрізняється від загальної %d\n"
+
+#: fdisk/fdisk.c:1844
+#, c-format
+msgid "Warning: bad start-of-data in partition %d\n"
+msgstr "Попередження: неправильна область початку даних у розділі %d\n"
+
+#: fdisk/fdisk.c:1852
+#, c-format
+msgid "Warning: partition %d overlaps partition %d.\n"
+msgstr "Попередження: розділ %d перекривається з розділом %d.\n"
+
+#: fdisk/fdisk.c:1872
+#, c-format
+msgid "Warning: partition %d is empty\n"
+msgstr "Попередження: розділ %d порожній\n"
+
+#: fdisk/fdisk.c:1877
+#, c-format
+msgid "Logical partition %d not entirely in partition %d\n"
+msgstr "Логічний розділ %d не вміщується цілком у розділ %d\n"
+
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Total allocated sectors %d greater than the maximum %lld\n"
+msgstr "Загальна кількість розподілених секторів %d перевищує максимум %d\n"
+
+#: fdisk/fdisk.c:1886
+#, fuzzy, c-format
+msgid "%lld unallocated sectors\n"
+msgstr "%d нерозподілених секторів\n"
+
+#: fdisk/fdisk.c:1901 fdisk/fdisksgilabel.c:631 fdisk/fdisksunlabel.c:503
+#, c-format
+msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
+msgstr "Розділ %d вже визначений.  Видаліть його перед повторним додаванням.\n"
+
+#: fdisk/fdisk.c:1928 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
+#, c-format
+msgid "First %s"
+msgstr "Перший %s"
+
+#: fdisk/fdisk.c:1943 fdisk/fdisksunlabel.c:559
+#, c-format
+msgid "Sector %d is already allocated\n"
+msgstr "Сектор %d вже розподілений\n"
+
+#: fdisk/fdisk.c:1979
+msgid "No free sectors available\n"
+msgstr "Немає наявних вільних секторів\n"
+
+#: fdisk/fdisk.c:1988 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570
+#, c-format
+msgid "Last %s or +size or +sizeM or +sizeK"
+msgstr "Останній %s або +size або +sizeM або +sizeK"
+
+#: fdisk/fdisk.c:2053
+msgid ""
+"\tSorry - this fdisk cannot handle AIX disk labels.\n"
+"\tIf you want to add DOS-type partitions, create\n"
+"\ta new empty DOS partition table first. (Use o.)\n"
+"\tWARNING: This will destroy the present disk contents.\n"
+msgstr ""
+"\tПробачте - ця програма fdisk не підтримує AIX етикетки диску.\n"
+"\tЯкщо ви бажаєте додати DOS розділи, створіть спочатку нову\n"
+"\tDOS таблицю розділів. (Використовуйте команду o.)\n"
+"\tЗАСТЕРЕЖЕННЯ: Це призведе до знищення поточного вмісту диску.\n"
+
+#: fdisk/fdisk.c:2065 fdisk/fdiskbsdlabel.c:618
+msgid "The maximum number of partitions has been created\n"
+msgstr "Вже створено максимальну кількість розділів\n"
+
+#: fdisk/fdisk.c:2073
+msgid "You must delete some partition and add an extended partition first\n"
+msgstr ""
+"Спочатку необхідно видалити деякий розділ та додати розширений розділ\n"
+
+#: fdisk/fdisk.c:2076
+#, fuzzy
+msgid "All logical partitions are in use\n"
+msgstr "логічні розділи не у тому порядку як на диску"
+
+#: fdisk/fdisk.c:2077
+#, fuzzy
+msgid "Adding a primary partition\n"
+msgstr "Неправильний первинний розділ"
+
+#: fdisk/fdisk.c:2082
+#, c-format
+msgid ""
+"Command action\n"
+"   %s\n"
+"   p   primary partition (1-4)\n"
+msgstr ""
+"Команда дія\n"
+"   %s\n"
+"   p   первинний розділ (1-4)\n"
+
+#: fdisk/fdisk.c:2084
+msgid "l   logical (5 or over)"
+msgstr "l   логічний (5 або більше)"
+
+#: fdisk/fdisk.c:2084
+msgid "e   extended"
+msgstr "e   розширений"
+
+#: fdisk/fdisk.c:2103
+#, c-format
+msgid "Invalid partition number for type `%c'\n"
+msgstr "Неправильний номер розділу для типу `%c'\n"
+
+#: fdisk/fdisk.c:2139
+msgid ""
+"The partition table has been altered!\n"
+"\n"
+msgstr ""
+"Таблиця розділів була змінена!\n"
+"\n"
+
+#: fdisk/fdisk.c:2148
+msgid "Calling ioctl() to re-read partition table.\n"
+msgstr "Викликається ioctl(), щоб перечитати таблицю розділів.\n"
+
+#: fdisk/fdisk.c:2164
+#, c-format
+msgid ""
+"\n"
+"WARNING: Re-reading the partition table failed with error %d: %s.\n"
+"The kernel still uses the old table.\n"
+"The new table will be used at the next reboot.\n"
+msgstr ""
+"\n"
+"ЗАСТЕРЕЖЕННЯ: Перечитування таблиці розділів завершилось з помилкою %d: %s.\n"
+"Ядро досі використовує стару таблицю розділів.\n"
+"Нова таблиця розділів використовуватиметься після перезавантаження.\n"
+
+#: fdisk/fdisk.c:2174
+msgid ""
+"\n"
+"WARNING: If you have created or modified any DOS 6.x\n"
+"partitions, please see the fdisk manual page for additional\n"
+"information.\n"
+msgstr ""
+"\n"
+"ЗАСТЕРЕЖЕННЯ: Якщо ви створили або змінили будь-які DOS 6.x\n"
+"розділи, перегляньте man-сторінку з fdisk для отримання додаткової\n"
+"інформації.\n"
+
+#: fdisk/fdisk.c:2181
+msgid "Syncing disks.\n"
+msgstr "Синхронізація дисків.\n"
+
+#: fdisk/fdisk.c:2228
+#, c-format
+msgid "Partition %d has no data area\n"
+msgstr "Розділ %d не має області даних\n"
+
+#: fdisk/fdisk.c:2233
+msgid "New beginning of data"
+msgstr "Новий початок даних"
+
+#: fdisk/fdisk.c:2249
+msgid "Expert command (m for help): "
+msgstr "Команди експертного режиму(m - довідка): "
+
+#: fdisk/fdisk.c:2262
+msgid "Number of cylinders"
+msgstr "Кількість циліндрів"
+
+#: fdisk/fdisk.c:2289
+msgid "Number of heads"
+msgstr "Кількість головок"
+
+#: fdisk/fdisk.c:2314
+msgid "Number of sectors"
+msgstr "Кількість секторів"
+
+#: fdisk/fdisk.c:2317
+msgid "Warning: setting sector offset for DOS compatiblity\n"
+msgstr "Попередження: встановлюється зсув сектору для сумісності з DOS\n"
+
+#: fdisk/fdisk.c:2389
+#, c-format
+msgid "Disk %s doesn't contain a valid partition table\n"
+msgstr "Диск %s не містить правильної таблиці розділів\n"
+
+#: fdisk/fdisk.c:2400
+#, c-format
+msgid "Cannot open %s\n"
+msgstr "не вдається відкрити %s\n"
+
+#: fdisk/fdisk.c:2418 fdisk/sfdisk.c:2378
+#, c-format
+msgid "cannot open %s\n"
+msgstr "не вдається відкрити %s\n"
+
+#: fdisk/fdisk.c:2438
+#, c-format
+msgid "%c: unknown command\n"
+msgstr "%c: невідома команда\n"
+
+#: fdisk/fdisk.c:2506
+msgid "This kernel finds the sector size itself - -b option ignored\n"
+msgstr ""
+"Це ядро визначає розмір сектору саме, тому -b параметри проігноровано\n"
+
+#: fdisk/fdisk.c:2510
+msgid ""
+"Warning: the -b (set sector size) option should be used with one specified "
+"device\n"
+msgstr ""
+"Попередження: з вказаним пристроєм повинен використовуватись параметр -b "
+"(встановити розмір сектора)\n"
+
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2569
+#, c-format
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+msgstr "Знайдено OSF/1 етикетку диску на %s, перехід у режим етикетки диску.\n"
+
+#: fdisk/fdisk.c:2579
+msgid "Command (m for help): "
+msgstr "Команда (m - довідка): "
+
+#: fdisk/fdisk.c:2595
+#, c-format
+msgid ""
+"\n"
+"The current boot file is: %s\n"
+msgstr ""
+"\n"
+"Поточний файл завантаження: %s\n"
+
+#: fdisk/fdisk.c:2597
+msgid "Please enter the name of the new boot file: "
+msgstr "Введіть назву нового файлу завантаження: "
+
+#: fdisk/fdisk.c:2599
+msgid "Boot file unchanged\n"
+msgstr "Файл завантаження не змінено\n"
+
+#: fdisk/fdisk.c:2672
+msgid ""
+"\n"
+"\tSorry, no experts menu for SGI partition tables available.\n"
+"\n"
+msgstr ""
+"\n"
+"\tПробачте, меню для фахівців недоступне для SGI таблиці розділів.\n"
+"\n"
+
+#: fdisk/fdiskaixlabel.c:27
+msgid ""
+"\n"
+"\tThere is a valid AIX label on this disk.\n"
+"\tUnfortunately Linux cannot handle these\n"
+"\tdisks at the moment.  Nevertheless some\n"
+"\tadvice:\n"
+"\t1. fdisk will destroy its contents on write.\n"
+"\t2. Be sure that this disk is NOT a still vital\n"
+"\t   part of a volume group. (Otherwise you may\n"
+"\t   erase the other disks as well, if unmirrored.)\n"
+"\t3. Before deleting this physical volume be sure\n"
+"\t   to remove the disk logically from your AIX\n"
+"\t   machine.  (Otherwise you become an AIXpert)."
+msgstr ""
+"\n"
+"\tНа цьому диску знайдено правильну етикетку AIX диску.\n"
+"\tНажаль наразі Linux не підтримує цей тип дисків.\n"
+"\tПроте деякі поради:\n"
+"\t1. fdisk знищить вміст при запису.\n"
+"\t2. Перевірте, що цей диск НЕ є життєво\n"
+"\t   необхідною частиною групи томів. (У іншому випадку\n"
+"\t   також можна стерти інші диски.)\n"
+"\t3. Перед видаленням цього фізичного тому переконайтесь що\n"
+"\t   диско логічно видалений з AIX\n"
+"\t   системи.  (У іншому випадку ви станете фахівцем з AIX)."
+
+#: fdisk/fdiskbsdlabel.c:122
+#, c-format
+msgid ""
+"\n"
+"BSD label for device: %s\n"
+msgstr ""
+"\n"
+"BSD етикетка пристрою: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:130
+msgid "   d   delete a BSD partition"
+msgstr "   d   видалити BSD розділ"
+
+#: fdisk/fdiskbsdlabel.c:131
+msgid "   e   edit drive data"
+msgstr "   e   редагувати дані диску"
+
+#: fdisk/fdiskbsdlabel.c:132
+msgid "   i   install bootstrap"
+msgstr "   i   встановити bootstrap"
+
+#: fdisk/fdiskbsdlabel.c:133
+msgid "   l   list known filesystem types"
+msgstr "   l   перелік відомих типів файлових систем"
+
+#: fdisk/fdiskbsdlabel.c:135
+msgid "   n   add a new BSD partition"
+msgstr "   n   додати новий BSD розділ"
+
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   p   print BSD partition table"
+msgstr "   p   вивести таблицю розділів BSD"
+
+#: fdisk/fdiskbsdlabel.c:139
+msgid "   s   show complete disklabel"
+msgstr "   s   показати всю етикетку диску"
+
+#: fdisk/fdiskbsdlabel.c:140
+msgid "   t   change a partition's filesystem id"
+msgstr "   t   змінити ідентифікатор файлової системи розділу"
+
+#: fdisk/fdiskbsdlabel.c:141
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u   змінити одиниці виміру (циліндри/сектори)"
+
+#: fdisk/fdiskbsdlabel.c:142
+msgid "   w   write disklabel to disk"
+msgstr "   w   записати етикетку диску на диск"
+
+#: fdisk/fdiskbsdlabel.c:144
+msgid "   x   link BSD partition to non-BSD partition"
+msgstr "   x   посилання з BSD розділу на не-BSD розділ"
+
+#: fdisk/fdiskbsdlabel.c:176
+#, c-format
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "Розділ %s має неправильну кількість секторів 0.\n"
+
+#: fdisk/fdiskbsdlabel.c:180
+#, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "Читається етикетка диску %s з сектору %d.\n"
+
+#: fdisk/fdiskbsdlabel.c:190
+#, c-format
+msgid "There is no *BSD partition on %s.\n"
+msgstr "Немає *BSD розділів на %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:204
+msgid "BSD disklabel command (m for help): "
+msgstr "Команда режиму BSD етикетки диску (m - довідка): "
+
+#: fdisk/fdiskbsdlabel.c:318
+#, c-format
+msgid "type: %s\n"
+msgstr "тип: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:320
+#, c-format
+msgid "type: %d\n"
+msgstr "тип: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:321
+#, c-format
+msgid "disk: %.*s\n"
+msgstr "диск: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:322
+#, c-format
+msgid "label: %.*s\n"
+msgstr "етикетка: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:323
+msgid "flags:"
+msgstr "ознаки:"
+
+#: fdisk/fdiskbsdlabel.c:325
+msgid " removable"
+msgstr " змінний"
+
+#: fdisk/fdiskbsdlabel.c:327
+msgid " ecc"
+msgstr " ecc"
+
+#: fdisk/fdiskbsdlabel.c:329
+msgid " badsect"
+msgstr " пошк.сект"
+
+#. On various machines the fields of *lp are short/int/long
+#. In order to avoid problems, we cast them all to long.
+#: fdisk/fdiskbsdlabel.c:333
+#, c-format
+msgid "bytes/sector: %ld\n"
+msgstr "байт/сектор: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:334
+#, c-format
+msgid "sectors/track: %ld\n"
+msgstr "секторів/доріжку: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:335
+#, c-format
+msgid "tracks/cylinder: %ld\n"
+msgstr "доріжок/циліндр: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:336
+#, c-format
+msgid "sectors/cylinder: %ld\n"
+msgstr "векторів/циліндр: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:337
+#, c-format
+msgid "cylinders: %ld\n"
+msgstr "циліндрів: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:338
+#, c-format
+msgid "rpm: %d\n"
+msgstr "об/хв: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:339
+#, c-format
+msgid "interleave: %d\n"
+msgstr "чергування: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:340
+#, c-format
+msgid "trackskew: %d\n"
+msgstr "доріжк.ухил: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:341
+#, c-format
+msgid "cylinderskew: %d\n"
+msgstr "циліндр.ухил: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:342
+#, c-format
+msgid "headswitch: %ld\t\t# milliseconds\n"
+msgstr "перемик.головок: %ld\t\t# мілісекунд\n"
+
+#: fdisk/fdiskbsdlabel.c:344
+#, c-format
+msgid "track-to-track seek: %ld\t# milliseconds\n"
+msgstr "перех.наст.доріжки: %ld\t# мілісекунд\n"
+
+#: fdisk/fdiskbsdlabel.c:346
+msgid "drivedata: "
+msgstr "дані:"
+
+#: fdisk/fdiskbsdlabel.c:355
+#, c-format
+msgid ""
+"\n"
+"%d partitions:\n"
+msgstr ""
+"\n"
+"%d розділів:\n"
+
+#: fdisk/fdiskbsdlabel.c:356
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr "#      початок     кінець   розмір    тип фс   [розм.фс розм.бл cpg]\n"
+
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
+#, c-format
+msgid "Writing disklabel to %s.\n"
+msgstr "Запис етикетки диску у %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
+#, c-format
+msgid "%s contains no disklabel.\n"
+msgstr "%s не містить етикетки диску.\n"
+
+#: fdisk/fdiskbsdlabel.c:427
+msgid "Do you want to create a disklabel? (y/n) "
+msgstr "Створити нову етикетку диску? (y/n) "
+
+#: fdisk/fdiskbsdlabel.c:467
+msgid "bytes/sector"
+msgstr "байт/сектор"
+
+#: fdisk/fdiskbsdlabel.c:468
+msgid "sectors/track"
+msgstr "секторів/доріжку"
+
+#: fdisk/fdiskbsdlabel.c:469
+msgid "tracks/cylinder"
+msgstr "доріжок/циліндр"
+
+#: fdisk/fdiskbsdlabel.c:477
+msgid "sectors/cylinder"
+msgstr "секторів/циліндр"
+
+#: fdisk/fdiskbsdlabel.c:481
+msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
+msgstr "Повинно бути <= секторів/доріжку * доріжок/циліндр (типово).\n"
+
+#: fdisk/fdiskbsdlabel.c:483
+msgid "rpm"
+msgstr "об/хв"
+
+#: fdisk/fdiskbsdlabel.c:484
+msgid "interleave"
+msgstr "чергування"
+
+#: fdisk/fdiskbsdlabel.c:485
+msgid "trackskew"
+msgstr "доріжк.ухил"
+
+#: fdisk/fdiskbsdlabel.c:486
+msgid "cylinderskew"
+msgstr "циліндр.ухил"
+
+#: fdisk/fdiskbsdlabel.c:487
+msgid "headswitch"
+msgstr "перех.головок"
+
+#: fdisk/fdiskbsdlabel.c:488
+msgid "track-to-track seek"
+msgstr "перех.наст.доріжки"
+
+#: fdisk/fdiskbsdlabel.c:529
+#, c-format
+msgid "Bootstrap: %sboot -> boot%s (%s): "
+msgstr "Bootstrap: %sboot -> boot%s (%s): "
+
+#: fdisk/fdiskbsdlabel.c:554
+msgid "Bootstrap overlaps with disk label!\n"
+msgstr "Bootstrap перекривається з етикеткою диску!\n"
+
+#: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
+#, c-format
+msgid "Bootstrap installed on %s.\n"
+msgstr "Встановлено у %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:599
+#, c-format
+msgid "Partition (a-%c): "
+msgstr "Розділ (a-%c): "
+
+#: fdisk/fdiskbsdlabel.c:630
+msgid "This partition already exists.\n"
+msgstr "Цей розділ вже існує.\n"
+
+#: fdisk/fdiskbsdlabel.c:756
+#, c-format
+msgid "Warning: too many partitions (%d, maximum is %d).\n"
+msgstr "Попередження: надто багато розділів (%d, максимум - %d).\n"
+
+#: fdisk/fdiskbsdlabel.c:804
+msgid ""
+"\n"
+"Syncing disks.\n"
+msgstr ""
+"\n"
+"Синхронізуються диски.\n"
+
+#: fdisk/fdisksgilabel.c:80
+msgid "SGI volhdr"
+msgstr "SGI volhdr"
+
+#: fdisk/fdisksgilabel.c:81
+msgid "SGI trkrepl"
+msgstr "SGI trkrepl"
+
+#: fdisk/fdisksgilabel.c:82
+msgid "SGI secrepl"
+msgstr "SGI secrepl"
+
+#: fdisk/fdisksgilabel.c:83
+msgid "SGI raw"
+msgstr "SGI raw"
+
+#: fdisk/fdisksgilabel.c:84
+msgid "SGI bsd"
+msgstr "SGI bsd"
+
+#: fdisk/fdisksgilabel.c:85
+msgid "SGI sysv"
+msgstr "SGI sysv"
+
+#: fdisk/fdisksgilabel.c:86
+msgid "SGI volume"
+msgstr "SGI том"
+
+#: fdisk/fdisksgilabel.c:87
+msgid "SGI efs"
+msgstr "SGI efs"
+
+#: fdisk/fdisksgilabel.c:88
+msgid "SGI lvol"
+msgstr "SGI lvol"
+
+#: fdisk/fdisksgilabel.c:89
+msgid "SGI rlvol"
+msgstr "SGI rlvol"
+
+#: fdisk/fdisksgilabel.c:90
+msgid "SGI xfs"
+msgstr "SGI xfs"
+
+#: fdisk/fdisksgilabel.c:91
+msgid "SGI xfslog"
+msgstr "SGI xfslog"
+
+#: fdisk/fdisksgilabel.c:92
+msgid "SGI xlv"
+msgstr "SGI xlv"
+
+#: fdisk/fdisksgilabel.c:93
+msgid "SGI xvm"
+msgstr "SGI xvm"
+
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
+msgid "Linux swap"
+msgstr "Linux swap"
+
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
+msgid "Linux native"
+msgstr "Linux native"
+
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+msgid "Linux LVM"
+msgstr "Linux LVM"
+
+#: fdisk/fdisksgilabel.c:97
+msgid "Linux RAID"
+msgstr "Linux RAID"
+
+#: fdisk/fdisksgilabel.c:163
+msgid ""
+"According to MIPS Computer Systems, Inc the Label must not contain more than "
+"512 bytes\n"
+msgstr ""
+"Згідно MIPS Computer Systems, Inc етикетка не повинна містити більше ніж 512 "
+"байт\n"
+
+#: fdisk/fdisksgilabel.c:182
+msgid "Detected sgi disklabel with wrong checksum.\n"
+msgstr "Знайдено sgi етикетку диска з неправильною контрольною сумою.\n"
+
+#: fdisk/fdisksgilabel.c:200
+#, c-format
+msgid ""
+"\n"
+"Disk %s (SGI disk label): %d heads, %d sectors\n"
+"%d cylinders, %d physical cylinders\n"
+"%d extra sects/cyl, interleave %d:1\n"
+"%s\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Диск %s (SGI етикетка диску): %d головок, %d секторів\n"
+"%d циліндрів, %d фізичних циліндрів\n"
+"%d додаткових секторів/цил, чергування %d:1\n"
+"%s\n"
+"Одиниці виміру = %s з %d * 512 байт\n"
+"\n"
+
+#: fdisk/fdisksgilabel.c:212
+#, c-format
+msgid ""
+"\n"
+"Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Диск %s (SGI етикетка диску): %d головок, %d секторів, %d циліндрів\n"
+"Одиниці виміру = %s з %d * 512 байт\n"
+"\n"
+
+#: fdisk/fdisksgilabel.c:218
+#, c-format
+msgid ""
+"----- partitions -----\n"
+"Pt# %*s  Info     Start       End   Sectors  Id  System\n"
+msgstr ""
+"----- розділи -----\n"
+"Рзд# %*s  Інфо   Початок    Кінець  Секторів  Ід  Система\n"
+
+#: fdisk/fdisksgilabel.c:240
+#, c-format
+msgid ""
+"----- Bootinfo -----\n"
+"Bootfile: %s\n"
+"----- Directory Entries -----\n"
+msgstr ""
+"----- Завантажувальна інформація -----\n"
+"Завантажувальний файл: %s\n"
+"----- Елементи каталогу -----\n"
+
+#: fdisk/fdisksgilabel.c:248
+#, c-format
+msgid "%2d: %-10s sector%5u size%8u\n"
+msgstr "%2d: %-10s сектор%5u розмір%8u\n"
+
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
+msgid ""
+"\n"
+"Invalid Bootfile!\n"
+"\tThe bootfile must be an absolute non-zero pathname,\n"
+"\te.g. \"/unix\" or \"/unix.save\".\n"
+msgstr ""
+"\n"
+"Неправильний завантажувальний файл!\n"
+"\tЗавантажувальний файл повинен мати не-нульовий абсолютний шлях,\n"
+"\tнаприклад,  \"/unix\" або \"/unix.save\".\n"
+
+#: fdisk/fdisksgilabel.c:308
+msgid ""
+"\n"
+"\tName of Bootfile too long:  16 bytes maximum.\n"
+msgstr ""
+"\n"
+"\tНазва завантажувального файлу надто велика:  максимум 16 байт.\n"
+
+#: fdisk/fdisksgilabel.c:313
+msgid ""
+"\n"
+"\tBootfile must have a fully qualified pathname.\n"
+msgstr ""
+"\n"
+"\tЗавантажувальний файл повинен мати абсолютний шлях.\n"
+
+#: fdisk/fdisksgilabel.c:320
+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"
+"\tЗнайте, що існування завантажувального файлу не перевіряється.\n"
+"\tТипові для SGI -  \"/unix\" та резервна копія \"/unix.save\".\n"
+
+#: fdisk/fdisksgilabel.c:346
+#, c-format
+msgid ""
+"\n"
+"\tBootfile is changed to \"%s\".\n"
+msgstr ""
+"\n"
+"\tЗавантажувальний файл змінено на \"%s\".\n"
+
+#: fdisk/fdisksgilabel.c:436
+msgid "More than one entire disk entry present.\n"
+msgstr "Присутній більш ніж один елемент диску.\n"
+
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
+msgid "No partitions defined\n"
+msgstr "Не визначено розділів\n"
+
+#: fdisk/fdisksgilabel.c:449
+msgid "IRIX likes when Partition 11 covers the entire disk.\n"
+msgstr "IRIX покладається на те, що розділ 11 займає весь диск.\n"
+
+#: fdisk/fdisksgilabel.c:451
+#, c-format
+msgid ""
+"The entire disk partition should start at block 0,\n"
+"not at diskblock %d.\n"
+msgstr ""
+"Розділ на весь диск повинен починатись з блоку 0,\n"
+"а не з блоку диску %d.\n"
+
+#: fdisk/fdisksgilabel.c:457
+#, c-format
+msgid ""
+"The entire disk partition is only %d diskblock large,\n"
+"but the disk is %d diskblocks long.\n"
+msgstr ""
+"Розділ на весь диск довжиною лише %d дискових блоків,\n"
+"але довжина диску складає %d дискових блоків.\n"
+
+#: fdisk/fdisksgilabel.c:463
+msgid "One Partition (#11) should cover the entire disk.\n"
+msgstr "Розділ (#11) повинен займати весь диск.\n"
+
+#: fdisk/fdisksgilabel.c:473
+#, c-format
+msgid "Partition %d does not start on cylinder boundary.\n"
+msgstr "Розділ %d не починається з межі циліндру.\n"
+
+#: fdisk/fdisksgilabel.c:479
+#, c-format
+msgid "Partition %d does not end on cylinder boundary.\n"
+msgstr "Розділ %d не закінчується на межі циліндру.\n"
+
+#: fdisk/fdisksgilabel.c:486
+#, c-format
+msgid "The Partition %d and %d overlap by %d sectors.\n"
+msgstr "Розділи %d та %d перекриваються на %d секторів.\n"
+
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
+msgstr "Невикористаний простір з %8u секторів - сектори %8u-%u\n"
+
+#: fdisk/fdisksgilabel.c:523
+msgid ""
+"\n"
+"The boot partition does not exist.\n"
+msgstr ""
+"\n"
+"Завантажувальний розділ не існує.\n"
+
+#: fdisk/fdisksgilabel.c:526
+msgid ""
+"\n"
+"The swap partition does not exist.\n"
+msgstr ""
+"\n"
+"Розділ підкачки не існує.\n"
+
+#: fdisk/fdisksgilabel.c:530
+msgid ""
+"\n"
+"The swap partition has no swap type.\n"
+msgstr ""
+"\n"
+"Розділ підкачки має тип не підкачки.\n"
+
+#: fdisk/fdisksgilabel.c:533
+msgid "\tYou have chosen an unusual boot file name.\n"
+msgstr "\tВи вибрали незвичайну назву файлу завантаження.\n"
+
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
+msgid "Sorry You may change the Tag of non-empty partitions.\n"
+msgstr "Пробачте, Ви можете змінити тег не-порожніх розділів.\n"
+
+#: fdisk/fdisksgilabel.c:548
+msgid ""
+"It is highly recommended that the partition at offset 0\n"
+"is of type \"SGI volhdr\", the IRIX system will rely on it to\n"
+"retrieve from its directory standalone tools like sash and fx.\n"
+"Only the \"SGI volume\" entire disk section may violate this.\n"
+"Type YES if you are sure about tagging this partition differently.\n"
+msgstr ""
+"Наполегливо рекомендується, щоб тип розділу зі зсувом 0\n"
+"був \"SGI volhdr\", IRIX система покладається на це при\n"
+"отримані з її каталогу окремих утиліт, наприклад sash та fx.\n"
+"Не дотримуватись цього можуть лише \"SGI volume\" на весь диск.\n"
+"Введіть YES, якщо ви впевнені, що хочете позначити цей розділ по-іншому.\n"
+
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:628
+msgid "YES\n"
+msgstr "YES\n"
+
+#. rebuild freelist
+#: fdisk/fdisksgilabel.c:577
+msgid "Do You know, You got a partition overlap on the disk?\n"
+msgstr "Ви знаєте, що на диску є розділи, що перекриваються?\n"
+
+#: fdisk/fdisksgilabel.c:637
+msgid "Attempting to generate entire disk entry automatically.\n"
+msgstr "Спроба створити весь диск автоматично.\n"
+
+#: fdisk/fdisksgilabel.c:642
+msgid "The entire disk is already covered with partitions.\n"
+msgstr "Весь диск вже зайнятий розділами.\n"
+
+#: fdisk/fdisksgilabel.c:646
+msgid "You got a partition overlap on the disk. Fix it first!\n"
+msgstr "На диску є розділи, що перекриваються. Спочатку виправте це!\n"
+
+#: fdisk/fdisksgilabel.c:655 fdisk/fdisksgilabel.c:684
+msgid ""
+"It is highly recommended that eleventh partition\n"
+"covers the entire disk and is of type `SGI volume'\n"
+msgstr ""
+"Наполегливо рекомендується, щоб одинадцятий розділ\n"
+"займав увесь диск та мав тип `SGI volume'\n"
+
+#: fdisk/fdisksgilabel.c:671
+msgid "You will get a partition overlap on the disk. Fix it first!\n"
+msgstr "Ваші розділи на диску будуть перекриватись. Виправте це!\n"
+
+#: fdisk/fdisksgilabel.c:676
+#, c-format
+msgid " Last %s"
+msgstr " Останній %s"
+
+#: fdisk/fdisksgilabel.c:706
+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 ""
+"Створення нової SGI етикетки диску.  Зміни залишатимуться в пам'яті,\n"
+"доки ви їх не запишете. Після чого, звичайно, попередній вміст\n"
+"буде втрачено.\n"
+"\n"
+
+#: fdisk/fdisksgilabel.c:725
+#, c-format
+msgid ""
+"Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
+"d.\n"
+"This value may be truncated for devices > 33.8 GB.\n"
+msgstr ""
+"Попередження: BLKGETSIZE ioctl завершився аварійно на %s. Використовується "
+"значення геометрії циліндру %d.\n"
+"Це значення може бути відсічене для пристроїв > 33.8 ГБ.\n"
+
+#: fdisk/fdisksgilabel.c:738
+#, c-format
+msgid "Trying to keep parameters of partition %d.\n"
+msgstr "Спроба зберегти параметри розділу %d.\n"
+
+#: fdisk/fdisksgilabel.c:740
+#, c-format
+msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
+msgstr "ІД=%02x\tПОЧАТОК=%d\tДОВЖИНА=%d\n"
+
+#: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
+msgid "Empty"
+msgstr "Порожн"
+
+#: fdisk/fdisksunlabel.c:46
+msgid "SunOS root"
+msgstr "SunOS root"
+
+#: fdisk/fdisksunlabel.c:47
+msgid "SunOS swap"
+msgstr "SunOS swap"
+
+#: fdisk/fdisksunlabel.c:48
+msgid "SunOS usr"
+msgstr "SunOS usr"
+
+#: fdisk/fdisksunlabel.c:49
+msgid "Whole disk"
+msgstr "Весь диск"
+
+#: fdisk/fdisksunlabel.c:50
+msgid "SunOS stand"
+msgstr "SunOS stand"
+
+#: fdisk/fdisksunlabel.c:51
+msgid "SunOS var"
+msgstr "SunOS var"
+
+#: fdisk/fdisksunlabel.c:52
+msgid "SunOS home"
+msgstr "SunOS home"
+
+#. DOS 3.3+ secondary
+#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:98
+msgid "Linux raid autodetect"
+msgstr "Linux raid autodetect"
+
+#: fdisk/fdisksunlabel.c:133
+msgid ""
+"Detected sun disklabel with wrong checksum.\n"
+"Probably you'll have to set all the values,\n"
+"e.g. heads, sectors, cylinders and partitions\n"
+"or force a fresh label (s command in main menu)\n"
+msgstr ""
+"Знайдено sun етикетку диска з неправильною контрольною сумою.\n"
+"Можливо слід перевстановити всі значення,\n"
+"такі як головки, сектори, циліндри та розділи\n"
+"або примусово очистити етикетку (команда s у головному меню)\n"
+
+#: fdisk/fdisksunlabel.c:232
+#, c-format
+msgid "Autoconfigure found a %s%s%s\n"
+msgstr "Автоматичне визначення знайшло %s%s%s\n"
+
+#: fdisk/fdisksunlabel.c:259
+msgid ""
+"Building a new sun disklabel. Changes will remain in memory only,\n"
+"until you decide to write them. After that, of course, the previous\n"
+"content won't be recoverable.\n"
+"\n"
+msgstr ""
+"Створюється нова sun етикетка диску. Зміни залишатимуться у пам'яті,\n"
+"доки ви не запишете їх. Після чого, звичайно, попередній вміст\n"
+"буде втрачено.\n"
+"\n"
+
+#: fdisk/fdisksunlabel.c:270
+msgid ""
+"Drive type\n"
+"   ?   auto configure\n"
+"   0   custom (with hardware detected defaults)"
+msgstr ""
+"Тип пристрою\n"
+"   ?   авто конфігурація\n"
+"   0   власний (з автоматично знайденими типовими значеннями)"
+
+#: fdisk/fdisksunlabel.c:280
+msgid "Select type (? for auto, 0 for custom): "
+msgstr "Виберіть тип (? автоматично, 0 власний): "
+
+#: fdisk/fdisksunlabel.c:292
+msgid "Autoconfigure failed.\n"
+msgstr "Помилка при автоматичному визначенні.\n"
+
+#: fdisk/fdisksunlabel.c:316
+msgid "Sectors/track"
+msgstr "Секторів/доріжку"
+
+#: fdisk/fdisksunlabel.c:323
+msgid "Alternate cylinders"
+msgstr "Запасні циліндри"
+
+#: fdisk/fdisksunlabel.c:326
+msgid "Physical cylinders"
+msgstr "Фізичні сектори"
+
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:724
+msgid "Rotation speed (rpm)"
+msgstr "Швидкість обертання (об/хв)"
+
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:717
+msgid "Interleave factor"
+msgstr "Фактор чергування"
+
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:710
+msgid "Extra sectors per cylinder"
+msgstr "Додаткових секторів у циліндрі"
+
+#: fdisk/fdisksunlabel.c:348
+msgid "You may change all the disk params from the x menu"
+msgstr "Ви можете змінити всі параметри диску з меню x"
+
+#: fdisk/fdisksunlabel.c:355
+msgid "3,5\" floppy"
+msgstr "3,5\" дискета"
+
+#: fdisk/fdisksunlabel.c:355
+msgid "Linux custom"
+msgstr "Linux custom"
+
+#: fdisk/fdisksunlabel.c:442
+#, c-format
+msgid "Partition %d doesn't end on cylinder boundary\n"
+msgstr "Розділ %d не закінчується на межі циліндру\n"
+
+#: fdisk/fdisksunlabel.c:462
+#, c-format
+msgid "Partition %d overlaps with others in sectors %d-%d\n"
+msgstr "Розділ %d перекривається з іншим у секторах %d-%d\n"
+
+#: fdisk/fdisksunlabel.c:484
+#, c-format
+msgid "Unused gap - sectors 0-%d\n"
+msgstr "Невикористаний простір - сектори 0-%d\n"
+
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
+#, c-format
+msgid "Unused gap - sectors %d-%d\n"
+msgstr "Невикористаний простір - сектори %d-%d\n"
+
+#: fdisk/fdisksunlabel.c:513
+msgid ""
+"Other partitions already cover the whole disk.\n"
+"Delete some/shrink them before retry.\n"
+msgstr ""
+"Інші розділи вже займають весь диск.\n"
+"Видаліть частину/зменшіть їх розмір перед спробою.\n"
+
+#: fdisk/fdisksunlabel.c:589
+#, 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 ""
+"Третій розділ не займає весь диск, але значення\n"
+"%d %s перекриває деякий інший розділ. Ваш елемент було змінено\n"
+"на %d %s\n"
+
+#: fdisk/fdisksunlabel.c:611
+#, 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 ""
+"Якщо ви бажаєте підтримувати сумісність з SunOS/Solaris, створіть цей розділ "
+"як\n"
+"весь диск(5), починаючи з 0, розміром %u секторів\n"
+
+#: fdisk/fdisksunlabel.c:623
+msgid ""
+"It is highly recommended that the partition at offset 0\n"
+"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
+"there may destroy your partition table and bootblock.\n"
+"Type YES if you're very sure you would like that partition\n"
+"tagged with 82 (Linux swap): "
+msgstr ""
+"Наполегливо рекомендується, щоб розділ зі зсувом 0 був UFS,\n"
+"файловою системою EXT2FS або SunOS swap. Якщо тут вставити Linux swap,\n"
+"можна зруйнувати таблицю розділів та завантажувальний блок.\n"
+"Введіть YES, якщо ви справді впевнені, що бажаєте позначити розділ\n"
+"типом 82 (Linux swap): "
+
+#: fdisk/fdisksunlabel.c:654
+#, c-format
+msgid ""
+"\n"
+"Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n"
+"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"%d extra sects/cyl, interleave %d:1\n"
+"%s\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Диск %s (Sun етикетка диску): %d головок, %d секторів, %d об/хв\n"
+"%d циліндрів, %d запасних циліндрів, %d фізичних циліндрів\n"
+"%d додаткових секторів/цил, чергування %d:1\n"
+"%s\n"
+"Одиниці виміру = %s з %d * 512 байт\n"
+"\n"
+
+#: fdisk/fdisksunlabel.c:668
+#, c-format
+msgid ""
+"\n"
+"Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Диск %s (Sun етикетка диску): %d головок, %d секторів, %d циліндрів\n"
+"Одиниці виміру = %s з %d * 512 байт\n"
+"\n"
+
+#: fdisk/fdisksunlabel.c:673
+#, c-format
+msgid "%*s Flag    Start       End    Blocks   Id  System\n"
+msgstr "%*s Ознака Початок    Кінець     Блоки   Ід  Система\n"
+
+#: fdisk/fdisksunlabel.c:698
+msgid "Number of alternate cylinders"
+msgstr "Кількість запасних циліндрів"
+
+#: fdisk/fdisksunlabel.c:731
+msgid "Number of physical cylinders"
+msgstr "Кількість фізичних циліндрів"
+
+#: fdisk/i386_sys_types.c:7
+msgid "FAT12"
+msgstr "FAT12"
+
+#: fdisk/i386_sys_types.c:8
+msgid "XENIX root"
+msgstr "XENIX root"
+
+#: fdisk/i386_sys_types.c:9
+msgid "XENIX usr"
+msgstr "XENIX usr"
+
+#: fdisk/i386_sys_types.c:10
+msgid "FAT16 <32M"
+msgstr "FAT16 <32M"
+
+#: fdisk/i386_sys_types.c:11
+msgid "Extended"
+msgstr "Extended"
+
+#. DOS 3.3+ extended partition
+#: fdisk/i386_sys_types.c:12
+msgid "FAT16"
+msgstr "FAT16"
+
+#. DOS 16-bit >=32M
+#: fdisk/i386_sys_types.c:13
+msgid "HPFS/NTFS"
+msgstr "HPFS/NTFS"
+
+#. OS/2 IFS, eg, HPFS or NTFS or QNX
+#: fdisk/i386_sys_types.c:14
+msgid "AIX"
+msgstr "AIX"
+
+#. AIX boot (AIX -- PS/2 port) or SplitDrive
+#: fdisk/i386_sys_types.c:15
+msgid "AIX bootable"
+msgstr "AIX bootable"
+
+#. AIX data or Coherent
+#: fdisk/i386_sys_types.c:16
+msgid "OS/2 Boot Manager"
+msgstr "OS/2 Boot Manager"
+
+#. OS/2 Boot Manager
+#: fdisk/i386_sys_types.c:17
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
+
+#: fdisk/i386_sys_types.c:18
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
+
+#. LBA really is `Extended Int 13h'
+#: fdisk/i386_sys_types.c:19
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
+
+#: fdisk/i386_sys_types.c:20
+msgid "W95 Ext'd (LBA)"
+msgstr "W95 Ext'd (LBA)"
+
+#: fdisk/i386_sys_types.c:21
+msgid "OPUS"
+msgstr "OPUS"
+
+#: fdisk/i386_sys_types.c:22
+msgid "Hidden FAT12"
+msgstr "Hidden FAT12"
+
+#: fdisk/i386_sys_types.c:23
+msgid "Compaq diagnostics"
+msgstr "Compaq diagnostics"
+
+#: fdisk/i386_sys_types.c:24
+msgid "Hidden FAT16 <32M"
+msgstr "Hidden FAT16 <32M"
+
+#: fdisk/i386_sys_types.c:25
+msgid "Hidden FAT16"
+msgstr "Hidden FAT16"
+
+#: fdisk/i386_sys_types.c:26
+msgid "Hidden HPFS/NTFS"
+msgstr "Hidden HPFS/NTFS"
+
+#: fdisk/i386_sys_types.c:27
+msgid "AST SmartSleep"
+msgstr "AST SmartSleep"
+
+#: fdisk/i386_sys_types.c:28
+msgid "Hidden W95 FAT32"
+msgstr "Hidden W95 FAT32"
+
+#: fdisk/i386_sys_types.c:29
+msgid "Hidden W95 FAT32 (LBA)"
+msgstr "Hidden W95 FAT32 (LBA)"
+
+#: fdisk/i386_sys_types.c:30
+msgid "Hidden W95 FAT16 (LBA)"
+msgstr "Hidden W95 FAT16 (LBA)"
+
+#: fdisk/i386_sys_types.c:31
+msgid "NEC DOS"
+msgstr "NEC DOS"
+
+#: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr "Plan 9"
+
+#: fdisk/i386_sys_types.c:33
+msgid "PartitionMagic recovery"
+msgstr "PartitionMagic recovery"
+
+#: fdisk/i386_sys_types.c:34
+msgid "Venix 80286"
+msgstr "Venix 80286"
+
+#: fdisk/i386_sys_types.c:35
+msgid "PPC PReP Boot"
+msgstr "PPC PReP Boot"
+
+#: fdisk/i386_sys_types.c:36
+msgid "SFS"
+msgstr "SFS"
+
+#: fdisk/i386_sys_types.c:37
+msgid "QNX4.x"
+msgstr "QNX4.x"
+
+#: fdisk/i386_sys_types.c:38
+msgid "QNX4.x 2nd part"
+msgstr "QNX4.x 2nd part"
+
+#: fdisk/i386_sys_types.c:39
+msgid "QNX4.x 3rd part"
+msgstr "QNX4.x 3rd part"
+
+#: fdisk/i386_sys_types.c:40
+msgid "OnTrack DM"
+msgstr "OnTrack DM"
+
+#: fdisk/i386_sys_types.c:41
+msgid "OnTrack DM6 Aux1"
+msgstr "OnTrack DM6 Aux1"
+
+#. (or Novell)
+#: fdisk/i386_sys_types.c:42
+msgid "CP/M"
+msgstr "CP/M"
+
+#. CP/M or Microport SysV/AT
+#: fdisk/i386_sys_types.c:43
+msgid "OnTrack DM6 Aux3"
+msgstr "OnTrack DM6 Aux3"
+
+#: fdisk/i386_sys_types.c:44
+msgid "OnTrackDM6"
+msgstr "OnTrackDM6"
+
+#: fdisk/i386_sys_types.c:45
+msgid "EZ-Drive"
+msgstr "EZ-Drive"
+
+#: fdisk/i386_sys_types.c:46
+msgid "Golden Bow"
+msgstr "Golden Bow"
+
+#: fdisk/i386_sys_types.c:47
+msgid "Priam Edisk"
+msgstr "Priam Edisk"
+
+#. DOS R/O or SpeedStor
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:89
+#: fdisk/i386_sys_types.c:95 fdisk/i386_sys_types.c:96
+msgid "SpeedStor"
+msgstr "SpeedStor"
+
+#: fdisk/i386_sys_types.c:49
+msgid "GNU HURD or SysV"
+msgstr "GNU HURD or SysV"
+
+#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
+#: fdisk/i386_sys_types.c:50
+msgid "Novell Netware 286"
+msgstr "Novell Netware 286"
+
+#: fdisk/i386_sys_types.c:51
+msgid "Novell Netware 386"
+msgstr "Novell Netware 386"
+
+#: fdisk/i386_sys_types.c:52
+msgid "DiskSecure Multi-Boot"
+msgstr "DiskSecure Multi-Boot"
+
+#: fdisk/i386_sys_types.c:53
+msgid "PC/IX"
+msgstr "PC/IX"
+
+#: fdisk/i386_sys_types.c:54
+msgid "Old Minix"
+msgstr "Old  Minix"
+
+#. Minix 1.4a and earlier
+#: fdisk/i386_sys_types.c:55
+msgid "Minix / old Linux"
+msgstr "Minix / old Linux"
+
+#. Minix 1.4b and later
+#: fdisk/i386_sys_types.c:56
+#, fuzzy
+msgid "Linux swap / Solaris"
+msgstr "Linux swap"
+
+#: fdisk/i386_sys_types.c:58
+msgid "OS/2 hidden C: drive"
+msgstr "OS/2 hidden C: drive"
+
+#: fdisk/i386_sys_types.c:59
+msgid "Linux extended"
+msgstr "Linux extended"
+
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
+msgid "NTFS volume set"
+msgstr "NTFS volume set"
+
+#: fdisk/i386_sys_types.c:63
+msgid "Amoeba"
+msgstr "Amoeba"
+
+#: fdisk/i386_sys_types.c:64
+msgid "Amoeba BBT"
+msgstr "Amoeba BBT"
+
+#. (bad block table)
+#: fdisk/i386_sys_types.c:65
+msgid "BSD/OS"
+msgstr "BSD/OS"
+
+#. BSDI
+#: fdisk/i386_sys_types.c:66
+msgid "IBM Thinkpad hibernation"
+msgstr "IBM Thinkpad hibernation"
+
+#: fdisk/i386_sys_types.c:67
+msgid "FreeBSD"
+msgstr "FreeBSD"
+
+#. various BSD flavours
+#: fdisk/i386_sys_types.c:68
+msgid "OpenBSD"
+msgstr "OpenBSD"
+
+#: fdisk/i386_sys_types.c:69
+msgid "NeXTSTEP"
+msgstr "NeXTSTEP"
+
+#: fdisk/i386_sys_types.c:70
+msgid "Darwin UFS"
+msgstr "Darwin UFS"
+
+#: fdisk/i386_sys_types.c:71
+msgid "NetBSD"
+msgstr "NetBSD"
+
+#: fdisk/i386_sys_types.c:72
+msgid "Darwin boot"
+msgstr "Darwin boot"
+
+#: fdisk/i386_sys_types.c:73
+msgid "BSDI fs"
+msgstr "BSDI fs"
+
+#: fdisk/i386_sys_types.c:74
+msgid "BSDI swap"
+msgstr "BSDI swap"
+
+#: fdisk/i386_sys_types.c:75
+msgid "Boot Wizard hidden"
+msgstr "Boot Wizard hidden"
+
+#: fdisk/i386_sys_types.c:76
+msgid "Solaris boot"
+msgstr "Solaris завантажувальний"
+
+#: fdisk/i386_sys_types.c:77
+msgid "DRDOS/sec (FAT-12)"
+msgstr "DRDOS/sec (FAT-12)"
+
+#: fdisk/i386_sys_types.c:78
+msgid "DRDOS/sec (FAT-16 < 32M)"
+msgstr "DRDOS/sec (FAT-16 < 32M)"
+
+#: fdisk/i386_sys_types.c:79
+msgid "DRDOS/sec (FAT-16)"
+msgstr "DRDOS/sec (FAT-16)"
+
+#: fdisk/i386_sys_types.c:80
+msgid "Syrinx"
+msgstr "Syrinx"
+
+#: fdisk/i386_sys_types.c:81
+msgid "Non-FS data"
+msgstr "Не-ФС дані"
+
+#: fdisk/i386_sys_types.c:82
+msgid "CP/M / CTOS / ..."
+msgstr "CP/M / CTOS / ..."
+
+#. CP/M or Concurrent CP/M or
+#. Concurrent DOS or CTOS
+#: fdisk/i386_sys_types.c:84
+msgid "Dell Utility"
+msgstr "Dell Utility"
+
+#. Dell PowerEdge Server utilities
+#: fdisk/i386_sys_types.c:85
+msgid "BootIt"
+msgstr "BootIt"
+
+#. BootIt EMBRM
+#: fdisk/i386_sys_types.c:86
+msgid "DOS access"
+msgstr "DOS access"
+
+#. DOS access or SpeedStor 12-bit FAT
+#. extended partition
+#: fdisk/i386_sys_types.c:88
+msgid "DOS R/O"
+msgstr "DOS R/O"
+
+#. SpeedStor 16-bit FAT extended
+#. partition < 1024 cyl.
+#: fdisk/i386_sys_types.c:91
+msgid "BeOS fs"
+msgstr "BeOS fs"
+
+#: fdisk/i386_sys_types.c:92
+msgid "EFI GPT"
+msgstr "EFI GPT"
+
+#. Intel EFI GUID Partition Table
+#: fdisk/i386_sys_types.c:93
+msgid "EFI (FAT-12/16/32)"
+msgstr "EFI (FAT-12/16/32)"
+
+#. Intel EFI System Partition
+#: fdisk/i386_sys_types.c:94
+msgid "Linux/PA-RISC boot"
+msgstr "Linux/PA-RISC boot"
+
+#. SpeedStor large partition
+#: fdisk/i386_sys_types.c:97
+msgid "DOS secondary"
+msgstr "DOS secondary"
+
+#. New (2.2.x) raid partition with
+#. autodetect using persistent
+#. superblock
+#: fdisk/i386_sys_types.c:101
+msgid "LANstep"
+msgstr "LANstep"
+
+#. SpeedStor >1024 cyl. or LANstep
+#: fdisk/i386_sys_types.c:102
+msgid "BBT"
+msgstr "BBT"
+
+#: fdisk/sfdisk.c:164
+#, c-format
+msgid "seek error on %s - cannot seek to %lu\n"
+msgstr "помилка позиціювання %s - не вдається перейти на %lu\n"
+
+#: fdisk/sfdisk.c:169
+#, c-format
+msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
+msgstr "помилка позиціювання: очікувалось 0x%08x%08x, отримано 0x%08x%08x\n"
+
+#: fdisk/sfdisk.c:215
+msgid "out of memory - giving up\n"
+msgstr "недостатньо пам'яті - відмова\n"
+
+#: fdisk/sfdisk.c:220 fdisk/sfdisk.c:303
+#, c-format
+msgid "read error on %s - cannot read sector %lu\n"
+msgstr "помилка читання %s - не вдається прочитати сектор %lu\n"
+
+#: fdisk/sfdisk.c:238
+#, c-format
+msgid "ERROR: sector %lu does not have an msdos signature\n"
+msgstr "ПОМИЛКА: сектор %lu немає msdos сигнатури\n"
+
+#: fdisk/sfdisk.c:253
+#, c-format
+msgid "write error on %s - cannot write sector %lu\n"
+msgstr "помилка запису на %s - не вдається записати сектор %lu\n"
+
+#: fdisk/sfdisk.c:291
+#, c-format
+msgid "cannot open partition sector save file (%s)\n"
+msgstr "не вдається відкрити файл збереження сектору розділу (%s)\n"
+
+#: fdisk/sfdisk.c:309
+#, c-format
+msgid "write error on %s\n"
+msgstr "помилка запису на %s\n"
+
+#: fdisk/sfdisk.c:327
+#, c-format
+msgid "cannot stat partition restore file (%s)\n"
+msgstr "не вдається отримати інформацію про файл відновлення розділу (%s)\n"
+
+#: fdisk/sfdisk.c:332
+msgid "partition restore file has wrong size - not restoring\n"
+msgstr ""
+"файл відновлення розділу має неправильний розмір - відміна відновлення\n"
+
+#: fdisk/sfdisk.c:336
+msgid "out of memory?\n"
+msgstr "недостатньо пам'яті\n"
+
+#: fdisk/sfdisk.c:342
+#, c-format
+msgid "cannot open partition restore file (%s)\n"
+msgstr "не вдається відкрити файл відновлення (%s)\n"
+
+#: fdisk/sfdisk.c:348
+#, c-format
+msgid "error reading %s\n"
+msgstr "помилка читання %s\n"
+
+#: fdisk/sfdisk.c:355
+#, c-format
+msgid "cannot open device %s for writing\n"
+msgstr "не вдається відкрити пристрій %s для запису\n"
+
+#: fdisk/sfdisk.c:367
+#, c-format
+msgid "error writing sector %lu on %s\n"
+msgstr "помилка запису сектору %lu на %s\n"
+
+#: fdisk/sfdisk.c:418
+#, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "Диск %s: не вдається отримати розмір\n"
+
+#: fdisk/sfdisk.c:423
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "Диск %s: не вдається отримати геометрію\n"
+
+#: fdisk/sfdisk.c:447
+#, c-format
+msgid ""
+"Warning: start=%lu - this looks like a partition rather than\n"
+"the entire disk. Using fdisk on it is probably meaningless.\n"
+"[Use the --force option if you really want this]\n"
+msgstr ""
+"Попередження: початок=%lu - схоже на розділ, а не на диск.\n"
+"Використання fdisk для нього мабуть безглуздо..\n"
+"[Використовуйте параметр --force, якщо ви дійсно цього бажаєте]\n"
+
+#: fdisk/sfdisk.c:454
+#, c-format
+msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
+msgstr "Попередження: HDIO_GETGEO вказує, що є %lu головок\n"
+
+#: fdisk/sfdisk.c:457
+#, c-format
+msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
+msgstr "Попередження: HDIO_GETGEO вказує, що є %lu секторів\n"
+
+#: fdisk/sfdisk.c:461
+#, c-format
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
+msgstr "Попередження: BLKGETSIZE/HDIO_GETGEO вказує, що є %lu циліндрів\n"
+
+#: fdisk/sfdisk.c:465
+#, c-format
+msgid ""
+"Warning: unlikely number of sectors (%lu) - usually at most 63\n"
+"This will give problems with all software that uses C/H/S addressing.\n"
+msgstr ""
+"Попередження: неправильна кількість секторів (%lu) - зазвичай щонайбільше "
+"63\n"
+"Це буде спричиняти проблеми з усім ПЗ, яке використовує C/H/S адресацію.\n"
+
+#: fdisk/sfdisk.c:469
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
+msgstr ""
+"\n"
+"Диск %s: %lu циліндрів, %lu головок, %lu секторів/доріжку\n"
+
+#: fdisk/sfdisk.c:551
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr ""
+"%s з розділу %s має неможливе значення кількості головок: %lu (мусить бути 0-"
+"%lu)\n"
+
+#: fdisk/sfdisk.c:556
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
+"lu)\n"
+msgstr ""
+"%s з розділу %s має неможливе значення кількості секторів: %lu (мусить бути "
+"1-%lu)\n"
+
+#: fdisk/sfdisk.c:561
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
+"lu)\n"
+msgstr ""
+"%s з розділу %s має неможливе значення кількості циліндрів: %lu (мусить бути "
+"0-%lu)\n"
+
+#: fdisk/sfdisk.c:601
+msgid ""
+"Id  Name\n"
+"\n"
+msgstr ""
+"Ідентиф. Назва\n"
+"\n"
+
+#: fdisk/sfdisk.c:754
+msgid "Re-reading the partition table ...\n"
+msgstr "Перечитується таблиця розділів ...\n"
+
+#: fdisk/sfdisk.c:760
+msgid ""
+"The command to re-read the partition table failed\n"
+"Reboot your system now, before using mkfs\n"
+msgstr ""
+"Команда перечитування таблиці розділів завершилась аварійно\n"
+"Перезавантажте систему перед використанням mkfs\n"
+
+#: fdisk/sfdisk.c:765
+#, c-format
+msgid "Error closing %s\n"
+msgstr "Помилка закривання %s\n"
+
+#: fdisk/sfdisk.c:803
+#, c-format
+msgid "%s: no such partition\n"
+msgstr "%s: немає такого розділу\n"
+
+#: fdisk/sfdisk.c:826
+msgid "unrecognized format - using sectors\n"
+msgstr "нерозпізнаний формат - використовуються сектори\n"
+
+#: fdisk/sfdisk.c:865
+#, c-format
+msgid "# partition table of %s\n"
+msgstr "# таблиця розділів диску %s\n"
+
+#: fdisk/sfdisk.c:876
+#, c-format
+msgid "unimplemented format - using %s\n"
+msgstr "нереалізований формат - використовується %s\n"
+
+#: fdisk/sfdisk.c:880
+#, c-format
+msgid ""
+"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Одиниці виміру = циліндри по %lu байт, блоки по 1024 байт, рахуючи від %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:883
+msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
+msgstr "Пристрій Завант Початок Кінець Циліндрів Блоків   Ід  Система\n"
+
+#: fdisk/sfdisk.c:888
+#, c-format
+msgid ""
+"Units = sectors of 512 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Одиниці виміру = сектори по 512 байт, рахуючи від %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:890
+msgid "   Device Boot    Start       End   #sectors  Id  System\n"
+msgstr "Пристрій Завант Початок    Кінець   Секторів  Ід  Система\n"
+
+#: fdisk/sfdisk.c:893
+#, c-format
+msgid ""
+"Units = blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Одиниця виміру = блоки по 1024 байт, рахуючи від %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:895
+msgid "   Device Boot   Start       End    #blocks   Id  System\n"
+msgstr "Пристрій Завант Початок   Кінець     Блоків   Ід  Система\n"
+
+#: fdisk/sfdisk.c:898
+#, c-format
+msgid ""
+"Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Одиниці виміру = mebi-байти по 1048576 байт, блоки по 1024 байт, рахуючи від "
+"%d\n"
+"\n"
+
+#: fdisk/sfdisk.c:900
+msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
+msgstr "  Пристрій Завант Початок Кінець Мб     Блоків   Ід  Система\n"
+
+#: fdisk/sfdisk.c:1060
+#, c-format
+msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"\t\tпочаток: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1067
+#, c-format
+msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "\t\tкінець: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1070
+#, c-format
+msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
+msgstr "розділ закінчується на циліндрі  %ld, за межею обсягу диску\n"
+
+#: fdisk/sfdisk.c:1080
+msgid "No partitions found\n"
+msgstr "Не знайдено розділів\n"
+
+#: fdisk/sfdisk.c:1084
+#, c-format
+msgid ""
+"Warning: The partition table looks like it was made\n"
+"  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
+"For this listing I'll assume that geometry.\n"
+msgstr ""
+"Попередження: Схоже,що таблиця розділів була зроблена\n"
+"  для C/H/S=*/%ld/%ld (замість %ld/%ld/%ld).\n"
+"Для цього виводу вважатиметься ця геометрія.\n"
+
+#: fdisk/sfdisk.c:1133
+msgid "no partition table present.\n"
+msgstr "відсутня таблиця розділів.\n"
+
+#: fdisk/sfdisk.c:1135
+#, c-format
+msgid "strange, only %d partitions defined.\n"
+msgstr "дивно, визначено лише %d розділів.\n"
+
+#: fdisk/sfdisk.c:1144
+#, c-format
+msgid "Warning: partition %s has size 0 but is not marked Empty\n"
+msgstr "Попередження: розділ %s має розмір 0, але не позначений порожнім\n"
+
+#: fdisk/sfdisk.c:1147
+#, c-format
+msgid "Warning: partition %s has size 0 and is bootable\n"
+msgstr "Попередження: розділ %s має розмір 0 та позначений завантажувальним\n"
+
+#: fdisk/sfdisk.c:1150
+#, c-format
+msgid "Warning: partition %s has size 0 and nonzero start\n"
+msgstr "Попередження: розділ %s має розмір 0 але починається не з нуля\n"
+
+#: fdisk/sfdisk.c:1161
+#, c-format
+msgid "Warning: partition %s "
+msgstr "Попередження: розділ %s "
+
+#: fdisk/sfdisk.c:1162
+#, c-format
+msgid "is not contained in partition %s\n"
+msgstr "не розташований у розділі %s\n"
+
+#: fdisk/sfdisk.c:1173
+#, c-format
+msgid "Warning: partitions %s "
+msgstr "Попередження: розділи %s "
+
+#: fdisk/sfdisk.c:1174
+#, c-format
+msgid "and %s overlap\n"
+msgstr "та %s перекриваються\n"
+
+#: fdisk/sfdisk.c:1185
+#, c-format
+msgid ""
+"Warning: partition %s contains part of the partition table (sector %lu),\n"
+"and will destroy it when filled\n"
+msgstr ""
+"Попередження: розділ %s містить частину таблиці розділів (сектор %lu),\n"
+"та її буде знищено при його заповненні\n"
+
+#: fdisk/sfdisk.c:1197
+#, c-format
+msgid "Warning: partition %s starts at sector 0\n"
+msgstr "Попередження: розділ %s починається з сектор 0\n"
+
+#: fdisk/sfdisk.c:1201
+#, c-format
+msgid "Warning: partition %s extends past end of disk\n"
+msgstr "Попередження: розділ %s поширюється за межі диску\n"
+
+#: fdisk/sfdisk.c:1216
+msgid ""
+"Among the primary partitions, at most one can be extended\n"
+" (although this is not a problem under Linux)\n"
+msgstr ""
+"Крім первинних розділів, принаймні один може бути розширеним\n"
+" (хоча це не проблема для Linux)\n"
+
+#: fdisk/sfdisk.c:1234
+#, c-format
+msgid "Warning: partition %s does not start at a cylinder boundary\n"
+msgstr "Попередження: розділ %s починається не з межі циліндра\n"
+
+#: fdisk/sfdisk.c:1240
+#, c-format
+msgid "Warning: partition %s does not end at a cylinder boundary\n"
+msgstr "Попередження: розділ %s не закінчується на межі циліндра\n"
+
+#: fdisk/sfdisk.c:1258
+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 ""
+"Попередження: більш ніж один первинний розділ позначений завантажувальним "
+"(активним)\n"
+"Це не має значення для Lilo, але DOS MBR не зможе завантажуватись з цього "
+"диску.\n"
+
+#: fdisk/sfdisk.c:1265
+msgid ""
+"Warning: usually one can boot from primary partitions only\n"
+"LILO disregards the `bootable' flag.\n"
+msgstr ""
+"Попередження: зазвичай можна завантажуватись лише з первинних розділів\n"
+"LILO не звертає уваги на ознаку `завантажувальний'.\n"
+
+#: fdisk/sfdisk.c:1271
+msgid ""
+"Warning: no primary partition is marked bootable (active)\n"
+"This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
+msgstr ""
+"Попередження: немає первинного розділу позначеного завантажувальним "
+"(активним)\n"
+"Це несуттєво для LILO, але DOS MBR не зможе завантажуватись з цього диску.\n"
+
+#: fdisk/sfdisk.c:1285
+msgid "start"
+msgstr "початок"
+
+#: fdisk/sfdisk.c:1288
+#, c-format
+msgid ""
+"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"розділ %s: початок: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,%"
+"ld)\n"
+
+#: fdisk/sfdisk.c:1294
+msgid "end"
+msgstr "кінець"
+
+#: fdisk/sfdisk.c:1297
+#, c-format
+msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr ""
+"розділ %s: кінець: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1300
+#, c-format
+msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
+msgstr "розділ %s закінчується на циліндрі %ld, за межами диску\n"
+
+#: fdisk/sfdisk.c:1325
+#, 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 ""
+"Попередження: зміщено початок розширеного розділу з %ld на %ld\n"
+"(Лише для відображення. Не змінюйте вміст.)\n"
+
+#: fdisk/sfdisk.c:1331
+msgid ""
+"Warning: extended partition does not start at a cylinder boundary.\n"
+"DOS and Linux will interpret the contents differently.\n"
+msgstr ""
+"Попередження: розширений розділ не починаєтеся на межі циліндра.\n"
+"DOS та Linux будуть інтерпретувати вміст по-різному.\n"
+
+#: fdisk/sfdisk.c:1349 fdisk/sfdisk.c:1426
+#, c-format
+msgid "too many partitions - ignoring those past nr (%d)\n"
+msgstr "надто багато розділів - ігнорується попередній nr (%d)\n"
+
+#: fdisk/sfdisk.c:1364
+msgid "tree of partitions?\n"
+msgstr "дерево розділів?\n"
+
+#: fdisk/sfdisk.c:1485
+msgid "detected Disk Manager - unable to handle that\n"
+msgstr "знайдено Disk Manager - це нне вдаєтьсяобробити\n"
+
+#: fdisk/sfdisk.c:1492
+msgid "DM6 signature found - giving up\n"
+msgstr "знайдено DM6 сигнатуру - відміна операції\n"
+
+#: fdisk/sfdisk.c:1512
+msgid "strange..., an extended partition of size 0?\n"
+msgstr "дивно..., розширений розділ нульового розміру?\n"
+
+#: fdisk/sfdisk.c:1519 fdisk/sfdisk.c:1530
+msgid "strange..., a BSD partition of size 0?\n"
+msgstr "дивно..., BSD розмір нульового розміру?\n"
+
+#: fdisk/sfdisk.c:1564
+#, fuzzy, c-format
+msgid " %s: unrecognized partition table type\n"
+msgstr " %s: нерозпізнаний розділ\n"
+
+#: fdisk/sfdisk.c:1576
+msgid "-n flag was given: Nothing changed\n"
+msgstr "вказано параметр -n: Нічого не змінено\n"
+
+#: fdisk/sfdisk.c:1592
+msgid "Failed saving the old sectors - aborting\n"
+msgstr "не вдається зберегти старі сектори - виконання перервано\n"
+
+#: fdisk/sfdisk.c:1597
+#, c-format
+msgid "Failed writing the partition on %s\n"
+msgstr "не вдається записати розділ на %s\n"
+
+#: fdisk/sfdisk.c:1674
+msgid "long or incomplete input line - quitting\n"
+msgstr "довгий або незавершений вхідний рядок - завершення\n"
+
+#: fdisk/sfdisk.c:1710
+#, c-format
+msgid "input error: `=' expected after %s field\n"
+msgstr "помилка вводу: очікувався символ `=' після поля %s\n"
+
+#: fdisk/sfdisk.c:1717
+#, c-format
+msgid "input error: unexpected character %c after %s field\n"
+msgstr "помилка вводу: очікувався символ %c після поля %s\n"
+
+#: fdisk/sfdisk.c:1723
+#, c-format
+msgid "unrecognized input: %s\n"
+msgstr "нерозпізнаний ввід: %s\n"
+
+#: fdisk/sfdisk.c:1765
+msgid "number too big\n"
+msgstr "число занадто велике\n"
+
+#: fdisk/sfdisk.c:1769
+msgid "trailing junk after number\n"
+msgstr "не цифри після числа\n"
+
+#: fdisk/sfdisk.c:1890
+msgid "no room for partition descriptor\n"
+msgstr "немає місця для дескриптору розділу\n"
+
+#: fdisk/sfdisk.c:1923
+msgid "cannot build surrounding extended partition\n"
+msgstr "не вдається створити оточуючий розширений розділ\n"
+
+#: fdisk/sfdisk.c:1974
+msgid "too many input fields\n"
+msgstr "надто багато вхідних полів\n"
+
+#. no free blocks left - don't read any further
+#: fdisk/sfdisk.c:2008
+msgid "No room for more\n"
+msgstr "Немає більше місця\n"
+
+#: fdisk/sfdisk.c:2027
+msgid "Illegal type\n"
+msgstr "Недопустимий тип\n"
+
+#: fdisk/sfdisk.c:2059
+#, c-format
+msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
+msgstr ""
+"Попередження: вказаний розмір (%lu) перевищує допустимий розмір (%lu)\n"
+
+#: fdisk/sfdisk.c:2065
+msgid "Warning: empty partition\n"
+msgstr "Попередження: порожній розділ\n"
+
+#: fdisk/sfdisk.c:2079
+#, c-format
+msgid "Warning: bad partition start (earliest %lu)\n"
+msgstr "Попередження: неправильний початок розділу (раніше %lu)\n"
+
+#: fdisk/sfdisk.c:2092
+msgid "unrecognized bootable flag - choose - or *\n"
+msgstr "не розпізнана завантажувальна ознака - виберіть - або *\n"
+
+#: fdisk/sfdisk.c:2109 fdisk/sfdisk.c:2122
+msgid "partial c,h,s specification?\n"
+msgstr "часткова специфікація цил,гол,сект?\n"
+
+#: fdisk/sfdisk.c:2133
+msgid "Extended partition not where expected\n"
+msgstr "Розширений розділ не там де має бути розширений\n"
+
+#: fdisk/sfdisk.c:2165
+msgid "bad input\n"
+msgstr "неправильний ввід\n"
+
+#: fdisk/sfdisk.c:2187
+msgid "too many partitions\n"
+msgstr "надто багато розділів\n"
+
+#: fdisk/sfdisk.c:2220
+msgid ""
+"Input in the following format; absent fields get a default value.\n"
+"<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
+"Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
+msgstr ""
+"Ввід у наступному форматі; відсутні поля отримують типове значення.\n"
+"<початок> <розмір> <тип [E,S,L,X,hex]> <озн.завантаж. [-,*]> <c,h,s> <c,h,"
+"s>\n"
+"Зазвичай, вам необхідно лише вказати <початок> та <розмір> (та можливо "
+"<тип>).\n"
+
+#: fdisk/sfdisk.c:2240
+msgid "version"
+msgstr "версія"
+
+#: fdisk/sfdisk.c:2246
+#, c-format
+msgid "Usage: %s [options] device ...\n"
+msgstr "Використання: %s [параметри] пристрій ...\n"
+
+#: fdisk/sfdisk.c:2247
+msgid "device: something like /dev/hda or /dev/sda"
+msgstr "пристрій: щось на зразок /dev/hda чи /dev/sda"
+
+#: fdisk/sfdisk.c:2248
+msgid "useful options:"
+msgstr "корисні параметри:"
+
+#: fdisk/sfdisk.c:2249
+msgid "    -s [or --show-size]: list size of a partition"
+msgstr "    -s [або --show-size]: вивести розмір розділу"
+
+#: fdisk/sfdisk.c:2250
+msgid "    -c [or --id]:        print or change partition Id"
+msgstr "    -c [або --id]:        вивести або змінити ідентифікатор розділу"
+
+#: fdisk/sfdisk.c:2251
+msgid "    -l [or --list]:      list partitions of each device"
+msgstr "    -l [або --list]:      вивести розділи кожного пристрою"
+
+#: fdisk/sfdisk.c:2252
+msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
+msgstr ""
+"    -d [або --dump]:      те ж саме, але у форматі прийнятному для "
+"подальшого вводу"
+
+#: fdisk/sfdisk.c:2253
+msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
+msgstr ""
+"    -i [або --increment]: кількість циліндрів починається з 1, а не з 0"
+
+#: fdisk/sfdisk.c:2254
+msgid ""
+"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
+"MB"
+msgstr ""
+"    -uS, -uB, -uC, -uM:   ввід/вивід у одиницях сектори/блоки/циліндри/Мб"
+
+#: fdisk/sfdisk.c:2255
+msgid "    -T [or --list-types]:list the known partition types"
+msgstr "    -T [або --list-types]:вивести всі відомі типи розділів"
+
+#: fdisk/sfdisk.c:2256
+msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
+msgstr ""
+"    -D [або --DOS]:       для DOS-сумісності: втрачається трохи простору"
+
+#: fdisk/sfdisk.c:2257
+msgid "    -R [or --re-read]:   make kernel reread partition table"
+msgstr "    -R [або --re-read]:   змусити ядро перечитати таблицю розділів"
+
+#: fdisk/sfdisk.c:2258
+msgid "    -N# :                change only the partition with number #"
+msgstr "    -N# :                 змінити лише розділ з номером #"
+
+#: fdisk/sfdisk.c:2259
+msgid "    -n :                 do not actually write to disk"
+msgstr "    -n :                  не записувати нічого на диск"
+
+#: fdisk/sfdisk.c:2260
+msgid ""
+"    -O file :            save the sectors that will be overwritten to file"
+msgstr ""
+"    -O file :             зберегти у файл сектори, які будуть перезаписані"
+
+#: fdisk/sfdisk.c:2261
+msgid "    -I file :            restore these sectors again"
+msgstr "    -I file :             відновити ці сектори знову"
+
+#: fdisk/sfdisk.c:2262
+msgid "    -v [or --version]:   print version"
+msgstr "    -v [або --version]:   вивести версію"
+
+#: fdisk/sfdisk.c:2263
+msgid "    -? [or --help]:      print this message"
+msgstr "    -? [або --help]:      вивести це повідомлення"
+
+#: fdisk/sfdisk.c:2264
+msgid "dangerous options:"
+msgstr "небезпечні параметри:"
+
+#: fdisk/sfdisk.c:2265
+msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
+msgstr "    -g [або --show-geometry]: вивести видану ядром геометрію"
+
+#: fdisk/sfdisk.c:2266
+msgid ""
+"    -x [or --show-extended]: also list extended partitions on output\n"
+"                             or expect descriptors for them on input"
+msgstr ""
+"    -x [або --show-extended]: також вивести перелік розширених розділів\n"
+"                              або очікувати їх дескриптори при вводі"
+
+#: fdisk/sfdisk.c:2268
+msgid ""
+"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+msgstr "    -L  [або --Linux]:      не скаржитись на несуттєві для Linux речі"
+
+#: fdisk/sfdisk.c:2269
+msgid "    -q  [or --quiet]:      suppress warning messages"
+msgstr "    -q  [або --quiet]:      не виводити попередження"
+
+#: fdisk/sfdisk.c:2270
+msgid "    You can override the detected geometry using:"
+msgstr "    Ви можете перевизначити виявлену геометрію використовуючи:"
+
+#: fdisk/sfdisk.c:2271
+msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
+msgstr "    -C# [або --cylinders #]:встановити кількість циліндрів"
+
+#: fdisk/sfdisk.c:2272
+msgid "    -H# [or --heads #]:    set the number of heads to use"
+msgstr "    -H# [або --heads #]:    встановити кількість головок"
+
+#: fdisk/sfdisk.c:2273
+msgid "    -S# [or --sectors #]:  set the number of sectors to use"
+msgstr "    -S# [або --sectors #]:  встановити кількість секторів"
+
+#: fdisk/sfdisk.c:2274
+msgid "You can disable all consistency checking with:"
+msgstr "Ви можете вимкнути перевірку логічності за допомогою:"
+
+#: fdisk/sfdisk.c:2275
+msgid "    -f  [or --force]:      do what I say, even if it is stupid"
+msgstr ""
+"    -f  [або --force]:      виконувати команди примусово, навіть безглузді"
+
+#: fdisk/sfdisk.c:2281
+msgid "Usage:"
+msgstr "Використання:"
+
+#: fdisk/sfdisk.c:2282
+#, c-format
+msgid "%s device\t\t list active partitions on device\n"
+msgstr "%s пристрій\t\t вивести активні розділи пристрою\n"
+
+#: fdisk/sfdisk.c:2283
+#, c-format
+msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
+msgstr "%s пристрій n1 n2 ... активувати розділ n1 ..., де-активувати решту\n"
+
+#: fdisk/sfdisk.c:2284
+#, c-format
+msgid "%s -An device\t activate partition n, inactivate the other ones\n"
+msgstr "%s -An пристрій\t активувати розділ n, де-активувати решту розділів\n"
+
+#: fdisk/sfdisk.c:2436
+msgid "no command?\n"
+msgstr "немає команди?\n"
+
+#: fdisk/sfdisk.c:2554
+#, fuzzy, c-format
+msgid "total: %lu blocks\n"
+msgstr "загалом: %d блоків\n"
+
+#: fdisk/sfdisk.c:2591
+msgid "usage: sfdisk --print-id device partition-number\n"
+msgstr "використання: sfdisk --print-id пристрій номер_розділу\n"
+
+#: fdisk/sfdisk.c:2593
+msgid "usage: sfdisk --change-id device partition-number Id\n"
+msgstr "використання: sfdisk --change-id пристрій номер_розділу ідентиф.\n"
+
+#: fdisk/sfdisk.c:2595
+msgid "usage: sfdisk --id device partition-number [Id]\n"
+msgstr "використання: sfdisk --id пристрій номер_пристрою [ідентиф.]\n"
+
+#: fdisk/sfdisk.c:2602
+msgid "can specify only one device (except with -l or -s)\n"
+msgstr "можна вказувати лише один пристрій (за винятком -l чи -s)\n"
+
+#: fdisk/sfdisk.c:2628
+#, c-format
+msgid "cannot open %s read-write\n"
+msgstr "неможливі відкрити %s для читання-запису\n"
+
+#: fdisk/sfdisk.c:2630
+#, c-format
+msgid "cannot open %s for reading\n"
+msgstr "неможливі відкрити %s для читання\n"
+
+#: fdisk/sfdisk.c:2655
+#, c-format
+msgid "%s: OK\n"
+msgstr "%s: Гаразд\n"
+
+#: fdisk/sfdisk.c:2672
+#, c-format
+msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
+msgstr "%s: %ld циліндрів, %ld головок, %ld секторів/трек\n"
+
+#: fdisk/sfdisk.c:2689
+#, c-format
+msgid "BLKGETSIZE ioctl failed for %s\n"
+msgstr "помилка у системному виклику BLKGETSIZE на %s\n"
+
+#: fdisk/sfdisk.c:2767
+#, c-format
+msgid "bad active byte: 0x%x instead of 0x80\n"
+msgstr "неправильний 'активний' байт 0x%x замість 0x80\n"
+
+#: fdisk/sfdisk.c:2785 fdisk/sfdisk.c:2838 fdisk/sfdisk.c:2869
+msgid ""
+"Done\n"
+"\n"
+msgstr ""
+"Виконано\n"
+"\n"
+
+#: fdisk/sfdisk.c:2794
+#, c-format
+msgid ""
+"You have %d active primary partitions. This does not matter for LILO,\n"
+"but the DOS MBR will only boot a disk with 1 active partition.\n"
+msgstr ""
+"Позначено активними %d розділів. Це немає значення для LILO,\n"
+"Але DOS MBR може завантажуватись лише з дисків, у яких 1 активний розділ.\n"
+
+#: fdisk/sfdisk.c:2808
+#, c-format
+msgid "partition %s has id %x and is not hidden\n"
+msgstr "розділ %s має ідентиф. %x та він не прихований\n"
+
+#: fdisk/sfdisk.c:2865
+#, c-format
+msgid "Bad Id %lx\n"
+msgstr "Неправильний Ідент. %lx\n"
+
+#: fdisk/sfdisk.c:2880
+msgid "This disk is currently in use.\n"
+msgstr "Цей диск наразі використовується.\n"
+
+#: fdisk/sfdisk.c:2897
+#, c-format
+msgid "Fatal error: cannot find %s\n"
+msgstr "Фатальна помилка: не вдається знайти %s\n"
+
+#: fdisk/sfdisk.c:2900
+#, c-format
+msgid "Warning: %s is not a block device\n"
+msgstr "Попередження: %s не є блочним пристроєм\n"
+
+#: fdisk/sfdisk.c:2906
+msgid "Checking that no-one is using this disk right now ...\n"
+msgstr "Перевіряється, що ніхто наразі не використовує диск ...\n"
+
+#: fdisk/sfdisk.c:2908
+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"
+"Цей диск наразі використовується - зміна розділів, можливо, погана ідея.\n"
+"Демонтуйте всі файлові системи, та відключіть всі розділи підкачки на цьому "
+"диску.\n"
+"Використовуйте параметр --no-reread щоб обминути цю перевірку.\n"
+
+#: fdisk/sfdisk.c:2912
+msgid "Use the --force flag to overrule all checks.\n"
+msgstr "Використовуйте параметр --force, щоб відхилити всі перевірки.\n"
+
+#: fdisk/sfdisk.c:2916
+msgid "OK\n"
+msgstr "Гаразд\n"
+
+#: fdisk/sfdisk.c:2925
+msgid "Old situation:\n"
+msgstr "Старий стан:\n"
+
+#: fdisk/sfdisk.c:2929
+#, c-format
+msgid "Partition %d does not exist, cannot change it\n"
+msgstr "Розділ %d не існує, не вдається його змінити\n"
+
+#: fdisk/sfdisk.c:2937
+msgid "New situation:\n"
+msgstr "Новий стан:\n"
+
+#: fdisk/sfdisk.c:2942
+msgid ""
+"I don't like these partitions - nothing changed.\n"
+"(If you really want this, use the --force option.)\n"
+msgstr ""
+"Ці розділи виглядають неправильно - нічого не змінено.\n"
+"(Якщо ви дійсно цього бажаєте, використовуйте параметр --force.)\n"
+
+#: fdisk/sfdisk.c:2945
+msgid "I don't like this - probably you should answer No\n"
+msgstr "Ці розділи виглядають неправильно - можливо слід відповісти No\n"
+
+#: fdisk/sfdisk.c:2950
+msgid "Are you satisfied with this? [ynq] "
+msgstr "Ви цим задоволені? [ynq] "
+
+#: fdisk/sfdisk.c:2952
+msgid "Do you want to write this to disk? [ynq] "
+msgstr "Бажаєте записати на диск? [ynq] "
+
+#: fdisk/sfdisk.c:2957
+msgid ""
+"\n"
+"sfdisk: premature end of input\n"
+msgstr ""
+"\n"
+"sfdisk: передчасне закінчення вводу\n"
+
+#: fdisk/sfdisk.c:2959
+msgid "Quitting - nothing changed\n"
+msgstr "Завершення - нічого не змінено\n"
+
+#: fdisk/sfdisk.c:2965
+msgid "Please answer one of y,n,q\n"
+msgstr "Відповідайте одне з y,n,q\n"
+
+#: fdisk/sfdisk.c:2973
+msgid ""
+"Successfully wrote the new partition table\n"
+"\n"
+msgstr ""
+"Успішно записано нову таблицю розділів\n"
+"\n"
+
+#: fdisk/sfdisk.c:2979
+msgid ""
+"If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
+"to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+"(See fdisk(8).)\n"
+msgstr ""
+"Якщо ви створили або змінили DOS розділ, скажімо /dev/foo7, тоді "
+"використовуйте dd(1)\n"
+"для заповнення нулями перших 512 байт:  dd if=/dev/zero of=/dev/foo7 bs=512 "
+"count=1\n"
+"(Дивіться fdisk(8).)\n"
+
+#: getopt/getopt.c:233
+msgid "Try `getopt --help' for more information.\n"
+msgstr "Спробуйте `getopt --help', щоб отримати додаткову інформацію.\n"
+
+#: getopt/getopt.c:299
+msgid "empty long option after -l or --long argument"
+msgstr "порожній довий параметр після аргументу -l або --long"
+
+#: getopt/getopt.c:319
+msgid "unknown shell after -s or --shell argument"
+msgstr "невідома оболонка після аргументу -s або --shell"
+
+#: getopt/getopt.c:324
+msgid "Usage: getopt optstring parameters\n"
+msgstr "Використання: getopt специф_арг параметри\n"
+
+#: getopt/getopt.c:325
+msgid "       getopt [options] [--] optstring parameters\n"
+msgstr "       getopt [аргументи] [--] специф_арг параметри\n"
+
+#: getopt/getopt.c:326
+msgid "       getopt [options] -o|--options optstring [options] [--]\n"
+msgstr ""
+"       getopt [аргументи] -o|--options спецмф_арг параметри [аргументи] "
+"[--]\n"
+
+#: getopt/getopt.c:327
+msgid "              parameters\n"
+msgstr "              параметри\n"
+
+#: getopt/getopt.c:328
+msgid ""
+"  -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Довгі аргументи можуть починались з одного -\n"
+
+#: getopt/getopt.c:329
+msgid "  -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Вивести цю довідку\n"
+
+#: getopt/getopt.c:330
+msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
+msgstr "  -l, --longoptions=довгі_арг  Специфікація довгих аргументів\n"
+
+#: getopt/getopt.c:331
+msgid ""
+"  -n, --name=progname          The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=назва_програми    Помилки виводити від імені цієї програми\n"
+
+#: getopt/getopt.c:332
+msgid "  -o, --options=optstring      Short options to be recognized\n"
+msgstr "  -o, --options=специф_арг     Специфікація коротких аргументів\n"
+
+#: getopt/getopt.c:333
+msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  Вимкнути повідомлення про помилки від getopt"
+"(3)\n"
+
+#: getopt/getopt.c:334
+msgid "  -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Без звичайного виводу\n"
+
+#: getopt/getopt.c:335
+msgid "  -s, --shell=shell            Set shell quoting conventions\n"
+msgstr ""
+"  -s, --shell=оболонка         Встановити стиль цитування як у оболонці\n"
+
+#: getopt/getopt.c:336
+msgid "  -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Перевірити версію getopt(1)\n"
+
+#: getopt/getopt.c:337
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr "  -u, --unqote                 Не цитувати вивід\n"
+
+#: getopt/getopt.c:338
+msgid "  -V, --version                Output version information\n"
+msgstr "  -V, --version                Вивести інформацію про версію\n"
+
+#: getopt/getopt.c:395 getopt/getopt.c:456
+msgid "missing optstring argument"
+msgstr "відсутній аргумент специф_арг"
+
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (розширена) 1.1.3\n"
+
+#: getopt/getopt.c:450
+msgid "internal error, contact the author."
+msgstr "внутрішня помилка, зв'яжіться з автором."
+
+#: hwclock/cmos.c:172
+msgid "booted from MILO\n"
+msgstr "система завантажена з MILO\n"
+
+#: hwclock/cmos.c:181
+msgid "Ruffian BCD clock\n"
+msgstr "Ruffian BCD годинник\n"
+
+#: hwclock/cmos.c:197
+#, c-format
+msgid "clockport adjusted to 0x%x\n"
+msgstr "порт годинника настроєно на 0x%x\n"
+
+#: hwclock/cmos.c:209
+msgid "funky TOY!\n"
+msgstr "боязливий TOY!\n"
+
+#: hwclock/cmos.c:263
+#, c-format
+msgid "%s: atomic %s failed for 1000 iterations!"
+msgstr "%s: помилка атомарної операція %s за 1000 ітерацій!"
+
+#: hwclock/cmos.c:587
+#, c-format
+msgid "Cannot open /dev/port: %s"
+msgstr "не вдається відкрити /dev/port: %s"
+
+#: hwclock/cmos.c:594
+msgid "I failed to get permission because I didn't try.\n"
+msgstr "не вдається отримати дозвіл, тому-що не було зроблено спроби.\n"
+
+#: hwclock/cmos.c:597
+#, c-format
+msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
+msgstr ""
+"%s не вдається отримати доступ до порту I/O:  помилка системного виклику iopl"
+"(3).\n"
+
+#: hwclock/cmos.c:600
+msgid "Probably you need root privileges.\n"
+msgstr "Можливо слід мати права адміністратора.\n"
+
+#: hwclock/hwclock.c:223
+#, c-format
+msgid "Assuming hardware clock is kept in %s time.\n"
+msgstr "Вважається, що апаратний годинник синхронізований з %s часом.\n"
+
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
+msgid "UTC"
+msgstr "UTC"
+
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
+msgid "local"
+msgstr "локальний"
+
+#: hwclock/hwclock.c:303
+#, c-format
+msgid "%s: Warning: unrecognized third line in adjtime file\n"
+msgstr "%s: Попередження: нерозпізнаний третій рядок у adjtime файлі\n"
+
+#: hwclock/hwclock.c:305
+msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
+msgstr "(Очікувалось: або `UTC', або `LOCAL', або порожній рядок.)\n"
+
+#: hwclock/hwclock.c:312
+#, c-format
+msgid "Last drift adjustment done at %ld seconds after 1969\n"
+msgstr "Остання корекція відхилення виконана у %ld секунд після 1969\n"
+
+#: hwclock/hwclock.c:314
+#, c-format
+msgid "Last calibration done at %ld seconds after 1969\n"
+msgstr "Останнє калібрування виконано у %ld секунд після 1969\n"
+
+#: hwclock/hwclock.c:316
+#, c-format
+msgid "Hardware clock is on %s time\n"
+msgstr "Апаратний годинник налаштований на %s час\n"
+
+#: hwclock/hwclock.c:318
+msgid "unknown"
+msgstr "невідомий"
+
+#: hwclock/hwclock.c:342
+msgid "Waiting for clock tick...\n"
+msgstr "Очікується сигнал годинника...\n"
+
+#: hwclock/hwclock.c:346
+msgid "...got clock tick\n"
+msgstr "...отримано сигнал годинника\n"
+
+#: hwclock/hwclock.c:399
+#, c-format
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr ""
+"Неправильне значення у апаратному годиннику: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+
+#: hwclock/hwclock.c:407
+#, c-format
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr ""
+"Час апаратного годинника: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld секунд після "
+"1969\n"
+
+#: hwclock/hwclock.c:435
+#, c-format
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr "Час прочитаний з апаратного годинника: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+
+#: hwclock/hwclock.c:462
+#, c-format
+msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr ""
+"Апаратний годинник встановлюється у %.2d:%.2d:%.2d = %ld секунд після 1969\n"
+
+#: hwclock/hwclock.c:468
+msgid "Clock not changed - testing only.\n"
+msgstr "Годинник не змінено - лише перевірка.\n"
+
+#: hwclock/hwclock.c:516
+#, c-format
+msgid ""
+"Time elapsed since reference time has been %.6f seconds.\n"
+"Delaying further to reach the next full second.\n"
+msgstr ""
+"Час, що минув з синхронізації часу %.6f секунд.\n"
+"Очікується досягнення наступної повної секунди.\n"
+
+#: hwclock/hwclock.c:545
+msgid ""
+"The Hardware Clock registers contain values that are either invalid (e.g. "
+"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr ""
+"Регістри апаратного годинника містять значення, яке або неправильне "
+"(наприклад 50-й день місяця), або за межами, які може обробити програма "
+"(наприклад 2095рік).\n"
+
+#: hwclock/hwclock.c:555
+#, c-format
+msgid "%s  %.6f seconds\n"
+msgstr "%s  %.6f секунд\n"
+
+#: hwclock/hwclock.c:589
+msgid "No --date option specified.\n"
+msgstr "Не було вказано параметр --date.\n"
+
+#: hwclock/hwclock.c:595
+msgid "--date argument too long\n"
+msgstr "аргумент --date надто довгий\n"
+
+#: hwclock/hwclock.c:602
+msgid ""
+"The value of the --date option is not a valid date.\n"
+"In particular, it contains quotation marks.\n"
+msgstr ""
+"Значення аргументу --date не є правильною датою.\n"
+"Зокрема, воно містить лапки.\n"
+
+#: hwclock/hwclock.c:610
+#, c-format
+msgid "Issuing date command: %s\n"
+msgstr "Виконується команда date: %s\n"
+
+#: hwclock/hwclock.c:614
+msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
+msgstr ""
+"не вдається виконати команду 'date' у оболонці /bin/sh. Помилка popen()"
+
+#: hwclock/hwclock.c:622
+#, c-format
+msgid "response from date command = %s\n"
+msgstr "вивід команди date = %s\n"
+
+#: hwclock/hwclock.c:624
+#, c-format
+msgid ""
+"The date command issued by %s returned unexpected results.\n"
+"The command was:\n"
+"  %s\n"
+"The response was:\n"
+"  %s\n"
+msgstr ""
+"Команда date виконана %s повернула неочікуваний результат.\n"
+"Команда:\n"
+"  %s\n"
+"Результат:\n"
+"  %s\n"
+
+#: hwclock/hwclock.c:636
+#, c-format
+msgid ""
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
+"The command was:\n"
+"  %s\n"
+"The response was:\n"
+" %s\n"
+msgstr ""
+"Команда date виконана %s повернула результат відмінний від цілого числа, яке "
+"мало б бути конвертованим значенням часу.\n"
+"Команда:\n"
+"  %s\n"
+"Результат:\n"
+" %s\n"
+
+#: hwclock/hwclock.c:647
+#, c-format
+msgid "date string %s equates to %ld seconds since 1969.\n"
+msgstr "рядок дати %s дорівнює %ld секундам з 1969.\n"
+
+#: hwclock/hwclock.c:679
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+"Апаратний годинник містить неправильний час, програма не може встановити по "
+"ньому системний час.\n"
+
+#: hwclock/hwclock.c:701
+msgid "Calling settimeofday:\n"
+msgstr "Запускається settimeofday:\n"
+
+#: hwclock/hwclock.c:702
+#, c-format
+msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+
+#: hwclock/hwclock.c:704
+#, c-format
+msgid "\ttz.tz_minuteswest = %d\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
+
+#: hwclock/hwclock.c:707
+msgid "Not setting system clock because running in test mode.\n"
+msgstr ""
+"Системний час не встановлюється, тому що запущений у тестовому режимі.\n"
+
+#: hwclock/hwclock.c:716
+msgid "Must be superuser to set system clock.\n"
+msgstr ""
+"Для встановлення системного часу необхідно мати права адміністратора.\n"
+
+#: hwclock/hwclock.c:719
+msgid "settimeofday() failed"
+msgstr "помилка у settimeofday()"
+
+#: hwclock/hwclock.c:749
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
+"Коефіцієнт відхилення не корегується, тому що попереднє значення апаратного "
+"годинника було неправильним.\n"
+
+#: hwclock/hwclock.c:754
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"Коефіцієнт відхилення не корегується, тому що час останнього калібрування "
+"дорівнює нулю,\n"
+"тому попереднє значення неправильне та необхідне рекалібрування.\n"
+
+#: hwclock/hwclock.c:760
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+"Коефіцієнт відхилення не корегується, тому що минуло менше доби з моменту "
+"останнього калібрування.\n"
+
+#: hwclock/hwclock.c:808
+#, c-format
+msgid ""
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
+"of %f seconds/day.\n"
+"Adjusting drift factor by %f seconds/day\n"
+msgstr ""
+"Відхилення годинника %.1f секунд за останні %d секунд незважаючи на "
+"поправочний коефіцієнт відхилення %f секунд/добу.\n"
+"Коефіцієнт відхилення корегується на %f секунд/добу\n"
+
+#: hwclock/hwclock.c:859
+#, c-format
+msgid "Time since last adjustment is %d seconds\n"
+msgstr "З моменту останнього корегування минуло %d секунд\n"
+
+#: hwclock/hwclock.c:861
+#, c-format
+msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+msgstr ""
+"Необхідно вставити %d секунд та знову перевірити час знову %.6f секунд "
+"назад\n"
+
+#: hwclock/hwclock.c:890
+msgid "Not updating adjtime file because of testing mode.\n"
+msgstr "У тестовому режимі файл adjtime не оновлюється.\n"
+
+#: hwclock/hwclock.c:891
+#, c-format
+msgid ""
+"Would have written the following to %s:\n"
+"%s"
+msgstr ""
+"У файл %s було б записано:\n"
+"%s"
+
+#: hwclock/hwclock.c:915
+msgid "Drift adjustment parameters not updated.\n"
+msgstr "Параметри корекції відхилення не оновлені.\n"
+
+#: hwclock/hwclock.c:956
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr ""
+"У апаратному годиннику встановлено некоректний час, тому його не "
+"вдаєтьсяскорегувати.\n"
+
+#: hwclock/hwclock.c:988
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr ""
+"Необхідна корекція менше ніж на одну секунду, тому годинник не оновлюється.\n"
+
+#: hwclock/hwclock.c:1014
+#, c-format
+msgid "Using %s.\n"
+msgstr "Використовується %s.\n"
+
+#: hwclock/hwclock.c:1016
+msgid "No usable clock interface found.\n"
+msgstr "Не знайдено підтримуваного інтерфейсу годинника.\n"
+
+#: hwclock/hwclock.c:1112
+msgid "Unable to set system clock.\n"
+msgstr "не вдається встановити системний час.\n"
+
+#: hwclock/hwclock.c:1142
+msgid ""
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
+"machine.\n"
+"This copy of hwclock was built for a machine other than Alpha\n"
+"(and thus is presumably not running on an Alpha now).  No action taken.\n"
+msgstr ""
+"Ядро зберігає значення епохи у апаратному годиннику лише на Alpha системах.\n"
+"Ця копія hwclock скомпільована для іншої архітектури, ніж Alpha\n"
+"(тож, напевно, ця система не є системою Alpha). Ніяких дій не виконано.\n"
+
+#: hwclock/hwclock.c:1151
+msgid "Unable to get the epoch value from the kernel.\n"
+msgstr "не вдається отримати значення епохи від ядра.\n"
+
+#: hwclock/hwclock.c:1153
+#, c-format
+msgid "Kernel is assuming an epoch value of %lu\n"
+msgstr "Ядро вважає, що значення епохи - %lu\n"
+
+#: hwclock/hwclock.c:1156
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+"Щоб встановити значення епохи, необхідно використовувати параметр 'epoch' із "
+"зазначенням встановлюваного значення.\n"
+
+#: hwclock/hwclock.c:1159
+#, c-format
+msgid "Not setting the epoch to %d - testing only.\n"
+msgstr "Епоха не встановлюється у %d - лише тестування.\n"
+
+#: hwclock/hwclock.c:1162
+msgid "Unable to set the epoch value in the kernel.\n"
+msgstr "не вдається встановити значення епохи у ядрі.\n"
+
+#: hwclock/hwclock.c:1196
+#, c-format
+msgid ""
+"hwclock - query and set the hardware clock (RTC)\n"
+"\n"
+"Usage: hwclock [function] [options...]\n"
+"\n"
+"Functions:\n"
+"  --help        show this help\n"
+"  --show        read hardware clock and print result\n"
+"  --set         set the rtc to the time given with --date\n"
+"  --hctosys     set the system time from the hardware clock\n"
+"  --systohc     set the hardware clock to the current system time\n"
+"  --adjust      adjust the rtc to account for systematic drift since \n"
+"                the clock was last set or adjusted\n"
+"  --getepoch    print out the kernel's hardware clock epoch value\n"
+"  --setepoch    set the kernel's hardware clock epoch value to the \n"
+"                value given with --epoch\n"
+"  --version     print out the version of hwclock to stdout\n"
+"\n"
+"Options: \n"
+"  --utc         the hardware clock is kept in coordinated universal time\n"
+"  --localtime   the hardware clock is kept in local time\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
+"  --badyear     ignore rtc's year because the bios is broken\n"
+"  --date        specifies the time to which to set the hardware clock\n"
+"  --epoch=year  specifies the year which is the beginning of the \n"
+"                hardware clock's epoch value\n"
+"  --noadjfile   do not access /etc/adjtime. Requires the use of\n"
+"                either --utc or --localtime\n"
+msgstr ""
+"hwclock - опитування та встановлення апаратного годинника (RTC)\n"
+"\n"
+"Використання: hwclock [функції] [параметри...]\n"
+"\n"
+"Функції:\n"
+"  --help        показати цю довідку\n"
+"  --show        отримати час з апаратного годинника та вивести результат\n"
+"  --set         встановити годинник у час вказаний в аргументі --date\n"
+"  --hctosys     встановити системний час з апаратного годинника\n"
+"  --systohc     встановити у апаратному годиннику значення поточного\n"
+"                системного часу\n"
+"  --adjust      скорегувати апаратний годинник на значення систематичного\n"
+"                відхилення з моменту коли годинник був останній раз "
+"оновлений\n"
+"  --getepoch    вивести отримане від годинника ядра значення епохи\n"
+"  --setepoch    встановити значення епохи годинника ядра у значення казане\n"
+"                в --epoch\n"
+"  --version     вивести версію hwclock у стандартний вивід\n"
+"\n"
+"Параметри: \n"
+"  --utc         апаратний годинник зберігає всесвітній координований час\n"
+"  --localtime   апаратний годинник зберігає локальний час\n"
+"  --directisa   прямий доступ до ISA шини, замість %s\n"
+"  --badyear     ігнорувати рік з годинника, тому що bios неправильний\n"
+"  --date        вказує час у який встановлювати апаратний годинник\n"
+"  --epoch=рік   вказує рік який є початком епохи апаратного годинника\n"
+"  --noadjfile   не обробляти /etc/adjtime. Вимагає використання або --utc,\n"
+"                або --localtime\n"
+
+#: hwclock/hwclock.c:1223
+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"
+"                вказати hwclock тип вашої системи alpha (дивіться hwclock"
+"(8))\n"
+
+#: hwclock/hwclock.c:1397
+#, c-format
+msgid "%s takes no non-option arguments.  You supplied %d.\n"
+msgstr "%s не очікує параметрів без ключів. Ви вказали %d.\n"
+
+#: hwclock/hwclock.c:1403
+msgid ""
+"You have specified multiple functions.\n"
+"You can only perform one function at a time.\n"
+msgstr ""
+"Ви вказали декілька функцій.\n"
+"Можна виконувати лише одну функцію одночасно.\n"
+
+#: hwclock/hwclock.c:1410
+#, c-format
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive.  You specified "
+"both.\n"
+msgstr ""
+"%s: Параметри --utc та --localtime виключають одне одного. А ви вказали "
+"обидва.\n"
+
+#: hwclock/hwclock.c:1417
+#, c-format
+msgid ""
+"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
+"specified both.\n"
+msgstr ""
+"%s: Параметри --adjust та --noadjfile виключають одне одного. А ви вказали "
+"обидва.\n"
+
+#: hwclock/hwclock.c:1424
+#, c-format
+msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
+msgstr ""
+"%s: Разом з --noadjfile, необхідно вказувати або --utc, або --localtime\n"
+
+#: hwclock/hwclock.c:1438
+msgid "No usable set-to time.  Cannot set clock.\n"
+msgstr "Вказано неправильне значення часу. не вдається встановити годинник.\n"
+
+#: hwclock/hwclock.c:1454
+msgid "Sorry, only the superuser can change the Hardware Clock.\n"
+msgstr "Змінювати значення апаратного годинника може лише адміністратор.\n"
+
+#: hwclock/hwclock.c:1459
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr "Змінювати системний час може лише адміністратор.\n"
+
+#: hwclock/hwclock.c:1464
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr ""
+"Змінювати значення епохи апаратного годинника у ядрі може лише "
+"адміністратор.\n"
+
+#: hwclock/hwclock.c:1484
+msgid "Cannot access the Hardware Clock via any known method.\n"
+msgstr ""
+"не вдається отримати доступ до апаратного годинника використовуючи будь-який "
+"відомий метод.\n"
+
+#: hwclock/hwclock.c:1488
+msgid ""
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
+msgstr "Щоб переглянути подробиці пошуку методу доступу вкажіть --debug.\n"
+
+#: hwclock/kd.c:43
+msgid "Waiting in loop for time from KDGHWCLK to change\n"
+msgstr "Очікування зміни часу з KDGHWCLK у циклі\n"
+
+#: hwclock/kd.c:46
+msgid "KDGHWCLK ioctl to read time failed"
+msgstr "Помилка зчитування часу з системному виклику ioctl KDGHWCLK"
+
+#: hwclock/kd.c:67 hwclock/rtc.c:187
+msgid "Timed out waiting for time change.\n"
+msgstr "Вийшов час очікування зміни часу.\n"
+
+#: hwclock/kd.c:71
+msgid "KDGHWCLK ioctl to read time failed in loop"
+msgstr "Помилка зчитування у циклі часу з системному виклику ioctl KDGHWCLK"
+
+#: hwclock/kd.c:93
+#, c-format
+msgid "ioctl() failed to read time from %s"
+msgstr "помилка зчитування часу у ioctl() з %s"
+
+#: hwclock/kd.c:129
+msgid "ioctl KDSHWCLK failed"
+msgstr "помилка ioctl KDSHWCLK"
+
+#: hwclock/kd.c:166
+msgid "Can't open /dev/tty1 or /dev/vc/1"
+msgstr "не вдається відкрити /dev/tty1 чи /dev/vc/1"
+
+#: hwclock/kd.c:171
+msgid "KDGHWCLK ioctl failed"
+msgstr "помилка ioctl KDSHWCLK"
+
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "помилка у open() для %s"
+
+#: hwclock/rtc.c:149
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
+msgstr "зчитування часу у ioctl() для %s.\n"
+
+#: hwclock/rtc.c:171
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "Очікування зміни часу з %s у циклі\n"
+
+#: hwclock/rtc.c:226
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s не має функції переривання."
+
+#: hwclock/rtc.c:237
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
+msgstr "помилка очікування у циклі в read() для %s"
+
+#: hwclock/rtc.c:255
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick failed"
+msgstr "помилка очікування у циклі в read() для %s"
+
+#: hwclock/rtc.c:258
+#, fuzzy, c-format
+msgid "select() to %s to wait for clock tick timed out\n"
+msgstr "помилка очікування у циклі в read() для %s"
+
+#: hwclock/rtc.c:267
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
+msgstr "помилка вимкнення оновлення переривань у ioctl() для %s"
+
+#: hwclock/rtc.c:270
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
+msgstr "неочікувана помилка вимкнення оновлення переривань у ioctl() для %s"
+
+#: hwclock/rtc.c:329
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
+msgstr "помилка встановлення часу в ioctl() для %s.\n"
+
+#: hwclock/rtc.c:335
+#, c-format
+msgid "ioctl(%s) was successful.\n"
+msgstr "ioctl(%s) успішно виконано.\n"
+
+#: hwclock/rtc.c:364
+#, c-format
+msgid "Open of %s failed"
+msgstr "Помилка відкривання %s"
+
+#: hwclock/rtc.c:382 hwclock/rtc.c:428
+#, c-format
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
+msgstr ""
+"для маніпулювання значенням епохи у ядрі необхідно отримати доступ до Linux "
+"'rtc' пристрою через спеціальний файл %s. Цей файл не існує у цій системі.\n"
+
+#: hwclock/rtc.c:387 hwclock/rtc.c:433
+#, c-format
+msgid "Unable to open %s"
+msgstr "не вдається відкрити %s"
+
+#: hwclock/rtc.c:394
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "помилка у ioctl(RTC_EPOCH_READ) для %s"
+
+#: hwclock/rtc.c:400
+#, c-format
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "прочитано значення епохи %ld з %s через RTC_EPOCH_READ ioctl.\n"
+
+#. kernel would not accept this epoch value
+#. Hmm - bad habit, deciding not to do what the user asks
+#. just because one believes that the kernel might not like it.
+#: hwclock/rtc.c:420
+#, c-format
+msgid "The epoch value may not be less than 1900.  You requested %ld\n"
+msgstr "Значення епохи не може бути нижчим ніж 1900.  Ви вказали %ld\n"
+
+#: hwclock/rtc.c:438
+#, c-format
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr "встановлюється епоха = %ld через RTC_EPOCH_SET ioctl у %s.\n"
+
+#: hwclock/rtc.c:443
+#, c-format
+msgid ""
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgstr ""
+"Драйвер ядра для %s не підтримує системний виклик RTC_EPOCH_SET ioctl.\n"
+
+#: hwclock/rtc.c:446
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "помилка у ioctl(RTC_EPOCH_SET) для %s"
+
+#: login-utils/agetty.c:312
+msgid "calling open_tty\n"
+msgstr "викликається open_tty\n"
+
+#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
+#: login-utils/agetty.c:325
+msgid "calling termio_init\n"
+msgstr "викликається termio_init\n"
+
+#: login-utils/agetty.c:330
+msgid "writing init string\n"
+msgstr "записується рядок ініціалізації\n"
+
+#. Optionally detect the baud rate from the modem status message.
+#: login-utils/agetty.c:340
+msgid "before autobaud\n"
+msgstr "перед auto_baud\n"
+
+#: login-utils/agetty.c:352
+msgid "waiting for cr-lf\n"
+msgstr "пошук символу нового рядка\n"
+
+#: login-utils/agetty.c:356
+#, c-format
+msgid "read %c\n"
+msgstr "прочитано %c\n"
+
+#. Read the login name.
+#: login-utils/agetty.c:365
+msgid "reading login name\n"
+msgstr "читається реєстраційне ім'я\n"
+
+#: login-utils/agetty.c:386
+#, c-format
+msgid "%s: can't exec %s: %m"
+msgstr "%s: не вдається запустити %s: %m"
+
+#: login-utils/agetty.c:406
+msgid "can't malloc initstring"
+msgstr "не вдається виділити пам'ять для рядку ініціалізації"
+
+#: login-utils/agetty.c:471
+#, c-format
+msgid "bad timeout value: %s"
+msgstr "неправильне значення періоду очікування: %s"
+
+#: login-utils/agetty.c:480
+msgid "after getopt loop\n"
+msgstr "після getopt циклу\n"
+
+#: login-utils/agetty.c:530
+msgid "exiting parseargs\n"
+msgstr "завершується функція parse_args\n"
+
+#: login-utils/agetty.c:542
+msgid "entered parse_speeds\n"
+msgstr "початок функції parse_speeds\n"
+
+#: login-utils/agetty.c:545
+#, c-format
+msgid "bad speed: %s"
+msgstr "неправильне значення швидкості: %s"
+
+#: login-utils/agetty.c:547
+msgid "too many alternate speeds"
+msgstr "надто багато запасних значень швидкості"
+
+#: login-utils/agetty.c:549
+msgid "exiting parsespeeds\n"
+msgstr "завершується функція parse_speeds\n"
+
+#: login-utils/agetty.c:649
+#, c-format
+msgid "/dev: chdir() failed: %m"
+msgstr "помилка chdir(\"/dev\"): %m"
+
+#: login-utils/agetty.c:653
+#, c-format
+msgid "/dev/%s: not a character device"
+msgstr "/dev/%s: не є символьним пристроєм"
+
+#. ignore close(2) errors
+#: login-utils/agetty.c:660
+msgid "open(2)\n"
+msgstr "open(2)\n"
+
+#: login-utils/agetty.c:662
+#, c-format
+msgid "/dev/%s: cannot open as standard input: %m"
+msgstr "/dev/%s: не вдається відкрити стандартний ввід: %m"
+
+#: login-utils/agetty.c:672
+#, c-format
+msgid "%s: not open for read/write"
+msgstr "%s: не вдається відкрити для читання/запису"
+
+#. Set up standard output and standard error file descriptors.
+#: login-utils/agetty.c:676
+msgid "duping\n"
+msgstr "виклик dup()\n"
+
+#. set up stdout and stderr
+#: login-utils/agetty.c:678
+#, c-format
+msgid "%s: dup problem: %m"
+msgstr "%s: помилка при dup: %m"
+
+#: login-utils/agetty.c:752
+msgid "term_io 2\n"
+msgstr "term_io 2\n"
+
+#: login-utils/agetty.c:937
+msgid "user"
+msgstr "користувач"
+
+#: login-utils/agetty.c:937
+msgid "users"
+msgstr "користувачів"
+
+#: login-utils/agetty.c:1025
+#, c-format
+msgid "%s: read: %m"
+msgstr "%s: прочитано: %m"
+
+#: login-utils/agetty.c:1071
+#, c-format
+msgid "%s: input overrun"
+msgstr "%s: переповнення вводу"
+
+#: login-utils/agetty.c:1195
+#, c-format
+msgid ""
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
+"line baud_rate,... [termtype]\n"
+msgstr ""
+"Використання: %s [-hiLmw] [-l програма_входу] [-t час_очікування] [-I "
+"рядок_ініц] [-H реєстрац_вузол] швидкість_передачі,... рядок "
+"[тип_терміналу]\n"
+"або\t[-hiLmw] [-l програма_входу] [-t час_очікування] [-I рядок_ініц] [-H "
+"реєстрац_вузол] рядок швидкість_передачі,... [тип_терміналу]\n"
+
+#: login-utils/checktty.c:104 login-utils/checktty.c:125
+msgid "login: memory low, login may fail\n"
+msgstr "login: недостатньо пам'яті, login може зазнати невдачі\n"
+
+#: login-utils/checktty.c:105
+msgid "can't malloc for ttyclass"
+msgstr "не вдається виділити пам'ять для ttyclass"
+
+#: login-utils/checktty.c:126
+msgid "can't malloc for grplist"
+msgstr "не вдається виділити пам'ять для grplist"
+
+#. there was a default rule, but user didn't match, reject!
+#: login-utils/checktty.c:422
+#, c-format
+msgid "Login on %s from %s denied by default.\n"
+msgstr "Вхід на %s з %s заборонений перманентно.\n"
+
+#. if we get here, /etc/usertty exists, there's a line
+#. matching our username, but it doesn't contain the
+#. name of the tty where the user is trying to log in.
+#. So deny access!
+#: login-utils/checktty.c:433
+#, c-format
+msgid "Login on %s from %s denied.\n"
+msgstr "Вхід на %s з %s заборонений.\n"
+
+#: login-utils/chfn.c:128 login-utils/chsh.c:113
+#, c-format
+msgid "%s: you (user %d) don't exist.\n"
+msgstr "%s: ваш користувач з uid %d не існує.\n"
+
+#: login-utils/chfn.c:135 login-utils/chsh.c:120
+#, c-format
+msgid "%s: user \"%s\" does not exist.\n"
+msgstr "%s: користувач \"%s\" не існує.\n"
+
+#: login-utils/chfn.c:140 login-utils/chsh.c:125
+#, c-format
+msgid "%s: can only change local entries; use yp%s instead.\n"
+msgstr ""
+"%s: може змінювати лише локальні записи; використовуйте yp%s натомість.\n"
+
+#: login-utils/chfn.c:151 login-utils/chsh.c:136
+#, fuzzy
+msgid "Unknown user context"
+msgstr "невідома помилка у ключі"
+
+#: login-utils/chfn.c:152
+#, c-format
+msgid "%s: %s is not authorized to change the finger info of %s\n"
+msgstr ""
+
+#: login-utils/chfn.c:159 login-utils/chsh.c:144
+#, c-format
+msgid "%s: Can't set default context for /etc/passwd"
+msgstr ""
+
+#: login-utils/chfn.c:173
+#, c-format
+msgid "Changing finger information for %s.\n"
+msgstr "Зміна finger інформації для %s.\n"
+
+#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
+#: login-utils/chfn.c:194 login-utils/chsh.c:176 login-utils/chsh.c:180
+#: login-utils/chsh.c:187 login-utils/chsh.c:191
+msgid "Password error."
+msgstr "Помилка паролю."
+
+#: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304
+#: mount/lomount.c:310
+msgid "Password: "
+msgstr "Пароль: "
+
+#: login-utils/chfn.c:206 login-utils/chsh.c:203
+msgid "Incorrect password."
+msgstr "Некоректний пароль."
+
+#: login-utils/chfn.c:217
+msgid "Finger information not changed.\n"
+msgstr "Finger інформацію не змінено.\n"
+
+#: login-utils/chfn.c:319
+#, c-format
+msgid "Usage: %s [ -f full-name ] [ -o office ] "
+msgstr "Використання: %s [ -f повне_ім'я ] [ -o офіс ]"
+
+#: login-utils/chfn.c:320
+msgid ""
+"[ -p office-phone ]\n"
+"\t[ -h home-phone ] "
+msgstr ""
+"[ -p офісний-телефон ]\n"
+"\t[ -h домашній-телефон ] "
+
+#: login-utils/chfn.c:321
+msgid "[ --help ] [ --version ]\n"
+msgstr "[ --help ] [ --version ]\n"
+
+#: login-utils/chfn.c:392 login-utils/chsh.c:311
+msgid ""
+"\n"
+"Aborted.\n"
+msgstr ""
+"\n"
+"Перервано.\n"
+
+#: login-utils/chfn.c:425
+msgid "field is too long.\n"
+msgstr "поле надто велике.\n"
+
+#: login-utils/chfn.c:433
+#, c-format
+msgid "'%c' is not allowed.\n"
+msgstr "'%c' не не дозволяється.\n"
+
+#: login-utils/chfn.c:438
+msgid "Control characters are not allowed.\n"
+msgstr "Керуючі послідовності не дозволяються.\n"
+
+#: login-utils/chfn.c:503
+msgid "Finger information *NOT* changed.  Try again later.\n"
+msgstr "Finger інформацію НЕ змінено. Спробуйте пізніше.\n"
+
+#: login-utils/chfn.c:506
+msgid "Finger information changed.\n"
+msgstr "Finger інформацію змінено.\n"
+
+#: login-utils/chfn.c:520 login-utils/chsh.c:426 sys-utils/cytune.c:327
+msgid "malloc failed"
+msgstr "помилка виділення пам'яті"
+
+#: login-utils/chsh.c:137
+#, fuzzy, c-format
+msgid "%s: %s is not authorized to change the shell of %s\n"
+msgstr "%s: \"%s\" не зі списку /etc/shells.\n"
+
+#: login-utils/chsh.c:157
+#, c-format
+msgid ""
+"%s: Running UID doesn't match UID of user we're altering, shell change "
+"denied\n"
+msgstr ""
+
+#: login-utils/chsh.c:163
+#, c-format
+msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
+msgstr "%s: Ваша оболонка не у /etc/shells, зміна оболонки заборонена\n"
+
+#: login-utils/chsh.c:170
+#, c-format
+msgid "Changing shell for %s.\n"
+msgstr "Змінюється оболонка для %s.\n"
+
+#: login-utils/chsh.c:211
+msgid "New shell"
+msgstr "Нова оболонка"
+
+#: login-utils/chsh.c:218
+msgid "Shell not changed.\n"
+msgstr "Оболонка не змінена.\n"
+
+#: login-utils/chsh.c:225
+msgid "Shell *NOT* changed.  Try again later.\n"
+msgstr "Оболонка НЕ змінена. Спробуйте пізніше.\n"
+
+#: login-utils/chsh.c:228
+msgid "Shell changed.\n"
+msgstr "Оболонка змінена.\n"
+
+#: login-utils/chsh.c:293
+#, c-format
+msgid ""
+"Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ username ]\n"
+msgstr ""
+"Використання: %s [ -s оболонка ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ ім'я_користувача ]\n"
+
+#: login-utils/chsh.c:336
+#, c-format
+msgid "%s: shell must be a full path name.\n"
+msgstr "%s: шлях до оболонки повинен бути абсолютним.\n"
+
+#: login-utils/chsh.c:340
+#, c-format
+msgid "%s: \"%s\" does not exist.\n"
+msgstr "%s: \"%s\" не існує.\n"
+
+#: login-utils/chsh.c:344
+#, c-format
+msgid "%s: \"%s\" is not executable.\n"
+msgstr "%s: \"%s\" не є виконуваним.\n"
+
+#: login-utils/chsh.c:351
+#, c-format
+msgid "%s: '%c' is not allowed.\n"
+msgstr "%s: '%c' не дозволяється.\n"
+
+#: login-utils/chsh.c:355
+#, c-format
+msgid "%s: Control characters are not allowed.\n"
+msgstr "%s: Використовувати керуючі символи не дозволяються.\n"
+
+#: login-utils/chsh.c:362
+#, c-format
+msgid "Warning: \"%s\" is not listed in /etc/shells\n"
+msgstr "Попередження: \"%s\" не зі списку /etc/shells\n"
+
+#: login-utils/chsh.c:364
+#, c-format
+msgid "%s: \"%s\" is not listed in /etc/shells.\n"
+msgstr "%s: \"%s\" не зі списку /etc/shells.\n"
+
+#: login-utils/chsh.c:366
+#, c-format
+msgid "%s: use -l option to see list\n"
+msgstr "%s: використовуйте параметр -l щоб переглянути список\n"
+
+#: login-utils/chsh.c:372
+#, c-format
+msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
+msgstr "Попередження: \"%s\" не зі списку /etc/shells.\n"
+
+#: login-utils/chsh.c:373
+#, c-format
+msgid "Use %s -l to see list.\n"
+msgstr "Використовуйте %s -l щоб переглянути список.\n"
+
+#: login-utils/chsh.c:393
+msgid "No known shells.\n"
+msgstr "Немає відомих оболонок.\n"
+
+#: login-utils/cryptocard.c:68
+msgid "couldn't open /dev/urandom"
+msgstr "не вдається відкрити /dev/urandom"
+
+#: login-utils/cryptocard.c:73
+msgid "couldn't read random data from /dev/urandom"
+msgstr "не вдається прочитати дані з /dev/urandom"
+
+#: login-utils/cryptocard.c:96
+#, c-format
+msgid "can't open %s for reading"
+msgstr "не вдається відкрити %s для читання"
+
+#: login-utils/cryptocard.c:100
+#, c-format
+msgid "can't stat(%s)"
+msgstr "помилка при stat(%s)"
+
+#: login-utils/cryptocard.c:106
+#, c-format
+msgid "%s doesn't have the correct filemodes"
+msgstr "%s не має правильних прав файлу"
+
+#: login-utils/cryptocard.c:111
+#, c-format
+msgid "can't read data from %s"
+msgstr "не вдається прочитати дані з %s"
+
+#: login-utils/islocal.c:38
+#, c-format
+msgid "Can't read %s, exiting."
+msgstr "не вдається прочитати %s, завершення."
+
+#: login-utils/last.c:148
+msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
+msgstr ""
+"Використання: last [-#] [-f file] [-t tty] [-h назва_вузла] "
+"[користувач ...]\n"
+
+#: login-utils/last.c:312
+msgid "  still logged in"
+msgstr "  досі у системі"
+
+#: login-utils/last.c:340
+#, c-format
+msgid ""
+"\n"
+"wtmp begins %s"
+msgstr ""
+"\n"
+"wtmp починається %s"
+
+#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
+msgid "last: malloc failure.\n"
+msgstr "last: помилка виділення пам'яті.\n"
+
+#: login-utils/last.c:441
+msgid "last: gethostname"
+msgstr "last: помилка gethostname"
+
+#: login-utils/last.c:490
+#, c-format
+msgid ""
+"\n"
+"interrupted %10.10s %5.5s \n"
+msgstr ""
+"\n"
+"перервано %10.10s %5.5s \n"
+
+#: login-utils/login.c:254
+#, c-format
+msgid "FATAL: can't reopen tty: %s"
+msgstr "ФАТАЛЬНА ПОМИЛКА: не вдається відкрити tty: %s"
+
+#: login-utils/login.c:285
+msgid "FATAL: bad tty"
+msgstr "ФАТАЛЬНА ПОМИЛКА: неправильний tty"
+
+#: login-utils/login.c:418
+msgid "login: -h for super-user only.\n"
+msgstr "login: параметр -h може використовувати лише адміністратор.\n"
+
+#: login-utils/login.c:445
+msgid "usage: login [-fp] [username]\n"
+msgstr "використання: login [-fp] [ім'я_користувача]\n"
+
+#: login-utils/login.c:538
+#, c-format
+msgid "login: PAM Failure, aborting: %s\n"
+msgstr "login: помилка PAM, перервано: %s\n"
+
+#: login-utils/login.c:540
+#, c-format
+msgid "Couldn't initialize PAM: %s"
+msgstr "не вдається ініціалізувати PAM: %s"
+
+#.
+#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
+#. * so that the "login: " prompt gets localized. Unfortunately,
+#. * PAM doesn't have an interface to specify the "Password: " string
+#. * (yet).
+#.
+#: login-utils/login.c:557
+msgid "login: "
+msgstr "Ім'я:"
+
+#: login-utils/login.c:597
+#, c-format
+msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
+msgstr "ПОМИЛОК ВХОДУ %d З %s ДЛЯ %s, %s"
+
+#: login-utils/login.c:601
+msgid ""
+"Login incorrect\n"
+"\n"
+msgstr ""
+"Некоректний вхід\n"
+"\n"
+
+#: login-utils/login.c:610
+#, c-format
+msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
+msgstr "НАДТО БАГАТО ПОМИЛОК ВХОДУ (%d) З %s ДЛЯ %s, %s"
+
+#: login-utils/login.c:614
+#, c-format
+msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
+msgstr "НЕВДАЛИЙ СЕАНС ВХОДУ З %s ДЛЯ %s, %s"
+
+#: login-utils/login.c:618
+msgid ""
+"\n"
+"Login incorrect\n"
+msgstr ""
+"\n"
+"Некоректний вхід\n"
+
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
+msgid ""
+"\n"
+"Session setup problem, abort.\n"
+msgstr ""
+"\n"
+"Помилка встановлення сеансу, перервано.\n"
+
+#: login-utils/login.c:641
+#, c-format
+msgid "NULL user name in %s:%d. Abort."
+msgstr "NULL ім'я користувача у %s:%d. Вихід."
+
+#: login-utils/login.c:648
+#, c-format
+msgid "Invalid user name \"%s\" in %s:%d. Abort."
+msgstr "Неправильне ім'я користувача \"%s\" у %s:%d. Вихід."
+
+#: login-utils/login.c:667
+msgid "login: Out of memory\n"
+msgstr "login: Недостатньо пам'яті\n"
+
+#: login-utils/login.c:709
+msgid "Illegal username"
+msgstr "Недопустиме ім'я користувача"
+
+#: login-utils/login.c:752
+#, c-format
+msgid "%s login refused on this terminal.\n"
+msgstr "%s заборонено входити на цьому терміналі.\n"
+
+#: login-utils/login.c:757
+#, c-format
+msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
+msgstr "%s ЗАБОРОНЕНО ВХОДИТИ З %s НА TTY %s"
+
+#: login-utils/login.c:761
+#, c-format
+msgid "LOGIN %s REFUSED ON TTY %s"
+msgstr "ВХІД %s ЗАБОРОНЕНИЙ НА TTY %s"
+
+#: login-utils/login.c:814
+msgid "Login incorrect\n"
+msgstr "Некоректний вхід\n"
+
+#: login-utils/login.c:836
+msgid ""
+"Too many users logged on already.\n"
+"Try again later.\n"
+msgstr ""
+"Наразі у системі надто багато користувачів.\n"
+"Спробуйте пізніше.\n"
+
+#: login-utils/login.c:840
+msgid "You have too many processes running.\n"
+msgstr "Ви запустили надто багато процесів.\n"
+
+#: login-utils/login.c:1063
+#, c-format
+msgid "DIALUP AT %s BY %s"
+msgstr "ВХІД НА %s ВІД %s"
+
+#: login-utils/login.c:1070
+#, c-format
+msgid "ROOT LOGIN ON %s FROM %s"
+msgstr "ВХІД ROOT НА %s З %s"
+
+#: login-utils/login.c:1073
+#, c-format
+msgid "ROOT LOGIN ON %s"
+msgstr "ВХІД ROOT НА %s"
+
+#: login-utils/login.c:1076
+#, c-format
+msgid "LOGIN ON %s BY %s FROM %s"
+msgstr "ВХІД НА %s КОРИСТУВАЧ %s З %s"
+
+#: login-utils/login.c:1079
+#, c-format
+msgid "LOGIN ON %s BY %s"
+msgstr "ВХІД НА %s КОРИСТУВАЧ %s"
+
+#: login-utils/login.c:1091
+msgid "You have new mail.\n"
+msgstr "Для вас є нова пошта.\n"
+
+#: login-utils/login.c:1093
+msgid "You have mail.\n"
+msgstr "Для вас є пошта.\n"
+
+#. error in fork()
+#: login-utils/login.c:1111
+#, c-format
+msgid "login: failure forking: %s"
+msgstr "login: помилка розгалуження: %s"
+
+#: login-utils/login.c:1148
+#, c-format
+msgid "TIOCSCTTY failed: %m"
+msgstr "помилка TIOCSCTTY: %m"
+
+#: login-utils/login.c:1154
+msgid "setuid() failed"
+msgstr "помилка setuid()"
+
+#: login-utils/login.c:1160
+#, c-format
+msgid "No directory %s!\n"
+msgstr "Немає каталогу %s!\n"
+
+#: login-utils/login.c:1164
+msgid "Logging in with home = \"/\".\n"
+msgstr "Вхід з домашнім каталогом = \"/\".\n"
+
+#: login-utils/login.c:1172
+msgid "login: no memory for shell script.\n"
+msgstr "login: недостатньо пам'яті для сценарію оболонки.\n"
+
+#: login-utils/login.c:1199
+#, c-format
+msgid "login: couldn't exec shell script: %s.\n"
+msgstr "login: не вдається виконати сценарій оболонки: %s.\n"
+
+#: login-utils/login.c:1202
+#, c-format
+msgid "login: no shell: %s.\n"
+msgstr "login: немає оболонки: %s.\n"
+
+#: login-utils/login.c:1217
+#, c-format
+msgid ""
+"\n"
+"%s login: "
+msgstr ""
+"\n"
+"%s ім'я: "
+
+#: login-utils/login.c:1228
+msgid "login name much too long.\n"
+msgstr "реєстраційне ім'я надто довге.\n"
+
+#: login-utils/login.c:1229
+msgid "NAME too long"
+msgstr "Ім'я надто довге"
+
+#: login-utils/login.c:1236
+msgid "login names may not start with '-'.\n"
+msgstr "реєстраційне ім'я не може починатись з '-'.\n"
+
+#: login-utils/login.c:1246
+msgid "too many bare linefeeds.\n"
+msgstr "надто багато надмірних нових рядків.\n"
+
+#: login-utils/login.c:1247
+msgid "EXCESSIVE linefeeds"
+msgstr "НАДМІРНІ символи нового рядка"
+
+#: login-utils/login.c:1279
+#, c-format
+msgid "Login timed out after %d seconds\n"
+msgstr "Вийшов час очікування входу після %d секунд\n"
+
+#: login-utils/login.c:1367
+#, c-format
+msgid "Last login: %.*s "
+msgstr "Останній вхід: %.*s "
+
+#: login-utils/login.c:1371
+#, c-format
+msgid "from %.*s\n"
+msgstr "з %.*s\n"
+
+#: login-utils/login.c:1374
+#, c-format
+msgid "on %.*s\n"
+msgstr "на %.*s\n"
+
+#: login-utils/login.c:1394
+#, c-format
+msgid "LOGIN FAILURE FROM %s, %s"
+msgstr "ПОМИЛКА ВХОДУ З %s, %s"
+
+#: login-utils/login.c:1397
+#, c-format
+msgid "LOGIN FAILURE ON %s, %s"
+msgstr "ПОМИЛКА ВХОДУ НА %s, %s"
+
+#: login-utils/login.c:1401
+#, c-format
+msgid "%d LOGIN FAILURES FROM %s, %s"
+msgstr "%d ПОМИЛОК ВХОДУ З %s, %s"
+
+#: login-utils/login.c:1404
+#, c-format
+msgid "%d LOGIN FAILURES ON %s, %s"
+msgstr "%d ПОМИЛОК ВХОДУ НА %s, %s"
+
+#: login-utils/mesg.c:89
+msgid "is y\n"
+msgstr "встановлено y\n"
+
+#: login-utils/mesg.c:92
+msgid "is n\n"
+msgstr "встановлено  n\n"
+
+#: login-utils/mesg.c:112
+msgid "usage: mesg [y | n]\n"
+msgstr "використання: mesg [y | n]\n"
+
+#: login-utils/newgrp.c:68
+msgid "newgrp: Who are you?"
+msgstr "newgrp: Ви хто?"
+
+#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
+msgid "newgrp: setgid"
+msgstr "newgrp: setgid"
+
+#: login-utils/newgrp.c:81
+msgid "newgrp: No such group."
+msgstr "newgrp: немає такої групи."
+
+#: login-utils/newgrp.c:90
+msgid "newgrp: Permission denied"
+msgstr "newgrp: Доступ заборонено"
+
+#: login-utils/newgrp.c:97
+msgid "newgrp: setuid"
+msgstr "newgrp: setuid"
+
+#: login-utils/newgrp.c:103
+msgid "No shell"
+msgstr "Немає оболонки"
+
+#: login-utils/passwd.c:161
+msgid "The password must have at least 6 characters, try again.\n"
+msgstr "Пароль повинен складатися принаймні з 6 символів, спробуйте ще раз.\n"
+
+#: login-utils/passwd.c:174
+msgid ""
+"The password must contain characters out of two of the following\n"
+"classes:  upper and lower case letters, digits and non alphanumeric\n"
+"characters. See passwd(1) for more information.\n"
+msgstr ""
+"Пароль повинен містити символи двох наступних груп категорій:\n"
+"літери у верхньому та нижньому регістрі, цифри та не алфавітно-цифрові\n"
+"символи. Додаткову інформацію дивіться у passwd(1).\n"
+
+#: login-utils/passwd.c:183
+msgid "You cannot reuse the old password.\n"
+msgstr "Не можна використовувати свій старий пароль.\n"
+
+#: login-utils/passwd.c:188
+msgid "Please don't use something like your username as password!\n"
+msgstr "Не використовуйте ваше ім'я у якості паролю!\n"
+
+#: login-utils/passwd.c:199 login-utils/passwd.c:206
+msgid "Please don't use something like your realname as password!\n"
+msgstr "Не використовуйте ваше справжнє ім'я у якості паролю!\n"
+
+#: login-utils/passwd.c:224
+msgid "Usage: passwd [username [password]]\n"
+msgstr "Використання: passwd [ім'я_користувача [пароль]]\n"
+
+#: login-utils/passwd.c:225
+msgid "Only root may use the one and two argument forms.\n"
+msgstr ""
+"Лише адміністратор може використовувати варіант з одним чи двома "
+"параметрами.\n"
+
+#: login-utils/passwd.c:280
+msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+msgstr "Використання: passwd [-foqsvV] [користувач [пароль]]\n"
+
+#: login-utils/passwd.c:301
+#, c-format
+msgid "Can't exec %s: %s\n"
+msgstr "не вдається виконати %s: %s\n"
+
+#: login-utils/passwd.c:312
+msgid "Cannot find login name"
+msgstr "не вдається знайти реєстраційне ім'я"
+
+#: login-utils/passwd.c:319 login-utils/passwd.c:326
+msgid "Only root can change the password for others.\n"
+msgstr "Лише адміністратор може змінювати пароль інших користувачів.\n"
+
+#: login-utils/passwd.c:334
+msgid "Too many arguments.\n"
+msgstr "Надто багато параметрів.\n"
+
+#: login-utils/passwd.c:339
+#, c-format
+msgid "Can't find username anywhere. Is `%s' really a user?"
+msgstr ""
+"не вдається ніде знайти ім'я користувача. Чи `%s' справді ім'я користувача?"
+
+#: login-utils/passwd.c:343
+msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+msgstr ""
+"Можна змінювати лише локальні паролі. Використовуйте yppasswd натомість."
+
+#: login-utils/passwd.c:349
+msgid "UID and username does not match, imposter!"
+msgstr "UID та ім'я користувача не відповідають одне одному, ви шахрай!"
+
+#: login-utils/passwd.c:354
+#, c-format
+msgid "Changing password for %s\n"
+msgstr "Змінюється пароль для %s\n"
+
+#: login-utils/passwd.c:358
+msgid "Enter old password: "
+msgstr "Введіть старий пароль: "
+
+#: login-utils/passwd.c:360
+msgid "Illegal password, imposter."
+msgstr "Неправильний пароль, шахрай."
+
+#: login-utils/passwd.c:372
+msgid "Enter new password: "
+msgstr "Введіть новий пароль: "
+
+#: login-utils/passwd.c:374
+msgid "Password not changed."
+msgstr "Пароль не змінено."
+
+#: login-utils/passwd.c:383
+msgid "Re-type new password: "
+msgstr "Введіть пароль повторно: "
+
+#: login-utils/passwd.c:386
+msgid "You misspelled it. Password not changed."
+msgstr "Паролі не співпадають. Пароль не змінено."
+
+#: login-utils/passwd.c:401
+#, c-format
+msgid "password changed, user %s"
+msgstr "пароль змінено, користувач %s"
+
+#: login-utils/passwd.c:404
+msgid "ROOT PASSWORD CHANGED"
+msgstr "ПАРОЛЬ АДМІНІСТРАТОРА ЗМІНЕНО"
+
+#: login-utils/passwd.c:406
+#, c-format
+msgid "password changed by root, user %s"
+msgstr "пароль змінено адміністратором, користувач %s"
+
+#: login-utils/passwd.c:413
+msgid "calling setpwnam to set password.\n"
+msgstr "викликається setpwnam для встановлення паролю.\n"
+
+#: login-utils/passwd.c:417
+msgid "Password *NOT* changed.  Try again later.\n"
+msgstr "Пароль НЕ змінено. Спробуйте ще раз пізніше.\n"
+
+#: login-utils/passwd.c:423
+msgid "Password changed.\n"
+msgstr "Пароль змінено.\n"
+
+#: login-utils/shutdown.c:113
+msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+msgstr "Використання: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+
+#: login-utils/shutdown.c:131
+msgid "Shutdown process aborted"
+msgstr "Процес завершення роботи відмінено"
+
+#: login-utils/shutdown.c:162
+#, c-format
+msgid "%s: Only root can shut a system down.\n"
+msgstr "%s: Лише адміністратор може завершувати роботу системи.\n"
+
+#: login-utils/shutdown.c:256
+msgid "That must be tomorrow, can't you wait till then?\n"
+msgstr "Це напевно буде завтра, можете зачекати до того часу?\n"
+
+#: login-utils/shutdown.c:307
+msgid "for maintenance; bounce, bounce"
+msgstr "for maintenance; bounce, bounce"
+
+#: login-utils/shutdown.c:311
+#, c-format
+msgid "timeout = %d, quiet = %d, reboot = %d\n"
+msgstr "timeout = %d, quiet = %d, reboot = %d\n"
+
+#: login-utils/shutdown.c:336
+msgid "The system is being shut down within 5 minutes"
+msgstr "Роботу системи буде завершено через 5 хвилин"
+
+#: login-utils/shutdown.c:340
+msgid "Login is therefore prohibited."
+msgstr "Таким чином вхід заборонено."
+
+#: login-utils/shutdown.c:362
+#, c-format
+msgid "rebooted by %s: %s"
+msgstr "перезавантаження ініційоване %s: %s"
+
+#: login-utils/shutdown.c:365
+#, c-format
+msgid "halted by %s: %s"
+msgstr "завершення системи ініційоване %s: %s"
+
+#. RB_AUTOBOOT
+#: login-utils/shutdown.c:429
+msgid ""
+"\n"
+"Why am I still alive after reboot?"
+msgstr ""
+"\n"
+"Чому програма досі працює після перезавантаження?"
+
+#: login-utils/shutdown.c:431
+msgid ""
+"\n"
+"Now you can turn off the power..."
+msgstr ""
+"\n"
+"Ви можете вимкнути живлення..."
+
+#: login-utils/shutdown.c:447
+msgid "Calling kernel power-off facility...\n"
+msgstr "Викликається функція ядра вимкнення живлення...\n"
+
+#: login-utils/shutdown.c:450
+#, c-format
+msgid "Error powering off\t%s\n"
+msgstr "Помилка вимикання живлення\t%s\n"
+
+#: login-utils/shutdown.c:458
+#, c-format
+msgid "Executing the program \"%s\" ...\n"
+msgstr "Запускається програма \"%s\" ...\n"
+
+#: login-utils/shutdown.c:461
+#, c-format
+msgid "Error executing\t%s\n"
+msgstr "Помилка виконання\t%s\n"
+
+#. gettext crashes on \a
+#: login-utils/shutdown.c:488
+#, c-format
+msgid "URGENT: broadcast message from %s:"
+msgstr "ТЕРМІНОВО: широкомовне повідомлення від %s:"
+
+#: login-utils/shutdown.c:494
+#, c-format
+msgid "System going down in %d hours %d minutes"
+msgstr "Роботу системи буде завершено через %d годин %d хвилин"
+
+#: login-utils/shutdown.c:497
+#, c-format
+msgid "System going down in 1 hour %d minutes"
+msgstr "Роботу системи буде завершено через 1 годину %d хвилин"
+
+#: login-utils/shutdown.c:500
+#, c-format
+msgid "System going down in %d minutes\n"
+msgstr "Роботу системи буде завершено через %d хвилин\n"
+
+#: login-utils/shutdown.c:503
+msgid "System going down in 1 minute\n"
+msgstr "Роботу системи буде завершено через 1 хвилину\n"
+
+#: login-utils/shutdown.c:505
+msgid "System going down IMMEDIATELY!\n"
+msgstr "Роботу системи буде завершено НЕВІДКЛАДНО!\n"
+
+#: login-utils/shutdown.c:510
+#, c-format
+msgid "\t... %s ...\n"
+msgstr "\t... %s ...\n"
+
+#: login-utils/shutdown.c:567
+msgid "Cannot fork for swapoff. Shrug!"
+msgstr "не вдається створити процес для swapoff. Дивно!"
+
+#: login-utils/shutdown.c:575
+msgid "Cannot exec swapoff, hoping umount will do the trick."
+msgstr "не вдається виконати swapoff, можливо umount виконає цю дію."
+
+#: login-utils/shutdown.c:594
+msgid "Cannot fork for umount, trying manually."
+msgstr "не вдається створити процес для umount, спробуйте вручну."
+
+#: login-utils/shutdown.c:603
+#, c-format
+msgid "Cannot exec %s, trying umount.\n"
+msgstr "не вдається виконати %s, спробуйте umount.\n"
+
+#: login-utils/shutdown.c:607
+msgid "Cannot exec umount, giving up on umount."
+msgstr "не вдається виконати umount, відмова від umount."
+
+#: login-utils/shutdown.c:612
+msgid "Unmounting any remaining filesystems..."
+msgstr "Відключення решти файлових систем..."
+
+#: login-utils/shutdown.c:648
+#, c-format
+msgid "shutdown: Couldn't umount %s: %s\n"
+msgstr "shutdown: не вдається відключити %s: %s\n"
+
+#: login-utils/simpleinit.c:130
+msgid "Booting to single user mode.\n"
+msgstr "Перевантаження у режим єдиного користувача.\n"
+
+#: login-utils/simpleinit.c:134
+msgid "exec of single user shell failed\n"
+msgstr "помилка виконання єдиної оболонки користувача\n"
+
+#: login-utils/simpleinit.c:138
+msgid "fork of single user shell failed\n"
+msgstr "помилка створення процесу оболонки єдиного користувача\n"
+
+#: login-utils/simpleinit.c:206
+msgid "error opening fifo\n"
+msgstr "помилка відкривання fifo\n"
+
+#: login-utils/simpleinit.c:210
+msgid "error setting close-on-exec on /dev/initctl"
+msgstr "помилка встановлення close-on-exec на /dev/initctl"
+
+#: login-utils/simpleinit.c:257
+msgid "error running finalprog\n"
+msgstr "помилка запуску final_prog\n"
+
+#. Error
+#: login-utils/simpleinit.c:261
+msgid "error forking finalprog\n"
+msgstr "помилка створення процесу final_prog\n"
+
+#: login-utils/simpleinit.c:343
+msgid ""
+"\n"
+"Wrong password.\n"
+msgstr ""
+"\n"
+"Неправильний пароль.\n"
+
+#: login-utils/simpleinit.c:416
+msgid "lstat of path failed\n"
+msgstr "помилка виконання lstat для шляху\n"
+
+#: login-utils/simpleinit.c:424
+msgid "stat of path failed\n"
+msgstr "помилка виконання stat для шляху\n"
+
+#: login-utils/simpleinit.c:432
+msgid "open of directory failed\n"
+msgstr "помилка відкривання каталогу\n"
+
+#: login-utils/simpleinit.c:506
+msgid "fork failed\n"
+msgstr "помилка створення процесу\n"
+
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
+msgid "exec failed\n"
+msgstr "помилка запуску\n"
+
+#: login-utils/simpleinit.c:561
+msgid "cannot open inittab\n"
+msgstr "не вдається відкрити inittab\n"
+
+#: login-utils/simpleinit.c:628
+msgid "no TERM or cannot stat tty\n"
+msgstr "немає TERM або не вдається виконати stat для tty\n"
+
+#: login-utils/simpleinit.c:934
+#, c-format
+msgid "error stopping service: \"%s\""
+msgstr "помилка зупинення служби: \"%s\""
+
+#: login-utils/ttymsg.c:75
+msgid "too many iov's (change code in wall/ttymsg.c)"
+msgstr "надто багато iov-структур (змініть код у wall/ttymsg.c)"
+
+#: login-utils/ttymsg.c:85
+msgid "excessively long line arg"
+msgstr "надмірно довгий рядок параметра"
+
+#: login-utils/ttymsg.c:139
+msgid "cannot fork"
+msgstr "не вдається створити процес"
+
+#: login-utils/ttymsg.c:143
+#, c-format
+msgid "fork: %s"
+msgstr "fork: %s"
+
+#: login-utils/ttymsg.c:171
+#, c-format
+msgid "%s: BAD ERROR"
+msgstr "%s: ПОГАНА ПОМИЛКА"
+
+#: login-utils/vipw.c:143
+#, c-format
+msgid "%s: the password file is busy.\n"
+msgstr "%s: файл паролів зайнятий.\n"
+
+#: login-utils/vipw.c:146
+#, c-format
+msgid "%s: the group file is busy.\n"
+msgstr "%s: файл груп зайнятий.\n"
+
+#: login-utils/vipw.c:162
+#, c-format
+msgid "%s: the %s file is busy (%s present)\n"
+msgstr "%s: файл %s зайнятий (наявний %s)\n"
+
+#: login-utils/vipw.c:168
+#, c-format
+msgid "%s: can't link %s: %s\n"
+msgstr "%s: помилка створення посилання %s: %s\n"
+
+#: login-utils/vipw.c:202
+#, fuzzy, c-format
+msgid "%s: Can't get context for %s"
+msgstr "не вдається отримати таймаут для %s: %s\n"
+
+#: login-utils/vipw.c:208
+#, fuzzy, c-format
+msgid "%s: Can't set context for %s"
+msgstr "не вдається отримати таймаут для %s: %s\n"
+
+#: login-utils/vipw.c:217
+#, c-format
+msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
+msgstr "%s: не вдається розблокувати %s: %s (ваші зміни все ще у %s)\n"
+
+#: login-utils/vipw.c:240
+#, c-format
+msgid "%s: Cannot fork\n"
+msgstr "%s: не вдається створити процес\n"
+
+#: login-utils/vipw.c:276
+#, c-format
+msgid "%s: %s unchanged\n"
+msgstr "%s: %s не змінено\n"
+
+#: login-utils/vipw.c:297
+#, c-format
+msgid "%s: no changes made\n"
+msgstr "%s: не було змінено\n"
+
+#: login-utils/vipw.c:352
+msgid "You are using shadow groups on this system.\n"
+msgstr "На цій системі використовуються тіньові групи.\n"
+
+#: login-utils/vipw.c:353
+msgid "You are using shadow passwords on this system.\n"
+msgstr "На цій системі використовуються тіньові паролі.\n"
+
+#: login-utils/vipw.c:354
+#, c-format
+msgid "Would you like to edit %s now [y/n]? "
+msgstr "Бажаєте відредагувати %s зараз [y/n]? "
+
+#: login-utils/wall.c:104
+#, c-format
+msgid "usage: %s [file]\n"
+msgstr "використання: %s [файл]\n"
+
+#: login-utils/wall.c:159
+#, c-format
+msgid "%s: can't open temporary file.\n"
+msgstr "%s: не вдається відкрити тимчасовий файл.\n"
+
+#: login-utils/wall.c:186
+#, c-format
+msgid "Broadcast Message from %s@%s"
+msgstr "Широкомовне повідомлення від %s@%s"
+
+#: login-utils/wall.c:204
+#, c-format
+msgid "%s: will not read %s - use stdin.\n"
+msgstr "%s: не буде прочитано %s - використовується stdin.\n"
+
+#: login-utils/wall.c:209
+#, c-format
+msgid "%s: can't read %s.\n"
+msgstr "%s: не вдається прочитати %s.\n"
+
+#: login-utils/wall.c:231
+#, c-format
+msgid "%s: can't stat temporary file.\n"
+msgstr "%s: не вдається отримати інформацію про тимчасовий файл.\n"
+
+#: login-utils/wall.c:241
+#, c-format
+msgid "%s: can't read temporary file.\n"
+msgstr "%s: не вдається прочитати тимчасовий файл.\n"
+
+#: misc-utils/cal.c:262
+msgid "illegal month value: use 1-12"
+msgstr "неправильне значення місяця: використовуйте 1-12"
+
+#: misc-utils/cal.c:266
+msgid "illegal year value: use 1-9999"
+msgstr "неправильне значення року: використовуйте 1-9999"
+
+#. %s is the month name, %d the year number.
+#. * you can change the order and/or add something here; eg for
+#. * Basque the translation should be: "%2$dko %1$s", and
+#. * the Vietnamese should be "%s na(m %d", etc.
+#.
+#: misc-utils/cal.c:373
+#, c-format
+msgid "%s %d"
+msgstr "%s %d"
+
+#: misc-utils/cal.c:676
+msgid "usage: cal [-13smjyV] [[month] year]\n"
+msgstr "використання: cal [-13smjyV] [[місяць] рік]\n"
+
+#: misc-utils/ddate.c:205
+#, c-format
+msgid "usage: %s [+format] [day month year]\n"
+msgstr "використання: %s [+формат] [день місяць рік]\n"
+
+#. handle St. Tib's Day
+#: misc-utils/ddate.c:252
+msgid "St. Tib's Day"
+msgstr "День святого Tib"
+
+#: misc-utils/kill.c:206
+#, c-format
+msgid "%s: unknown signal %s\n"
+msgstr "%s: невідомий сигнал %s\n"
+
+#: misc-utils/kill.c:269
+#, c-format
+msgid "%s: can't find process \"%s\"\n"
+msgstr "%s: не вдається знайти процес \"%s\"\n"
+
+#: misc-utils/kill.c:313
+#, c-format
+msgid "%s: unknown signal %s; valid signals:\n"
+msgstr "%s: невідомий сигнал %s; правильні сигнали:\n"
+
+#: misc-utils/kill.c:353
+#, c-format
+msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
+msgstr "використання: %s [ -s сигнал | -p ] [ -a ] pid ...\n"
+
+#: misc-utils/kill.c:354
+#, c-format
+msgid "       %s -l [ signal ]\n"
+msgstr "       %s -l [ сигнал ]\n"
+
+#: misc-utils/logger.c:140
+#, c-format
+msgid "logger: %s: %s.\n"
+msgstr "logger: %s: %s.\n"
+
+#: misc-utils/logger.c:247
+#, c-format
+msgid "logger: unknown facility name: %s.\n"
+msgstr "logger: невідома назва можливості: %s.\n"
+
+#: misc-utils/logger.c:259
+#, c-format
+msgid "logger: unknown priority name: %s.\n"
+msgstr "logger: невідома назва пріоритету: %s.\n"
+
+#: misc-utils/logger.c:286
+msgid ""
+"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr ""
+"використання: logger [-is] [-f файл] [-p пріор] [-t тег] [-u сокет] "
+"[ повідомлення ... ]\n"
+
+#: misc-utils/look.c:348
+msgid "usage: look [-dfa] [-t char] string [file]\n"
+msgstr "використання: look [-dfa] [-t символ] рядок [файл]\n"
+
+#: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
+#, c-format
+msgid "Could not open %s\n"
+msgstr "не вдається відкрити %s\n"
+
+#: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
+#, c-format
+msgid "Got %d bytes from %s\n"
+msgstr "Отримано %d байт з %s\n"
+
+#: misc-utils/namei.c:102
+#, c-format
+msgid "namei: unable to get current directory - %s\n"
+msgstr "namei: не вдається отримати поточний каталог - %s\n"
+
+#: misc-utils/namei.c:115
+#, c-format
+msgid "namei: unable to chdir to %s - %s (%d)\n"
+msgstr "namei: не вдається перейти у каталог %s - %s (%d)\n"
+
+#: misc-utils/namei.c:125
+msgid "usage: namei [-mx] pathname [pathname ...]\n"
+msgstr "використання: namei [-mx] шлях [шлях ...]\n"
+
+#: misc-utils/namei.c:150
+msgid "namei: could not chdir to root!\n"
+msgstr "namei: не вдається перейти у кореневий каталог!\n"
+
+#: misc-utils/namei.c:157
+msgid "namei: could not stat root!\n"
+msgstr "namei: не вдається отримати інформацію про кореневий каталог!\n"
+
+#: misc-utils/namei.c:171
+msgid "namei: buf overflow\n"
+msgstr "namei: переповнення буфера\n"
+
+#: misc-utils/namei.c:217
+#, c-format
+msgid " ? could not chdir into %s - %s (%d)\n"
+msgstr " ? не вдається перейти у каталог %s - %s (%d)\n"
+
+#: misc-utils/namei.c:246
+#, c-format
+msgid " ? problems reading symlink %s - %s (%d)\n"
+msgstr " ? проблема при читання символічного посилання %s - %s (%d)\n"
+
+#: misc-utils/namei.c:256
+msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
+msgstr "  *** ПЕРЕВИЩЕНО UNIX МЕЖУ СИМВОЛІЧНИХ посилань ***\n"
+
+#: misc-utils/namei.c:293
+#, c-format
+msgid "namei: unknown file type 0%06o on file %s\n"
+msgstr "namei: невідомий тип файлу 0%06o для файлу %s\n"
+
+#: misc-utils/rename.c:38
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: недостатньо пам'яті\n"
+
+#: misc-utils/rename.c:56
+#, c-format
+msgid "%s: renaming %s to %s failed: %s\n"
+msgstr "%s: помилка перейменування %s на %s: %s\n"
+
+#: misc-utils/rename.c:86
+#, c-format
+msgid "call: %s from to files...\n"
+msgstr "виклик: %s звідки куди файли...\n"
+
+#: misc-utils/script.c:107
+#, c-format
+msgid ""
+"Warning: `%s' is a link.\n"
+"Use `%s [options] %s' if you really want to use it.\n"
+"Script not started.\n"
+msgstr ""
+"Попередження: `%s' - це посилання.\n"
+"Використовуйте `%s [параметри] %s', якщо ви дійсно бажаєте його "
+"використовувати.\n"
+"Сценарій не запущено.\n"
+
+#: misc-utils/script.c:169
+msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+msgstr "використання: script [-a] [-f] [-q] [-t] [файл]\n"
+
+#: misc-utils/script.c:192
+#, c-format
+msgid "Script started, file is %s\n"
+msgstr "Сценарій запущено, файл - %s\n"
+
+#: misc-utils/script.c:278
+#, c-format
+msgid "Script started on %s"
+msgstr "Сценарій запущено на %s"
+
+#: misc-utils/script.c:362
+#, c-format
+msgid ""
+"\n"
+"Script done on %s"
+msgstr ""
+"\n"
+"Сценарій завершено на %s"
+
+#: misc-utils/script.c:369
+#, c-format
+msgid "Script done, file is %s\n"
+msgstr "Сценарій завершено, файл %s\n"
+
+#: misc-utils/script.c:380
+msgid "openpty failed\n"
+msgstr "помилка openpty\n"
+
+#: misc-utils/script.c:414
+msgid "Out of pty's\n"
+msgstr "Скінчились pty-пристрої\n"
+
+#. Print error message about arguments, and the command's syntax.
+#: misc-utils/setterm.c:744
+#, c-format
+msgid "%s: Argument error, usage\n"
+msgstr "%s: Помилка у параметрах, використання\n"
+
+#: misc-utils/setterm.c:747
+msgid "  [ -term terminal_name ]\n"
+msgstr "  [ -term назва_терміналу ]\n"
+
+#: misc-utils/setterm.c:748
+msgid "  [ -reset ]\n"
+msgstr "  [ -reset ]\n"
+
+#: misc-utils/setterm.c:749
+msgid "  [ -initialize ]\n"
+msgstr "  [ -initialize ]\n"
+
+#: misc-utils/setterm.c:750
+msgid "  [ -cursor [on|off] ]\n"
+msgstr "  [ -cursor [on|off] ]\n"
+
+#: misc-utils/setterm.c:752
+msgid "  [ -snow [on|off] ]\n"
+msgstr "  [ -snow [on|off] ]\n"
+
+#: misc-utils/setterm.c:753
+msgid "  [ -softscroll [on|off] ]\n"
+msgstr "  [ -softscroll [on|off] ]\n"
+
+#: misc-utils/setterm.c:755
+msgid "  [ -repeat [on|off] ]\n"
+msgstr "  [ -repeat [on|off] ]\n"
+
+#: misc-utils/setterm.c:756
+msgid "  [ -appcursorkeys [on|off] ]\n"
+msgstr "  [ -appcursorkeys [on|off] ]\n"
+
+#: misc-utils/setterm.c:757
+msgid "  [ -linewrap [on|off] ]\n"
+msgstr "  [ -linewrap [on|off] ]\n"
+
+#: misc-utils/setterm.c:758
+msgid "  [ -default ]\n"
+msgstr "  [ -default ]\n"
+
+#: misc-utils/setterm.c:759
+msgid "  [ -foreground black|blue|green|cyan"
+msgstr "  [ -foreground black|blue|green|cyan"
+
+#: misc-utils/setterm.c:760 misc-utils/setterm.c:762
+msgid "|red|magenta|yellow|white|default ]\n"
+msgstr "|red|magenta|yellow|white|default ]\n"
+
+#: misc-utils/setterm.c:761
+msgid "  [ -background black|blue|green|cyan"
+msgstr "  [ -background black|blue|green|cyan"
+
+#: misc-utils/setterm.c:763
+msgid "  [ -ulcolor black|grey|blue|green|cyan"
+msgstr "  [ -ulcolor black|grey|blue|green|cyan"
+
+#: misc-utils/setterm.c:764 misc-utils/setterm.c:766 misc-utils/setterm.c:768
+#: misc-utils/setterm.c:770
+msgid "|red|magenta|yellow|white ]\n"
+msgstr "|red|magenta|yellow|white ]\n"
+
+#: misc-utils/setterm.c:765
+msgid "  [ -ulcolor bright blue|green|cyan"
+msgstr "  [ -ulcolor bright blue|green|cyan"
+
+#: misc-utils/setterm.c:767
+msgid "  [ -hbcolor black|grey|blue|green|cyan"
+msgstr "  [ -hbcolor black|grey|blue|green|cyan"
+
+#: misc-utils/setterm.c:769
+msgid "  [ -hbcolor bright blue|green|cyan"
+msgstr "  [ -hbcolor bright blue|green|cyan"
+
+#: misc-utils/setterm.c:772
+msgid "  [ -standout [ attr ] ]\n"
+msgstr "  [ -standout [ attr ] ]\n"
+
+#: misc-utils/setterm.c:774
+msgid "  [ -inversescreen [on|off] ]\n"
+msgstr "  [ -inversescreen [on|off] ]\n"
+
+#: misc-utils/setterm.c:775
+msgid "  [ -bold [on|off] ]\n"
+msgstr "  [ -bold [on|off] ]\n"
+
+#: misc-utils/setterm.c:776
+msgid "  [ -half-bright [on|off] ]\n"
+msgstr "  [ -half-bright [on|off] ]\n"
+
+#: misc-utils/setterm.c:777
+msgid "  [ -blink [on|off] ]\n"
+msgstr "  [ -blink [on|off] ]\n"
+
+#: misc-utils/setterm.c:778
+msgid "  [ -reverse [on|off] ]\n"
+msgstr "  [ -reverse [on|off] ]\n"
+
+#: misc-utils/setterm.c:779
+msgid "  [ -underline [on|off] ]\n"
+msgstr "  [ -underline [on|off] ]\n"
+
+#: misc-utils/setterm.c:780
+msgid "  [ -store ]\n"
+msgstr "  [ -store ]\n"
+
+#: misc-utils/setterm.c:781
+msgid "  [ -clear [all|rest] ]\n"
+msgstr "  [ -clear [all|rest] ]\n"
+
+#: misc-utils/setterm.c:782
+msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
+msgstr "  [ -tabs [ табул1 табул2 табул3 ... ] ]     (табулn = 1-160)\n"
+
+#: misc-utils/setterm.c:783
+msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
+msgstr "  [ -clrtabs [ табул1 табул2 табул3 ... ] ]  (табулn = 1-160)\n"
+
+#: misc-utils/setterm.c:784
+msgid "  [ -regtabs [1-160] ]\n"
+msgstr "  [ -regtabs [1-160] ]\n"
+
+#: misc-utils/setterm.c:785
+msgid "  [ -blank [0-60] ]\n"
+msgstr "  [ -blank [0-60] ]\n"
+
+#: misc-utils/setterm.c:786
+msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
+msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
+
+#: misc-utils/setterm.c:787
+msgid "  [ -append [1-NR_CONSOLES] ]\n"
+msgstr "  [ -append [1-NR_CONSOLES] ]\n"
+
+#: misc-utils/setterm.c:788
+msgid "  [ -file dumpfilename ]\n"
+msgstr "  [ -file назва_файлу_дампу ]\n"
+
+#: misc-utils/setterm.c:789
+msgid "  [ -msg [on|off] ]\n"
+msgstr "  [ -msg [on|off] ]\n"
+
+#: misc-utils/setterm.c:790
+msgid "  [ -msglevel [0-8] ]\n"
+msgstr "  [ -msglevel [0-8] ]\n"
+
+#: misc-utils/setterm.c:791
+msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
+msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
+
+#: misc-utils/setterm.c:792
+msgid "  [ -powerdown [0-60] ]\n"
+msgstr "  [ -powerdown [0-60] ]\n"
+
+#: misc-utils/setterm.c:793
+msgid "  [ -blength [0-2000] ]\n"
+msgstr "  [ -blength [0-2000] ]\n"
+
+#: misc-utils/setterm.c:794
+msgid "  [ -bfreq freqnumber ]\n"
+msgstr "  [ -bfreq частота_звуку ]\n"
+
+#: misc-utils/setterm.c:1049
+msgid "cannot (un)set powersave mode\n"
+msgstr "не вдається встановити/зняти режим енергозбереження\n"
+
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
+#, c-format
+msgid "klogctl error: %s\n"
+msgstr "помилка klogctl %s\n"
+
+#: misc-utils/setterm.c:1149
+#, c-format
+msgid "Error reading %s\n"
+msgstr "Помилка читання %s\n"
+
+#: misc-utils/setterm.c:1164
+msgid "Error writing screendump\n"
+msgstr "Помилка запису знімку екрану \n"
+
+#: misc-utils/setterm.c:1178
+#, c-format
+msgid "couldn't read %s, and cannot ioctl dump\n"
+msgstr "не вдається прочитати %s, або не вдається виконати ioctl дампу\n"
+
+#: misc-utils/setterm.c:1244
+#, c-format
+msgid "%s: $TERM is not defined.\n"
+msgstr "%s: не визначено $TERM.\n"
+
+#: misc-utils/whereis.c:157
+msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
+msgstr "whereis [ -sbmu ] [ -SBM каталог ... -f ] назва...\n"
+
+#: misc-utils/write.c:99
+msgid "write: can't find your tty's name\n"
+msgstr "write: не вдається  знайти назву вашого tty\n"
+
+#: misc-utils/write.c:110
+msgid "write: you have write permission turned off.\n"
+msgstr "write: у вас немає прав запису.\n"
+
+#: misc-utils/write.c:131
+#, c-format
+msgid "write: %s is not logged in on %s.\n"
+msgstr "write: %s не ввійшов у систему на %s.\n"
+
+#: misc-utils/write.c:139
+#, c-format
+msgid "write: %s has messages disabled on %s\n"
+msgstr "write: для %s вивід повідомлень вимкнено на %s\n"
+
+#: misc-utils/write.c:146
+msgid "usage: write user [tty]\n"
+msgstr "використання: write користувач [tty]\n"
+
+#: misc-utils/write.c:234
+#, c-format
+msgid "write: %s is not logged in\n"
+msgstr "write: %s не ввійшов у систему\n"
+
+#: misc-utils/write.c:243
+#, c-format
+msgid "write: %s has messages disabled\n"
+msgstr "write: для %s вивід повідомлень вимкнено\n"
+
+#: misc-utils/write.c:247
+#, c-format
+msgid "write: %s is logged in more than once; writing to %s\n"
+msgstr "write: %s ввійшов у систему більше одного разу; надсилається на %s\n"
+
+#: misc-utils/write.c:313
+#, c-format
+msgid "Message from %s@%s (as %s) on %s at %s ..."
+msgstr "Повідомлення від %s@%s (як %s) до %s у %s ..."
+
+#: misc-utils/write.c:316
+#, c-format
+msgid "Message from %s@%s on %s at %s ..."
+msgstr "Повідомлення від %s@%s до %s у %s ..."
+
+#: mount/fstab.c:114
+#, c-format
+msgid "warning: error reading %s: %s"
+msgstr "Попередження: помилка читання %s: %s"
+
+#: mount/fstab.c:142 mount/fstab.c:167
+#, c-format
+msgid "warning: can't open %s: %s"
+msgstr "Попередження: не вдається відкрити %s: %s"
+
+#: mount/fstab.c:147
+#, c-format
+msgid "mount: could not open %s - using %s instead\n"
+msgstr "mount: не вдається відкрити %s - натомість використовується %s\n"
+
+#. linktargetfile does not exist (as a file)
+#. and we cannot create it. Read-only filesystem?
+#. Too many files open in the system?
+#. Filesystem full?
+#: mount/fstab.c:451
+#, c-format
+msgid "can't create lock file %s: %s (use -n flag to override)"
+msgstr ""
+"не вдається створити файл блокування %s: %s (для перевизначення "
+"використовуйте -n)"
+
+#: mount/fstab.c:466
+#, c-format
+msgid "can't link lock file %s: %s (use -n flag to override)"
+msgstr ""
+"не вдається створити посилання на файл блокування %s: %s (для перевизначення "
+"використовуйте -n)"
+
+#: mount/fstab.c:478
+#, c-format
+msgid "can't open lock file %s: %s (use -n flag to override)"
+msgstr ""
+"не вдається відкрити файл блокування %s: %s (для перевизначення "
+"використовуйте -n)"
+
+#: mount/fstab.c:493
+#, c-format
+msgid "Can't lock lock file %s: %s\n"
+msgstr "не вдається заблокувати файл блокування %s: %s\n"
+
+#: mount/fstab.c:505
+#, c-format
+msgid "can't lock lock file %s: %s"
+msgstr "не вдається заблокувати файл блокування %s: %s"
+
+#: mount/fstab.c:507
+msgid "timed out"
+msgstr "вийшов час очікування"
+
+#: mount/fstab.c:514
+#, c-format
+msgid ""
+"Cannot create link %s\n"
+"Perhaps there is a stale lock file?\n"
+msgstr ""
+"не вдається створити посилання %s\n"
+"Можливо є застарілий файл файл блокування?\n"
+
+#: mount/fstab.c:563 mount/fstab.c:599
+#, c-format
+msgid "cannot open %s (%s) - mtab not updated"
+msgstr "не вдається відкрити %s (%s) - mtab не оновлено"
+
+#: mount/fstab.c:607
+#, c-format
+msgid "error writing %s: %s"
+msgstr "помилка запису %s: %s"
+
+#: mount/fstab.c:615
+#, c-format
+msgid "error changing mode of %s: %s\n"
+msgstr "помилка зімни режиму доступу до %s: %s\n"
+
+#: mount/fstab.c:633
+#, c-format
+msgid "can't rename %s to %s: %s\n"
+msgstr "не вдається перейменувати %s у %s: %s\n"
+
+#: mount/lomount.c:85
+#, c-format
+msgid "loop: can't open device %s: %s\n"
+msgstr "loop: не вдається відкрити пристрій %s: %s\n"
+
+#: mount/lomount.c:101
+#, c-format
+msgid ", offset %lld"
+msgstr ", зсув %lld"
+
+#: mount/lomount.c:104
+#, c-format
+msgid ", sizelimit %lld"
+msgstr ", обмеження на розмір %lld"
+
+#: mount/lomount.c:112
+#, c-format
+msgid ", encryption %s (type %d)"
+msgstr ", шифрування %s (тип %d)"
+
+#: mount/lomount.c:126
+#, c-format
+msgid ", offset %d"
+msgstr ", зсув %d"
+
+#: mount/lomount.c:129
+#, c-format
+msgid ", encryption type %d\n"
+msgstr ", тип шифрування %d\n"
+
+#: mount/lomount.c:138
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: не вдається отримати інформацію про пристрій %s: %s\n"
+
+#: mount/lomount.c:189
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: не вдається знайти жодний пристрій /dev/loop#"
+
+#: mount/lomount.c:192
+msgid ""
+"mount: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device? (If so, recompile or `modprobe loop'.)"
+msgstr ""
+"mount: Не вдається знайти жоден loop-пристрій. Можливо це ядро не \n"
+"       підтримує роботу з loop-пристроями (Якщо це так - перекомпілюйте\n"
+"       його або виконайте `modprobe loop')."
+
+#: mount/lomount.c:197
+msgid "mount: could not find any free loop device"
+msgstr "mount: не вдається знайти жодний вільний loop-пристрій"
+
+#: mount/lomount.c:294
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr "не вдається заблокувати у пам'яті, завершення.\n"
+
+#: mount/lomount.c:340
+#, fuzzy, c-format
+msgid "set_loop(%s,%s,%llu): success\n"
+msgstr "set_loop(%s,%s,%d): успішно завершено\n"
+
+#: mount/lomount.c:356
+#, c-format
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: не вдається видалити пристрій %s: %s\n"
+
+#: mount/lomount.c:366
+#, c-format
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): успішно завершено\n"
+
+#: mount/lomount.c:374
+msgid "This mount was compiled without loop support. Please recompile.\n"
+msgstr ""
+"Програма mount була скомпільована без підтримки loop-пристроїв. "
+"Перекомпілюйте її \n"
+
+#: mount/lomount.c:411
+#, c-format
+msgid ""
+"usage:\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+msgstr ""
+"використання:\n"
+"  %s loop_пристрій                                    # отримати інформацію\n"
+"  %s -d loop_пристрій                                 # видалити\n"
+"  %s [ -e шифрування ] [ -o зсув ] loop_пристрій файл # встановити\n"
+
+#: mount/lomount.c:429 mount/sundries.c:30 mount/sundries.c:45
+#: mount/sundries.c:244
+msgid "not enough memory"
+msgstr "недостатньо пам'яті"
+
+#: mount/lomount.c:509
+msgid "No loop support was available at compile time. Please recompile.\n"
+msgstr ""
+"При компіляції не було ввімкнено підтримку loop-пристроїв. Перекомпілюйте.\n"
+
+#: mount/mntent.c:168
+#, c-format
+msgid "[mntent]: warning: no final newline at the end of %s\n"
+msgstr "[mntent]: Попередження: відсутній символ нового рядка наприкінці %s\n"
+
+#: mount/mntent.c:219
+#, c-format
+msgid "[mntent]: line %d in %s is bad%s\n"
+msgstr "[mntent]: рядок %d у %s неправильний%s\n"
+
+#: mount/mntent.c:222
+msgid "; rest of file ignored"
+msgstr "; залишок файлу ігнорується"
+
+#: mount/mount.c:395
+#, c-format
+msgid "mount: according to mtab, %s is already mounted on %s"
+msgstr "mount: згідно mtab, %s вже підключений у %s"
+
+#: mount/mount.c:399
+#, c-format
+msgid "mount: according to mtab, %s is mounted on %s"
+msgstr "mount: згідно mtab, %s підключений у %s"
+
+#: mount/mount.c:420
+#, c-format
+msgid "mount: can't open %s for writing: %s"
+msgstr "mount: не вдається відкрити %s для запису: %s"
+
+#: mount/mount.c:435 mount/mount.c:661
+#, c-format
+msgid "mount: error writing %s: %s"
+msgstr "mount: помилка запису %s: %s"
+
+#: mount/mount.c:442
+#, c-format
+msgid "mount: error changing mode of %s: %s"
+msgstr "mount: помилка зміни прав доступу до %s: %s"
+
+#: mount/mount.c:493
+#, c-format
+msgid "%s looks like swapspace - not mounted"
+msgstr "%s схожий на розділ підкачки - не підключатиметься"
+
+#: mount/mount.c:553
+msgid "mount failed"
+msgstr "помилка підключення"
+
+#: mount/mount.c:555
+#, c-format
+msgid "mount: only root can mount %s on %s"
+msgstr "mount: лише адміністратор(root) може підключати %s у %s"
+
+#: mount/mount.c:584
+msgid "mount: loop device specified twice"
+msgstr "mount: loop-пристрій вказано двічі"
+
+#: mount/mount.c:589
+msgid "mount: type specified twice"
+msgstr "mount: тип вказано двічі"
+
+#: mount/mount.c:601
+msgid "mount: skipping the setup of a loop device\n"
+msgstr "mount: пропускається встановлення loop-пристрою\n"
+
+#: mount/mount.c:610
+#, c-format
+msgid "mount: going to use the loop device %s\n"
+msgstr "mount: буде використовуватись loop-пристрій %s\n"
+
+#: mount/mount.c:615
+msgid "mount: failed setting up loop device\n"
+msgstr "mount: помилка встановлення loop-пристрою\n"
+
+#: mount/mount.c:619
+msgid "mount: setup loop device successfully\n"
+msgstr "mount: встановлення loop-пристрою успішно завершено\n"
+
+#: mount/mount.c:656
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr "mount: не вдається відкрити %s: %s"
+
+#: mount/mount.c:675
+msgid "mount: argument to -p or --pass-fd must be a number"
+msgstr "mount: аргумент для -p або --pass-fd повинен бути числом"
+
+#: mount/mount.c:687
+#, c-format
+msgid "mount: cannot open %s for setting speed"
+msgstr "mount: помилка відкривання %s для встановлення швидкості"
+
+#: mount/mount.c:690
+#, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount: помилка встановлення швидкості: %s"
+
+#: mount/mount.c:744 mount/mount.c:1284
+#, c-format
+msgid "mount: cannot fork: %s"
+msgstr "mount: помилка створення процесу: %s"
+
+#: mount/mount.c:825
+msgid "mount: this version was compiled without support for the type `nfs'"
+msgstr "mount: цю версію програми скомпільовано без підтримки `nfs'"
+
+#: mount/mount.c:864
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
+msgstr "mount: помилка підключення nfs версії 4, пробується 3..\n"
+
+#: mount/mount.c:875
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
+msgstr ""
+"mount: не вдається визначити тип файлової системи, та тип явно не вказаний"
+
+#: mount/mount.c:878
+msgid "mount: you must specify the filesystem type"
+msgstr "mount: необхідно вказати тип файлової системи"
+
+#. should not happen
+#: mount/mount.c:881
+msgid "mount: mount failed"
+msgstr "mount: помилка підключення"
+
+#: mount/mount.c:887 mount/mount.c:922
+#, c-format
+msgid "mount: mount point %s is not a directory"
+msgstr "mount: точка монтування %s не є каталогом"
+
+#: mount/mount.c:889
+msgid "mount: permission denied"
+msgstr "mount: доступ заборонено"
+
+#: mount/mount.c:891
+msgid "mount: must be superuser to use mount"
+msgstr "mount: для використання mount необхідно мати права адміністратора"
+
+#. heuristic: if /proc/version exists, then probably proc is mounted
+#. proc mounted?
+#: mount/mount.c:895 mount/mount.c:899
+#, c-format
+msgid "mount: %s is busy"
+msgstr "mount: %s зайнятий"
+
+#. no
+#. yes, don't mention it
+#: mount/mount.c:901
+msgid "mount: proc already mounted"
+msgstr "mount: proc вже підключено"
+
+#: mount/mount.c:903
+#, c-format
+msgid "mount: %s already mounted or %s busy"
+msgstr "mount: %s вже підключено або %s зайнятий"
+
+#: mount/mount.c:909
+#, c-format
+msgid "mount: mount point %s does not exist"
+msgstr "mount: точка монтування %s не існує"
+
+#: mount/mount.c:911
+#, c-format
+msgid "mount: mount point %s is a symbolic link to nowhere"
+msgstr "mount: точка монтування %s є символічним посиланням, яке вказує нікуди"
+
+#: mount/mount.c:914
+#, c-format
+msgid "mount: special device %s does not exist"
+msgstr "mount: спеціальний пристрій %s не існує"
+
+#: mount/mount.c:924
+#, c-format
+msgid ""
+"mount: special device %s does not exist\n"
+"       (a path prefix is not a directory)\n"
+msgstr ""
+"mount: спеціальний пристрій %s не існує\n"
+"       (префікс шляху не є каталогом)\n"
+
+#: mount/mount.c:937
+#, c-format
+msgid "mount: %s not mounted already, or bad option"
+msgstr "mount: %s ще не підключений, або неправильний параметр"
+
+#: mount/mount.c:939
+#, c-format
+msgid ""
+"mount: wrong fs type, bad option, bad superblock on %s,\n"
+"       or too many mounted file systems"
+msgstr ""
+"mount: неправильний тип файлової системи, неправильний параметр, "
+"неправильний суперблок на %s,\n"
+"       або підключено надто багато файлових систем"
+
+#: mount/mount.c:973
+msgid "mount table full"
+msgstr "таблиця монтування переповнена"
+
+#: mount/mount.c:975
+#, c-format
+msgid "mount: %s: can't read superblock"
+msgstr "mount: %s: не вдається прочитати суперблок"
+
+#: mount/mount.c:979
+#, c-format
+msgid "mount: %s: unknown device"
+msgstr "mount: %s: невідомий пристрій"
+
+#: mount/mount.c:984
+#, c-format
+msgid "mount: fs type %s not supported by kernel"
+msgstr "mount: файлова система типу %s не підтримується ядром"
+
+#: mount/mount.c:996
+#, c-format
+msgid "mount: probably you meant %s"
+msgstr "mount: можливо ви мали на увазі %s"
+
+#: mount/mount.c:998
+msgid "mount: maybe you meant iso9660 ?"
+msgstr "mount: можливо ви мали на увазі iso9660 ?"
+
+#: mount/mount.c:1001
+#, c-format
+msgid "mount: %s has wrong device number or fs type %s not supported"
+msgstr ""
+"mount: %s має неправильний номер пристрою або файлова система типу %s не "
+"підтримується"
+
+#. strange ...
+#: mount/mount.c:1007
+#, c-format
+msgid "mount: %s is not a block device, and stat fails?"
+msgstr "mount: %s не є блочним пристроєм, та stat зазнав невдачі?"
+
+#: mount/mount.c:1009
+#, c-format
+msgid ""
+"mount: the kernel does not recognize %s as a block device\n"
+"       (maybe `insmod driver'?)"
+msgstr ""
+"mount: ядро не розпізнало %s як блочний пристрій\n"
+"       (можливо треба виконати `insmod драйвер'?)"
+
+#: mount/mount.c:1012
+#, c-format
+msgid "mount: %s is not a block device (maybe try `-o loop'?)"
+msgstr "mount: %s не є блочним пристроєм (можливо, спробуйте `-o loop'?)"
+
+#: mount/mount.c:1015
+#, c-format
+msgid "mount: %s is not a block device"
+msgstr "mount: %s не є блочним пристроєм"
+
+#: mount/mount.c:1018
+#, c-format
+msgid "mount: %s is not a valid block device"
+msgstr "mount: %s не є правильним блочним пристроєм"
+
+#. pre-linux 1.1.38, 1.1.41 and later
+#. linux 1.1.38 and later
+#: mount/mount.c:1021
+msgid "block device "
+msgstr "блочний пристрій "
+
+#: mount/mount.c:1023
+#, c-format
+msgid "mount: cannot mount %s%s read-only"
+msgstr "mount: не вдається підключити %s%s лише для читання"
+
+#: mount/mount.c:1027
+#, c-format
+msgid "mount: %s%s is write-protected but explicit `-w' flag given"
+msgstr "mount: %s%s захищений від запису, але було вказано ключ `-w'"
+
+#: mount/mount.c:1043
+#, c-format
+msgid "mount: %s%s is write-protected, mounting read-only"
+msgstr "mount: %s%s захищений від запису, монтується лише для читання"
+
+#: mount/mount.c:1126
+msgid "mount: no type was given - I'll assume nfs because of the colon\n"
+msgstr "mount: не вказано тип - вважається nfs, через наявність двокрапки\n"
+
+#: mount/mount.c:1131
+msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
+msgstr ""
+"mount: не вказано тип - вважається smbfs, через наявність префіксу //\n"
+
+#.
+#. * Retry in the background.
+#.
+#: mount/mount.c:1147
+#, c-format
+msgid "mount: backgrounding \"%s\"\n"
+msgstr "mount: продовження спроб у фоні \"%s\"\n"
+
+#: mount/mount.c:1158
+#, c-format
+msgid "mount: giving up \"%s\"\n"
+msgstr "mount: залишено спроби підключити \"%s\"\n"
+
+#: mount/mount.c:1229
+#, c-format
+msgid "mount: %s already mounted on %s\n"
+msgstr "mount: %s вже підключений у %s\n"
+
+#: mount/mount.c:1362
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a [-t|-O] ...     : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"or move a subtree:\n"
+"       mount --move olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+"Використання: mount -V          : вивести версію\n"
+"       mount -h                 : вивести цю довідку\n"
+"       mount                    : вивести перелік підключених файлових "
+"систем\n"
+"       mount -l                 : те ж саме, але також виводити імена томів\n"
+"Досі була інформаційна частина. Далі про підключення файлових систем.\n"
+"Команда - `mount [-t тип_фс] що куди'.\n"
+"Подробиці вказані у /etc/fstab можна пропускати.\n"
+"       mount -a [-t|-O] ...     : підключити всі файлові системи з /etc/"
+"fstab\n"
+"       mount пристрій           : підключити пристрій у відоме місце\n"
+"       mount каталог            : підключити у цей каталог відомий пристрій\n"
+"       mount -t тип пристр кат  : звичайна команда підключення\n"
+"Зверніть увагу, насправді підключається не пристрій, а файлова система\n"
+"(даного типу) розташована на пристрої.\n"
+"Також можна підключати вже видимий каталог у інше місце:\n"
+"       mount --bind старий_кат новий_кат\n"
+"або переміщувати піддерево:\n"
+"       mount --move старий_кат новий_кат\n"
+"Пристрій можна вказувати за назвою, наприклад /dev/hda1 або /dev/cdrom,\n"
+"або за назвою тому (-L назва_тому), або за uuid використовуючи -U uuid .\n"
+"Інші параметри: [-nfFrsvw] [-o параметри] [-p пароль].\n"
+"Додаткову інформацію дивіться у man 8 mount .\n"
+
+#: mount/mount.c:1544
+msgid "mount: only root can do that"
+msgstr "mount: це може робити лише адміністратор(root)"
+
+#: mount/mount.c:1549
+#, c-format
+msgid "mount: no %s found - creating it..\n"
+msgstr "mount: не знайдено %s - створюється..\n"
+
+#: mount/mount.c:1561
+msgid "mount: no such partition found"
+msgstr "mount: не знайдено такого розділу"
+
+#: mount/mount.c:1563
+#, c-format
+msgid "mount: mounting %s\n"
+msgstr "mount: підключення %s\n"
+
+#: mount/mount.c:1572
+msgid "nothing was mounted"
+msgstr "нічого не було підключено"
+
+#: mount/mount.c:1587
+#, c-format
+msgid "mount: cannot find %s in %s"
+msgstr "mount: не вдається знайти %s у %s"
+
+#: mount/mount.c:1603
+#, c-format
+msgid "mount: can't find %s in %s or %s"
+msgstr "mount: не вдається знайти %s у %s або %s"
+
+#: mount/mount_by_label.c:190
+#, c-format
+msgid ""
+"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr ""
+"mount: не вдається відкрити %s, тому конвертація UUID та LABEL неможлива.\n"
+
+#: mount/mount_by_label.c:310
+msgid "mount: bad UUID"
+msgstr "mount: неправильний UUID"
+
+#: mount/mount_guess_fstype.c:468
+msgid "mount: error while guessing filesystem type\n"
+msgstr "mount: помилка при автоматичному визначенні типу файлової системи\n"
+
+#: mount/mount_guess_fstype.c:520
+#, c-format
+msgid "mount: you didn't specify a filesystem type for %s\n"
+msgstr "mount: ви не вказали тип файлової системи для %s\n"
+
+#: mount/mount_guess_fstype.c:523
+#, c-format
+msgid "       I will try all types mentioned in %s or %s\n"
+msgstr "       будуть випробувані всі типи вказані у %s або %s\n"
+
+#: mount/mount_guess_fstype.c:526
+msgid "       and it looks like this is swapspace\n"
+msgstr "       та він схожий розділ підкачки\n"
+
+#: mount/mount_guess_fstype.c:528
+#, c-format
+msgid "       I will try type %s\n"
+msgstr "       буде випробувано тип %s\n"
+
+#: mount/mount_guess_fstype.c:616
+#, c-format
+msgid "Trying %s\n"
+msgstr "Випробовується %s\n"
+
+#: mount/nfsmount.c:237
+msgid "mount: excessively long host:dir argument\n"
+msgstr "mount: надмірна довжина аргументу вузол:каталог\n"
+
+#: mount/nfsmount.c:251
+msgid "mount: warning: multiple hostnames not supported\n"
+msgstr "mount: попередження: вказування кількох назв вузлів не підтримується\n"
+
+#: mount/nfsmount.c:256
+msgid "mount: directory to mount not in host:dir format\n"
+msgstr "mount: каталог для підключення не у форматі вузол:каталог\n"
+
+#: mount/nfsmount.c:267 mount/nfsmount.c:522
+#, c-format
+msgid "mount: can't get address for %s\n"
+msgstr "mount: не вдається отримати адресу для %s\n"
+
+#: mount/nfsmount.c:273
+msgid "mount: got bad hp->h_length\n"
+msgstr "mount: отримано неправильний hp->h_length\n"
+
+#: mount/nfsmount.c:290
+msgid "mount: excessively long option argument\n"
+msgstr "mount: надмірно довгий параметр\n"
+
+#: mount/nfsmount.c:382
+msgid "Warning: Unrecognized proto= option.\n"
+msgstr "Попередження: Нерозпізнаний параметр proto=.\n"
+
+#: mount/nfsmount.c:389
+msgid "Warning: Option namlen is not supported.\n"
+msgstr "Попередження: параметр namlen не підтримується.\n"
+
+#: mount/nfsmount.c:393
+#, c-format
+msgid "unknown nfs mount parameter: %s=%d\n"
+msgstr "невідомий параметр підключення nfs: %s=%d\n"
+
+#: mount/nfsmount.c:427
+msgid "Warning: option nolock is not supported.\n"
+msgstr "Попередження: параметр nolock не підтримується.\n"
+
+#: mount/nfsmount.c:432
+#, c-format
+msgid "unknown nfs mount option: %s%s\n"
+msgstr "невідомий параметр підключення nfs: %s%s\n"
+
+#: mount/nfsmount.c:528
+msgid "mount: got bad hp->h_length?\n"
+msgstr "mount: отримано неправильний hp->h_length?\n"
+
+#: mount/nfsmount.c:716
+msgid "NFS over TCP is not supported.\n"
+msgstr "NFS через TCP не підтримується.\n"
+
+#: mount/nfsmount.c:723
+msgid "nfs socket"
+msgstr "nfs сокет"
+
+#: mount/nfsmount.c:727
+msgid "nfs bindresvport"
+msgstr "nfs bindresvport"
+
+#: mount/nfsmount.c:741
+msgid "nfs server reported service unavailable"
+msgstr "nfs сервер повідомив, що служба недоступна"
+
+#: mount/nfsmount.c:750
+msgid "used portmapper to find NFS port\n"
+msgstr "використано portmapper, щоб знайти NFS порт\n"
+
+#: mount/nfsmount.c:754
+#, c-format
+msgid "using port %d for nfs deamon\n"
+msgstr "використовується порт %d служби nfs\n"
+
+#: mount/nfsmount.c:765
+msgid "nfs connect"
+msgstr "nfs connect"
+
+#: mount/nfsmount.c:852
+#, c-format
+msgid "unknown nfs status return value: %d"
+msgstr "повернений невідомий код стану nfs: %d"
+
+#: mount/sundries.c:55
+msgid "bug in xstrndup call"
+msgstr "помилка при виклику xstrndup"
+
+#: mount/swapon.c:64
+#, c-format
+msgid ""
+"usage: %s [-hV]\n"
+"       %s -a [-e] [-v]\n"
+"       %s [-v] [-p priority] special ...\n"
+"       %s [-s]\n"
+msgstr ""
+"використання: %s [-hV]\n"
+"       %s -a [-e] [-v]\n"
+"       %s [-v] [-p пріоритет] спец_файл ...\n"
+"       %s [-s]\n"
+
+#: mount/swapon.c:74
+#, c-format
+msgid ""
+"usage: %s [-hV]\n"
+"       %s -a [-v]\n"
+"       %s [-v] special ...\n"
+msgstr ""
+"використання: %s [-hV]\n"
+"       %s -a [-v]\n"
+"       %s [-v] спец_файл ...\n"
+
+#: mount/swapon.c:178 mount/swapon.c:242
+#, c-format
+msgid "%s on %s\n"
+msgstr "%s на %s\n"
+
+#: mount/swapon.c:182
+#, c-format
+msgid "swapon: cannot stat %s: %s\n"
+msgstr "swapon: не вдається отримати статистику %s: %s\n"
+
+#: mount/swapon.c:193
+#, c-format
+msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
+msgstr ""
+"swapon: попередження: %s має небезпечні права %04o, пропонується %04o\n"
+
+#: mount/swapon.c:205
+#, c-format
+msgid "swapon: Skipping file %s - it appears to have holes.\n"
+msgstr "swapon: пропускається файл %s - схоже, що він містить дірки.\n"
+
+#: mount/swapon.c:248
+msgid "Not superuser.\n"
+msgstr "Не адміністратор.\n"
+
+#: mount/swapon.c:312 mount/swapon.c:402
+#, c-format
+msgid "%s: cannot open %s: %s\n"
+msgstr "%s: не вдається відкрити %s: %s\n"
+
+#: mount/umount.c:77
+msgid "umount: compiled without support for -f\n"
+msgstr "umount: скомпільовано без підтримки -f\n"
+
+#: mount/umount.c:150
+#, c-format
+msgid "host: %s, directory: %s\n"
+msgstr "вузол: %s, каталог: %s\n"
+
+#: mount/umount.c:170
+#, c-format
+msgid "umount: can't get address for %s\n"
+msgstr "umount: не вдається отримати адресу для %s\n"
+
+#: mount/umount.c:175
+msgid "umount: got bad hostp->h_length\n"
+msgstr "umount: отримано неправильний hostp->h_length\n"
+
+#: mount/umount.c:223
+#, c-format
+msgid "umount: %s: invalid block device"
+msgstr "umount: %s: неправильний блочний пристрій"
+
+#: mount/umount.c:225
+#, c-format
+msgid "umount: %s: not mounted"
+msgstr "umount: %s: не підключений"
+
+#: mount/umount.c:227
+#, c-format
+msgid "umount: %s: can't write superblock"
+msgstr "umount: %s: не вдається записати суперблок"
+
+#. Let us hope fstab has a line "proc /proc ..."
+#. and not "none /proc ..."
+#: mount/umount.c:231
+#, c-format
+msgid "umount: %s: device is busy"
+msgstr "umount: %s: пристрій зайнятий"
+
+#: mount/umount.c:233
+#, c-format
+msgid "umount: %s: not found"
+msgstr "umount: %s: не існує"
+
+#: mount/umount.c:235
+#, c-format
+msgid "umount: %s: must be superuser to umount"
+msgstr ""
+"umount: %s: для використання umount необхідно мати права адміністратора"
+
+#: mount/umount.c:237
+#, c-format
+msgid "umount: %s: block devices not permitted on fs"
+msgstr "umount: %s: блочні пристрої не дозволено на файловій системі"
+
+#: mount/umount.c:239
+#, c-format
+msgid "umount: %s: %s"
+msgstr "umount: %s: %s"
+
+#: mount/umount.c:287
+msgid "no umount2, trying umount...\n"
+msgstr "немає umount2, пробується umount...\n"
+
+#: mount/umount.c:303
+#, c-format
+msgid "could not umount %s - trying %s instead\n"
+msgstr "не вдається відключити umount %s - натомість пробується %s\n"
+
+#: mount/umount.c:321
+#, c-format
+msgid "umount: %s busy - remounted read-only\n"
+msgstr "umount: %s зайнятий - перепідключено у режим лише-для-читання\n"
+
+#: mount/umount.c:331
+#, c-format
+msgid "umount: could not remount %s read-only\n"
+msgstr "umount: не вдається перепідключити %s у режим лише-для-читання\n"
+
+#: mount/umount.c:340
+#, c-format
+msgid "%s umounted\n"
+msgstr "%s відключено\n"
+
+#: mount/umount.c:436
+msgid "umount: cannot find list of filesystems to unmount"
+msgstr "umount: не вдається знайти перелік файлових систем для відключення"
+
+#: mount/umount.c:467
+msgid ""
+"Usage: umount [-hV]\n"
+"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-f] [-r] [-n] [-v] special | node...\n"
+msgstr ""
+"Використання: umount [-hV]\n"
+"       umount -a [-f] [-r] [-n] [-v] [-t тип_фс] [-O параметри]\n"
+"       umount [-f] [-r] [-n] [-v] спец_файл | каталог...\n"
+
+#: mount/umount.c:548
+#, c-format
+msgid "Trying to umount %s\n"
+msgstr "Спроба відключити %s\n"
+
+#: mount/umount.c:554
+#, c-format
+msgid "Could not find %s in mtab\n"
+msgstr "не вдається знайти %s у mtab\n"
+
+#: mount/umount.c:561
+#, c-format
+msgid "umount: %s is not mounted (according to mtab)"
+msgstr "umount: %s не є підключеним (згідно mtab)"
+
+#: mount/umount.c:565
+#, c-format
+msgid "umount: it seems %s is mounted multiple times"
+msgstr "umount: здається %s підключений декілька разів"
+
+#: mount/umount.c:578
+#, c-format
+msgid "umount: %s is not in the fstab (and you are not root)"
+msgstr "umount: %s відсутній у fstab (та ви не адміністратор)"
+
+#: mount/umount.c:582
+#, c-format
+msgid "umount: %s mount disagrees with the fstab"
+msgstr "umount: підключений %s відрізняється від fstab"
+
+#: mount/umount.c:616
+#, fuzzy, c-format
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: лише адміністратор може відключити %s від %s"
+
+#: mount/umount.c:688
+msgid "umount: only root can do that"
+msgstr "umount: це може робити лише адміністратор(root)"
+
+#: sys-utils/ctrlaltdel.c:27
+msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
+msgstr ""
+"Для визначення поведінки Ctrl-Alt-Del необхідно мати права адміністратора.\n"
+
+#: sys-utils/ctrlaltdel.c:42
+msgid "Usage: ctrlaltdel hard|soft\n"
+msgstr "Використання: ctrlaltdel hard|soft\n"
+
+#: sys-utils/cytune.c:120
+#, c-format
+msgid ""
+"File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
+"and the maximum transfer rate in characters/second was %f\n"
+msgstr ""
+"Файл %s, для граничного значення %lu, максимальна кількість символів у fifo "
+"була %d,\n"
+"та максимальна швидкість передачі у символах/секунду була %f\n"
+
+#: sys-utils/cytune.c:131
+#, c-format
+msgid ""
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
+"in fifo were %d,\n"
+"and the maximum transfer rate in characters/second was %f\n"
+msgstr ""
+"Файл %s, для граничного значення %lu та значення таймауту %lu, максимальна "
+"кількість символів у fifo була %d,\n"
+"та максимальна швидкість передачі у символах/секунду була %f\n"
+
+#: sys-utils/cytune.c:195
+#, c-format
+msgid "Invalid interval value: %s\n"
+msgstr "Неправильне значення інтервалу: %s\n"
+
+#: sys-utils/cytune.c:203
+#, c-format
+msgid "Invalid set value: %s\n"
+msgstr "Неправильне встановлене значення: %s\n"
+
+#: sys-utils/cytune.c:211
+#, c-format
+msgid "Invalid default value: %s\n"
+msgstr "Неправильне типове значення: %s\n"
+
+#: sys-utils/cytune.c:219
+#, c-format
+msgid "Invalid set time value: %s\n"
+msgstr "Неправильне значення встановленого часу: %s\n"
+
+#: sys-utils/cytune.c:227
+#, c-format
+msgid "Invalid default time value: %s\n"
+msgstr "Неправильне значення типового часу: %s\n"
+
+#: sys-utils/cytune.c:244
+#, c-format
+msgid ""
+"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
+"[-g|-G] file [file...]\n"
+msgstr ""
+"Використання: %s [-q [-i інтервал]] ([-s значення]|[-S значення]) ([-t "
+"значення]|[-T значення]) [-g|-G] файл [файл...]\n"
+
+#: sys-utils/cytune.c:256 sys-utils/cytune.c:275 sys-utils/cytune.c:295
+#: sys-utils/cytune.c:345
+#, c-format
+msgid "Can't open %s: %s\n"
+msgstr "не вдається відкрити %s: %s\n"
+
+#: sys-utils/cytune.c:263
+#, c-format
+msgid "Can't set %s to threshold %d: %s\n"
+msgstr "не вдається встановити %s у граничне значення %d: %s\n"
+
+#: sys-utils/cytune.c:282
+#, c-format
+msgid "Can't set %s to time threshold %d: %s\n"
+msgstr "не вдається встановити %s у граничне значення часу %d: %s\n"
+
+#: sys-utils/cytune.c:300 sys-utils/cytune.c:357 sys-utils/cytune.c:388
+#, c-format
+msgid "Can't get threshold for %s: %s\n"
+msgstr "не вдається отримати граничне значення для %s: %s\n"
+
+#: sys-utils/cytune.c:306 sys-utils/cytune.c:363 sys-utils/cytune.c:394
+#, c-format
+msgid "Can't get timeout for %s: %s\n"
+msgstr "не вдається отримати таймаут для %s: %s\n"
+
+#: sys-utils/cytune.c:312
+#, c-format
+msgid "%s: %ld current threshold and %ld current timeout\n"
+msgstr "%s: %ld - поточна межа, та %ld - поточний таймаут\n"
+
+#: sys-utils/cytune.c:315
+#, c-format
+msgid "%s: %ld default threshold and %ld default timeout\n"
+msgstr "%s: %ld - типова межа, та %ld - типовий таймаут\n"
+
+#: sys-utils/cytune.c:333
+msgid "Can't set signal handler"
+msgstr "не вдається встановити обробник сигналу"
+
+#: sys-utils/cytune.c:337 sys-utils/cytune.c:372
+msgid "gettimeofday failed"
+msgstr "помилка у gettimeofday"
+
+#: sys-utils/cytune.c:350 sys-utils/cytune.c:382
+#, c-format
+msgid "Can't issue CYGETMON on %s: %s\n"
+msgstr "не вдається дати CYGETMON на %s: %s\n"
+
+#: sys-utils/cytune.c:424
+#, c-format
+msgid ""
+"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu переривань, %lu/%lu симв.; fifo: %lu межа, %lu таймаут, %lu макс, %"
+"lu зараз\n"
+
+#: sys-utils/cytune.c:430
+#, c-format
+msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
+msgstr "   %f перерв/сек; %f отрим, %f відпр (симв/сек)\n"
+
+#: sys-utils/cytune.c:435
+#, c-format
+msgid ""
+"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr ""
+"%s: %lu переривань, %lu симв; fifo: %lu межа, %lu таймаут, %lu макс, %lu "
+"зараз\n"
+
+#: sys-utils/cytune.c:441
+#, c-format
+msgid "   %f int/sec; %f rec (char/sec)\n"
+msgstr "   %f перерв/сек; %f отрим (симв/сек)\n"
+
+#: sys-utils/dmesg.c:56
+#, c-format
+msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
+msgstr "Використання: %s [-c] [-n рівень] [-s розмір_буферу]\n"
+
+#: sys-utils/ipcrm.c:66
+#, c-format
+msgid "invalid id: %s\n"
+msgstr "неправильний ідентифікатор: %s\n"
+
+#: sys-utils/ipcrm.c:84
+#, c-format
+msgid "cannot remove id %s (%s)\n"
+msgstr "не вдається видалити ідентифікатор %s (%s)\n"
+
+#: sys-utils/ipcrm.c:99
+#, c-format
+msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
+msgstr "небажане використання: %s {shm | msg | sem} id ...\n"
+
+#: sys-utils/ipcrm.c:126
+#, c-format
+msgid "unknown resource type: %s\n"
+msgstr "невідомий тип ресурсу: %s\n"
+
+#: sys-utils/ipcrm.c:130
+msgid "resource(s) deleted\n"
+msgstr "ресурс(и) видалений\n"
+
+#: sys-utils/ipcrm.c:140
+#, c-format
+msgid ""
+"usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
+msgstr ""
+"Використання: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
+
+#: sys-utils/ipcrm.c:181
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: неправильний параметр -- %c\n"
+
+#: sys-utils/ipcrm.c:193
+#, c-format
+msgid "%s: illegal key (%s)\n"
+msgstr "%s: неправильний ключ (%s)\n"
+
+#: sys-utils/ipcrm.c:208 sys-utils/ipcrm.c:240
+msgid "permission denied for key"
+msgstr "доступ заборонено для ключа"
+
+#: sys-utils/ipcrm.c:211 sys-utils/ipcrm.c:250
+msgid "already removed key"
+msgstr "ключ вже видалено"
+
+#: sys-utils/ipcrm.c:214 sys-utils/ipcrm.c:245
+msgid "invalid key"
+msgstr "неправильний ключ"
+
+#: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
+msgid "unknown error in key"
+msgstr "невідома помилка у ключі"
+
+#: sys-utils/ipcrm.c:241
+msgid "permission denied for id"
+msgstr "доступ заборонено для ідентифікатора"
+
+#: sys-utils/ipcrm.c:246
+msgid "invalid id"
+msgstr "неправильний ідентифікатор"
+
+#: sys-utils/ipcrm.c:251
+msgid "already removed id"
+msgstr "ідентифікатор вже видалений"
+
+#: sys-utils/ipcrm.c:256
+msgid "unknown error in id"
+msgstr "невідома помилка у ідентифікаторі"
+
+#: sys-utils/ipcrm.c:259
+#, c-format
+msgid "%s: %s (%s)\n"
+msgstr "%s: %s (%s)\n"
+
+#: sys-utils/ipcrm.c:267
+#, c-format
+msgid "%s: unknown argument: %s\n"
+msgstr "%s: невідомий аргумент: %s\n"
+
+#: sys-utils/ipcs.c:121
+#, c-format
+msgid "usage : %s -asmq -tclup \n"
+msgstr "використання : %s -asmq -tclup \n"
+
+#: sys-utils/ipcs.c:122
+#, c-format
+msgid "\t%s [-s -m -q] -i id\n"
+msgstr "\t%s [-s -m -q] -i ідентифікатор\n"
+
+#: sys-utils/ipcs.c:123
+#, c-format
+msgid "\t%s -h for help.\n"
+msgstr "\t%s -h виводить довідку.\n"
+
+#: sys-utils/ipcs.c:129
+#, c-format
+msgid ""
+"%s provides information on ipc facilities for which you have read access.\n"
+msgstr ""
+"%s надає інформацію про ipc ресурси, для яких у вас є доступ для читання.\n"
+
+#: sys-utils/ipcs.c:131
+msgid ""
+"Resource Specification:\n"
+"\t-m : shared_mem\n"
+"\t-q : messages\n"
+msgstr ""
+"Специфікація ресурсу:\n"
+"\t-m : спільна_пам'ять\n"
+"\t-q : повідомлення\n"
+
+#: sys-utils/ipcs.c:132
+msgid ""
+"\t-s : semaphores\n"
+"\t-a : all (default)\n"
+msgstr ""
+"\t-s : семафори\n"
+"\t-a : усе (типово)\n"
+
+#: sys-utils/ipcs.c:133
+msgid ""
+"Output Format:\n"
+"\t-t : time\n"
+"\t-p : pid\n"
+"\t-c : creator\n"
+msgstr ""
+"Формат виводу:\n"
+"\t-t : час\n"
+"\t-p : pid\n"
+"\t-c : власник\n"
+
+#: sys-utils/ipcs.c:134
+msgid ""
+"\t-l : limits\n"
+"\t-u : summary\n"
+msgstr ""
+"\t-l : обмеження\n"
+"\t-u : зведення\n"
+
+#: sys-utils/ipcs.c:135
+msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgstr "-i id [-s -q -m] : подробиці про ресурс з ідентифікатором id\n"
+
+#: sys-utils/ipcs.c:267
+msgid "kernel not configured for shared memory\n"
+msgstr "підтримку спільної пам'яті не налаштовано у ядрі\n"
+
+#: sys-utils/ipcs.c:273
+msgid "------ Shared Memory Limits --------\n"
+msgstr "------ Обмеження спільної пам'яті --------\n"
+
+#. glibc 2.1.3 and all earlier libc's have ints as fields
+#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
+#: sys-utils/ipcs.c:278
+#, fuzzy, c-format
+msgid "max number of segments = %lu\n"
+msgstr "максимальна кількість сегментів = %ld\n"
+
+#: sys-utils/ipcs.c:280
+#, fuzzy, c-format
+msgid "max seg size (kbytes) = %lu\n"
+msgstr "максимальний розмір сегмента (кілобайт) = %ld\n"
+
+#: sys-utils/ipcs.c:282
+#, fuzzy, c-format
+msgid "max total shared memory (pages) = %lu\n"
+msgstr "максимум загалом спільної пам'яті (кілобайт) = %ld\n"
+
+#: sys-utils/ipcs.c:284
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %lu\n"
+msgstr "мінімальний розмір сегменту (байт) = %ld\n"
+
+#: sys-utils/ipcs.c:289
+msgid "------ Shared Memory Status --------\n"
+msgstr "------ Стан спільної пам'яті --------\n"
+
+#: sys-utils/ipcs.c:290
+#, c-format
+msgid "segments allocated %d\n"
+msgstr "виділених сегментів %d\n"
+
+#: sys-utils/ipcs.c:291
+#, c-format
+msgid "pages allocated %ld\n"
+msgstr "виділених сторінок %ld\n"
+
+#: sys-utils/ipcs.c:292
+#, c-format
+msgid "pages resident  %ld\n"
+msgstr "резидентних сторінок %ld\n"
+
+#: sys-utils/ipcs.c:293
+#, c-format
+msgid "pages swapped   %ld\n"
+msgstr "вивантажених сторінок %ld\n"
+
+#: sys-utils/ipcs.c:294
+#, c-format
+msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgstr "Швидкодія підкачки: %ld спроб\t %ld вдалих\n"
+
+#: sys-utils/ipcs.c:299
+msgid "------ Shared Memory Segment Creators/Owners --------\n"
+msgstr "------ Автори/Власники сегментів спільної пам'яті --------\n"
+
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:420 sys-utils/ipcs.c:519
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-20s %-20s %-20s %-20s %-20s %-20s\n"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:427
+msgid "shmid"
+msgstr "shmid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:520 sys-utils/ipcs.c:538
+msgid "perms"
+msgstr "права"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
+msgid "cuid"
+msgstr "cuid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
+msgid "cgid"
+msgstr "cgid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
+msgid "uid"
+msgstr "uid"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:520
+msgid "gid"
+msgstr "gid"
+
+#: sys-utils/ipcs.c:305
+msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
+msgstr "------ Час приєднання/від'єднання/зміни спільної пам'яті --------\n"
+
+#: sys-utils/ipcs.c:306
+#, c-format
+msgid "%-10s %-10s %-20s %-20s %-20s\n"
+msgstr "%-10s %-10s %-20s %-20s %-20s\n"
+
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:427 sys-utils/ipcs.c:436 sys-utils/ipcs.c:526
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:538
+msgid "owner"
+msgstr "власник"
+
+#: sys-utils/ipcs.c:307
+msgid "attached"
+msgstr "приєднано"
+
+#: sys-utils/ipcs.c:307
+msgid "detached"
+msgstr "від'єднано"
+
+#: sys-utils/ipcs.c:308
+msgid "changed"
+msgstr "змінено"
+
+#: sys-utils/ipcs.c:312
+msgid "------ Shared Memory Creator/Last-op --------\n"
+msgstr "------ Автор/останній-оп спільної пам'яті --------\n"
+
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:531
+#, c-format
+msgid "%-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s\n"
+
+#: sys-utils/ipcs.c:314
+msgid "cpid"
+msgstr "cpid"
+
+#: sys-utils/ipcs.c:314
+msgid "lpid"
+msgstr "lpid"
+
+#: sys-utils/ipcs.c:318
+msgid "------ Shared Memory Segments --------\n"
+msgstr "------ Сегменти спільної пам'яті --------\n"
+
+#: sys-utils/ipcs.c:319
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgstr "%-14s %-10s %-16s %-16s %-10s %-24s %-24s\n"
+
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:436 sys-utils/ipcs.c:538
+msgid "key"
+msgstr "ключ"
+
+#: sys-utils/ipcs.c:320
+msgid "bytes"
+msgstr "байт"
+
+#: sys-utils/ipcs.c:321
+msgid "nattch"
+msgstr "кільк.підкл"
+
+#: sys-utils/ipcs.c:321
+msgid "status"
+msgstr "стан"
+
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:458 sys-utils/ipcs.c:460 sys-utils/ipcs.c:559
+#: sys-utils/ipcs.c:561 sys-utils/ipcs.c:563 sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:647 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:651 sys-utils/ipcs.c:675
+msgid "Not set"
+msgstr "Не встан."
+
+#: sys-utils/ipcs.c:374
+msgid "dest"
+msgstr "зруйн"
+
+#: sys-utils/ipcs.c:375
+msgid "locked"
+msgstr "блоковано"
+
+#: sys-utils/ipcs.c:395
+msgid "kernel not configured for semaphores\n"
+msgstr "підтримку семафорів не налаштовано у ядрі\n"
+
+#: sys-utils/ipcs.c:401
+msgid "------ Semaphore Limits --------\n"
+msgstr "------ Обмеження семафорів --------\n"
+
+#: sys-utils/ipcs.c:405
+#, c-format
+msgid "max number of arrays = %d\n"
+msgstr "максимальна кількість масивів = %d\n"
+
+#: sys-utils/ipcs.c:406
+#, c-format
+msgid "max semaphores per array = %d\n"
+msgstr "максимум семафорів на масив = %d\n"
+
+#: sys-utils/ipcs.c:407
+#, c-format
+msgid "max semaphores system wide = %d\n"
+msgstr "максимум семафорів у системі = %d\n"
+
+#: sys-utils/ipcs.c:408
+#, c-format
+msgid "max ops per semop call = %d\n"
+msgstr "максимум операцій за semop виклик = %d\n"
+
+#: sys-utils/ipcs.c:409
+#, c-format
+msgid "semaphore max value = %d\n"
+msgstr "максимальне значення семафору = %d\n"
+
+#: sys-utils/ipcs.c:413
+msgid "------ Semaphore Status --------\n"
+msgstr "------ Стан семафору --------\n"
+
+#: sys-utils/ipcs.c:414
+#, c-format
+msgid "used arrays = %d\n"
+msgstr "використано масивів = %d\n"
+
+#: sys-utils/ipcs.c:415
+#, c-format
+msgid "allocated semaphores = %d\n"
+msgstr "виділено семафорів = %d\n"
+
+#: sys-utils/ipcs.c:419
+msgid "------ Semaphore Arrays Creators/Owners --------\n"
+msgstr "------ Автори/Власники масивів семафорів --------\n"
+
+#: sys-utils/ipcs.c:421 sys-utils/ipcs.c:436
+msgid "semid"
+msgstr "semid"
+
+#: sys-utils/ipcs.c:425
+msgid "------ Shared Memory Operation/Change Times --------\n"
+msgstr "------ Час операції/зміни спільної пам'яті --------\n"
+
+#: sys-utils/ipcs.c:426
+#, c-format
+msgid "%-8s %-10s %-26.24s %-26.24s\n"
+msgstr "%-8s %-10s %-26.24s %-26.24s\n"
+
+#: sys-utils/ipcs.c:427
+msgid "last-op"
+msgstr "остан-оп"
+
+#: sys-utils/ipcs.c:427
+msgid "last-changed"
+msgstr "остан-змін"
+
+#: sys-utils/ipcs.c:434
+msgid "------ Semaphore Arrays --------\n"
+msgstr "------ Масиви семафорів --------\n"
+
+#: sys-utils/ipcs.c:435 sys-utils/ipcs.c:678
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
+
+#: sys-utils/ipcs.c:437
+msgid "nsems"
+msgstr "кільк.сем"
+
+#: sys-utils/ipcs.c:496
+msgid "kernel not configured for message queues\n"
+msgstr "підтримку черг повідомлень не налаштовано у ядрі\n"
+
+#: sys-utils/ipcs.c:504
+msgid "------ Messages: Limits --------\n"
+msgstr "------ Повідомлення: обмеження --------\n"
+
+#: sys-utils/ipcs.c:505
+#, c-format
+msgid "max queues system wide = %d\n"
+msgstr "максимум черг у системі = %d\n"
+
+#: sys-utils/ipcs.c:506
+#, c-format
+msgid "max size of message (bytes) = %d\n"
+msgstr "максимальний розмір повідомлення (байт) = %d\n"
+
+#: sys-utils/ipcs.c:507
+#, c-format
+msgid "default max size of queue (bytes) = %d\n"
+msgstr "типовий максимальний розмір черги (байт) = %d\n"
+
+#: sys-utils/ipcs.c:511
+msgid "------ Messages: Status --------\n"
+msgstr "------ Повідомлення: стан --------\n"
+
+#: sys-utils/ipcs.c:512
+#, c-format
+msgid "allocated queues = %d\n"
+msgstr "виділено черг = %d\n"
+
+#: sys-utils/ipcs.c:513
+#, c-format
+msgid "used headers = %d\n"
+msgstr "використано заголовків = %d\n"
+
+#: sys-utils/ipcs.c:514
+#, c-format
+msgid "used space = %d bytes\n"
+msgstr "використано простору = %d байт\n"
+
+#: sys-utils/ipcs.c:518
+msgid "------ Message Queues: Creators/Owners --------\n"
+msgstr "------ Черги повідомлень: Автори/Власники --------\n"
+
+#: sys-utils/ipcs.c:520 sys-utils/ipcs.c:526 sys-utils/ipcs.c:532
+#: sys-utils/ipcs.c:538
+msgid "msqid"
+msgstr "msqid"
+
+#: sys-utils/ipcs.c:524
+msgid "------ Message Queues Send/Recv/Change Times --------\n"
+msgstr "------ Час відправлення/отримання/зміни черг повідомлень--------\n"
+
+#: sys-utils/ipcs.c:525
+#, c-format
+msgid "%-8s %-10s %-20s %-20s %-20s\n"
+msgstr "%-8s %-10s %-20s %-20s %-20s\n"
+
+#: sys-utils/ipcs.c:526
+msgid "send"
+msgstr "відправлено"
+
+#: sys-utils/ipcs.c:526
+msgid "recv"
+msgstr "отримано"
+
+#: sys-utils/ipcs.c:526
+msgid "change"
+msgstr "змінено"
+
+#: sys-utils/ipcs.c:530
+msgid "------ Message Queues PIDs --------\n"
+msgstr "------ PID черг повідомлень --------\n"
+
+#: sys-utils/ipcs.c:532
+msgid "lspid"
+msgstr "lspid"
+
+#: sys-utils/ipcs.c:532
+msgid "lrpid"
+msgstr "lrpid"
+
+#: sys-utils/ipcs.c:536
+msgid "------ Message Queues --------\n"
+msgstr "------ Черги повідомлень --------\n"
+
+#: sys-utils/ipcs.c:537
+#, c-format
+msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
+
+#: sys-utils/ipcs.c:539
+msgid "used-bytes"
+msgstr "використано-байт"
+
+#: sys-utils/ipcs.c:539
+msgid "messages"
+msgstr "повідомлень"
+
+#: sys-utils/ipcs.c:607
+#, c-format
+msgid ""
+"\n"
+"Shared memory Segment shmid=%d\n"
+msgstr ""
+"\n"
+"Сегмент спільної пам'яті shmid=%d\n"
+
+#: sys-utils/ipcs.c:608
+#, c-format
+msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+
+#: sys-utils/ipcs.c:610
+#, c-format
+msgid "mode=%#o\taccess_perms=%#o\n"
+msgstr "режим=%#o\tправа_доступу=%#o\n"
+
+#: sys-utils/ipcs.c:612
+#, c-format
+msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "байт=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+
+#: sys-utils/ipcs.c:615
+#, c-format
+msgid "att_time=%-26.24s\n"
+msgstr "час_приєдн=%-26.24s\n"
+
+#: sys-utils/ipcs.c:617
+#, c-format
+msgid "det_time=%-26.24s\n"
+msgstr "час_від'єдн=%-26.24s\n"
+
+#: sys-utils/ipcs.c:619 sys-utils/ipcs.c:650
+#, c-format
+msgid "change_time=%-26.24s\n"
+msgstr "час_змін=%-26.24s\n"
+
+#: sys-utils/ipcs.c:634
+#, c-format
+msgid ""
+"\n"
+"Message Queue msqid=%d\n"
+msgstr ""
+"\n"
+"Черга повідомлень msqid=%d\n"
+
+#: sys-utils/ipcs.c:635
+#, c-format
+msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+
+#: sys-utils/ipcs.c:637
+#, c-format
+msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
+msgstr "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
+
+#: sys-utils/ipcs.c:646
+#, c-format
+msgid "send_time=%-26.24s\n"
+msgstr "час_надсил=%-26.24s\n"
+
+#: sys-utils/ipcs.c:648
+#, c-format
+msgid "rcv_time=%-26.24s\n"
+msgstr "час_отрим=%-26.24s\n"
+
+#: sys-utils/ipcs.c:668
+#, c-format
+msgid ""
+"\n"
+"Semaphore Array semid=%d\n"
+msgstr ""
+"\n"
+"Масив семафорів semid=%d\n"
+
+#: sys-utils/ipcs.c:669
+#, c-format
+msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+
+#: sys-utils/ipcs.c:671
+#, c-format
+msgid "mode=%#o, access_perms=%#o\n"
+msgstr "режим=%#o, права_дост=%#o\n"
+
+#: sys-utils/ipcs.c:673
+#, c-format
+msgid "nsems = %ld\n"
+msgstr "кільк.сем = %ld\n"
+
+#: sys-utils/ipcs.c:674
+#, c-format
+msgid "otime = %-26.24s\n"
+msgstr "otime = %-26.24s\n"
+
+#: sys-utils/ipcs.c:676
+#, c-format
+msgid "ctime = %-26.24s\n"
+msgstr "ctime = %-26.24s\n"
+
+#: sys-utils/ipcs.c:679
+msgid "semnum"
+msgstr "ном.сем"
+
+#: sys-utils/ipcs.c:679
+msgid "value"
+msgstr "значення"
+
+#: sys-utils/ipcs.c:679
+msgid "ncount"
+msgstr "ncount"
+
+#: sys-utils/ipcs.c:679
+msgid "zcount"
+msgstr "zcount"
+
+#: sys-utils/ipcs.c:679
+msgid "pid"
+msgstr "pid"
+
+#: sys-utils/rdev.c:69
+msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+msgstr ""
+"використання: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+
+#: sys-utils/rdev.c:70
+msgid ""
+"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr ""
+"  rdev /dev/fd0  (або rdev /linux, тощо.) відображає поточний ROOT пристрій"
+
+#: sys-utils/rdev.c:71
+msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+msgstr "  rdev /dev/fd0 /dev/hda2         встановлює ROOT у /dev/hda2"
+
+#: sys-utils/rdev.c:72
+msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+msgstr ""
+"  rdev -R /dev/fd0 1              встановлює ROOTFLAGS (стан лише-для-"
+"читання)"
+
+#: sys-utils/rdev.c:73
+msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+msgstr "  rdev -r /dev/fd0 627            встановлює розмір RAMDISK"
+
+#: sys-utils/rdev.c:74
+msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+msgstr ""
+"  rdev -v /dev/fd0 1              встановлює VIDEOMODE при завантаженні"
+
+#: sys-utils/rdev.c:75
+msgid "  rdev -o N ...                   use the byte offset N"
+msgstr "  rdev -o N ...                   зсув у байтах N"
+
+#: sys-utils/rdev.c:76
+msgid "  rootflags ...                   same as rdev -R"
+msgstr "  rootflags ...                   те ж саме, що rdev -R"
+
+#: sys-utils/rdev.c:77
+msgid "  ramsize ...                     same as rdev -r"
+msgstr "  ramsize ...                     те ж саме, що rdev -r"
+
+#: sys-utils/rdev.c:78
+msgid "  vidmode ...                     same as rdev -v"
+msgstr "  vidmode ...                     те ж саме, що rdev -v"
+
+#: sys-utils/rdev.c:79
+msgid ""
+"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr ""
+"Зауваження: відео режими: -3=Питати, -2=РозширенийVGA, -1=ЗвичайнийVga, "
+"1=key1, 2=key2,..."
+
+#: sys-utils/rdev.c:80
+msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+msgstr ""
+"      використовуйте -R 1 для підключення лише-для-читання, -R 0 для читання/"
+"запису."
+
+#: sys-utils/rdev.c:247
+msgid "missing comma"
+msgstr "відсутня кома"
+
+#: sys-utils/readprofile.c:72
+msgid "out of memory"
+msgstr "недостатньо пам'яті"
+
+#: sys-utils/readprofile.c:118
+#, fuzzy, c-format
+msgid ""
+"%s: Usage: \"%s [options]\n"
+"\t -m <mapfile>  (defaults: \"%s\" and\n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <pro-file> (default: \"%s\")\n"
+"\t -M <mult>     set the profiling multiplier to <mult>\n"
+"\t -i            print only info about the sampling step\n"
+"\t -v            print verbose data\n"
+"\t -a            print all symbols, even if count is 0\n"
+"\t -b            print individual histogram-bin counts\n"
+"\t -s            print individual counters within functions\n"
+"\t -r            reset all the counters (root only)\n"
+"\t -n            disable byte order auto-detection\n"
+"\t -V            print version and exit\n"
+msgstr ""
+"%s: Використання: \"%s [параметри]\n"
+"\t -m <map_файл>  (типово: \"%s\" та \n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <pro_файл> (типово: \"%s\")\n"
+"\t -M <множн>    встановити множник профілювання у <множн>\n"
+"\t -i            вивести лише інформацію про крок профілювання\n"
+"\t -v            виводити розширену інформацію\n"
+"\t -a            виводити всі символи, навіть якщо їх число ненульове\n"
+"\t -b            вивести гістограму з індивідуальними стовпчиками "
+"лічильників\n"
+"\t -r            скинути всі лічильники (лише root)\n"
+"\t -n            вимкнути автоматичне визначення порядку байтів\n"
+"\t -V            вивести версію та вийти\n"
+
+#: sys-utils/readprofile.c:197
+#, c-format
+msgid "%s version %s\n"
+msgstr "%s версія %s\n"
+
+#: sys-utils/readprofile.c:284
+#, c-format
+msgid "Sampling_step: %i\n"
+msgstr "Крок профілювання: %i\n"
+
+#: sys-utils/readprofile.c:305 sys-utils/readprofile.c:329
+#, c-format
+msgid "%s: %s(%i): wrong map line\n"
+msgstr "%s: %s(%i): неправильний рядок мапи\n"
+
+#: sys-utils/readprofile.c:317
+#, c-format
+msgid "%s: can't find \"_stext\" in %s\n"
+msgstr "%s: не вдається знайти \"_stext\" у %s\n"
+
+#: sys-utils/readprofile.c:343
+#, c-format
+msgid "%s: profile address out of range. Wrong map file?\n"
+msgstr "%s: адреса профілю поза діапазоном. Неправильний файл мапи?\n"
+
+#: sys-utils/readprofile.c:397
+msgid "total"
+msgstr "загалом"
+
+#: sys-utils/renice.c:68
+msgid ""
+"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr ""
+"використання: renice пріоритет [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
+"користувачі ]\n"
+
+#: sys-utils/renice.c:97
+#, c-format
+msgid "renice: %s: unknown user\n"
+msgstr "renice: %s: невідомий користувач\n"
+
+#: sys-utils/renice.c:105
+#, c-format
+msgid "renice: %s: bad value\n"
+msgstr "renice: %s: неправильне значення\n"
+
+#: sys-utils/renice.c:123 sys-utils/renice.c:135
+msgid "getpriority"
+msgstr "getpriority"
+
+#: sys-utils/renice.c:128
+msgid "setpriority"
+msgstr "setpriority"
+
+#: sys-utils/renice.c:139
+#, c-format
+msgid "%d: old priority %d, new priority %d\n"
+msgstr "%d: старий пріоритет %d, новий пріоритет %d\n"
+
+#: sys-utils/setsid.c:26
+#, c-format
+msgid "usage: %s program [arg ...]\n"
+msgstr "використання: %s програма [аргументи ...]\n"
+
+#: sys-utils/tunelp.c:75
+#, c-format
+msgid ""
+"Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
+"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"          -T [on|off] ]\n"
+msgstr ""
+"Використання: %s <пристрій> [ -i <IRQ> | -t <ЧАС> | -c <СИМВОЛИ> | -w "
+"<ПАУЗА> | \n"
+"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"          -T [on|off] ]\n"
+
+#: sys-utils/tunelp.c:91
+msgid "malloc error"
+msgstr "помилка malloc"
+
+#: sys-utils/tunelp.c:103
+#, c-format
+msgid "%s: bad value\n"
+msgstr "%s: неправильне значення\n"
+
+#: sys-utils/tunelp.c:242
+#, c-format
+msgid "%s: %s not an lp device.\n"
+msgstr "%s: %s не є lp пристроєм.\n"
+
+#: sys-utils/tunelp.c:263
+#, c-format
+msgid "%s status is %d"
+msgstr "%s стан - %d"
+
+#: sys-utils/tunelp.c:264
+msgid ", busy"
+msgstr ", зайнятий"
+
+#: sys-utils/tunelp.c:265
+msgid ", ready"
+msgstr ", готовий"
+
+#: sys-utils/tunelp.c:266
+msgid ", out of paper"
+msgstr ", скінчився папір"
+
+#: sys-utils/tunelp.c:267
+msgid ", on-line"
+msgstr ", on-line"
+
+#: sys-utils/tunelp.c:268
+msgid ", error"
+msgstr ", помилка"
+
+#: sys-utils/tunelp.c:285
+msgid "LPGETIRQ error"
+msgstr "помилка LPGETIRQ"
+
+#: sys-utils/tunelp.c:291
+#, c-format
+msgid "%s using IRQ %d\n"
+msgstr "%s використовує IRQ %d\n"
+
+#: sys-utils/tunelp.c:293
+#, c-format
+msgid "%s using polling\n"
+msgstr "%s використовує опитування стану\n"
+
+#: text-utils/col.c:153
+#, c-format
+msgid "col: bad -l argument %s.\n"
+msgstr "col: неправильний -l аргумент %s.\n"
+
+#: text-utils/col.c:535
+msgid "usage: col [-bfpx] [-l nline]\n"
+msgstr "використання: col [-bfpx] [-l кільк.рядків]\n"
+
+#: text-utils/col.c:541
+msgid "col: write error.\n"
+msgstr "col: помилка запису.\n"
+
+#: text-utils/col.c:548
+#, c-format
+msgid "col: warning: can't back up %s.\n"
+msgstr "col: попередження: помилка резервного копіювання %s.\n"
+
+#: text-utils/col.c:549
+msgid "past first line"
+msgstr "повз перший рядок"
+
+#: text-utils/col.c:549
+msgid "-- line already flushed"
+msgstr "-- рядок вже скинуто у потік"
+
+#: text-utils/colcrt.c:97
+#, c-format
+msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
+msgstr "використання: %s [ - ] [ -2 ] [ файл ... ]\n"
+
+#: text-utils/column.c:297
+msgid "line too long"
+msgstr "рядок надто довгий"
+
+#: text-utils/column.c:374
+msgid "usage: column [-tx] [-c columns] [file ...]\n"
+msgstr "використання: column [-tx] [-c стовпчиків] [файл ...]\n"
+
+#: text-utils/hexsyntax.c:82
+msgid "hexdump: bad length value.\n"
+msgstr "hexdump: неправильне значення довжини.\n"
+
+#: text-utils/hexsyntax.c:93
+msgid "hexdump: bad skip value.\n"
+msgstr "hexdump: неправильне значення зсуву.\n"
+
+#: text-utils/hexsyntax.c:131
+msgid ""
+"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr ""
+"hexdump: [-bcCdovx] [-e формат] [-f файл_формату] [-n довжина] [-s зсув] "
+"[файл ...]\n"
+
+#: text-utils/more.c:263
+#, c-format
+msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
+msgstr "використання: %s [-dflpcsu] [+linenum | +/pattern] назва1 назва2 ...\n"
+
+#: text-utils/more.c:521
+#, c-format
+msgid ""
+"\n"
+"*** %s: directory ***\n"
+"\n"
+msgstr ""
+"\n"
+"*** %s: каталог ***\n"
+"\n"
+
+#. simple ELF detection
+#: text-utils/more.c:564
+#, c-format
+msgid ""
+"\n"
+"******** %s: Not a text file ********\n"
+"\n"
+msgstr ""
+"\n"
+"******** %s: не є текстовим файлом ********\n"
+"\n"
+
+#: text-utils/more.c:667
+msgid "[Use q or Q to quit]"
+msgstr "[Використовуйте q чи Q щоб вийти]"
+
+#: text-utils/more.c:847
+msgid "--More--"
+msgstr "--Далі--"
+
+#: text-utils/more.c:849
+#, c-format
+msgid "(Next file: %s)"
+msgstr "(Наступний файл: %s)"
+
+#: text-utils/more.c:855
+msgid "[Press space to continue, 'q' to quit.]"
+msgstr "[Натисніть пробіл, щоб продовжити, або 'q', щоб вийти.]"
+
+#: text-utils/more.c:1269
+#, c-format
+msgid "...back %d pages"
+msgstr "...назад %d сторінок"
+
+#: text-utils/more.c:1271
+msgid "...back 1 page"
+msgstr "...назад 1 сторінку"
+
+#: text-utils/more.c:1314
+msgid "...skipping one line"
+msgstr "...пропускається один рядок"
+
+#: text-utils/more.c:1316
+#, c-format
+msgid "...skipping %d lines"
+msgstr "...пропускається %d рядків"
+
+#: text-utils/more.c:1353
+msgid ""
+"\n"
+"***Back***\n"
+"\n"
+msgstr ""
+"\n"
+"***Назад***\n"
+"\n"
+
+#: text-utils/more.c:1391
+msgid ""
+"\n"
+"Most commands optionally preceded by integer argument k.  Defaults in "
+"brackets.\n"
+"Star (*) indicates argument becomes new default.\n"
+msgstr ""
+"\n"
+"Більшість команд можуть мати необов'язковий числовий параметр k.  Типові "
+"значення у кутових дужках.\n"
+"Зірочка (*) означає, що параметр стає новим типовим значенням.\n"
+
+#: text-utils/more.c:1398
+msgid ""
+"<space>                 Display next k lines of text [current screen size]\n"
+"z                       Display next k lines of text [current screen size]*\n"
+"<return>                Display next k lines of text [1]*\n"
+"d or ctrl-D             Scroll k lines [current scroll size, initially 11]*\n"
+"q or Q or <interrupt>   Exit from more\n"
+"s                       Skip forward k lines of text [1]\n"
+"f                       Skip forward k screenfuls of text [1]\n"
+"b or ctrl-B             Skip backwards k screenfuls of text [1]\n"
+"'                       Go to place where previous search started\n"
+"=                       Display current line number\n"
+"/<regular expression>   Search for kth occurrence of regular expression [1]\n"
+"n                       Search for kth occurrence of last r.e [1]\n"
+"!<cmd> or :!<cmd>       Execute <cmd> in a subshell\n"
+"v                       Start up /usr/bin/vi at current line\n"
+"ctrl-L                  Redraw screen\n"
+":n                      Go to kth next file [1]\n"
+":p                      Go to kth previous file [1]\n"
+":f                      Display current file name and line number\n"
+".                       Repeat previous command\n"
+msgstr ""
+"<space>                 Вивід наступних k рядків тексту [поточний розмір "
+"екрану]\n"
+"z                       Вивід наступних k рядків тексту [поточний розмір "
+"екрану]*\n"
+"<enter>                 Вивід наступних k рядків тексту [1]*\n"
+"d або ctrl-D            Прокрутити k рядків [поточний розмір прокрутки, "
+"спочатку 11]*\n"
+"q або Q або <interrupt> Вийти з more\n"
+"s                       Перейти вперед на k рядків тексту [1]\n"
+"f                       Перейти вперед на k екранів тексту [1]\n"
+"b або ctrl-B            Перейти назад на k екранів тексту [1]\n"
+"'                       Перейти у місце початку попереднього пошуку\n"
+"=                       Відобразити поточний номер рядка\n"
+"/<регулярний вираз>     Знайти k-й випадок співпадання з регулярним виразом "
+"[1]\n"
+"n                       Знайти k-й випадок співпадання з останнім рег."
+"виразом [1]\n"
+"!<кмнд> або :!<кмнд>    Виконати <кмнд> у оболонці\n"
+"v                       Запустити /usr/bin/vi з поточного рядка\n"
+"ctrl-L                  Оновити вміст екрану\n"
+":n                      Перейти на k-й рядок файлу [1]\n"
+":p                      Перейти на k-й попередній файл [1]\n"
+":f                      Відобразити назву поточного файлу та номер рядка\n"
+".                       Повторити попередню команду\n"
+
+#: text-utils/more.c:1470 text-utils/more.c:1475
+msgid "[Press 'h' for instructions.]"
+msgstr "[Натисніть 'h' щоб переглянути довідку.]"
+
+#: text-utils/more.c:1509
+#, c-format
+msgid "\"%s\" line %d"
+msgstr "\"%s\" рядок %d"
+
+#: text-utils/more.c:1511
+#, c-format
+msgid "[Not a file] line %d"
+msgstr "[Не файл] рядок %d"
+
+#: text-utils/more.c:1595
+msgid "  Overflow\n"
+msgstr "  Переповнення\n"
+
+#: text-utils/more.c:1642
+msgid "...skipping\n"
+msgstr "...перехід\n"
+
+#: text-utils/more.c:1672
+msgid "Regular expression botch"
+msgstr "Невдалий регулярний вираз"
+
+#: text-utils/more.c:1684
+msgid ""
+"\n"
+"Pattern not found\n"
+msgstr ""
+"\n"
+"Шаблон не знайдено\n"
+
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
+msgid "Pattern not found"
+msgstr "Шаблон не знайдено"
+
+#: text-utils/more.c:1748
+msgid "can't fork\n"
+msgstr "не вдається створити процес\n"
+
+#: text-utils/more.c:1787
+msgid ""
+"\n"
+"...Skipping "
+msgstr ""
+"\n"
+"...Перехід "
+
+#: text-utils/more.c:1792
+msgid "...Skipping to file "
+msgstr "...Перехід до файлу"
+
+#: text-utils/more.c:1794
+msgid "...Skipping back to file "
+msgstr "...Перехід назад до файлу"
+
+#: text-utils/more.c:2074
+msgid "Line too long"
+msgstr "Рядок надто довгий"
+
+#: text-utils/more.c:2117
+msgid "No previous command to substitute for"
+msgstr "Немає попередньої команди для заміни"
+
+#: text-utils/odsyntax.c:130
+msgid "od: od(1) has been deprecated for hexdump(1).\n"
+msgstr "od: використовувати od(1) небажано, користуйтесь hexdump(1).\n"
+
+#: text-utils/odsyntax.c:133
+#, c-format
+msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
+msgstr "od: у режимі сумісності з hexdump(1) параметр -%c не підтримується%s\n"
+
+#: text-utils/odsyntax.c:134
+msgid "; see strings(1)."
+msgstr "; дивіться strings(1)."
+
+#: text-utils/parse.c:63
+#, c-format
+msgid "hexdump: can't read %s.\n"
+msgstr "hexdump: не вдається прочитати %s.\n"
+
+#: text-utils/parse.c:68
+msgid "hexdump: line too long.\n"
+msgstr "hexdump: рядок надто довгий.\n"
+
+#: text-utils/parse.c:401
+msgid "hexdump: byte count with multiple conversion characters.\n"
+msgstr "hexdump: кількість байт з декількома символами перетворення.\n"
+
+#: text-utils/parse.c:483
+#, c-format
+msgid "hexdump: bad byte count for conversion character %s.\n"
+msgstr "hexdump: неправильна кількість байт для символу перетворення %s.\n"
+
+#: text-utils/parse.c:490
+#, c-format
+msgid "hexdump: %%s requires a precision or a byte count.\n"
+msgstr "hexdump: %%s потребує вказування точності або кількості байт.\n"
+
+#: text-utils/parse.c:496
+#, c-format
+msgid "hexdump: bad format {%s}\n"
+msgstr "hexdump: неправильний формат {%s}\n"
+
+#: text-utils/parse.c:502
+#, c-format
+msgid "hexdump: bad conversion character %%%s.\n"
+msgstr "hexdump: неправильний символ перетворення %%%s.\n"
+
+#: text-utils/pg.c:257
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+"%s: Використання: %s [-number] [-p рядок] [-cefnrs] [+line] [+/pattern/] "
+"[файли]\n"
+
+#: text-utils/pg.c:266
+#, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "%s: параметр потребує вказування аргументу -- %s\n"
+
+#: text-utils/pg.c:274
+#, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "%s: неправильний параметр -- %s\n"
+
+#: text-utils/pg.c:391
+msgid "...skipping forward\n"
+msgstr "...перехід вперед\n"
+
+#: text-utils/pg.c:393
+msgid "...skipping backward\n"
+msgstr "...перехід назад\n"
+
+#: text-utils/pg.c:415
+msgid "No next file"
+msgstr "Немає наступного файлу"
+
+#: text-utils/pg.c:419
+msgid "No previous file"
+msgstr "Немає попереднього файлу"
+
+#: text-utils/pg.c:949
+#, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: Помилка читання з файлу %s\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:955
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr "%s: Неочікуваний кінець файла у файлі %s\n"
+
+#: text-utils/pg.c:958
+#, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "%s: Невідома помилка у файлі %s\n"
+
+#: text-utils/pg.c:1053
+#, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: не вдається створити тимчасовий файл\n"
+
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
+msgid "RE error: "
+msgstr "Помилка РВ: "
+
+#: text-utils/pg.c:1219
+msgid "(EOF)"
+msgstr "(Кінець файлу)"
+
+#: text-utils/pg.c:1245
+msgid "No remembered search string"
+msgstr "Немає збереженого у пам'яті рядку пошуку"
+
+#: text-utils/pg.c:1328
+msgid "Cannot open "
+msgstr "не вдається відкрити "
+
+#: text-utils/pg.c:1376
+msgid "saved"
+msgstr "збережено"
+
+#: text-utils/pg.c:1483
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ": команда ! не допустима у режимі rflag.\n"
+
+#: text-utils/pg.c:1515
+msgid "fork() failed, try again later\n"
+msgstr "помилка виконання fork(), спробуйте пізніше ще раз\n"
+
+#: text-utils/pg.c:1720
+msgid "(Next file: "
+msgstr "(Наступний файл: "
+
+#: text-utils/rev.c:113
+msgid "Unable to allocate bufferspace\n"
+msgstr "не вдається виділити простір для буфера\n"
+
+#: text-utils/rev.c:156
+msgid "usage: rev [file ...]\n"
+msgstr "використання: rev [файл ...]\n"
+
+#: text-utils/ul.c:141
+#, c-format
+msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
+msgstr "використання: %s [ -i ] [ -tТермінал ] файл...\n"
+
+#: text-utils/ul.c:152
+msgid "trouble reading terminfo"
+msgstr "проблема при читанні terminfo"
+
+#: text-utils/ul.c:242
+#, c-format
+msgid "Unknown escape sequence in input: %o, %o\n"
+msgstr "Невідома escape-послідовність на вході: %o, %o\n"
+
+#: text-utils/ul.c:425
+msgid "Unable to allocate buffer.\n"
+msgstr "не вдається виділити буфер.\n"
+
+#: text-utils/ul.c:586
+msgid "Input line too long.\n"
+msgstr "Вхідний рядок надто довгий.\n"
+
+#: text-utils/ul.c:599
+msgid "Out of memory when growing buffer.\n"
+msgstr "Недостатньо пам'яті для збільшення буфера.\n"
+
+#~ msgid "%s: not compiled with minix v2 support\n"
+#~ msgstr "%s: скомпільовано без підтримки minix v2\n"
+
+#~ msgid "mount: the label %s occurs on both %s and %s\n"
+#~ msgstr "mount: етикетка %s зустрічається як у %s, так і у %s\n"
+
+#~ msgid "mount: %s duplicate - not mounted"
+#~ msgstr "mount: %s дубльована - не підключається"
+
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: спроба підключити %s у %s\n"
+
+#~ msgid "UUID"
+#~ msgstr "UUID"
+
+#~ msgid "label"
+#~ msgstr "етикетка"
+
+#~ msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
+#~ msgstr ""
+#~ "mount: ім'я %s зустрічається як на %s, так і на %s - не підключено\n"
+
+#~ msgid "Boot (%02X)"
+#~ msgstr "Завантаження (%02X)"
+
+#~ msgid "None (%02X)"
+#~ msgstr "Немає (%02X)"
+
+#~ msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#~ msgstr "%s: [%04x]:%ld (%s) зсув %d, шифрування %s\n"
+
+#~ msgid ""
+#~ "mount: Could not find any loop device.\n"
+#~ "       Maybe /dev/loop# has a wrong major number?"
+#~ msgstr ""
+#~ "mount: не вдається знайти жодний loop-пристрій.\n"
+#~ "       Можливо /dev/loop# має неправильний старший номер?"
+
+#~ 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: не вдається знайти жодний loop-пристрій. Можливо це ядро не \n"
+#~ "       підтримує роботу з loop-пристроями (тоді перекомпілюйте ядро \n"
+#~ "       або виконайте `insmod loop.o'), або можливо /dev/loop# має \n"
+#~ "       неправильний старший номер? "
+
+#~ msgid "Init (up to 16 hex digits): "
+#~ msgstr "Init (до 16 шістнадцяткових цифр): "
+
+#~ msgid "Non-hex digit '%c'.\n"
+#~ msgstr "Не шістнадцяткова цифра '%c'.\n"
+
+#~ msgid "Don't know how to get key for encryption system %d\n"
+#~ msgstr "Невідомо як отримати ключ системи шифрування %d\n"
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index b9a978ee..d7adc0ae 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -11,6 +11,24 @@
  *
  */
 
+/*
+ * Commands to sys_syslog:
+ *
+ *      0 -- Close the log.  Currently a NOP.
+ *      1 -- Open the log. Currently a NOP.
+ *      2 -- Read from the log.
+ *      3 -- Read all messages remaining in the ring buffer.
+ *      4 -- Read and clear all messages remaining in the ring buffer
+ *      5 -- Clear ring buffer.
+ *      6 -- Disable printk's to console
+ *      7 -- Enable printk's to console
+ *      8 -- Set level of messages printed to console
+ *      9 -- Return number of unread characters in the log buffer
+ *           [supported since 2.4.10]
+ *
+ * Only function 3 is allowed to non-root processes.
+ */
+
 #include <linux/unistd.h>
 #include <stdio.h>
 #include <getopt.h>
@@ -41,13 +59,14 @@ usage(void) {
 int
 main(int argc, char *argv[]) {
 	char *buf;
-	int  bufsize = 16392;
+	int  sz;
+	int  bufsize = 0;
 	int  i;
 	int  n;
 	int  c;
 	int  level = 0;
 	int  lastc;
-	int  cmd = 3;
+	int  cmd = 3;		/* Read all messages in the ring buffer */
 
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
@@ -57,14 +76,16 @@ main(int argc, char *argv[]) {
 	while ((c = getopt(argc, argv, "cn:s:")) != -1) {
 		switch (c) {
 		case 'c':
-			cmd = 4;
+			cmd = 4;	/* Read and clear all messages */
 			break;
 		case 'n':
-			cmd = 8;
+			cmd = 8;	/* Set level of messages */
 			level = atoi(optarg);
 			break;
 		case 's':
 			bufsize = atoi(optarg);
+			if (bufsize < 4096)
+				bufsize = 4096;
 			break;
 		case '?':
 		default:
@@ -89,9 +110,31 @@ main(int argc, char *argv[]) {
 		exit(0);
 	}
 
-	if (bufsize < 4096) bufsize = 4096;
-	buf = (char*)malloc(bufsize);
-	n = klogctl(cmd, buf, bufsize);
+	if (!bufsize) {
+		n = klogctl(10, NULL, 0);	/* read ringbuffer size */
+		if (n > 0)
+			bufsize = n;
+	}
+
+	if (bufsize) {
+		sz = bufsize + 8;
+		buf = (char *) malloc(sz);
+		n = klogctl(cmd, buf, sz);
+	} else {
+		sz = 16392;
+		while (1) {
+			buf = (char *) malloc(sz);
+			n = klogctl(3, buf, sz);	/* read only */
+			if (n != sz || sz > (1<<28))
+				break;
+			free(buf);
+			sz *= 4;
+		}
+
+		if (n > 0 && cmd == 4)
+			n = klogctl(cmd, buf, sz);	/* read and clear */
+	}
+
 	if (n < 0) {
 		perror("klogctl");
 		exit(1);
diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index de3de946..efb15658 100644
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -35,6 +35,9 @@
  * - also try /boot/System.map-`uname -r`
  * 2003-04-09 Werner Almesberger <wa@almesberger.net>
  * - fixed off-by eight error and improved heuristics in byte order detection
+ * 2003-08-12 Nikita Danilov <Nikita@Namesys.COM>
+ * - added -s option; example of use:
+ * "readprofile -s -m /boot/System.map-test | grep __d_lookup | sort -n -k3"
  */
 
 #include <errno.h>
@@ -55,7 +58,7 @@ static char *prgname;
 /* These are the defaults */
 static char defaultmap[]="/usr/src/linux/System.map";
 static char defaultpro[]="/proc/profile";
-static char optstring[]="M:m:np:itvarVb";
+static char optstring[]="M:m:np:itvarVbs";
 
 static void *
 xmalloc (size_t size) {
@@ -111,18 +114,19 @@ boot_uname_r_str(void) {
 
 static void
 usage(void) {
-	fprintf(stderr,
-		_("%s: Usage: \"%s [options]\n"
-		  "\t -m <mapfile>  (defaults: \"%s\" and\n\t\t\t\t  \"%s\")\n"
-		  "\t -p <pro-file> (default: \"%s\")\n"
-		  "\t -M <mult>     set the profiling multiplier to <mult>\n"
-		  "\t -i            print only info about the sampling step\n"
-		  "\t -v            print verbose data\n"
-		  "\t -a            print all symbols, even if count is 0\n"
-		  "\t -b            print individual histogram-bin counts\n"
-		  "\t -r            reset all the counters (root only)\n"
-		  "\t -n            disable byte order auto-detection\n"
-		  "\t -V            print version and exit\n"),
+	fprintf(stderr, _(
+		"%s: Usage: \"%s [options]\n"
+		"\t -m <mapfile>  (defaults: \"%s\" and\n\t\t\t\t  \"%s\")\n"
+		"\t -p <pro-file> (default: \"%s\")\n"
+		"\t -M <mult>     set the profiling multiplier to <mult>\n"
+		"\t -i            print only info about the sampling step\n"
+		"\t -v            print verbose data\n"
+		"\t -a            print all symbols, even if count is 0\n"
+		"\t -b            print individual histogram-bin counts\n"
+		"\t -s            print individual counters within functions\n"
+		"\t -r            reset all the counters (root only)\n"
+		"\t -n            disable byte order auto-detection\n"
+		"\t -V            print version and exit\n"),
 		prgname, prgname, defaultmap, boot_uname_r_str(), defaultpro);
 	exit(1);
 }
@@ -140,7 +144,8 @@ main(int argc, char **argv) {
 	char fn_name[S_LEN], next_name[S_LEN];   /* current and next name */
 	char mode[8];
 	int c;
-	int optAll=0, optInfo=0, optReset=0, optVerbose=0, optNative=0, optBins=0;
+	int optAll=0, optInfo=0, optReset=0, optVerbose=0, optNative=0;
+	int optBins=0, optSub=0;
 	char mapline[S_LEN];
 	int maplineno=1;
 	int popenMap;   /* flag to tell if popen() has been used */
@@ -173,6 +178,9 @@ main(int argc, char **argv) {
 		case 'b':
 			optBins++;
 			break;
+		case 's':
+			optSub++;
+			break;
 		case 'i':
 			optInfo++;
 			break;
@@ -228,8 +236,8 @@ main(int argc, char **argv) {
 	 * Use an fd for the profiling buffer, to skip stdio overhead
 	 */
 	if (((proFd=open(proFile,O_RDONLY)) < 0)
-	     || ((int)(len=lseek(proFd,0,SEEK_END)) < 0)
-	     || (lseek(proFd,0,SEEK_SET) < 0)) {
+	    || ((int)(len=lseek(proFd,0,SEEK_END)) < 0)
+	    || (lseek(proFd,0,SEEK_SET) < 0)) {
 		fprintf(stderr,"%s: %s: %s\n",prgname,proFile,strerror(errno));
 		exit(1);
 	}
@@ -258,7 +266,7 @@ main(int argc, char **argv) {
 		}
 		if (big > small) {
 			fprintf(stderr,"Assuming reversed byte order. "
-			   "Use -n to force native byte order.\n");
+				"Use -n to force native byte order.\n");
 			for (p = buf; p < buf+entries; p++)
 				for (i = 0; i < sizeof(*buf)/2; i++) {
 					unsigned char *b = (unsigned char *) p;
@@ -352,18 +360,31 @@ main(int argc, char **argv) {
 		if (optBins) {
 			if (optVerbose || this > 0)
 				printf ("  total\t\t\t\t%u\n", this);
-		} else {
-			fn_len = next_add-fn_add;
-			if (fn_len && (this || optAll)) {
-				if (optVerbose)
-					printf("%016llx %-40s %6i %8.4f\n", fn_add,
-					       fn_name,this,this/(double)fn_len);
-				else
-					printf("%6i %-40s %8.4f\n",
-					       this,fn_name,this/(double)fn_len);
+		} else if ((this || optAll) &&
+			   (fn_len = next_add-fn_add) != 0) {
+			if (optVerbose)
+				printf("%016llx %-40s %6i %8.4f\n", fn_add,
+				       fn_name,this,this/(double)fn_len);
+			else
+				printf("%6i %-40s %8.4f\n",
+				       this,fn_name,this/(double)fn_len);
+			if (optSub) {
+				unsigned long long scan;
+
+				for (scan = (fn_add-add0)/step + 1;
+				     scan < (next_add-add0)/step; scan++) {
+					unsigned long long addr;
+
+					addr = (scan - 1)*step + add0;
+					printf("\t%#llx\t%s+%#llx\t%u\n",
+					       addr, fn_name, addr - fn_add,
+					       buf[scan]);
+				}
 			}
 		}
-		fn_add=next_add; strcpy(fn_name,next_name);
+
+		fn_add = next_add;
+		strcpy(fn_name,next_name);
 
 		maplineno++;
 	}
-- 
2.39.5