Imported from util-linux-2.12 tarball.
diff --git a/HISTORY b/HISTORY
index 978a683..4050dbc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,67 @@
+util-linux 2.12
+
+* losetup: -p option specifies fd for passphrase
+* fdisk: sgi layout fix
+* mount: -p option specifies fd for passphrase
+* mount: recognize some PCDOS floppies
+* umount: in "umount name", first try to interpret "name" as a mount point
+
+util-linux 2.12pre
+
+* Catalan messages (Antoni Bella Perez)
+* Danish messages (Claus Hindsgaul)
+* Dutch messages (Taco Witte)
+* Finnish messages (Lauri Nurmi)
+* French messages (Michel Robitaille)
+* German messages (Michael Piefel)
+* Slovenian messages (Primoz Peterlin)
+* Spanish messages (Santiago Vila Doncel)
+* Swedish messages (Christian Rose)
+* Turkish messages (Nilgün Belma Bugüner)
+* cfdisk: localize the Y/N answer, improve printing localized messages
+* cfdisk: make various variables long long - some disks are close to 2 TB
+* cfdisk: use BLKGETSIZE64
+* fdisk: make various variables unsigned to lengthen the life of 32-bit vars
+* fdisk: some sgi fixes (Phillip Kesling)
+* fdisk: k=1000, K=1024
+* fdisk: removed last occurrences of HDIO_REQ
+* fdisk: use BLKGETSIZE64
+* hwclock: fix rtc test (Heiko Zuerker)
+* login: set a timeout on printing the timeout message (Robert Ambrose)
+* md5: x86_64 fix (mmj)
+* more: POSIX fixes
+* mount: do not supply MS_MGC_VAL when there are conflicting flags
+* mount: ncp and smb are called smbfs and ncpfs - global change
+* mount: add support for xvm mount by label (Eric Sandeen)
+* mount: correct hfs magic recognition
+* mount: keep original umask - it influences the mount call (mmj)
+* raw.8: documented unbinding of raw devices
+* readprofile: fixed off-by eight error (Werner Almesberger)
+* script: add -c option (Wayne Davison)
+* sfdisk.8: added an example of partitioning with logical partitions
+* sfdisk: only add a AA55 signature for DOS-type partition tables
+* tailf: new (Rik Faith)
+
+util-linux 2.11z
+
+* Catalan messages (Antoni Bella Perez)
+* Danish messages (Claus Hindsgaul)
+* Dutch messages (Taco Witte)
+* Finnish messages (Lauri Nurmi)
+* French messages (Michel Robitaille) - HURRAY!
+* German messages (Michael Piefel)
+* Slovenian messages (Primoz Peterlin)
+* Spanish messages (Santiago Vila Doncel)
+* Swedish messages (Christian Rose)
+* Turkish messages (Nilgün Belma Bugüner)
+* getopt: replaced getopt-1.1.2 by getopt-1.1.3 (Frodo Looijaard)
+* mkcramfs: change default blocksize for ia64 and alpha
+* more.help: removed (it is built-in now, and translated)
+* mount: add -i option (inhibit calling external mount programs)
+* mount: change default: do resolve symlinks
+* readprofile: look for System.map also in /boot/System.map-`uname -r` (mmj)
+* sfdisk: also translate "start" and "end"; s/MB/MiB/
+
 util-linux 2.11y
 
 * Danish messages (Claus Hindsgaul)
diff --git a/Makefile b/Makefile
index fd43061..dd4b84e 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
 
 SUBDIRS=po \
 	lib \
-	getopt-1.1.2 \
+	getopt \
 	disk-utils \
 	login-utils \
 	misc-utils \
diff --git a/VERSION b/VERSION
index 9105217..3e162f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.11y
+2.12
diff --git a/configure b/configure
index e67be05..5c0f3e4 100755
--- a/configure
+++ b/configure
@@ -25,6 +25,7 @@
 # F6. For agetty.c: is updwtmp() available?
 # F7. For pg.c: are fseeko() and ftello() available?
 # F8. For fsck.cramfs.c: is lchown() available?
+# F9. For cfdisk.c: is rpmatch() available?
 #
 #  1. For sys-utils/cytune.c: do we need <linux/tqueue.h>?
 #  2. For cfdisk, setterm, more, ul: do we have ncurses? How installed?
@@ -53,7 +54,7 @@
 echo >> defines.h
 
 CC=${CC-cc}
-CFLAGS=${CFLAGS-"-O"}
+CFLAGS=${CFLAGS-"-O2"}
 LDFLAGS=${LDFLAGS-"-s"}
 echo CC=$CC >> make_include
 echo CFLAGS=$CFLAGS >> make_include
@@ -335,6 +336,26 @@
 rm -f conftest conftest.c
 
 #
+# F9. For cfdisk.c: is rpmatch() available?
+#
+echo '
+#define _SVID_SOURCE
+#include <stdlib.h>
+int main(int a, char **v){
+  rpmatch("y");
+  exit(0);
+}
+' > conftest.c
+eval $compile
+if test -s conftest; then
+        echo "#define HAVE_rpmatch" >> defines.h
+        echo "You have rpmatch()"
+else
+        echo "You don't have rpmatch()"
+fi
+rm -f conftest conftest.c
+
+#
 # 1. cytune.c may need struct tq_struct
 #
 echo "
@@ -651,7 +672,8 @@
 if rpcgen -h -o conftest.h conftest.x 2> conferrs && \
    rpcgen -c -o conftestx.c conftest.x 2>> conferrs && \
    rpcgen -l -o conftestl.c conftest.x 2>> conferrs && \
-   cc -c conftestx.c 2>> conferrs && cc -c conftestl.c 2>> conferrs && \
+   $CC $CFLAGS -c conftestx.c 2>> conferrs && \
+   $CC $CFLAGS -c conftestl.c 2>> conferrs && \
    test ! -s conferrs
 then
         echo "HAVE_GOOD_RPC=yes" >> make_include
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index a88819b..3275571 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -46,7 +46,14 @@
 static const char *progname = "mkcramfs";
 static int verbose = 0;
 
+#ifdef __ia64__
+#define PAGE_CACHE_SIZE (16384)
+#elif defined __alpha__
+#define PAGE_CACHE_SIZE (8192)
+#else
 #define PAGE_CACHE_SIZE (4096)
+#endif
+
 /* The kernel assumes PAGE_CACHE_SIZE as block size. */
 static unsigned int blksize = PAGE_CACHE_SIZE; /* settable via -b option */
 static long total_blocks = 0, total_nodes = 1; /* pre-count the root node */
diff --git a/disk-utils/raw.8 b/disk-utils/raw.8
index 4fd91fa..6fbdb85 100644
--- a/disk-utils/raw.8
+++ b/disk-utils/raw.8
@@ -43,6 +43,8 @@
 .I \-a
 option to query all bound raw devices.
 .PP
+Unbinding can be done by specifying major and minor 0.
+.PP
 Once bound to a block device, a raw device can be opened, read and
 written, just like the block device it is bound to.  However, the raw
 device does not behave exactly like the block device.  In particular,
diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index 6ffd80b..389e6bf 100644
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -82,14 +82,8 @@
 #include "xstrncpy.h"
 #include "common.h"
 
-#if defined(__GNUC__) || defined(HAS_LONG_LONG)
-typedef long long ext2_loff_t;
-#else
-typedef long      ext2_loff_t;
-#endif
-
-extern ext2_loff_t ext2_llseek(unsigned int fd, ext2_loff_t offset,
-			       unsigned int origin);
+extern long long ext2_llseek(unsigned int fd, long long offset,
+			     unsigned int origin);
 
 #define VERSION UTIL_LINUX_VERSION
 
@@ -195,12 +189,13 @@
 
 int heads = 0;
 int sectors = 0;
-int cylinders = 0;
+long long cylinders = 0;
 int cylinder_size = 0;		/* heads * sectors */
-int total_size = 0;		/* actual_size rounded down */
-unsigned long actual_size = 0;	/* set using ioctl */
+long long total_size = 0;	/* actual_size rounded down */
+long long actual_size = 0;	/* set using ioctl */
 				/* explicitly given user values */
-int user_heads = 0, user_sectors = 0, user_cylinders = 0;
+int user_heads = 0, user_sectors = 0;
+long long user_cylinders = 0;
 				/* kernel values; ignore the cylinders */
 int kern_heads = 0, kern_sectors = 0;
 				/* partition-table derived values */
@@ -208,7 +203,7 @@
 
 
 static void
-set_hsc0(unsigned char *h, unsigned char *s, int *c, int sector) {
+set_hsc0(unsigned char *h, unsigned char *s, int *c, long long sector) {
 	if (sector >= 1024*cylinder_size)
 		sector = 1024*cylinder_size - 1;
 	*s = sector % sectors + 1;
@@ -219,7 +214,8 @@
 }
 
 static void
-set_hsc(unsigned char *h, unsigned char *s, unsigned char *c, int sector) {
+set_hsc(unsigned char *h, unsigned char *s, unsigned char *c,
+	long long sector) {
 	int cc;
 
 	set_hsc0(h, s, &cc, sector);
@@ -228,12 +224,12 @@
 }
 
 static void
-set_hsc_begin(struct partition *p, int sector) {
+set_hsc_begin(struct partition *p, long long sector) {
 	set_hsc(& p->head, & p->sector, & p->cyl, sector);
 }
 
 static void
-set_hsc_end(struct partition *p, int sector) {
+set_hsc_end(struct partition *p, long long sector) {
 	set_hsc(& p->end_head, & p->end_sector, & p->end_cyl, sector);
 }
 
@@ -257,8 +253,9 @@
 
 static unsigned int
 read4_little_endian(unsigned char *cp) {
-	return (uint)(cp[0]) + ((uint)(cp[1]) << 8)
-		+ ((uint)(cp[2]) << 16) + ((uint)(cp[3]) << 24);
+	return (unsigned int)(cp[0]) + ((unsigned int)(cp[1]) << 8)
+		+ ((unsigned int)(cp[2]) << 16)
+		+ ((unsigned int)(cp[3]) << 24);
 }
 
 static void
@@ -296,9 +293,9 @@
 } partition_table;
 
 typedef struct {
-    int first_sector;	/* first sector in partition */
-    int last_sector;	/* last sector in partition */
-    int offset;		/* offset from first sector to start of data */
+    long long first_sector;	/* first sector in partition */
+    long long last_sector;	/* last sector in partition */
+    long offset;		/* offset from first sector to start of data */
     int flags;		/* active == 0x80 */
     int id;		/* filesystem type */
     int num;		/* number of partition -- primary vs. logical */
@@ -351,7 +348,7 @@
 int PTYPE_START = 28;
 int FSTYPE_START = 38;
 int LABEL_START = 54;
-int SIZE_START = 70;
+int SIZE_START = 68;
 int COMMAND_LINE_X = 5;
 
 static void die_x(int ret);
@@ -570,16 +567,16 @@
 }
 
 static void
-read_sector(char *buffer, int sect_num) {
-    if (ext2_llseek(fd, ((ext2_loff_t) sect_num)*SECTOR_SIZE, SEEK_SET) < 0)
+read_sector(char *buffer, long long sect_num) {
+    if (ext2_llseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0)
 	fatal(_("Cannot seek on disk drive"), 2);
     if (read(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE)
 	fatal(_("Cannot read disk drive"), 2);
 }
 
 static void
-write_sector(char *buffer, int sect_num) {
-    if (ext2_llseek(fd, ((ext2_loff_t) sect_num)*SECTOR_SIZE, SEEK_SET) < 0)
+write_sector(char *buffer, long long sect_num) {
+    if (ext2_llseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0)
 	fatal(_("Cannot seek on disk drive"), 2);
     if (write(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE)
 	fatal(_("Cannot write disk drive"), 2);
@@ -603,10 +600,9 @@
 #define DOS_OSTYPE_SZ 8
 #define DOS_LABEL_SZ 11
 #define DOS_FSTYPE_SZ 8
-	ext2_loff_t offset;
+	long long offset;
 
-	offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset)
-		* SECTOR_SIZE;
+	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE;
 	if (ext2_llseek(fd, offset, SEEK_SET) == offset
 	    && read(fd, &sector, sizeof(sector)) == sizeof(sector)) {
 		dos_copy_to_info(p_info[i].ostype, OSTYPESZ,
@@ -664,11 +660,11 @@
 	} xfsb;
 
 	char *label;
-	ext2_loff_t offset;
+	long long offset;
 	int j;
 
-	offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset)
-		* SECTOR_SIZE + 1024;
+	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
+		+ 1024;
 	if (ext2_llseek(fd, offset, SEEK_SET) == offset
 	    && read(fd, &e2fsb, sizeof(e2fsb)) == sizeof(e2fsb)
 	    && e2fsb.s_magic[0] + (e2fsb.s_magic[1]<<8) == EXT2_SUPER_MAGIC) {
@@ -684,8 +680,7 @@
 		return;
 	}
 
-	offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset)
-		* SECTOR_SIZE + 0;
+	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE + 0;
 	if (ext2_llseek(fd, offset, SEEK_SET) == offset
 	    && read(fd, &xfsb, sizeof(xfsb)) == sizeof(xfsb)
 	    && !strcmp(xfsb.s_magic, XFS_SUPER_MAGIC)) {
@@ -698,8 +693,8 @@
 	}
 
 	/* reiserfs? */
-	offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset)
-		* SECTOR_SIZE + REISERFS_DISK_OFFSET_IN_BYTES;
+	offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE
+		+ REISERFS_DISK_OFFSET_IN_BYTES;
 	if (ext2_llseek(fd, offset, SEEK_SET) == offset
 	    && read(fd, &reiserfsb, 1024) == 1024
 	    && is_reiserfs_magic_string(&reiserfsb)) {
@@ -802,7 +797,7 @@
 }
 
 static void
-insert_empty_part(int i, int first, int last) {
+insert_empty_part(int i, long long first, long long last) {
     int p;
 
     for (p = num_parts; p > i; p--)
@@ -877,8 +872,8 @@
 }
 
 static int
-add_part(int num, int id, int flags, int first, int last, int offset,
-	 int want_label, char **errmsg) {
+add_part(int num, int id, int flags, long long first, long long last,
+	 long long offset, int want_label, char **errmsg) {
     int i, pri = 0, log = 0;
 
     if (num_parts == MAXIMUM_PARTS) {
@@ -1141,6 +1136,9 @@
 #endif
 	if (lenName >= sizeof(buff)) {	/* truncate ridiculously long string */
 	    xstrncpy(buff, mi, sizeof(buff));
+	} else if (lenName >= itemLength) {
+            snprintf(buff, sizeof(buff),
+		     (menuType & MENU_BUTTON) ? "[%s]" : "%s", mi);
 	} else {
             snprintf(buff, sizeof(buff),
 		     (menuType & MENU_BUTTON) ? "[%*s%-*s]" : "%*s%-*s",
@@ -1377,13 +1375,13 @@
 new_part(int i) {
     char response[LINE_LENGTH], def[LINE_LENGTH];
     char c;
-    int first = p_info[i].first_sector;
-    int last = p_info[i].last_sector;
-    int offset = 0;
+    long long first = p_info[i].first_sector;
+    long long last = p_info[i].last_sector;
+    long long offset = 0;
     int flags = 0;
     int id = LINUX;
     int num = -1;
-    int num_sects = last - first + 1;
+    long long num_sects = last - first + 1;
     int len, ext, j;
     char *errmsg;
     double sectors_per_MB = K*K / 512.0;
@@ -1495,6 +1493,21 @@
 #endif
 }
 
+static int
+said_yes(char answer) {
+#ifdef HAVE_rpmatch
+	char reply[2];
+	int yn;
+
+	reply[0] = answer;
+	reply[1] = 0;
+	yn = rpmatch(reply);	/* 1: yes, 0: no, -1: ? */
+	if (yn >= 0)
+		return yn;
+#endif
+	return (answer == 'y' || answer == 'Y');
+}
+
 static void
 get_partition_table_geometry(partition_table *bufp) {
     struct partition *p;
@@ -1515,7 +1528,7 @@
 	    putchar(BELL);
 	    refresh();
 	    cont = getch();
-	    if ((cont != 'y') && (cont != 'Y'))
+	    if (cont == EOF || !said_yes(cont))
 		    die_x(3);
 	    zero_table = TRUE;
 	    return;
@@ -1558,7 +1571,7 @@
 	       kern_sectors ? kern_sectors : 63);
     cylinder_size = heads*sectors;
     cylinders = actual_size/cylinder_size;
-    if (user_cylinders > 0 && user_cylinders <= 0x7fffffff/cylinder_size)
+    if (user_cylinders > 0)
 	    cylinders = user_cylinders;
 
     total_size = cylinder_size*cylinders;
@@ -1586,7 +1599,9 @@
 
 static void
 fill_p_info(void) {
-    int pn, i, bs, bsz;
+    int pn, i;
+    long long bs, bsz;
+    unsigned long long bytes;
     struct partition *p;
     partition_table buffer;
     partition_info tmp_ext = { 0, 0, 0, 0, FREE_SPACE, PRIMARY };
@@ -1615,8 +1630,15 @@
     ioctl(fd, BLKFLSBUF);	/* ignore errors */
 				/* e.g. Permission Denied */
 
-    if (ioctl(fd, BLKGETSIZE, &actual_size))
-	fatal(_("Cannot get disk size"), 3);
+    if (ioctl(fd, BLKGETSIZE64, &bytes) == 0)
+	    actual_size = (bytes >> 9);
+    else {
+	    unsigned long sz = 0;
+
+	    if (ioctl(fd, BLKGETSIZE, &sz))
+		    fatal(_("Cannot get disk size"), 3);
+	    actual_size = sz;
+    }
 
     read_sector(buffer.c.b, 0);
 
@@ -1695,7 +1717,7 @@
 
 static void
 fill_part_table(struct partition *p, partition_info *pi) {
-    int begin;
+    long long begin;
 
     p->boot_ind = pi->flags;
     p->sys_ind = pi->id;
@@ -1948,7 +1970,7 @@
 
 static void
 print_p_info_entry(FILE *fp, partition_info *p) {
-    int size;
+    long long size;
     char part_str[40];
 
     if (p->id == UNUSABLE)
@@ -1965,17 +1987,17 @@
 
     fp_printf(fp, " ");
 
-    fp_printf(fp, "%8d%c", p->first_sector,
+    fp_printf(fp, "%11lld%c", p->first_sector,
 	      ((p->first_sector/cylinder_size) !=
 	       ((float)p->first_sector/cylinder_size) ?
 	       '*' : ' '));
 
-    fp_printf(fp, "%8d%c", p->last_sector,
+    fp_printf(fp, "%11lld%c", p->last_sector,
 	      (((p->last_sector+1)/cylinder_size) !=
 	       ((float)(p->last_sector+1)/cylinder_size) ?
 	       '*' : ' '));
 
-    fp_printf(fp, "%7d%c", p->offset,
+    fp_printf(fp, "%6ld%c", p->offset,
 	      ((((p->first_sector == 0 || IS_LOGICAL(p->num)) &&
 		 (p->offset != sectors)) ||
 		(p->first_sector != 0 && IS_PRIMARY(p->num) &&
@@ -1983,30 +2005,30 @@
 	       '#' : ' '));
 
     size = p->last_sector - p->first_sector + 1;
-    fp_printf(fp, "%8d%c", size,
+    fp_printf(fp, "%11lld%c", size,
 	      ((size/cylinder_size) != ((float)size/cylinder_size) ?
 	       '*' : ' '));
 
-    fp_printf(fp, " ");
+    /* fp_printf(fp, " "); */
 
     if (p->id == UNUSABLE)
-	sprintf(part_str, "%.17s", _("Unusable"));
+	sprintf(part_str, "%.15s", _("Unusable"));
     else if (p->id == FREE_SPACE)
-	sprintf(part_str, "%.17s", _("Free Space"));
+	sprintf(part_str, "%.15s", _("Free Space"));
     else if (partition_type_name(p->id))
-	sprintf(part_str, "%.17s (%02X)", partition_type_name(p->id), p->id);
+	sprintf(part_str, "%.15s (%02X)", partition_type_name(p->id), p->id);
     else
-	sprintf(part_str, "%.17s (%02X)", _("Unknown"), p->id);
-    fp_printf(fp, "%-22.22s", part_str);
+	sprintf(part_str, "%.15s (%02X)", _("Unknown"), p->id);
+    fp_printf(fp, "%-20.20s", part_str);
 
     fp_printf(fp, " ");
 
     if (p->flags == ACTIVE_FLAG)
-	fp_printf(fp, _("Boot (%02X)"), p->flags);
+	fp_printf(fp, _("Boot"), p->flags);
     else if (p->flags != 0)
-	fp_printf(fp, _("Unknown (%02X)"), p->flags);
+	fp_printf(fp, _("(%02X)"), p->flags);
     else
-	fp_printf(fp, _("None (%02X)"), p->flags);
+	fp_printf(fp, _("None"), p->flags);
 
     fp_printf(fp, "\n");
 }
@@ -2043,9 +2065,9 @@
 
     fp_printf(fp, _("Partition Table for %s\n"), disk_device);
     fp_printf(fp, "\n");
-    fp_printf(fp, _("            First    Last\n"));
-    fp_printf(fp, _(" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"));
-    fp_printf(fp, _("-- ------- -------- --------- ------ --------- ---------------------- ---------\n"));
+    fp_printf(fp, _("               First       Last\n"));
+    fp_printf(fp, _(" # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) Flag\n"));
+    fp_printf(fp, _("-- ------- ----------- ----------- ------ ----------- -------------------- ----\n"));
 
     for (i = 0; i < num_parts; i++) {
 	if (pext && (p_info[i].first_sector >= ext_info.first_sector)) {
@@ -2065,7 +2087,7 @@
 
 static void
 print_part_entry(FILE *fp, int num, partition_info *pi) {
-    int first = 0, start = 0, end = 0, size = 0;
+    long long first = 0, start = 0, end = 0, size = 0;
     unsigned char ss, es, sh, eh;
     int sc, ec;
     int flags = 0, id = 0;
@@ -2090,7 +2112,7 @@
 	set_hsc0(&eh, &es, &ec, end);
     }
 
-    fp_printf(fp, "%2d  0x%02X %4d %4d %4d 0x%02X %4d %4d %4d %8d %9d\n",
+    fp_printf(fp, "%2d  0x%02X %4d %4d %4d 0x%02X %4d %4d %4d %11lld %11lld\n",
 	      num+1, flags, sh, ss, sc, id, eh, es, ec, first, size);
 }
 
@@ -2128,9 +2150,9 @@
     fp_printf(fp, _("Partition Table for %s\n"), disk_device);
     fp_printf(fp, "\n");
     /* Three-line heading. Read "Start Sector" etc vertically. */
-    fp_printf(fp, _("         ---Starting---      ----Ending----    Start Number of\n"));
-    fp_printf(fp, _(" # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"));
-    fp_printf(fp, _("-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"));
+    fp_printf(fp, _("         ---Starting---      ----Ending----    Start     Number of\n"));
+    fp_printf(fp, _(" # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n"));
+    fp_printf(fp, _("-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"));
 
     for (i = 0; i < 4; i++) {
 	for (j = 0;
@@ -2259,7 +2281,8 @@
     int done = FALSE;
     char def[LINE_LENGTH];
     char response[LINE_LENGTH];
-    int tmp_val, max_cyls, i;
+    long long tmp_val;
+    int i;
 
     while (!done) {
         static struct MenuItem menuGeometry[]=
@@ -2278,7 +2301,7 @@
 
 	switch (toupper( menuSimple(menuGeometry, 3) )) {
 	case 'C':
-	    sprintf(def, "%ld", actual_size/cylinder_size);
+	    sprintf(def, "%llu", actual_size/cylinder_size);
 	    mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X,
 		     _("Enter the number of cylinders: "));
 	    i = get_string(response, LINE_LENGTH, def);
@@ -2286,9 +2309,8 @@
 		user_cylinders = actual_size/cylinder_size;
 		ret_val = TRUE;
 	    } else if (i > 0) {
-		tmp_val = atoi(response);
-		max_cyls = 0x7fffffff / cylinder_size;
-		if (tmp_val > 0 && tmp_val <= max_cyls) {
+		tmp_val = atoll(response);
+		if (tmp_val > 0) {
 		    user_cylinders = tmp_val;
 		    ret_val = TRUE;
 		} else
@@ -2300,7 +2322,7 @@
 	    mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X,
 		     _("Enter the number of heads: "));
 	    if (get_string(response, LINE_LENGTH, def) > 0) {
-		tmp_val = atoi(response);
+		tmp_val = atoll(response);
 		if (tmp_val > 0 && tmp_val <= MAX_HEADS) {
 		    user_heads = tmp_val;
 		    ret_val = TRUE;
@@ -2313,7 +2335,7 @@
 	    mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X,
 		     _("Enter the number of sectors per track: "));
 	    if (get_string(response, LINE_LENGTH, def) > 0) {
-		tmp_val = atoi(response);
+		tmp_val = atoll(response);
 		if (tmp_val > 0 && tmp_val <= MAX_SECTORS) {
 		    user_sectors = tmp_val;
 		    ret_val = TRUE;
@@ -2337,7 +2359,7 @@
     }
 
     if (ret_val) {
-	int disk_end;
+	long long disk_end;
 
 	disk_end = total_size-1;
 
@@ -2448,9 +2470,10 @@
 
 static void
 draw_partition(int i) {
-    int size, j;
+    int j;
     int y = i + DISK_TABLE_START + 2 - (cur_part/NUM_ON_SCREEN)*NUM_ON_SCREEN;
     char *t;
+    long long size;
     double fsize;
 
     if (!arrow_cursor) {
@@ -2512,13 +2535,13 @@
     size = p_info[i].last_sector - p_info[i].first_sector + 1;
     fsize = (double) size * SECTOR_SIZE;
     if (display_units == SECTORS)
-	mvprintw(y, SIZE_START, "%9d", size);
+	mvprintw(y, SIZE_START, "%11lld", size);
     else if (display_units == CYLINDERS)
-	mvprintw(y, SIZE_START, "%9d", size/cylinder_size);
+	mvprintw(y, SIZE_START, "%11lld", size/cylinder_size);
     else if (display_units == MEGABYTES)
-	mvprintw(y, SIZE_START, "%9.2f", ceiling((100*fsize)/(K*K))/100);
+	mvprintw(y, SIZE_START, "%11.2f", ceiling((100*fsize)/(K*K))/100);
     else if (display_units == GIGABYTES)
-	mvprintw(y, SIZE_START, "%9.2f", ceiling((100*fsize)/(K*K*K))/100);
+	mvprintw(y, SIZE_START, "%11.2f", ceiling((100*fsize)/(K*K*K))/100);
     if (size % cylinder_size != 0 ||
 	p_info[i].first_sector % cylinder_size != 0)
 	mvprintw(y, COLUMNS-1, "*");
@@ -2573,16 +2596,16 @@
     mvaddstr(HEADER_START+2, (COLS-strlen(line))/2, line);
     {
 	    long long bytes = actual_size*(long long) SECTOR_SIZE;
-	    long megabytes = bytes/1000000;
+	    long long megabytes = bytes/1000000;
 	    if (megabytes < 10000)
-		    sprintf(line, _("Size: %lld bytes, %ld MB"),
+		    sprintf(line, _("Size: %lld bytes, %lld MB"),
 			    bytes, megabytes);
 	    else
-		    sprintf(line, _("Size: %lld bytes, %ld.%ld GB"),
+		    sprintf(line, _("Size: %lld bytes, %lld.%lld GB"),
 			    bytes, megabytes/1000, (megabytes/100)%10);
     }
     mvaddstr(HEADER_START+3, (COLS-strlen(line))/2, line);
-    sprintf(line, _("Heads: %d   Sectors per Track: %d   Cylinders: %d"),
+    sprintf(line, _("Heads: %d   Sectors per Track: %d   Cylinders: %lld"),
 	    heads, sectors, cylinders);
     mvaddstr(HEADER_START+4, (COLS-strlen(line))/2, line);
 
@@ -2592,13 +2615,13 @@
     mvaddstr(DISK_TABLE_START, FSTYPE_START, _("FS Type"));
     mvaddstr(DISK_TABLE_START, LABEL_START+1, _("[Label]"));
     if (display_units == SECTORS)
-	mvaddstr(DISK_TABLE_START, SIZE_START, _("  Sectors"));
+	mvaddstr(DISK_TABLE_START, SIZE_START, _("    Sectors"));
     else if (display_units == CYLINDERS)
-	mvaddstr(DISK_TABLE_START, SIZE_START, _("Cylinders"));
+	mvaddstr(DISK_TABLE_START, SIZE_START, _("  Cylinders"));
     else if (display_units == MEGABYTES)
-	mvaddstr(DISK_TABLE_START, SIZE_START, _("Size (MB)"));
+	mvaddstr(DISK_TABLE_START, SIZE_START, _("  Size (MB)"));
     else if (display_units == GIGABYTES)
-	mvaddstr(DISK_TABLE_START, SIZE_START, _("Size (GB)"));
+	mvaddstr(DISK_TABLE_START, SIZE_START, _("  Size (GB)"));
 
     move(DISK_TABLE_START+1, 1);
     for (i = 1; i < COLS-1; i++)
@@ -2651,8 +2674,7 @@
     int done = FALSE;
     char command;
 
-    static struct MenuItem menuMain[]=
-    {
+    static struct MenuItem menuMain[] = {
         { 'b', N_("Bootable"), N_("Toggle bootable flag of the current partition") },
         { 'd', N_("Delete"), N_("Delete the current partition") },
         { 'g', N_("Geometry"), N_("Change disk geometry (experts only)") },
@@ -2860,7 +2882,7 @@
 	    arrow_cursor = TRUE;
 	    break;
 	case 'c':
-	    user_cylinders = cylinders = atoi(optarg);
+	    user_cylinders = cylinders = atoll(optarg);
 	    if (cylinders <= 0) {
 		fprintf(stderr, "%s: %s\n", argv[0], _("Illegal cylinders value"));
 		exit(1);
diff --git a/fdisk/common.h b/fdisk/common.h
index 0e5da96..f388639 100644
--- a/fdisk/common.h
+++ b/fdisk/common.h
@@ -2,10 +2,11 @@
 
 /* including <linux/fs.h> fails */
 #include <sys/ioctl.h>
-#define BLKRRPART  _IO(0x12,95)    /* re-read partition table */
-#define BLKGETSIZE _IO(0x12,96)    /* return device size */
-#define BLKFLSBUF  _IO(0x12,97)    /* flush buffer cache */
-#define BLKSSZGET  _IO(0x12,104)   /* get block device sector size */
+#define BLKRRPART    _IO(0x12,95)    /* re-read partition table */
+#define BLKGETSIZE   _IO(0x12,96)    /* return device size */
+#define BLKFLSBUF    _IO(0x12,97)    /* flush buffer cache */
+#define BLKSSZGET    _IO(0x12,104)   /* get block device sector size */
+#define BLKGETSIZE64 _IOR(0x12,114,8)	/* 8 = sizeof(u64) */
 
 /* including <linux/hdreg.h> also fails */
 struct hd_geometry {
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 32b6bc3..32756a3 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -6,18 +6,8 @@
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation: either version 1 or
  * (at your option) any later version.
- *
- * For detailed old history, see older versions.
- * Contributions before 2001 by faith@cs.unc.edu, Michael Bischoff,
- * LeBlanc@mcc.ac.uk, martin@cs.unc.edu, leisner@sdsp.mc.xerox.com,
- * esr@snark.thyrsus.com, aeb@cwi.nl, quinlan@yggdrasil.com,
- * fasten@cs.bonn.edu, orschaer@cip.informatik.uni-erlangen.de,
- * jj@sunsite.mff.cuni.cz, fasten@shw.com, ANeuper@GUUG.de,
- * kgw@suse.de, kalium@gmx.de, dhuggins@linuxcare.com,
- * michal@ellpspace.math.ualberta.ca and probably others.
  */
 
-
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -71,7 +61,7 @@
 /* A valid partition table sector ends in 0x55 0xaa */
 static unsigned int
 part_table_flag(char *b) {
-	return ((uint) b[510]) + (((uint) b[511]) << 8);
+	return ((unsigned int) b[510]) + (((unsigned int) b[511]) << 8);
 }
 
 int
@@ -97,8 +87,9 @@
 
 static unsigned int
 read4_little_endian(unsigned char *cp) {
-	return (uint)(cp[0]) + ((uint)(cp[1]) << 8)
-		+ ((uint)(cp[2]) << 16) + ((uint)(cp[3]) << 24);
+	return (unsigned int)(cp[0]) + ((unsigned int)(cp[1]) << 8)
+		+ ((unsigned int)(cp[2]) << 16)
+		+ ((unsigned int)(cp[3]) << 24);
 }
 
 static void
@@ -141,9 +132,9 @@
 struct pte {
 	struct partition *part_table;	/* points into sectorbuffer */
 	struct partition *ext_pointer;	/* points into sectorbuffer */
-	char changed;		/* boolean */
-	uint offset;		/* disk sector number */
-	char *sectorbuffer;	/* disk sector contents */
+	char changed;			/* boolean */
+	unsigned int offset;		/* disk sector number */
+	char *sectorbuffer;		/* disk sector contents */
 } ptes[MAXIMUM_PARTS];
 
 char	*disk_device,			/* must be specified */
@@ -158,11 +149,11 @@
 	dos_changed = 0,
 	partitions = 4;			/* maximum partition + 1 */
 
-uint	user_cylinders, user_heads, user_sectors;
-uint	pt_heads, pt_sectors;
-uint	kern_heads, kern_sectors;
+unsigned int	user_cylinders, user_heads, user_sectors;
+unsigned int	pt_heads, pt_sectors;
+unsigned int	kern_heads, kern_sectors;
 
-uint	heads,
+unsigned int	heads,
 	sectors,
 	cylinders,
 	sector_size = DEFAULT_SECTOR_SIZE,
@@ -172,7 +163,7 @@
 	display_in_cyl_units = 1,
 	extended_offset = 0;		/* offset of link pointers */
 
-unsigned long total_number_of_sectors;
+unsigned long long total_number_of_sectors;
 
 #define dos_label (!sun_label && !sgi_label && !aix_label && !osf_label)
 int     sun_label = 0;                  /* looking at sun disklabel */
@@ -247,21 +238,21 @@
 }
 
 static void
-seek_sector(int fd, uint secno) {
-	ext2_loff_t offset = (ext2_loff_t) secno * sector_size;
-	if (ext2_llseek(fd, offset, SEEK_SET) == (ext2_loff_t) -1)
+seek_sector(int fd, unsigned int secno) {
+	long long offset = (long long) secno * sector_size;
+	if (ext2_llseek(fd, offset, SEEK_SET) == (long long) -1)
 		fatal(unable_to_seek);
 }
 
 static void
-read_sector(int fd, uint secno, char *buf) {
+read_sector(int fd, unsigned int secno, char *buf) {
 	seek_sector(fd, secno);
 	if (read(fd, buf, sector_size) != sector_size)
 		fatal(unable_to_read);
 }
 
 static void
-write_sector(int fd, uint secno, char *buf) {
+write_sector(int fd, unsigned int secno, char *buf) {
 	seek_sector(fd, secno);
 	if (write(fd, buf, sector_size) != sector_size)
 		fatal(unable_to_write);
@@ -269,7 +260,7 @@
 
 /* Allocate a buffer and read a partition table sector */
 static void
-read_pte(int fd, int pno, uint offset) {
+read_pte(int fd, int pno, unsigned int offset) {
 	struct pte *pe = &ptes[pno];
 
 	pe->offset = offset;
@@ -487,7 +478,7 @@
 
 void list_types(struct systypes *sys)
 {
-	uint last[4], done = 0, next = 0, size;
+	unsigned int last[4], done = 0, next = 0, size;
 	int i;
 
 	for (i = 0; sys[i].name; i++);
@@ -533,9 +524,10 @@
 }
 
 static void
-set_partition(int i, int doext, uint start, uint stop, int sysid) {
+set_partition(int i, int doext, unsigned int start, unsigned int stop,
+	      int sysid) {
 	struct partition *p;
-	uint offset;
+	unsigned int offset;
 
 	if (doext) {
 		p = ptes[i].ext_pointer;
@@ -809,7 +801,7 @@
 void
 get_geometry(int fd, struct geom *g) {
 	int sec_fac;
-	unsigned long longsectors;
+	unsigned long long bytes;	/* really u64 */
 
 	get_sectorsize(fd);
 	sec_fac = sector_size / 512;
@@ -828,15 +820,23 @@
 		pt_sectors ? pt_sectors :
 		kern_sectors ? kern_sectors : 63;
 
-	if (ioctl(fd, BLKGETSIZE, &longsectors))
-		longsectors = 0;
+	if (ioctl(fd, BLKGETSIZE64, &bytes) == 0) {
+		/* got bytes */
+	} else {
+		unsigned long longsectors;
+
+		if (ioctl(fd, BLKGETSIZE, &longsectors))
+			longsectors = 0;
+		bytes = ((unsigned long long) longsectors) << 9;
+	}
+
+	total_number_of_sectors = (bytes >> 9);
 
 	sector_offset = 1;
 	if (dos_compatible_flag)
 		sector_offset = sectors;
 
-	cylinders = longsectors / (heads * sectors);
-	cylinders /= sec_fac;
+	cylinders = total_number_of_sectors / (heads * sectors * sec_fac);
 	if (!cylinders)
 		cylinders = user_cylinders;
 
@@ -845,8 +845,6 @@
 		g->sectors = sectors;
 		g->cylinders = cylinders;
 	}
-
-	total_number_of_sectors = longsectors;
 }
 
 /*
@@ -1048,10 +1046,11 @@
  *
  * There is no default if DFLT is not between LOW and HIGH.
  */
-uint
-read_int(uint low, uint dflt, uint high, uint base, char *mesg)
+unsigned int
+read_int(unsigned int low, unsigned int dflt, unsigned int high,
+	 unsigned int base, char *mesg)
 {
-	uint i;
+	unsigned int i;
 	int default_ok = 1;
 	static char *ms = NULL;
 	static int mslen = 0;
@@ -1066,10 +1065,10 @@
 		default_ok = 0;
 
 	if (default_ok)
-		snprintf(ms, mslen, _("%s (%d-%d, default %d): "),
+		snprintf(ms, mslen, _("%s (%u-%u, default %u): "),
 			 mesg, low, high, dflt);
 	else
-		snprintf(ms, mslen, "%s (%d-%d): ",
+		snprintf(ms, mslen, "%s (%u-%u): ",
 			 mesg, low, high);
 
 	while (1) {
@@ -1095,8 +1094,10 @@
 					if (!display_in_cyl_units)
 						i *= heads * sectors;
 					break;
-				case 'k':
 				case 'K':
+					absolute = 1024;
+					break;
+				case 'k':
 					absolute = 1000;
 					break;
 				case 'm':
@@ -1131,7 +1132,7 @@
 			}
 		}
 		if (use_default)
-			printf(_("Using default value %d\n"), i = dflt);
+			printf(_("Using default value %u\n"), i = dflt);
 		if (i >= low && i <= high)
 			break;
 		else
@@ -1335,7 +1336,15 @@
 	int i, sys, origsys;
 	struct partition *p;
 
-	i = get_existing_partition(0, partitions);
+	/* If sgi_label then don't use get_existing_partition,
+	   let the user select a partition, since get_existing_partition()
+	   only works for Linux like partition tables. */
+	if (!sgi_label) { 
+		i = get_existing_partition(0, partitions);
+	} else {
+		i = get_partition(0, partitions);
+	}
+
 	if (i == -1)
 		return;
 	p = ptes[i].part_table;
@@ -1404,8 +1413,9 @@
  * Jan.  1990 (version 1.2.1 by Gordon W. Ross Aug. 1990; Modified by S.
  * Lubkin Oct.  1991). */
 
-static void long2chs(ulong ls, uint *c, uint *h, uint *s) {
-	int	spc = heads * sectors;
+static void
+long2chs(ulong ls, unsigned int *c, unsigned int *h, unsigned int *s) {
+	int spc = heads * sectors;
 
 	*c = ls / spc;
 	ls = ls % spc;
@@ -1414,10 +1424,10 @@
 }
 
 static void check_consistency(struct partition *p, int partition) {
-	uint	pbc, pbh, pbs;		/* physical beginning c, h, s */
-	uint	pec, peh, pes;		/* physical ending c, h, s */
-	uint	lbc, lbh, lbs;		/* logical beginning c, h, s */
-	uint	lec, leh, les;		/* logical ending c, h, s */
+	unsigned int pbc, pbh, pbs;	/* physical beginning c, h, s */
+	unsigned int pec, peh, pes;	/* physical ending c, h, s */
+	unsigned int lbc, lbh, lbs;	/* logical beginning c, h, s */
+	unsigned int lec, leh, les;	/* logical ending c, h, s */
 
 	if (!heads || !sectors || (partition >= 4))
 		return;		/* do not check extended partitions */
@@ -1478,7 +1488,7 @@
 
 static void
 list_disk_geometry(void) {
-	long long bytes = (long long) total_number_of_sectors * 512;
+	long long bytes = (total_number_of_sectors << 9);
 	long megabytes = bytes/1000000;
 
 	if (megabytes < 10000)
@@ -1490,7 +1500,7 @@
 	printf(_("%d heads, %d sectors/track, %d cylinders"),
 	       heads, sectors, cylinders);
 	if (units_per_sector == 1)
-		printf(_(", total %lu sectors"),
+		printf(_(", total %llu sectors"),
 		       total_number_of_sectors / (sector_size/512));
 	printf("\n");
 	printf(_("Units = %s of %d * %d = %d bytes\n\n"),
@@ -1507,7 +1517,7 @@
 wrong_p_order(int *prev) {
 	struct pte *pe;
 	struct partition *p;
-	uint last_p_start_pos = 0, p_start_pos;
+	unsigned int last_p_start_pos = 0, p_start_pos;
 	int i, last_i = 0;
 
 	for (i = 0 ; i < partitions; i++) {
@@ -1665,7 +1675,7 @@
 	if (w < 5)
 		w = 5;
 
-	printf(_("%*s Boot    Start       End    Blocks   Id  System\n"),
+	printf(_("%*s Boot      Start         End      Blocks   Id  System\n"),
 	       w+1, _("Device"));
 
 	for (i = 0; i < partitions; i++) {
@@ -1684,14 +1694,14 @@
 			if (sector_size > 1024)
 				pblocks *= (sector_size / 1024);
                         printf(
-			    "%s  %c %9ld %9ld %9ld%c  %2x  %s\n",
+			    "%s  %c %11lu %11lu %11lu%c  %2x  %s\n",
 			partname(disk_device, i+1, w+2),
 /* boot flag */		!p->boot_ind ? ' ' : p->boot_ind == ACTIVE_FLAG
 			? '*' : '?',
-/* start */		(long) cround(get_partition_start(pe)),
-/* end */		(long) cround(get_partition_start(pe) + psects
+/* start */		(unsigned long) cround(get_partition_start(pe)),
+/* end */		(unsigned long) cround(get_partition_start(pe) + psects
 				- (psects ? 1 : 0)),
-/* odd flag on end */	(long) pblocks, podd ? '+' : ' ',
+/* odd flag on end */	(unsigned long) pblocks, podd ? '+' : ' ',
 /* type id */		p->sys_ind,
 /* type name */		(type = partition_type(p->sys_ind)) ?
 			type : _("Unknown"));
@@ -1715,12 +1725,12 @@
 
 	printf(_("\nDisk %s: %d heads, %d sectors, %d cylinders\n\n"),
 		disk_device, heads, sectors, cylinders);
-        printf(_("Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"));
+        printf(_("Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"));
 	for (i = 0 ; i < partitions; i++) {
 		pe = &ptes[i];
 		p = (extend ? pe->ext_pointer : pe->part_table);
 		if (p != NULL) {
-                        printf("%2d %02x%4d%4d%5d%4d%4d%5d%9d%9d %02x\n",
+                        printf("%2d %02x%4d%4d%5d%4d%4d%5d%11u%11u %02x\n",
 				i + 1, p->boot_ind, p->head,
 				sector(p->sector),
 				cylinder(p->sector, p->cyl), p->end_head,
@@ -1734,7 +1744,7 @@
 }
 
 static void
-fill_bounds(uint *first, uint *last) {
+fill_bounds(unsigned int *first, unsigned int *last) {
 	int i;
 	struct pte *pe = &ptes[0];
 	struct partition *p;
@@ -1752,8 +1762,9 @@
 }
 
 static void
-check(int n, uint h, uint s, uint c, uint start) {
-	uint total, real_s, real_c;
+check(int n, unsigned int h, unsigned int s, unsigned int c,
+      unsigned int start) {
+	unsigned int total, real_s, real_c;
 
 	real_s = sector(s) - 1;
 	real_c = cylinder(s, c);
@@ -1779,8 +1790,8 @@
 static void
 verify(void) {
 	int i, j;
-	uint total = 1;
-	uint first[partitions], last[partitions];
+	unsigned int total = 1;
+	unsigned int first[partitions], last[partitions];
 	struct partition *p;
 
 	if (warn_geometry())
@@ -1824,7 +1835,7 @@
 
 	if (extended_offset) {
 		struct pte *pex = &ptes[ext_index];
-		uint e_last = get_start_sect(pex->part_table) +
+		unsigned int e_last = get_start_sect(pex->part_table) +
 			get_nr_sects(pex->part_table) - 1;
 
 		for (i = 4; i < partitions; i++) {
@@ -1855,7 +1866,8 @@
 	int i, read = 0;
 	struct partition *p = ptes[n].part_table;
 	struct partition *q = ptes[ext_index].part_table;
-	uint start, stop = 0, limit, temp,
+	long long llimit;
+	unsigned int start, stop = 0, limit, temp,
 		first[partitions], last[partitions];
 
 	if (p && p->sys_ind) {
@@ -1866,10 +1878,13 @@
 	fill_bounds(first, last);
 	if (n < 4) {
 		start = sector_offset;
-		if (display_in_cyl_units)
-			limit = heads * sectors * cylinders - 1;
+		if (display_in_cyl_units || !total_number_of_sectors)
+			llimit = heads * sectors * cylinders - 1;
 		else
-			limit = total_number_of_sectors - 1;
+			llimit = total_number_of_sectors - 1;
+		limit = llimit;
+		if (limit != llimit)
+			limit = 0x7fffffff;
 		if (extended_offset) {
 			first[ext_index] = extended_offset;
 			last[ext_index] = get_start_sect(q) +
@@ -1903,8 +1918,8 @@
 			read = 0;
 		}
 		if (!read && start == temp) {
-			uint i;
-			i = start;
+			unsigned int i = start;
+
 			start = read_int(cround(i), cround(i), cround(limit),
 					 0, mesg);
 			if (display_in_cyl_units) {
@@ -2174,7 +2189,7 @@
 move_begin(int i) {
 	struct pte *pe = &ptes[i];
 	struct partition *p = pe->part_table;
-	uint new, first;
+	unsigned int new, first;
 
 	if (warn_geometry())
 		return;
@@ -2575,7 +2590,15 @@
 				unknown_command(c);
 			break;
 		case 'd':
-			j = get_existing_partition(1, partitions);
+        		/* If sgi_label then don't use get_existing_partition,
+			   let the user select a partition, since
+			   get_existing_partition() only works for Linux-like
+			   partition tables */
+        		if (!sgi_label) {
+                		j = get_existing_partition(1, partitions);
+        		} else {
+                		j = get_partition(1, partitions);
+        		}
 			if (j >= 0)
 				delete_partition(j);
 			break;
diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index 82bf468..6daadd9 100644
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
@@ -26,15 +26,8 @@
 #define cround(n)	(display_in_cyl_units ? ((n)/units_per_sector)+1 : (n))
 #define scround(x)	(((x)+units_per_sector-1)/units_per_sector)
 
-#if defined(__GNUC__) || defined(HAS_LONG_LONG)
-typedef long long ext2_loff_t;
-#else
-typedef long      ext2_loff_t;
-#endif
-
-extern ext2_loff_t ext2_llseek(unsigned int fd,
-			       ext2_loff_t offset,
-			       unsigned int origin);
+extern long long ext2_llseek(unsigned int fd, long long offset,
+			     unsigned int origin);
 
 struct partition {
 	unsigned char boot_ind;         /* 0x80 - active */
@@ -62,12 +55,9 @@
 };
 
 /* prototypes for fdisk.c */
-extern char *disk_device,
-            *line_ptr;
-extern int fd,
-           partitions;
-extern uint display_in_cyl_units,
-            units_per_sector;
+extern char *disk_device, *line_ptr;
+extern int fd, partitions;
+extern unsigned int display_in_cyl_units, units_per_sector;
 extern void change_units(void);
 extern void fatal(enum failure why);
 extern void get_geometry(int fd, struct geom *);
@@ -80,7 +70,8 @@
 extern void reread_partition_table(int leave);
 extern struct partition *get_part_table(int);
 extern int valid_part_table_flag(unsigned char *b);
-extern uint read_int(uint low, uint dflt, uint high, uint base, char *mesg);
+extern unsigned int read_int(unsigned int low, unsigned int dflt,
+			     unsigned int high, unsigned int base, char *mesg);
 
 
 #define PLURAL	0
diff --git a/fdisk/fdiskaixlabel.c b/fdisk/fdiskaixlabel.c
index 395de53..4f6167f 100644
--- a/fdisk/fdiskaixlabel.c
+++ b/fdisk/fdiskaixlabel.c
@@ -4,7 +4,6 @@
   	Internationalization
 */
 #include <stdio.h>              /* stderr */
-#include <stdlib.h>             /* uint */
 #include <string.h>             /* strstr */
 #include <unistd.h>             /* write */
 
diff --git a/fdisk/fdiskaixlabel.h b/fdisk/fdiskaixlabel.h
index ca6919d..45e53aa 100644
--- a/fdisk/fdiskaixlabel.h
+++ b/fdisk/fdiskaixlabel.h
@@ -21,7 +21,7 @@
 #define aixlabel ((aix_partition *)MBRbuffer)
 extern char MBRbuffer[MAX_SECTOR_SIZE];
 extern char changed[MAXIMUM_PARTS];
-extern uint heads, sectors, cylinders;
+extern unsigned int heads, sectors, cylinders;
 extern int show_begin;
 extern int aix_label;
 extern char *partition_type(unsigned char type);
diff --git a/fdisk/fdiskbsdlabel.c b/fdisk/fdiskbsdlabel.c
index 6895e60..fe20391 100644
--- a/fdisk/fdiskbsdlabel.c
+++ b/fdisk/fdiskbsdlabel.c
@@ -266,7 +266,7 @@
 static void
 xbsd_new_part (void)
 {
-  uint begin, end;
+  unsigned int begin, end;
   char mesg[256];
   int i;
 
@@ -566,7 +566,7 @@
   sector = get_start_sect(xbsd_part);
 #endif
 
-  if (ext2_llseek (fd, (ext2_loff_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
+  if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE, SEEK_SET) == -1)
     fatal (unable_to_seek);
   if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE))
     fatal (unable_to_write);
@@ -735,7 +735,7 @@
 	sector = 0;
 #endif
 
-	if (ext2_llseek (fd, (ext2_loff_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
+	if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE, SEEK_SET) == -1)
 		fatal (unable_to_seek);
 	if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE))
 		fatal (unable_to_read);
@@ -762,7 +762,7 @@
 static int
 xbsd_writelabel (struct partition *p, struct xbsd_disklabel *d)
 {
-  int sector;
+  unsigned int sector;
 
 #if !defined (__alpha__) && !defined (__powerpc__) && !defined (__hppa__)
   sector = get_start_sect(p) + BSD_LABELSECTOR;
@@ -781,12 +781,12 @@
 
 #if defined (__alpha__) && BSD_LABELSECTOR == 0
   alpha_bootblock_checksum (disklabelbuffer);
-  if (ext2_llseek (fd, (ext2_loff_t) 0, SEEK_SET) == -1)
+  if (ext2_llseek (fd, (long long) 0, SEEK_SET) == -1)
     fatal (unable_to_seek);
   if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE))
     fatal (unable_to_write);
 #else
-  if (ext2_llseek (fd, (ext2_loff_t) sector * SECTOR_SIZE + BSD_LABELOFFSET,
+  if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE + BSD_LABELOFFSET,
 		   SEEK_SET) == -1)
     fatal (unable_to_seek);
   if (sizeof (struct xbsd_disklabel) != write (fd, d, sizeof (struct xbsd_disklabel)))
diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c
index f5f7373..2359e17 100644
--- a/fdisk/fdisksgilabel.c
+++ b/fdisk/fdisksgilabel.c
@@ -6,11 +6,14 @@
  *	This file may be modified and redistributed under
  *	the terms of the GNU Public License.
  *
- * Sat Mar 20 EST 1999 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+ * 1999-03-20 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
  *	Internationalization
+ *
+ * 2003-03-20 Phillip Kesling <pkesling@sgi.com>
+ *      Some fixes
  */
 #include <stdio.h>              /* stderr */
-#include <stdlib.h>             /* uint */
+#include <stdlib.h>		/* exit */
 #include <string.h>             /* strstr */
 #include <unistd.h>             /* write */
 #include <sys/ioctl.h>          /* ioctl */
@@ -33,40 +36,39 @@
  * only dealing with free blocks here
  */
 
-typedef struct { int first; int last; } freeblocks;
+typedef struct { unsigned int first; unsigned int last; } freeblocks;
 static freeblocks freelist[17]; /* 16 partitions can produce 17 vacant slots */
 
 static void
-setfreelist( int i, int f, int l ) {
+setfreelist(int i, unsigned int f, unsigned int l) {
 	freelist[i].first = f;
 	freelist[i].last = l;
 }
 
 static void
-add2freelist( int f, int l ) {
+add2freelist(unsigned int f, unsigned int l) {
 	int i = 0;
-	for( ; i<17 ; i++ ) {
-		if(freelist[i].last==0) break;
-	}
-	setfreelist( i, f, l );
+	for ( ; i < 17 ; i++)
+		if (freelist[i].last == 0)
+			break;
+	setfreelist(i, f, l);
 }
 
 static void
 clearfreelist(void) {
-	int i = 0;
-	for( ; i<17 ; i++ ) {
-		setfreelist( i, 0, 0 );
-	}
+	int i;
+
+	for (i = 0; i < 17 ; i++)
+		setfreelist(i, 0, 0);
 }
 
-static int
-isinfreelist( int b ) {
-	int i = 0;
-	for( ; i<17 ; i++ ) {
-		if (freelist[i].first <= b && freelist[i].last >= b) {
+static unsigned int
+isinfreelist(unsigned int b) {
+	int i;
+
+	for (i = 0; i < 17 ; i++)
+		if (freelist[i].first <= b && freelist[i].last >= b)
 			return freelist[i].last;
-		}
-	}
 	return 0;
 }
 	/* return last vacant block of this stride (never 0). */
@@ -103,130 +105,132 @@
 
 static inline __u32
 __swap32(__u32 x) {
-        return (((__u32)(x) & 0xFF) << 24) | (((__u32)(x) & 0xFF00) << 8) | (((__u32)(x) & 0xFF0000) >> 8) | (((__u32)(x) & 0xFF000000) >> 24);
+        return (((x & 0xFF) << 24) |
+		((x & 0xFF00) << 8) |
+		((x & 0xFF0000) >> 8) |
+		((x & 0xFF000000) >> 24));
 }
 
 static int
 sgi_get_nsect(void) {
-    return SSWAP16(sgilabel->devparam.nsect);
+	return SSWAP16(sgilabel->devparam.nsect);
 }
 
 static int
 sgi_get_ntrks(void) {
-    return SSWAP16(sgilabel->devparam.ntrks);
+	return SSWAP16(sgilabel->devparam.ntrks);
 }
 
 #if 0
 static int
 sgi_get_head_vol0(void) {
-    return SSWAP16(sgilabel->devparam.head_vol0);
+	return SSWAP16(sgilabel->devparam.head_vol0);
 }
 
 static int
 sgi_get_bytes(void) {
-    return SSWAP16(sgilabel->devparam.bytes);
+	return SSWAP16(sgilabel->devparam.bytes);
 }
-#endif
 
 static int
 sgi_get_pcylcount(void) {
-    return SSWAP16(sgilabel->devparam.pcylcount);
+	return SSWAP16(sgilabel->devparam.pcylcount);
 }
+#endif
 
 void
 sgi_nolabel() {
-    sgilabel->magic = 0;
-    sgi_label = 0;
-    partitions = 4;
+	sgilabel->magic = 0;
+	sgi_label = 0;
+	partitions = 4;
 }
 
 static unsigned int
-two_s_complement_32bit_sum(unsigned int* base, int size /* in bytes */ ) {
-    int i=0;
-    unsigned int sum=0;
+two_s_complement_32bit_sum(unsigned int *base, int size /* in bytes */) {
+	int i = 0;
+	unsigned int sum = 0;
 
-    size = size / sizeof( unsigned int );
-    for( i=0; i<size; i++ )
-	sum = sum - SSWAP32(base[i]);
-    return sum;
+	size /= sizeof(unsigned int);
+	for (i = 0; i < size; i++)
+		sum -= SSWAP32(base[i]);
+	return sum;
 }
 
 int
 check_sgi_label() {
-    if (sizeof(sgilabel) > 512) {
-	    fprintf(stderr,
-		    _("According to MIPS Computer Systems, Inc the "
-		    "Label must not contain more than 512 bytes\n"));
-	    exit(1);
-    }
+	if (sizeof(sgilabel) > 512) {
+		fprintf(stderr,
+			_("According to MIPS Computer Systems, Inc the "
+			  "Label must not contain more than 512 bytes\n"));
+		exit(1);
+	}
 
-    if (sgilabel->magic != SGI_LABEL_MAGIC &&
-	sgilabel->magic != SGI_LABEL_MAGIC_SWAPPED) {
-	sgi_label = 0;
-	other_endian = 0;
-	return 0;
-    }
+	if (sgilabel->magic != SGI_LABEL_MAGIC &&
+	    sgilabel->magic != SGI_LABEL_MAGIC_SWAPPED) {
+		sgi_label = 0;
+		other_endian = 0;
+		return 0;
+	}
 
-    other_endian = (sgilabel->magic == SGI_LABEL_MAGIC_SWAPPED);
-    /*
-     * test for correct checksum
-     */
-    if( two_s_complement_32bit_sum( (unsigned int*)sgilabel,
-			sizeof(*sgilabel) ) )
-    {
-	fprintf( stderr, _("Detected sgi disklabel with wrong checksum.\n"));
-    } else
-    {
-	heads = sgi_get_ntrks();
-	cylinders = sgi_get_pcylcount();
-	sectors = sgi_get_nsect();
-    }
-    update_units();
-    sgi_label = 1;
-    partitions= 16;
-    volumes = 15;
-    return 1;
+	other_endian = (sgilabel->magic == SGI_LABEL_MAGIC_SWAPPED);
+	/*
+	 * test for correct checksum
+	 */
+	if (two_s_complement_32bit_sum((unsigned int*)sgilabel,
+				       sizeof(*sgilabel))) {
+		fprintf(stderr,
+			_("Detected sgi disklabel with wrong checksum.\n"));
+	}
+	update_units();
+	sgi_label = 1;
+	partitions= 16;
+	volumes = 15;
+	return 1;
 }
 
 void
-sgi_list_table( int xtra ) {
-    int i, w;
-    int kpi = 0;		/* kernel partition ID */
-    char *type;
+sgi_list_table(int xtra) {
+	int i, w, wd;
+	int kpi = 0;		/* kernel partition ID */
+	char *type;
 
-    w = strlen( disk_device );
+	if (xtra) {
+		printf(_("\nDisk %s (SGI disk label): %d heads, %d sectors\n"
+			 "%d cylinders, %d physical cylinders\n"
+			 "%d extra sects/cyl, interleave %d:1\n"
+			 "%s\n"
+			 "Units = %s of %d * 512 bytes\n\n"),
+		       disk_device, heads, sectors, cylinders,
+		       SSWAP16(sgiparam.pcylcount),
+		       SSWAP16(sgiparam.sparecyl),
+		       SSWAP16(sgiparam.ilfact),
+		       (char *)sgilabel,
+		       str_units(PLURAL), units_per_sector);
+	} else {
+		printf(_("\nDisk %s (SGI disk label): "
+			 "%d heads, %d sectors, %d cylinders\n"
+			 "Units = %s of %d * 512 bytes\n\n"),
+		       disk_device, heads, sectors, cylinders,
+		       str_units(PLURAL), units_per_sector);
+	}
 
-    if( xtra ) {
-	printf(_("\nDisk %s (SGI disk label): %d heads, %d sectors\n"
-	       "%d cylinders, %d physical cylinders\n"
-	       "%d extra sects/cyl, interleave %d:1\n"
-	       "%s\n"
-	       "Units = %s of %d * 512 bytes\n\n"),
-	       disk_device, heads, sectors, cylinders,
-	       SSWAP16(sgiparam.pcylcount),
-	       SSWAP16(sgiparam.sparecyl),
-	       SSWAP16(sgiparam.ilfact),
-	       (char *)sgilabel,
-	       str_units(PLURAL), units_per_sector);
-    } else {
-	printf( _("\nDisk %s (SGI disk label): "
-		"%d heads, %d sectors, %d cylinders\n"
-		"Units = %s of %d * 512 bytes\n\n"),
-	        disk_device, heads, sectors, cylinders,
-	        str_units(PLURAL), units_per_sector );
-    }
-    printf(_("----- partitions -----\n"
-	   "Pt# %*s  Info     Start       End   Sectors  Id  System\n"),
-	   w + 1, _("Device"));
-    for (i = 0 ; i < partitions; i++) {
-	    if( sgi_get_num_sectors(i) || debug ) {
-	    __u32 start = sgi_get_start_sector(i);
-	    __u32 len = sgi_get_num_sectors(i);
-	    kpi++;		/* only count nonempty partitions */
-	    printf(
-		"%2d: %s %4s %9ld %9ld %9ld  %2x  %s\n",
+	w = strlen(disk_device);
+	wd = strlen(_("Device"));
+	if (w < wd)
+		w = wd;
+
+	printf(_("----- partitions -----\n"
+		 "Pt# %*s  Info     Start       End   Sectors  Id  System\n"),
+	       w + 2, _("Device"));
+	for (i = 0 ; i < partitions; i++) {
+		if (sgi_get_num_sectors(i) || debug) {
+			__u32 start = sgi_get_start_sector(i);
+			__u32 len = sgi_get_num_sectors(i);
+			kpi++;		/* only count nonempty partitions */
+			printf(
+				"%2d: %s %4s %9ld %9ld %9ld  %2x  %s\n",
 /* fdisk part number */   i+1,
-/* device */              partname(disk_device, kpi, w+2),
+/* device */              partname(disk_device, kpi, w+3),
 /* flags */               (sgi_get_swappartition() == i) ? "swap" :
 /* flags */               (sgi_get_bootpartition() == i) ? "boot" : "    ", 
 /* start */               (long) scround(start),
@@ -234,96 +238,95 @@
 /* no odd flag on end */  (long) len, 
 /* type id */             sgi_get_sysid(i),
 /* type name */           (type = partition_type(sgi_get_sysid(i)))
-		    ? type : _("Unknown"));
+				? type : _("Unknown"));
+		}
 	}
-    }
-    printf(_("----- Bootinfo -----\nBootfile: %s\n"
-	     "----- Directory Entries -----\n"),
-	   sgilabel->boot_file );
-    for (i = 0 ; i < volumes; i++)
-    {
-	if (sgilabel->directory[i].vol_file_size)
-	{
-	    __u32 start = SSWAP32(sgilabel->directory[i].vol_file_start);
-	    __u32 len = SSWAP32(sgilabel->directory[i].vol_file_size);
-	    char*name = sgilabel->directory[i].vol_file_name;
-	    printf(_("%2d: %-10s sector%5u size%8u\n"),
-		    i, name, (unsigned int) start, (unsigned int) len);
+	printf(_("----- Bootinfo -----\nBootfile: %s\n"
+		 "----- Directory Entries -----\n"),
+	       sgilabel->boot_file);
+	for (i = 0 ; i < volumes; i++) {
+		if (sgilabel->directory[i].vol_file_size) {
+			__u32 start = SSWAP32(sgilabel->directory[i].vol_file_start);
+			__u32 len = SSWAP32(sgilabel->directory[i].vol_file_size);
+			char *name = sgilabel->directory[i].vol_file_name;
+			printf(_("%2d: %-10s sector%5u size%8u\n"),
+			       i, name, (unsigned int) start,
+			       (unsigned int) len);
+		}
 	}
-    }
+}
+
+unsigned int
+sgi_get_start_sector(int i) {
+	return SSWAP32(sgilabel->partitions[i].start_sector);
+}
+
+unsigned int
+sgi_get_num_sectors(int i) {
+	return SSWAP32(sgilabel->partitions[i].num_sectors);
 }
 
 int
-sgi_get_start_sector( int i ) {
-    return SSWAP32(sgilabel->partitions[i].start_sector);
-}
-
-int
-sgi_get_num_sectors( int i ) {
-    return SSWAP32(sgilabel->partitions[i].num_sectors);
-}
-
-int
-sgi_get_sysid( int i )
+sgi_get_sysid(int i)
 {
-    return SSWAP32(sgilabel->partitions[i].id);
+	return SSWAP32(sgilabel->partitions[i].id);
 }
 
 int
 sgi_get_bootpartition(void)
 {
-    return SSWAP16(sgilabel->boot_part);
+	return SSWAP16(sgilabel->boot_part);
 }
 
 int
 sgi_get_swappartition(void)
 {
-    return SSWAP16(sgilabel->swap_part);
+	return SSWAP16(sgilabel->swap_part);
 }
 
 void
-sgi_set_bootpartition( int i )
+sgi_set_bootpartition(int i)
 {
-    sgilabel->boot_part = SSWAP16(((short)i));
+	sgilabel->boot_part = SSWAP16(((short)i));
 }
 
-static int
+static unsigned int
 sgi_get_lastblock(void) {
-    return heads * sectors * cylinders;
+	return heads * sectors * cylinders;
 }
 
 void
-sgi_set_swappartition( int i ) {
-    sgilabel->swap_part = SSWAP16(((short)i));
+sgi_set_swappartition(int i) {
+	sgilabel->swap_part = SSWAP16(((short)i));
 }
 
 static int
-sgi_check_bootfile( const char* aFile ) {
-    if( strlen( aFile ) < 3 ) /* "/a\n" is minimum */
-    {
-	printf( _("\nInvalid Bootfile!\n"
-		"\tThe bootfile must be an absolute non-zero pathname,\n"
-		"\te.g. \"/unix\" or \"/unix.save\".\n") );
-	return 0;
-    } else
-    if( strlen( aFile ) > 16 )
-    {
-	printf( _("\n\tName of Bootfile too long:  16 bytes maximum.\n") );
-	return 0;
-    } else
-    if( aFile[0] != '/' )
-    {
-	printf( _("\n\tBootfile must have a fully qualified pathname.\n") );
-	return 0;
-    }
-    if( strncmp( aFile, sgilabel->boot_file, 16 ) )
-    {
-	printf( _("\n\tBe aware, that the bootfile is not checked for existence.\n\t"
-		"SGI's default is \"/unix\" and for backup \"/unix.save\".\n") );
-	/* filename is correct and did change */
-	return 1;
-    }
-    return 0;	/* filename did not change */
+sgi_check_bootfile(const char* aFile) {
+	if (strlen(aFile) < 3) /* "/a\n" is minimum */ {
+		printf(_("\nInvalid Bootfile!\n"
+			 "\tThe bootfile must be an absolute non-zero pathname,\n"
+			 "\te.g. \"/unix\" or \"/unix.save\".\n"));
+		return 0;
+	} else {
+		if (strlen(aFile) > 16) {
+			printf(_("\n\tName of Bootfile too long:  "
+				 "16 bytes maximum.\n"));
+			return 0;
+		} else {
+			if (aFile[0] != '/') {
+				printf(_("\n\tBootfile must have a "
+					 "fully qualified pathname.\n"));
+				return 0;
+			}
+		}
+	}
+	if (strncmp(aFile, sgilabel->boot_file, 16)) {
+		printf(_("\n\tBe aware, that the bootfile is not checked for existence.\n\t"
+			 "SGI's default is \"/unix\" and for backup \"/unix.save\".\n"));
+		/* filename is correct and did change */
+		return 1;
+	}
+	return 0;	/* filename did not change */
 }
 
 const char *
@@ -332,532 +335,512 @@
 }
 
 void
-sgi_set_bootfile( const char* aFile )
-{
-    int i = 0;
-    if( sgi_check_bootfile( aFile ) )
-    {
-	while( i<16 )
-	{
-	    if( (aFile[i] != '\n')	/* in principle caught again by next line */
-	    &&  (strlen( aFile ) > i ) )
-		sgilabel->boot_file[i] = aFile[i];
-	    else
-		sgilabel->boot_file[i] = 0;
-	    i++;
+sgi_set_bootfile(const char* aFile) {
+	int i = 0;
+
+	if (sgi_check_bootfile(aFile)) {
+		while (i < 16) {
+			if ((aFile[i] != '\n')	/* in principle caught again by next line */
+			    &&  (strlen(aFile) > i))
+				sgilabel->boot_file[i] = aFile[i];
+			else
+				sgilabel->boot_file[i] = 0;
+			i++;
+		}
+		printf(_("\n\tBootfile is changed to \"%s\".\n"),
+		       sgilabel->boot_file);
 	}
-	printf( _("\n\tBootfile is changed to \"%s\".\n"), sgilabel->boot_file );
-    }
 }
 
 void
-create_sgiinfo(void)
-{
-    /* I keep SGI's habit to write the sgilabel to the second block */
-    sgilabel->directory[0].vol_file_start = SSWAP32( 2 );
-    sgilabel->directory[0].vol_file_size = SSWAP32( sizeof( sgiinfo ) );
-    strncpy( sgilabel->directory[0].vol_file_name, "sgilabel", 8 );
+create_sgiinfo(void) {
+	/* I keep SGI's habit to write the sgilabel to the second block */
+	sgilabel->directory[0].vol_file_start = SSWAP32(2);
+	sgilabel->directory[0].vol_file_size = SSWAP32(sizeof(sgiinfo));
+	strncpy(sgilabel->directory[0].vol_file_name, "sgilabel", 8);
 }
 
-sgiinfo * fill_sgiinfo(void);
+sgiinfo *fill_sgiinfo(void);
 
 void
-sgi_write_table(void)
-{
-    sgilabel->csum = 0;
-    sgilabel->csum = SSWAP32( two_s_complement_32bit_sum(
-				 (unsigned int*)sgilabel, 
-				 sizeof(*sgilabel) ) );
-    assert( two_s_complement_32bit_sum(
-	    (unsigned int*)sgilabel, sizeof(*sgilabel) ) == 0 );
-    if( lseek(fd, 0, SEEK_SET) < 0 )
-	fatal(unable_to_seek);
-    if( write(fd, sgilabel, SECTOR_SIZE) != SECTOR_SIZE )
-	fatal(unable_to_write);
-    if( ! strncmp( sgilabel->directory[0].vol_file_name, "sgilabel",8 ) )
-    {
-	/*
-	 * keep this habbit of first writing the "sgilabel".
-	 * I never tested whether it works without (AN 981002).
-	 */
-	sgiinfo*info = fill_sgiinfo();	/* fills the block appropriately */
-	int infostartblock = SSWAP32( sgilabel->directory[0].vol_file_start );
-	if( ext2_llseek(fd, (ext2_loff_t)infostartblock*
-	    SECTOR_SIZE, SEEK_SET) < 0 )
-	    fatal(unable_to_seek);
-	if( write(fd, info, SECTOR_SIZE) != SECTOR_SIZE )
-	    fatal(unable_to_write);
-	free( info );
-    }
+sgi_write_table(void) {
+	sgilabel->csum = 0;
+	sgilabel->csum = SSWAP32(two_s_complement_32bit_sum(
+		(unsigned int*)sgilabel, 
+		sizeof(*sgilabel)));
+	assert(two_s_complement_32bit_sum(
+		(unsigned int*)sgilabel, sizeof(*sgilabel)) == 0);
+	if (lseek(fd, 0, SEEK_SET) < 0)
+		fatal(unable_to_seek);
+	if (write(fd, sgilabel, SECTOR_SIZE) != SECTOR_SIZE)
+		fatal(unable_to_write);
+	if (! strncmp(sgilabel->directory[0].vol_file_name, "sgilabel", 8)) {
+		/*
+		 * keep this habit of first writing the "sgilabel".
+		 * I never tested whether it works without (AN 981002).
+		 */
+		sgiinfo *info = fill_sgiinfo();
+		int infostartblock = SSWAP32(sgilabel->directory[0].vol_file_start);
+		if (ext2_llseek(fd, (long long)infostartblock*
+				SECTOR_SIZE, SEEK_SET) < 0)
+			fatal(unable_to_seek);
+		if (write(fd, info, SECTOR_SIZE) != SECTOR_SIZE)
+			fatal(unable_to_write);
+		free(info);
+	}
 }
 
 static int
-compare_start( int *x, int *y ) {
-    /*
-     * sort according to start sectors
-     * and prefers largest partition:
-     * entry zero is entire disk entry
-     */
-    int i = *x;
-    int j = *y;
-    int a = sgi_get_start_sector(i);
-    int b = sgi_get_start_sector(j);
-    int c = sgi_get_num_sectors(i);
-    int d = sgi_get_num_sectors(j);
-    if( a == b )
-    {
-	return( d - c );
-    }
-    return( a - b );
+compare_start(int *x, int *y) {
+	/*
+	 * sort according to start sectors
+	 * and prefers largest partition:
+	 * entry zero is entire disk entry
+	 */
+	unsigned int i = *x;
+	unsigned int j = *y;
+	unsigned int a = sgi_get_start_sector(i);
+	unsigned int b = sgi_get_start_sector(j);
+	unsigned int c = sgi_get_num_sectors(i);
+	unsigned int d = sgi_get_num_sectors(j);
+
+	if (a == b)
+		return (d > c) ? 1 : (d == c) ? 0 : -1;
+	return (a > b) ? 1 : -1;
 }
 
 static int
 sgi_gaps(void) {
-    /*
-     * returned value is:
-     *  = 0 : disk is properly filled to the rim
-     *  < 0 : there is an overlap
-     *  > 0 : there is still some vacant space
-     */
-    return verify_sgi(0);
+	/*
+	 * returned value is:
+	 *  = 0 : disk is properly filled to the rim
+	 *  < 0 : there is an overlap
+	 *  > 0 : there is still some vacant space
+	 */
+	return verify_sgi(0);
 }
 
 int
-verify_sgi( int verbose )
+verify_sgi(int verbose)
 {
-    int Index[16];	/* list of valid partitions */
-    int sortcount = 0;	/* number of used partitions, i.e. non-zero lengths */
-    int entire = 0, i = 0;	/* local counters */
-    int start = 0;
-    int gap = 0;	/* count unused blocks */
-    int lastblock = sgi_get_lastblock();
-    /*
-     */
-    clearfreelist();
-    for( i=0; i<16; i++ )
-    {
-	if( sgi_get_num_sectors(i)!=0 )
-	{
-	    Index[sortcount++]=i;
-	    if( sgi_get_sysid(i) == ENTIRE_DISK )
-	    {
-		if( entire++ == 1 )
-		{
-		    if(verbose)
-			printf(_("More than one entire disk entry present.\n"));
+	int Index[16];		/* list of valid partitions */
+	int sortcount = 0;	/* number of used partitions, i.e. non-zero lengths */
+	int entire = 0, i = 0;
+	unsigned int start = 0;
+	long long gap = 0;	/* count unused blocks */
+	unsigned int lastblock = sgi_get_lastblock();
+
+	clearfreelist();
+	for (i=0; i<16; i++) {
+		if (sgi_get_num_sectors(i) != 0) {
+			Index[sortcount++]=i;
+			if (sgi_get_sysid(i) == ENTIRE_DISK) {
+				if (entire++ == 1) {
+					if (verbose)
+						printf(_("More than one entire disk entry present.\n"));
+				}
+			}
 		}
-	    }
 	}
-    }
-    if( sortcount == 0 )
-    {
-	if(verbose)
-	    printf(_("No partitions defined\n"));
-        return lastblock;
-    }
-    qsort( Index, sortcount, sizeof(Index[0]), (void*)compare_start );
-    if( sgi_get_sysid( Index[0] ) == ENTIRE_DISK )
-    {
-	if( ( Index[0] != 10 ) && verbose )
-	    printf( _("IRIX likes when Partition 11 covers the entire disk.\n") );
-	if( ( sgi_get_start_sector( Index[0] ) != 0 ) && verbose )
-	    printf( _("The entire disk partition should start at block 0,\nnot "
-		    "at diskblock %d.\n"), sgi_get_start_sector(Index[0] ) );
-    if(debug)	/* I do not understand how some disks fulfil it */
-	if( ( sgi_get_num_sectors( Index[0] ) != lastblock ) && verbose )
-	    printf( _("The entire disk partition is only %d diskblock large,\n"
-		    "but the disk is %d diskblocks long.\n"),
-		    sgi_get_num_sectors( Index[0] ), lastblock );
-	lastblock = sgi_get_num_sectors( Index[0] );
-    } else
-    {
-	if( verbose )
-	    printf( _("One Partition (#11) should cover the entire disk.\n") );
-	if(debug>2)
-	    printf( "sysid=%d\tpartition=%d\n",
-			sgi_get_sysid( Index[0] ), Index[0]+1 );
-    }
-    for( i=1, start=0; i<sortcount; i++ )
-    {
-	int cylsize = sgi_get_nsect() * sgi_get_ntrks();
-	if( (sgi_get_start_sector( Index[i] ) % cylsize) != 0 )
-	{
-	if(debug)	/* I do not understand how some disks fulfil it */
-	    if( verbose )
-		printf( _("Partition %d does not start on cylinder boundary.\n"),
-			Index[i]+1 );
+	if (sortcount == 0) {
+		if (verbose)
+			printf(_("No partitions defined\n"));
+		return (lastblock > 0) ? 1 : (lastblock == 0) ? 0 : -1;
 	}
-	if( sgi_get_num_sectors( Index[i] ) % cylsize != 0 )
-	{
-	if(debug)	/* I do not understand how some disks fulfil it */
-	    if( verbose )
-		printf( _("Partition %d does not end on cylinder boundary.\n"),
-			Index[i]+1 );
+	qsort(Index, sortcount, sizeof(Index[0]), (void*)compare_start);
+	if (sgi_get_sysid(Index[0]) == ENTIRE_DISK) {
+		if ((Index[0] != 10) && verbose)
+			printf(_("IRIX likes when Partition 11 covers the entire disk.\n"));
+		if ((sgi_get_start_sector(Index[0]) != 0) && verbose)
+			printf(_("The entire disk partition should start "
+				 "at block 0,\n"
+				 "not at diskblock %d.\n"),
+			       sgi_get_start_sector(Index[0]));
+		if (debug)	/* I do not understand how some disks fulfil it */
+			if ((sgi_get_num_sectors(Index[0]) != lastblock) && verbose)
+				printf(_("The entire disk partition is only %d diskblock large,\n"
+					 "but the disk is %d diskblocks long.\n"),
+				       sgi_get_num_sectors(Index[0]), lastblock);
+		lastblock = sgi_get_num_sectors(Index[0]);
+	} else {
+		if (verbose)
+			printf(_("One Partition (#11) should cover the entire disk.\n"));
+		if (debug>2)
+			printf("sysid=%d\tpartition=%d\n",
+			       sgi_get_sysid(Index[0]), Index[0]+1);
 	}
-	/* We cannot handle several "entire disk" entries. */
-	if( sgi_get_sysid( Index[i] ) == ENTIRE_DISK ) continue;
-	if( start > sgi_get_start_sector( Index[i] ) )
-	{
-	    if( verbose )
-		printf( _("The Partition %d and %d overlap by %d sectors.\n"),
-			Index[i-1]+1, Index[i]+1,
-			start - sgi_get_start_sector( Index[i] ) );
-	    if( gap >  0 ) gap = -gap;
-	    if( gap == 0 ) gap = -1;
+	for (i=1, start=0; i<sortcount; i++) {
+		int cylsize = sgi_get_nsect() * sgi_get_ntrks();
+		if ((sgi_get_start_sector(Index[i]) % cylsize) != 0) {
+			if (debug)	/* I do not understand how some disks fulfil it */
+				if (verbose)
+					printf(_("Partition %d does not start on cylinder boundary.\n"),
+					       Index[i]+1);
+		}
+		if (sgi_get_num_sectors(Index[i]) % cylsize != 0) {
+			if (debug)	/* I do not understand how some disks fulfil it */
+				if (verbose)
+					printf(_("Partition %d does not end on cylinder boundary.\n"),
+					       Index[i]+1);
+		}
+		/* We cannot handle several "entire disk" entries. */
+		if (sgi_get_sysid(Index[i]) == ENTIRE_DISK) continue;
+		if (start > sgi_get_start_sector(Index[i])) {
+			if (verbose)
+				printf(_("The Partition %d and %d overlap by %d sectors.\n"),
+				       Index[i-1]+1, Index[i]+1,
+				       start - sgi_get_start_sector(Index[i]));
+			if (gap >  0) gap = -gap;
+			if (gap == 0) gap = -1;
+		}
+		if (start < sgi_get_start_sector(Index[i])) {
+			if (verbose)
+				printf(_("Unused gap of %8u sectors - sectors %8u-%u\n"),
+				       sgi_get_start_sector(Index[i]) - start,
+				       start, sgi_get_start_sector(Index[i])-1);
+			gap += sgi_get_start_sector(Index[i]) - start;
+			add2freelist(start, sgi_get_start_sector(Index[i]));
+		}
+		start = sgi_get_start_sector(Index[i])
+			+ sgi_get_num_sectors(Index[i]);
+		if (debug > 1) {
+			if (verbose)
+				printf("%2d:%12d\t%12d\t%12d\n", Index[i],
+				       sgi_get_start_sector(Index[i]),
+				       sgi_get_num_sectors(Index[i]),
+				       sgi_get_sysid(Index[i]));
+		}
 	}
-	if( start < sgi_get_start_sector( Index[i] ) )
-	{
-	    if( verbose )
-		printf( _("Unused gap of %8d sectors - sectors %8d-%d\n"),
-			sgi_get_start_sector( Index[i] ) - start,
-			start, sgi_get_start_sector( Index[i] )-1 );
-	    gap += sgi_get_start_sector( Index[i] ) - start;
-	    add2freelist( start, sgi_get_start_sector( Index[i] ) );
+	if (start < lastblock) {
+		if (verbose)
+			printf(_("Unused gap of %8u sectors - sectors %8u-%u\n"),
+			       lastblock - start, start, lastblock-1);
+		gap += lastblock - start;
+		add2freelist(start, lastblock);
 	}
-	start = sgi_get_start_sector( Index[i] )
-	      + sgi_get_num_sectors(  Index[i] );
-	if(debug>1)
-	{
-	    if( verbose )
-		printf( "%2d:%12d\t%12d\t%12d\n", Index[i],
-			sgi_get_start_sector(Index[i]),
-			sgi_get_num_sectors(Index[i]),
-			sgi_get_sysid(Index[i]) );
+	/*
+	 * Done with arithmetics
+	 * Go for details now
+	 */
+	if (verbose) {
+		if (!sgi_get_num_sectors(sgi_get_bootpartition())) {
+			printf(_("\nThe boot partition does not exist.\n"));
+		}
+		if (!sgi_get_num_sectors(sgi_get_swappartition())) {
+			printf(_("\nThe swap partition does not exist.\n"));
+		} else {
+			if ((sgi_get_sysid(sgi_get_swappartition()) != SGI_SWAP)
+			    &&  (sgi_get_sysid(sgi_get_swappartition()) != LINUX_SWAP))
+				printf(_("\nThe swap partition has no swap type.\n"));
+		}
+		if (sgi_check_bootfile("/unix"))
+			printf(_("\tYou have chosen an unusual boot file name.\n"));
 	}
-    }
-    if( ( start < lastblock ) )
-    {
-	if( verbose )
-	    printf( _("Unused gap of %8d sectors - sectors %8d-%d\n"),
-		    lastblock - start, start, lastblock-1 );
-	gap += lastblock - start;
-	add2freelist( start, lastblock );
-    }
-    /*
-     * Done with arithmetics
-     * Go for details now
-     */
-    if( verbose )
-    {
-	if( !sgi_get_num_sectors( sgi_get_bootpartition() ) )
-	{
-	    printf( _("\nThe boot partition does not exist.\n") );
-	}
-	if( !sgi_get_num_sectors( sgi_get_swappartition() ) )
-	{
-	    printf( _("\nThe swap partition does not exist.\n") );
-	} else
-	if( ( sgi_get_sysid( sgi_get_swappartition() ) != SGI_SWAP )
-	&&  ( sgi_get_sysid( sgi_get_swappartition() ) != LINUX_SWAP ) )
-	{
-	    printf( _("\nThe swap partition has no swap type.\n") );
-	}
-	if( sgi_check_bootfile( "/unix" ) )
-	{
-	    printf( _("\tYou have chosen an unusual boot file name.\n") );
-	}
-    }
-    return gap;
+	return (gap > 0) ? 1 : (gap == 0) ? 0 : -1;
 }
 
 void
-sgi_change_sysid( int i, int sys )
+sgi_change_sysid(int i, int sys)
 {
-    if( sgi_get_num_sectors(i) == 0 ) /* caught already before, ... */
-    {
-	printf(_("Sorry You may change the Tag of non-empty partitions.\n"));
-	return;
-    }
-    if( ((sys != ENTIRE_DISK ) && (sys != SGI_VOLHDR))
-     && (sgi_get_start_sector(i)<1) )
-    {
-	read_chars(
-	_("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"));
-	if (strcmp (line_ptr, _("YES\n")))
-                    return;
-    }
-    sgilabel->partitions[i].id = SSWAP32(sys);
+	if (sgi_get_num_sectors(i) == 0) /* caught already before, ... */ {
+		printf(_("Sorry You may change the Tag of non-empty partitions.\n"));
+		return;
+	}
+	if (((sys != ENTIRE_DISK) && (sys != SGI_VOLHDR))
+	    && (sgi_get_start_sector(i)<1)) {
+		read_chars(
+			_("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"));
+		if (strcmp (line_ptr, _("YES\n")))
+			return;
+	}
+	sgilabel->partitions[i].id = SSWAP32(sys);
 }
 
 /* returns partition index of first entry marked as entire disk */
 static int
 sgi_entire(void) {
-    int i=0;
-    for( i=0; i<16; i++ )
-	if( sgi_get_sysid(i) == SGI_VOLUME )
-	    return i;
-    return -1;
+	int i;
+
+	for (i=0; i<16; i++)
+		if (sgi_get_sysid(i) == SGI_VOLUME)
+			return i;
+	return -1;
 }
 
 static void
-sgi_set_partition( int i, uint start, uint length, int sys ) {
-    sgilabel->partitions[i].id =
-	    SSWAP32( sys );
-    sgilabel->partitions[i].num_sectors =
-	    SSWAP32( length );
-    sgilabel->partitions[i].start_sector =
-	    SSWAP32( start );
-    set_changed(i);
-    if( sgi_gaps() < 0 )	/* rebuild freelist */
-	printf(_("Do You know, You got a partition overlap on the disk?\n"));
+sgi_set_partition(int i, unsigned int start, unsigned int length, int sys) {
+	sgilabel->partitions[i].id = SSWAP32(sys);
+	sgilabel->partitions[i].num_sectors = SSWAP32(length);
+	sgilabel->partitions[i].start_sector = SSWAP32(start);
+	set_changed(i);
+	if (sgi_gaps() < 0)	/* rebuild freelist */
+		printf(_("Do You know, You got a partition overlap on the disk?\n"));
 }
 
 static void
 sgi_set_entire(void) {
-    int n;
-    for( n=10; n<partitions; n++ ) {
-	if(!sgi_get_num_sectors( n ) ) {
-	    sgi_set_partition( n, 0, sgi_get_lastblock(), SGI_VOLUME );
-	    break;
+	int n;
+
+	for (n=10; n<partitions; n++) {
+		if (!sgi_get_num_sectors(n)) {
+			sgi_set_partition(n, 0, sgi_get_lastblock(), SGI_VOLUME);
+			break;
+		}
 	}
-    }
 }
 
 static
 void
 sgi_set_volhdr(void)
 {
-    int n;
-    for( n=8; n<partitions; n++ )
-    {
-	if(!sgi_get_num_sectors( n ) )
-	{
-	    /*
-	     * 5 cylinders is an arbitrary value I like
-	     * IRIX 5.3 stored files in the volume header
-	     * (like sash, symmon, fx, ide) with ca. 3200
-	     * sectors.
-	     */
-	    if( heads * sectors * 5 < sgi_get_lastblock() )
-		sgi_set_partition( n, 0, heads * sectors * 5, SGI_VOLHDR );
-	    break;
+	int n;
+
+	for (n=8; n<partitions; n++) {
+		if (!sgi_get_num_sectors(n)) {
+			/*
+			 * 5 cylinders is an arbitrary value I like
+			 * IRIX 5.3 stored files in the volume header
+			 * (like sash, symmon, fx, ide) with ca. 3200
+			 * sectors.
+			 */
+			if (heads * sectors * 5 < sgi_get_lastblock())
+				sgi_set_partition(n, 0, heads * sectors * 5, SGI_VOLHDR);
+			break;
+		}
 	}
-    }
 }
 
 void
-sgi_delete_partition( int i )
+sgi_delete_partition(int i)
 {
-    sgi_set_partition( i, 0, 0, 0 );
+	sgi_set_partition(i, 0, 0, 0);
 }
 
 void
-sgi_add_partition( int n, int sys )
+sgi_add_partition(int n, int sys)
 {
-    char mesg[256];
-    int first=0, last=0;
+	char mesg[256];
+	unsigned int first=0, last=0;
 
-    if( n == 10 ) {
-	sys = SGI_VOLUME;
-    } else if ( n == 8 ) {
-	sys = 0;
-    }
-    if( sgi_get_num_sectors(n) )
-    {
-	printf(_("Partition %d is already defined.  Delete "
-		"it before re-adding it.\n"), n + 1);
-	return;
-    }
-    if( (sgi_entire() == -1)
-    &&  (sys != SGI_VOLUME) )
-    {
-	printf(_("Attempting to generate entire disk entry automatically.\n"));
-	sgi_set_entire();
-	sgi_set_volhdr();
-    }
-    if( (sgi_gaps() == 0)
-    &&  (sys != SGI_VOLUME) )
-    {
-	printf(_("The entire disk is already covered with partitions.\n"));
-	return;
-    }
-    if( sgi_gaps() < 0 )
-    {
-	printf(_("You got a partition overlap on the disk. Fix it first!\n"));
-	return;
-    }
-    snprintf(mesg, sizeof(mesg), _("First %s"), str_units(SINGULAR));
-    for(;;) {
-	if(sys == SGI_VOLUME) {
-	    last = sgi_get_lastblock();
-	    first = read_int(0, 0, last-1, 0, mesg);
-	    if( first != 0 ) {
-		printf(_("It is highly recommended that eleventh partition\n"
-		       "covers the entire disk and is of type `SGI volume'\n"));
-	    }
-	} else {
-	    first = freelist[0].first;
-	    last  = freelist[0].last;
-	    first = read_int(scround(first), scround(first), scround(last)-1,
-			     0, mesg);
+	if (n == 10) {
+		sys = SGI_VOLUME;
+	} else if (n == 8) {
+		sys = 0;
 	}
+	if (sgi_get_num_sectors(n)) {
+		printf(_("Partition %d is already defined.  Delete "
+			 "it before re-adding it.\n"), n + 1);
+		return;
+	}
+	if ((sgi_entire() == -1)
+	    &&  (sys != SGI_VOLUME)) {
+		printf(_("Attempting to generate entire disk entry automatically.\n"));
+		sgi_set_entire();
+		sgi_set_volhdr();
+	}
+	if ((sgi_gaps() == 0) &&  (sys != SGI_VOLUME)) {
+		printf(_("The entire disk is already covered with partitions.\n"));
+		return;
+	}
+	if (sgi_gaps() < 0) {
+		printf(_("You got a partition overlap on the disk. Fix it first!\n"));
+		return;
+	}
+	snprintf(mesg, sizeof(mesg), _("First %s"), str_units(SINGULAR));
+	for (;;) {
+		if (sys == SGI_VOLUME) {
+			last = sgi_get_lastblock();
+			first = read_int(0, 0, last-1, 0, mesg);
+			if (first != 0) {
+				printf(_("It is highly recommended that eleventh partition\n"
+					 "covers the entire disk and is of type `SGI volume'\n"));
+			}
+		} else {
+			first = freelist[0].first;
+			last  = freelist[0].last;
+			first = read_int(scround(first), scround(first), scround(last)-1,
+					 0, mesg);
+		}
+		if (display_in_cyl_units)
+			first *= units_per_sector;
+		else
+			first = first; /* align to cylinder if you know how ... */
+		if (!last)
+			last = isinfreelist(first);
+		if (last == 0) {
+			printf(_("You will get a partition overlap on the disk. "
+				 "Fix it first!\n"));
+		} else
+			break;
+	}
+	snprintf(mesg, sizeof(mesg), _(" Last %s"), str_units(SINGULAR));
+	last = read_int(scround(first), scround(last)-1, scround(last)-1,
+			scround(first), mesg)+1;
 	if (display_in_cyl_units)
-	    first *= units_per_sector;
-	else
-	    first = first; /* align to cylinder if you know how ... */
-	if( !last )
-	    last = isinfreelist(first);
-	if( last == 0 ) {
-	    printf(_("You will get a partition overlap on the disk. "
-		    "Fix it first!\n"));
-	} else
-	    break;
-    }
-    snprintf(mesg, sizeof(mesg), _(" Last %s"), str_units(SINGULAR));
-    last = read_int(scround(first), scround(last)-1, scround(last)-1,
-		    scround(first), mesg)+1;
-    if (display_in_cyl_units)
-	last *= units_per_sector;                                     
-    else                                                             
-	last = last; /* align to cylinder if You know how ... */
-    if( (sys == SGI_VOLUME) && ( first != 0 || last != sgi_get_lastblock() ) )
-	printf(_("It is highly recommended that eleventh partition\n"
-		"covers the entire disk and is of type `SGI volume'\n"));
-    sgi_set_partition( n, first, last-first, sys );
+		last *= units_per_sector;                                     
+	else                                                             
+		last = last; /* align to cylinder if You know how ... */
+	if ((sys == SGI_VOLUME) && (first != 0 || last != sgi_get_lastblock()))
+		printf(_("It is highly recommended that eleventh partition\n"
+			 "covers the entire disk and is of type `SGI volume'\n"));
+	sgi_set_partition(n, first, last-first, sys);
 }
 
 void
 create_sgilabel(void)
 {
-    struct hd_geometry geometry;
-    struct { int start;
-	     int nsect;
-	     int sysid; } old[4];
-    int i=0;
-    fprintf( stderr,
-	_("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"));
+	struct hd_geometry geometry;
+	struct {
+		unsigned int start;
+		unsigned int nsect;
+		int sysid;
+	} old[4];
+	int i=0;
+	long longsectors;	/* the number of sectors on the device */
+	int res; 			/* the result from the ioctl */
+	int sec_fac; 		/* the sector factor */
 
-    other_endian = (BYTE_ORDER == LITTLE_ENDIAN);
+	sec_fac = sector_size / 512;	/* determine the sector factor */
 
-#ifdef HDIO_REQ
-    if (!ioctl(fd, HDIO_REQ, &geometry))
-#else
-    if (!ioctl(fd, HDIO_GETGEO, &geometry))
-#endif
-    {
-	heads = geometry.heads;
-	sectors = geometry.sectors;
-	cylinders = geometry.cylinders;
-    }
-    for (i = 0; i < 4; i++)
-    {
-	old[i].sysid = 0;
-	if( valid_part_table_flag(MBRbuffer) )
-	{
-	    if( get_part_table(i)->sys_ind )
-	    {
-		old[i].sysid = get_part_table(i)->sys_ind;
-		old[i].start = get_start_sect( get_part_table(i) );
-		old[i].nsect = get_nr_sects( get_part_table(i) );
-		printf( _("Trying to keep parameters of partition %d.\n"), i );
-		if( debug )
-		    printf( _("ID=%02x\tSTART=%d\tLENGTH=%d\n"),
-			    old[i].sysid, old[i].start, old[i].nsect );
-	    }
+	fprintf(stderr,
+		_("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"));
+
+	other_endian = (BYTE_ORDER == LITTLE_ENDIAN);
+
+	res = ioctl(fd, BLKGETSIZE, &longsectors);
+
+	if (!ioctl(fd, HDIO_GETGEO, &geometry)) {
+		heads = geometry.heads;
+		sectors = geometry.sectors;
+		if (res == 0) {
+			/* the get device size ioctl was successful */
+			cylinders = longsectors / (heads * sectors);
+			cylinders /= sec_fac;
+		} else {
+			/* otherwise print error and use truncated version */
+			cylinders = geometry.cylinders;
+			fprintf(stderr,
+				_("Warning:  BLKGETSIZE ioctl failed on %s.  "
+				  "Using geometry cylinder value of %d.\n"
+				  "This value may be truncated for devices"
+				  " > 33.8 GB.\n"), disk_device, cylinders);
+		}
 	}
-    }
-    memset(MBRbuffer, 0, sizeof(MBRbuffer));
-    sgilabel->magic = SSWAP32(SGI_LABEL_MAGIC);
-    sgilabel->boot_part = SSWAP16(0);
-    sgilabel->swap_part = SSWAP16(1);
-
-    /* sizeof(sgilabel->boot_file) = 16 > 6 */
-    memset(sgilabel->boot_file, 0, 16);
-    strcpy(sgilabel->boot_file, "/unix");
-
-    sgilabel->devparam.skew			= (0);
-    sgilabel->devparam.gap1			= (0);
-    sgilabel->devparam.gap2			= (0);
-    sgilabel->devparam.sparecyl			= (0);
-    sgilabel->devparam.pcylcount		= SSWAP16(geometry.cylinders);
-    sgilabel->devparam.head_vol0		= SSWAP16(0);
-    sgilabel->devparam.ntrks			= SSWAP16(geometry.heads);
-						/* tracks/cylinder (heads) */
-    sgilabel->devparam.cmd_tag_queue_depth	= (0);
-    sgilabel->devparam.unused0			= (0);
-    sgilabel->devparam.unused1			= SSWAP16(0);
-    sgilabel->devparam.nsect			= SSWAP16(geometry.sectors);
-						/* sectors/track */
-    sgilabel->devparam.bytes			= SSWAP16(512);
-    sgilabel->devparam.ilfact			= SSWAP16(1);
-    sgilabel->devparam.flags			= SSWAP32(TRACK_FWD|\
-							IGNORE_ERRORS|RESEEK);
-    sgilabel->devparam.datarate			= SSWAP32(0);
-    sgilabel->devparam.retries_on_error		= SSWAP32(1);
-    sgilabel->devparam.ms_per_word		= SSWAP32(0);
-    sgilabel->devparam.xylogics_gap1		= SSWAP16(0);
-    sgilabel->devparam.xylogics_syncdelay	= SSWAP16(0);
-    sgilabel->devparam.xylogics_readdelay	= SSWAP16(0);
-    sgilabel->devparam.xylogics_gap2		= SSWAP16(0);
-    sgilabel->devparam.xylogics_readgate	= SSWAP16(0);
-    sgilabel->devparam.xylogics_writecont	= SSWAP16(0);
-    memset( &(sgilabel->directory), 0, sizeof(struct volume_directory)*15 );
-    memset( &(sgilabel->partitions), 0, sizeof(struct sgi_partition)*16 );
-    sgi_label  =  1;
-    partitions = 16;
-    volumes    = 15;
-    sgi_set_entire();
-    sgi_set_volhdr();
-    for (i = 0; i < 4; i++)
-    {
-	if( old[i].sysid )
-	{
-	    sgi_set_partition( i, old[i].start, old[i].nsect, old[i].sysid );
+	for (i = 0; i < 4; i++) {
+		old[i].sysid = 0;
+		if (valid_part_table_flag(MBRbuffer)) {
+			if (get_part_table(i)->sys_ind) {
+				old[i].sysid = get_part_table(i)->sys_ind;
+				old[i].start = get_start_sect(get_part_table(i));
+				old[i].nsect = get_nr_sects(get_part_table(i));
+				printf(_("Trying to keep parameters of partition %d.\n"), i);
+				if (debug)
+					printf(_("ID=%02x\tSTART=%d\tLENGTH=%d\n"),
+					       old[i].sysid, old[i].start, old[i].nsect);
+			}
+		}
 	}
-    }
+
+	memset(MBRbuffer, 0, sizeof(MBRbuffer));
+	sgilabel->magic = SSWAP32(SGI_LABEL_MAGIC);
+	sgilabel->boot_part = SSWAP16(0);
+	sgilabel->swap_part = SSWAP16(1);
+
+	/* sizeof(sgilabel->boot_file) = 16 > 6 */
+	memset(sgilabel->boot_file, 0, 16);
+	strcpy(sgilabel->boot_file, "/unix");
+
+	sgilabel->devparam.skew			= (0);
+	sgilabel->devparam.gap1			= (0);
+	sgilabel->devparam.gap2			= (0);
+	sgilabel->devparam.sparecyl			= (0);
+	sgilabel->devparam.pcylcount		= SSWAP16(geometry.cylinders);
+	sgilabel->devparam.head_vol0		= SSWAP16(0);
+	sgilabel->devparam.ntrks			= SSWAP16(geometry.heads);
+	/* tracks/cylinder (heads) */
+	sgilabel->devparam.cmd_tag_queue_depth	= (0);
+	sgilabel->devparam.unused0			= (0);
+	sgilabel->devparam.unused1			= SSWAP16(0);
+	sgilabel->devparam.nsect			= SSWAP16(geometry.sectors);
+	/* sectors/track */
+	sgilabel->devparam.bytes			= SSWAP16(512);
+	sgilabel->devparam.ilfact			= SSWAP16(1);
+	sgilabel->devparam.flags			= SSWAP32(TRACK_FWD|\
+								  IGNORE_ERRORS|RESEEK);
+	sgilabel->devparam.datarate			= SSWAP32(0);
+	sgilabel->devparam.retries_on_error		= SSWAP32(1);
+	sgilabel->devparam.ms_per_word		= SSWAP32(0);
+	sgilabel->devparam.xylogics_gap1		= SSWAP16(0);
+	sgilabel->devparam.xylogics_syncdelay	= SSWAP16(0);
+	sgilabel->devparam.xylogics_readdelay	= SSWAP16(0);
+	sgilabel->devparam.xylogics_gap2		= SSWAP16(0);
+	sgilabel->devparam.xylogics_readgate	= SSWAP16(0);
+	sgilabel->devparam.xylogics_writecont	= SSWAP16(0);
+	memset(&(sgilabel->directory), 0, sizeof(struct volume_directory)*15);
+	memset(&(sgilabel->partitions), 0, sizeof(struct sgi_partition)*16);
+	sgi_label  =  1;
+	partitions = 16;
+	volumes    = 15;
+	sgi_set_entire();
+	sgi_set_volhdr();
+	for (i = 0; i < 4; i++) {
+		if (old[i].sysid) {
+			sgi_set_partition(i, old[i].start, old[i].nsect, old[i].sysid);
+		}
+	}
 }
 
 void
 sgi_set_ilfact(void)
 {
-    /* do nothing in the beginning */
+	/* do nothing in the beginning */
 }
 
 void
 sgi_set_rspeed(void)
 {
-    /* do nothing in the beginning */
+	/* do nothing in the beginning */
 }
 
 void
 sgi_set_pcylcount(void)
 {
-    /* do nothing in the beginning */
+	/* do nothing in the beginning */
 }
 
 void
 sgi_set_xcyl(void)
 {
-    /* do nothing in the beginning */
+	/* do nothing in the beginning */
 }
 
 void
 sgi_set_ncyl(void)
 {
-    /* do nothing in the beginning */
+	/* do nothing in the beginning */
 }
 
 /* _____________________________________________________________
  */
 
-sgiinfo*
+sgiinfo *
 fill_sgiinfo(void)
 {
-    sgiinfo*info=calloc( 1, sizeof(sgiinfo) );
-    info->magic=SSWAP32(SGI_INFO_MAGIC);
-    info->b1=SSWAP32(-1);
-    info->b2=SSWAP16(-1);
-    info->b3=SSWAP16(1);
-    /* You may want to replace this string !!!!!!! */
-    strcpy( info->scsi_string, "IBM OEM 0662S12         3 30" );
-    strcpy( info->serial, "0000" );
-    info->check1816 = SSWAP16(18*256 +16 );
-    strcpy( info->installer, "Sfx version 5.3, Oct 18, 1994" );
-    return info;
+	sgiinfo*info=calloc(1, sizeof(sgiinfo));
+	info->magic=SSWAP32(SGI_INFO_MAGIC);
+	info->b1=SSWAP32(-1);
+	info->b2=SSWAP16(-1);
+	info->b3=SSWAP16(1);
+	/* You may want to replace this string !!!!!!! */
+	strcpy(info->scsi_string, "IBM OEM 0662S12         3 30");
+	strcpy(info->serial, "0000");
+	info->check1816 = SSWAP16(18*256 +16);
+	strcpy(info->installer, "Sfx version 5.3, Oct 18, 1994");
+	return info;
 }
diff --git a/fdisk/fdisksgilabel.h b/fdisk/fdisksgilabel.h
index cdad01a..a230196 100644
--- a/fdisk/fdisksgilabel.h
+++ b/fdisk/fdisksgilabel.h
@@ -104,7 +104,7 @@
 #define sgilabel ((sgi_partition *)MBRbuffer)
 #define sgiparam (sgilabel->devparam)
 extern char MBRbuffer[MAX_SECTOR_SIZE];
-extern uint heads, sectors, cylinders;
+extern unsigned int heads, sectors, cylinders, sector_size;
 extern int show_begin;
 extern int sgi_label;
 extern char *partition_type(unsigned char type);
@@ -118,8 +118,8 @@
 extern int 	check_sgi_label( void );
 extern void	sgi_list_table( int xtra );
 extern void	sgi_change_sysid( int i, int sys );
-extern int	sgi_get_start_sector( int i );
-extern int	sgi_get_num_sectors( int i );
+extern unsigned int	sgi_get_start_sector( int i );
+extern unsigned int	sgi_get_num_sectors( int i );
 extern int	sgi_get_sysid( int i );
 extern void	sgi_delete_partition( int i );
 extern void	sgi_add_partition( int n, int sys );
diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index 8d6a204..edfe4b9 100644
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
@@ -11,7 +11,7 @@
  */
 
 #include <stdio.h>		/* stderr */
-#include <stdlib.h>		/* uint */
+#include <stdlib.h>		/* qsort */
 #include <string.h>		/* strstr */
 #include <unistd.h>		/* write */
 #include <sys/ioctl.h>		/* ioctl */
@@ -99,7 +99,7 @@
 }
 
 static void
-set_sun_partition(int i, uint start, uint stop, int sysid) {
+set_sun_partition(int i, unsigned int start, unsigned int stop, int sysid) {
 	sunlabel->infos[i].id = sysid;
 	sunlabel->partitions[i].start_cylinder =
 		SSWAP32(start / (heads * sectors));
@@ -296,11 +296,7 @@
 	    }
 	}
 	if (!p || floppy) {
-#ifdef HDIO_REQ
-	    if (!ioctl(fd, HDIO_REQ, &geometry)) {
-#else
 	    if (!ioctl(fd, HDIO_GETGEO, &geometry)) {
-#endif
 	        heads = geometry.heads;
 	        sectors = geometry.sectors;
 	        cylinders = geometry.cylinders;
@@ -396,7 +392,7 @@
 }
 
 static void
-fetch_sun(uint *starts, uint *lens, uint *start, uint *stop) {
+fetch_sun(unsigned int *starts, unsigned int *lens, unsigned int *start, unsigned int *stop) {
 	int i, continuous = 1;
 	*start = 0; *stop = cylinders * heads * sectors;
 	for (i = 0; i < partitions; i++) {
@@ -422,7 +418,7 @@
 	}
 }
 
-static uint *verify_sun_starts;
+static unsigned int *verify_sun_starts;
 
 static int
 verify_sun_cmp(int *a, int *b) {
@@ -434,7 +430,7 @@
 
 void
 verify_sun(void) {
-    uint starts[8], lens[8], start, stop;
+    unsigned int starts[8], lens[8], start, stop;
     int i,j,k,starto,endo;
     int array[8];
 
@@ -496,8 +492,8 @@
 
 void
 add_sun_partition(int n, int sys) {
-	uint start, stop, stop2;
-	uint starts[8], lens[8];
+	unsigned int start, stop, stop2;
+	unsigned int starts[8], lens[8];
 	int whole_disk = 0;
 		
 	char mesg[256];
@@ -606,15 +602,16 @@
 
 void
 sun_delete_partition(int i) {
+	unsigned int nsec;
+
 	if (i == 2 && sunlabel->infos[i].id == WHOLE_DISK && 
 	    !sunlabel->partitions[i].start_cylinder && 
-	    SSWAP32(sunlabel->partitions[i].num_sectors)
+	    (nsec = SSWAP32(sunlabel->partitions[i].num_sectors))
 	      == heads * sectors * cylinders)
 		printf(_("If you want to maintain SunOS/Solaris compatibility, "
 		       "consider leaving this\n"
 		       "partition as Whole disk (5), starting at 0, with %u "
-		       "sectors\n"),
-		       (uint) SSWAP32(sunlabel->partitions[i].num_sectors));
+		       "sectors\n"), nsec);
 	sunlabel->infos[i].id = 0;
 	sunlabel->partitions[i].num_sectors = 0;
 }
diff --git a/fdisk/fdisksunlabel.h b/fdisk/fdisksunlabel.h
index 647a2ce..81bd72c 100644
--- a/fdisk/fdisksunlabel.h
+++ b/fdisk/fdisksunlabel.h
@@ -38,7 +38,7 @@
 				 
 /* fdisk.c */
 extern char MBRbuffer[MAX_SECTOR_SIZE];
-extern uint heads, sectors, cylinders;
+extern unsigned int heads, sectors, cylinders;
 extern int show_begin;
 extern int sun_label;
 extern char *partition_type(unsigned char type);
diff --git a/fdisk/i386_sys_types.c b/fdisk/i386_sys_types.c
index 5ecf2cc..740d2a7 100644
--- a/fdisk/i386_sys_types.c
+++ b/fdisk/i386_sys_types.c
@@ -14,10 +14,10 @@
 	{0x08, N_("AIX")},		/* AIX boot (AIX -- PS/2 port) or SplitDrive */
 	{0x09, N_("AIX bootable")},	/* AIX data or Coherent */
 	{0x0a, N_("OS/2 Boot Manager")},/* OS/2 Boot Manager */
-	{0x0b, N_("Win95 FAT32")},
-	{0x0c, N_("Win95 FAT32 (LBA)")},/* LBA really is `Extended Int 13h' */
-	{0x0e, N_("Win95 FAT16 (LBA)")},
-	{0x0f, N_("Win95 Ext'd (LBA)")},
+	{0x0b, N_("W95 FAT32")},
+	{0x0c, N_("W95 FAT32 (LBA)")},/* LBA really is `Extended Int 13h' */
+	{0x0e, N_("W95 FAT16 (LBA)")},
+	{0x0f, N_("W95 Ext'd (LBA)")},
 	{0x10, N_("OPUS")},
 	{0x11, N_("Hidden FAT12")},
 	{0x12, N_("Compaq diagnostics")},
@@ -25,9 +25,9 @@
 	{0x16, N_("Hidden FAT16")},
 	{0x17, N_("Hidden HPFS/NTFS")},
 	{0x18, N_("AST SmartSleep")},
-	{0x1b, N_("Hidden Win95 FAT32")},
-	{0x1c, N_("Hidden Win95 FAT32 (LBA)")},
-	{0x1e, N_("Hidden Win95 FAT16 (LBA)")},
+	{0x1b, N_("Hidden W95 FAT32")},
+	{0x1c, N_("Hidden W95 FAT32 (LBA)")},
+	{0x1e, N_("Hidden W95 FAT16 (LBA)")},
 	{0x24, N_("NEC DOS")},
 	{0x39, N_("Plan 9")},
 	{0x3c, N_("PartitionMagic recovery")},
diff --git a/fdisk/llseek.c b/fdisk/llseek.c
index 953f2bc..e2e6427 100644
--- a/fdisk/llseek.c
+++ b/fdisk/llseek.c
@@ -10,13 +10,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#if defined(__GNUC__) || defined(HAS_LONG_LONG)
-typedef long long       ext2_loff_t;
-#else
-typedef long            ext2_loff_t;
-#endif
-
-extern ext2_loff_t ext2_llseek (unsigned int, ext2_loff_t, unsigned int);
+extern long long ext2_llseek (unsigned int, long long, unsigned int);
 
 #ifdef __linux__
 
@@ -33,19 +27,19 @@
 #include <linux/unistd.h>	/* for __NR__llseek */
 
 static int _llseek (unsigned int, unsigned long,
-		   unsigned long, ext2_loff_t *, unsigned int);
+		   unsigned long, long long *, unsigned int);
 
 #ifdef __NR__llseek
 
 static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
-		 unsigned long, offset_low,ext2_loff_t *,result,
+		 unsigned long, offset_low,long long *,result,
 		 unsigned int, origin)
 
 #else
 
 /* no __NR__llseek on compilation machine - might give it explicitly */
 static int _llseek (unsigned int fd, unsigned long oh,
-		    unsigned long ol, ext2_loff_t *result,
+		    unsigned long ol, long long *result,
 		    unsigned int origin) {
 	errno = ENOSYS;
 	return -1;
@@ -53,26 +47,26 @@
 
 #endif
 
-static ext2_loff_t my_llseek (unsigned int fd, ext2_loff_t offset,
+static long long my_llseek (unsigned int fd, long long offset,
 		unsigned int origin)
 {
-	ext2_loff_t result;
+	long long result;
 	int retval;
 
 	retval = _llseek (fd, ((unsigned long long) offset) >> 32,
 			((unsigned long long) offset) & 0xffffffff,
 			&result, origin);
-	return (retval == -1 ? (ext2_loff_t) retval : result);
+	return (retval == -1 ? (long long) retval : result);
 }
 
 #endif /* __alpha__ */
 
 #endif	/* HAVE_LLSEEK */
 
-ext2_loff_t ext2_llseek (unsigned int fd, ext2_loff_t offset,
+long long ext2_llseek (unsigned int fd, long long offset,
 			 unsigned int origin)
 {
-	ext2_loff_t result;
+	long long result;
 	static int do_compat = 0;
 
 	if (!do_compat) {
@@ -90,8 +84,8 @@
 		 */
 	}
 
-	if ((sizeof(off_t) >= sizeof(ext2_loff_t)) ||
-	    (offset < ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1))))
+	if ((sizeof(off_t) >= sizeof(long long)) ||
+	    (offset < ((long long) 1 << ((sizeof(off_t)*8) -1))))
 		return lseek(fd, (off_t) offset, origin);
 
 	errno = EINVAL;
@@ -100,11 +94,11 @@
 
 #else /* !linux */
 
-ext2_loff_t ext2_llseek (unsigned int fd, ext2_loff_t offset,
+long long ext2_llseek (unsigned int fd, long long offset,
 			 unsigned int origin)
 {
-	if ((sizeof(off_t) < sizeof(ext2_loff_t)) &&
-	    (offset >= ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1)))) {
+	if ((sizeof(off_t) < sizeof(long long)) &&
+	    (offset >= ((long long) 1 << ((sizeof(off_t)*8) -1)))) {
 		errno = EINVAL;
 		return -1;
 	}
diff --git a/fdisk/sfdisk.8 b/fdisk/sfdisk.8
index 4947e2c..8fe8448 100644
--- a/fdisk/sfdisk.8
+++ b/fdisk/sfdisk.8
@@ -5,7 +5,7 @@
 .\" -- May be distributed under the GNU General Public License
 .\" The `DRDOS Warning' was taken from a net post by Stephen Tweedie.
 .\"
-.TH SFDISK 8 "1 September 1995" "Linux 1.3.23" "Linux Programmer's Manual"
+.TH SFDISK 8 "1 September 1995" "Linux" "Linux Programmer's Manual"
 .SH NAME
 sfdisk \- Partition table manipulator for Linux
 .SH SYNOPSIS
@@ -158,7 +158,7 @@
 .BR \-? " or " \-\-help
 Print a usage message and exit immediately.
 .TP
-.BR \-T " or " \-\-list-types
+.BR \-T " or " \-\-list\-types
 Print the recognized types (system Id's).
 .TP
 .BR \-s " or " \-\-show\-size
@@ -207,7 +207,7 @@
 .BI \-A "number"
 Make the indicated partition(s) active, and all others inactive.
 .TP
-.BI \-c " or " \-\-id " number [Id]"
+.BI \-c "\fR or " \-\-id " number [Id]"
 If no Id argument given: print the partition Id of the indicated
 partition. If an Id argument is present: change the type (Id) of
 the indicated partition to the given value.
@@ -265,7 +265,7 @@
 LILO or the OS/2 Boot Manager) also live in this empty space,
 so maybe you want this option if you use one.
 .TP
-.BR \-E " or " \-\-DOS-extended
+.BR \-E " or " \-\-DOS\-extended
 Take the starting sector numbers of "inner" extended partitions
 to be relative to the starting cylinder boundary of the outer one,
 (like some versions of DOS do) rather than to the starting sector
@@ -431,6 +431,29 @@
 .RE
 will partition /dev/hdc just as indicated above.
 
+The command
+.RS
+.nf
+.if t .ft CW
+sfdisk /dev/hdb << EOF
+,3,L
+,60,L
+,19,S
+,,E
+,130,L
+,130,L
+,130,L
+,,L
+EOF
+.if t .ft R
+.fi
+.RE
+will partition /dev/hdb into two Linux partitions of 3 and 60
+cylinders, a swap space of 19 cylinders, and an extended partition
+covering the rest. Inside the extended partition there are four
+Linux logical partitions, three of 130 cylinders and one
+covering the rest.
+
 With the \-x option, the number of input lines must be a multiple of 4:
 you have to list the two empty partitions that you never want
 using two blank lines. Without the \-x option, you give one line
@@ -482,7 +505,7 @@
 free disk space after any DRDOS partition, I don't have any other
 problems with the two coexisting on the one drive.'
 
-A. V. Le Blanc writes in README.esfdisk: `Dr. DOS 5.0 and 6.0 has been
+A. V. Le Blanc writes in README.efdisk: `Dr. DOS 5.0 and 6.0 has been
 reported to have problems cooperating with Linux, and with this version
 of efdisk in particular.  This efdisk sets the system type
 to hexadecimal 81.  Dr. DOS seems to confuse
diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index a57446c..6500131 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -132,8 +132,8 @@
  */
 #if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__)
 static
-_syscall5(int,  _llseek,  uint,  fd, ulong, hi, ulong, lo,
-       loff_t *, res, uint, wh);
+_syscall5(int,  _llseek,  unsigned int,  fd, ulong, hi, ulong, lo,
+       loff_t *, res, unsigned int, wh);
 #endif
 
 static int
@@ -154,8 +154,8 @@
 
     if (in != out) {
 	error(_("seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"),
-	       (uint)(in>>32), (uint)(in & 0xffffffff),
-	       (uint)(out>>32), (uint)(out & 0xffffffff));
+	       (unsigned int)(in>>32), (unsigned int)(in & 0xffffffff),
+	       (unsigned int)(out>>32), (unsigned int)(out & 0xffffffff));
 	return 0;
     }
     return 1;
@@ -882,9 +882,9 @@
 	printf(_("   Device Boot   Start       End    #blocks   Id  System\n"));
 	break;
       case F_MEGABYTE:
-	printf(_("Units = megabytes of 1048576 bytes, blocks of 1024 bytes"
+	printf(_("Units = mebibytes of 1048576 bytes, blocks of 1024 bytes"
 	       ", counting from %d\n\n"), increment);
-	printf(_("   Device Boot Start   End     MB    #blocks   Id  System\n"));
+	printf(_("   Device Boot Start   End    MiB    #blocks   Id  System\n"));
 	break;
     }
 }
@@ -1269,7 +1269,7 @@
 	b = p->p.begin_chs;
 	aa = chs_to_longchs(a);
 	bb = chs_to_longchs(b);
-	if (!chs_ok(b, PNO(p), "start"))
+	if (!chs_ok(b, PNO(p), _("start")))
 	  return 0;
 	if(a.s && !is_equal_chs(a, b))
 	  warn(_("partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"),
@@ -1278,7 +1278,7 @@
 	b = p->p.end_chs;
 	aa = chs_to_longchs(a);
 	bb = chs_to_longchs(b);
-	if (!chs_ok(b, PNO(p), "end"))
+	if (!chs_ok(b, PNO(p), _("end")))
 	  return 0;
 	if(a.s && !is_equal_chs(a, b))
 	  warn(_("partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"),
@@ -1568,9 +1568,11 @@
 	s = get_sector(dev, fd, p->sector);
 	if (!s) return 0;
 	s->to_be_written = 1;
-	copy_from_part(&(p->p), s->data + p->offset);
-	s->data[510] = 0x55;
-	s->data[511] = 0xaa;
+	if (p->ptype == DOS_TYPE) {
+	    copy_from_part(&(p->p), s->data + p->offset);
+	    s->data[510] = 0x55;
+	    s->data[511] = 0xaa;
+	}
     }
     if (save_sector_file) {
 	if (!save_sectors(dev, fd)) {
@@ -2719,7 +2721,8 @@
     int pno;
 
     pno = asc_to_index(pnam, z);
-    z->partitions[pno].p.bootable = 0x80;
+    if (z->partitions[pno].ptype == DOS_TYPE)
+	    z->partitions[pno].p.bootable = 0x80;
 }
 
 static void
@@ -2755,7 +2758,8 @@
     } else {
 	/* clear `active byte' everywhere */
 	for (pno=0; pno < z->partno; pno++)
-	    z->partitions[pno].p.bootable = 0;
+	    if (z->partitions[pno].ptype == DOS_TYPE)
+		z->partitions[pno].p.bootable = 0;
 
 	/* then set where desired */
 	if (ac == 1)
diff --git a/getopt-1.1.2/COPYING b/getopt/COPYING
similarity index 100%
rename from getopt-1.1.2/COPYING
rename to getopt/COPYING
diff --git a/getopt-1.1.2/Changelog b/getopt/Changelog
similarity index 67%
rename from getopt-1.1.2/Changelog
rename to getopt/Changelog
index 339c5bb..f37fa66 100644
--- a/getopt-1.1.2/Changelog
+++ b/getopt/Changelog
@@ -1,5 +1,15 @@
+20030123: Bumped up version number to 1.1.3
+20030123: Changed WITH_GETTEXT option to WITHOUT_GETTEXT
+20030123: Renamed example programs to have the string getopt- prepended
+20030123: Manpage: all minus signs are now escaped
+20030123: Sync with util-linux (2.11y)
+20010329: Bumped up version number to 1.1.2
+20010329: Sync with util-linux
+20010311: Bumped up version number to 1.1.1
+20010311: Fixed stupid compilation error if NLS not selected
+20000630: Bumped up version number to 1.1.0
 20000630: Ported the Native Language Support patches from util-linux
-          They are written by Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
+          They are written by Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
 20000627: Bumped up version number to 1.0.6
 20000627: A few manpage tweaks
 20000616: Introduced DESTDIR and directory creation in the Makefile.
diff --git a/getopt-1.1.2/Makefile b/getopt/Makefile
similarity index 90%
rename from getopt-1.1.2/Makefile
rename to getopt/Makefile
index 6b50f84..a8a8e9d 100644
--- a/getopt-1.1.2/Makefile
+++ b/getopt/Makefile
@@ -50,4 +50,5 @@
 	$(INSTALLDIR) $(USRBINDIR) $(MAN1DIR) $(GETOPTDIR)
 	$(INSTALLBIN) getopt $(USRBINDIR)
 	$(INSTALLMAN) getopt.1 $(MAN1DIR)
-	$(INSTALLBIN) parse.bash parse.tcsh test.bash test.tcsh $(GETOPTDIR)
+	$(INSTALLBIN) getopt-parse.bash getopt-parse.tcsh \
+	              getopt-test.bash getopt-test.tcsh $(GETOPTDIR)
diff --git a/getopt-1.1.2/README b/getopt/README
similarity index 100%
rename from getopt-1.1.2/README
rename to getopt/README
diff --git a/getopt-1.1.2/TODO b/getopt/TODO
similarity index 85%
rename from getopt-1.1.2/TODO
rename to getopt/TODO
index 70f2ea9..94d975d 100644
--- a/getopt-1.1.2/TODO
+++ b/getopt/TODO
@@ -4,3 +4,5 @@
 Perhaps a nice configure script?
 
 Add a `test' target in Makefile.
+
+Resync po-files with util-linux
diff --git a/getopt-1.1.2/getopt-1.1.2.lsm b/getopt/getopt-1.1.3.lsm
similarity index 64%
rename from getopt-1.1.2/getopt-1.1.2.lsm
rename to getopt/getopt-1.1.3.lsm
index 95be259..5849700 100644
--- a/getopt-1.1.2/getopt-1.1.2.lsm
+++ b/getopt/getopt-1.1.3.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: Getopt
-Version: 1.1.2
-Entered-date: 29MAR01
+Version: 1.1.3
+Entered-date: 23JAN02
 Description: An improved implementation of getopt(1), a program to parse
              options within a shell script. Fully compatible with other
              getopt(1) implementations, but with many additions like
@@ -9,11 +9,8 @@
 Keywords: getopt script parse bash tcsh
 Author: frodol@dds.nl (Frodo Looijaard)
 Primary-site: http://huizen.dds.nl/~frodol
-              28kB getopt-1.1.2.tar.gz
-              689  getopt-1.1.2.lsm
-Alternate-site: sunsite.unc.edu /pub/Linux/utils/shell
-              28kB getopt-1.1.2.tar.gz
-              689  getopt-1.1.2.lsm
+              28kB getopt-1.1.3.tar.gz
+              689  getopt-1.1.3.lsm
 Copying-policy: GPL
 End
 
diff --git a/getopt-1.1.2/parse.bash b/getopt/getopt-parse.bash
old mode 100644
new mode 100755
similarity index 100%
rename from getopt-1.1.2/parse.bash
rename to getopt/getopt-parse.bash
diff --git a/getopt-1.1.2/parse.tcsh b/getopt/getopt-parse.tcsh
old mode 100644
new mode 100755
similarity index 100%
rename from getopt-1.1.2/parse.tcsh
rename to getopt/getopt-parse.tcsh
diff --git a/getopt-1.1.2/test.bash b/getopt/getopt-test.bash
old mode 100644
new mode 100755
similarity index 100%
rename from getopt-1.1.2/test.bash
rename to getopt/getopt-test.bash
diff --git a/getopt-1.1.2/test.tcsh b/getopt/getopt-test.tcsh
old mode 100644
new mode 100755
similarity index 100%
rename from getopt-1.1.2/test.tcsh
rename to getopt/getopt-test.tcsh
diff --git a/getopt-1.1.2/getopt.1 b/getopt/getopt.1
similarity index 81%
rename from getopt-1.1.2/getopt.1
rename to getopt/getopt.1
index 29e4e1d..202884b 100644
--- a/getopt-1.1.2/getopt.1
+++ b/getopt/getopt.1
@@ -4,9 +4,9 @@
 .SH SYNOPSIS
 .BR getopt " optstring parameters"
 
-.BR getopt " [options] [" -- "] optstring parameters"
+.BR getopt " [options] [" \-\- "] optstring parameters"
 
-.BR getopt " [options] " -o | --options " optstring [options] [" -- "] parameters"
+.BR getopt " [options] " \-o | \-\-options " optstring [options] [" \-\- "] parameters"
 .SH DESCRIPTION
 .B getopt
 is used to break up 
@@ -24,7 +24,7 @@
 which modify the way getopt will parse
 .RI ( options
 and
-.I -o|--options optstring
+.I \-o|\-\-options optstring
 in the 
 .BR SYNOPSIS), 
 and the parameters which are to be
@@ -32,13 +32,13 @@
 .RI ( parameters
 in the 
 .BR SYNOPSIS).
-The second part will start at the first non-option parameter
+The second part will start at the first non\-option parameter
 that is not an option argument, or after the first occurence of 
-.RB ` -- '.
+.RB ` \-\- '.
 If no 
-.RB ` -o ' 
+.RB ` \-o ' 
 or 
-.RB ` --options ' 
+.RB ` \-\-options ' 
 option is found in the first part, the first
 parameter of the second part is used as the short options string.
 
@@ -46,7 +46,7 @@
 .B GETOPT_COMPATIBLE
 is set, or if its first parameter 
 is not an option (does not start with a
-.RB ` - ',
+.RB ` \- ',
 this is the first format in the 
 .BR SYNOPSIS),
 .B getopt
@@ -59,8 +59,8 @@
 
 Traditional implementations of
 .BR getopt (1)
-are unable to cope with whitespace and other (shell-specific) special characters
-in arguments and non-option parameters. To solve this problem, this 
+are unable to cope with whitespace and other (shell\-specific) special characters
+in arguments and non\-option parameters. To solve this problem, this 
 implementation can generate
 quoted output which must once again be interpreted by the shell (usually
 by using the
@@ -74,16 +74,16 @@
 To determine whether this enhanced version of
 .BR getopt (1)
 is installed, a special test option
-.RB ( -T ) 
+.RB ( \-T ) 
 can be used.
 .SH OPTIONS
-.IP "-a, --alternative"
+.IP "\-a, \-\-alternative"
 Allow long options to start with a single 
-.RB ` - '.
-.IP "-h, --help"
+.RB ` \- '.
+.IP "\-h, \-\-help"
 Output a small usage guide and exit succesfully. No other output is generated. 
-.IP "-l, --longoptions longopts"
-The long (multi-character) options to be recognized. 
+.IP "\-l, \-\-longoptions longopts"
+The long (multi\-character) options to be recognized. 
 More than one option name
 may be specified at once, by separating the names with commas. This option 
 may be given more than once, the 
@@ -93,19 +93,19 @@
 in 
 .I longopts 
 may be followed by one colon to indicate it has a required argument,and by two colons to indicate it has an optional argument.
-.IP "-n, --name progname"
+.IP "\-n, \-\-name progname"
 The name that will be used by the 
 .BR getopt (3)
 routines when it reports errors. Note that errors of
 .BR getopt (1)
 are still reported as coming from getopt.
-.IP "-o, --options shortopts"
-The short (one-character) options to be recognized. If this options is not
+.IP "\-o, \-\-options shortopts"
+The short (one\-character) options to be recognized. If this option is not
 found, the first parameter of 
 .B getopt 
 that does not start with
 a 
-.RB ` - ' 
+.RB ` \- ' 
 (and is not an option argument) is used as the short options string.
 Each short option character
 in 
@@ -115,20 +115,20 @@
 The first character of shortopts may be 
 .RB ` + ' 
 or
-.RB ` - ' 
+.RB ` \- ' 
 to influence the way
 options are parsed and output is generated (see section 
 .B SCANNING MODES
 for details).
-.IP "-q, --quiet"
+.IP "\-q, \-\-quiet"
 Disable error reporting by getopt(3).
-.IP "-Q, --quiet-output"
+.IP "\-Q, \-\-quiet\-output"
 Do not generate normal output. Errors are still reported by
 .BR getopt (3), 
 unless you also use 
-.IR -q .
-.IP "-s, --shell shell"
-Set quoting conventions to those of shell. If no -s argument is found,
+.IR \-q .
+.IP "\-s, \-\-shell shell"
+Set quoting conventions to those of shell. If no \-s argument is found,
 the
 .SM BASH
 conventions are used. Valid arguments are currently
@@ -137,12 +137,12 @@
 .RB ` csh ',
 and
 .RB ` tcsh '.
-.IP "-u, --unquoted"
-Do not quote the output. Note that whitespace and special (shell-dependent)
+.IP "\-u, \-\-unquoted"
+Do not quote the output. Note that whitespace and special (shell\-dependent)
 characters can cause havoc in this mode (like they do with other
 .BR getopt (1)
 implementations).
-.IP "-T --test"
+.IP "\-T \-\-test"
 Test if your 
 .BR getopt (1) 
 is this enhanced version or an old version. This generates no output, 
@@ -152,9 +152,9 @@
 .B GETOPT_COMPATIBLE
 is set,
 will return 
-.RB ` -- ' 
+.RB ` \-\- ' 
 and error status 0.
-.IP "-V, --version"
+.IP "\-V, \-\-version"
 Output version information and exit succesfully. No other output is generated. 
 .SH PARSING
 This section specifies the format of the second part of the parameters of
@@ -179,10 +179,10 @@
 
 The parameters are parsed from left to right. Each parameter is classified as a
 short option, a long option, an argument to an option,
-or a non-option parameter.
+or a non\-option parameter.
 
 A simple short option is a 
-.RB ` - ' 
+.RB ` \- ' 
 followed by a short option character. If
 the option has a required argument, it may be written directly after the option
 character or as the next parameter (ie. separated by whitespace on the 
@@ -191,12 +191,12 @@
 option character if present.
 
 It is possible to specify several short options after one 
-.RB ` - ', 
+.RB ` \- ', 
 as long as all (except possibly the last) do not have required or optional
 arguments.
 
 A long option normally begins with 
-.RB ` -- ' 
+.RB ` \-\- ' 
 followed by the long option name.
 If the option has a required argument, it may be written directly after
 the long option name, separated by 
@@ -214,29 +214,29 @@
 ambiguous.
 
 Each parameter not starting with a 
-.RB ` - ', 
+.RB ` \- ', 
 and not a required argument of
-a previous option, is a non-option parameter. Each parameter after
+a previous option, is a non\-option parameter. Each parameter after
 a 
-.RB ` -- ' 
-parameter is always interpreted as a non-option parameter.
+.RB ` \-\- ' 
+parameter is always interpreted as a non\-option parameter.
 If the environment variable 
 .B POSIXLY_CORRECT 
 is set, or if the short
 option string started with a 
 .RB ` + ', 
 all remaining parameters are interpreted
-as non-option parameters as soon as the first non-option parameter is
+as non\-option parameters as soon as the first non\-option parameter is
 found.
 .SH OUTPUT
 Output is generated for each element described in the previous section. 
 Output is done
 in the same order as the elements are specified in the input, except
-for non-option parameters. Output can be done in 
+for non\-option parameters. Output can be done in 
 .I compatible 
 .RI ( unquoted )
 mode, or in such way that whitespace and other special characters within
-arguments and non-option parameters are preserved (see 
+arguments and non\-option parameters are preserved (see 
 .BR QUOTING ).
 When the output is processed in the shell script, it will seem to be
 composed of distinct elements that can be processed one by one (by using the
@@ -247,10 +247,10 @@
 If there are problems parsing the parameters, for example because a
 required argument is not found or an option is not recognized, an error
 will be reported on stderr, there will be no output for the offending
-element, and a non-zero error status is returned.
+element, and a non\-zero error status is returned.
 
 For a short option, a single 
-.RB ` - ' 
+.RB ` \- ' 
 and the option character are generated
 as one parameter. If the option has an argument, the next
 parameter will be the argument. If the option takes an optional argument,
@@ -262,36 +262,36 @@
 implemetations do not support optional arguments.
 
 If several short options were specified after a single 
-.RB ` - ', 
+.RB ` \- ', 
 each will be present in the output as a separate parameter.
 
 For a long option, 
-.RB ` -- ' 
+.RB ` \-\- ' 
 and the full option name are generated as one
 parameter. This is done regardless whether the option was abbreviated or
 specified with a single 
-.RB ` - ' 
+.RB ` \- ' 
 in the input. Arguments are handled as with short options.
 
-Normally, no non-option parameters output is generated until all options
+Normally, no non\-option parameters output is generated until all options
 and their arguments have been generated. Then 
-.RB ` -- ' 
+.RB ` \-\- ' 
 is generated as a
-single parameter, and after it the non-option parameters in the order
+single parameter, and after it the non\-option parameters in the order
 they were found, each as a separate parameter.
 Only if the first character of the short options string was a 
-.RB ` - ',
-non-option parameter output is generated at the place they are found in the 
+.RB ` \- ',
+non\-option parameter output is generated at the place they are found in the 
 input (this is not supported if the first format of the 
 .B SYNOPSIS
 is used; in that case all preceding occurences of
-.RB ` - '
+.RB ` \- '
 and 
 .RB ` + '
 are ignored). 
 .SH QUOTING
 In compatible mode, whitespace or 'special' characters in arguments or
-non-option parameters are not handled correctly. As the output is 
+non\-option parameters are not handled correctly. As the output is 
 fed to the shell script, the script does not know how it is supposed to break 
 the output into separate parameters.  To circumvent this
 problem, this implementation offers quoting. The idea is that output
@@ -305,11 +305,11 @@
 is set, if the first form of the
 .B SYNOPSIS
 is used, or if the option
-.RB ` -u '
+.RB ` \-u '
 is found.
 
 Different shells use different quoting conventions. You can use the 
-.RB ` -s '
+.RB ` \-s '
 option to select the shell you are using. The following shells are
 currently supported:
 .RB ` sh ',
@@ -317,13 +317,13 @@
 .RB ` csh ' 
 and
 .RB ` tcsh '.
-Actually, only two `flavors' are distinguished: sh-like quoting conventions 
-and csh-like quoting conventions. Chances are that if you use another shell
+Actually, only two `flavors' are distinguished: sh\-like quoting conventions 
+and csh\-like quoting conventions. Chances are that if you use another shell
 script language, one of these flavors can still be used.
 
 .SH "SCANNING MODES"
 The first character of the short options string may be a
-.RB ` - '
+.RB ` \- '
 or a
 .RB ` + '
 to indicate a special scanning mode. If the first calling form
@@ -337,20 +337,20 @@
 .RB ` + ',
 or if the environment variable 
 .B POSIXLY_CORRECT
-is set, parsing stops as soon as the first non-option parameter 
+is set, parsing stops as soon as the first non\-option parameter 
 (ie. a parameter that does not start with a 
-.RB ` - ')
+.RB ` \- ')
 is found that
 is not an option argument. The remaining parameters are all interpreted as
-non-option parameters.
+non\-option parameters.
 
 If the first character is a
-.RB ` - ',
-non-option parameters are outputed at the place where they are found; in normal
+.RB ` \- ',
+non\-option parameters are outputed at the place where they are found; in normal
 operation, they are all collected at the end of output after a 
-.RB ` -- ' 
+.RB ` \-\- ' 
 parameter has been generated. Note that this
-.RB ` -- '
+.RB ` \-\- '
 parameter is still generated, but it will always be the last parameter in
 this mode.
 .SH COMPATIBILITY
@@ -361,10 +361,10 @@
 without any modifications, and with some advantages.
 
 If the first character of the first parameter of getopt is not a 
-.RB ` - ', 
+.RB ` \- ', 
 getopt goes into compatibility mode. It will interpret its first parameter as
 the string of short options, and all other arguments will be parsed. It
-will still do parameter shuffling (ie. all non-option parameters are outputed
+will still do parameter shuffling (ie. all non\-option parameters are outputed
 at the end), unless the environment variable 
 .B POSIXLY_CORRECT 
 is set.
@@ -379,7 +379,7 @@
 neither is needed.
 
 In compatibility mode, leading 
-.RB ` - '
+.RB ` \- '
 and 
 .RB ` + '
 characters in the short options string are ignored.
@@ -395,10 +395,10 @@
 .B 2 
 if it does not understand its own parameters,
 .B 3
-if an internal error occurs like out-of-memory, and
+if an internal error occurs like out\-of\-memory, and
 .B 4
 if it is called with 
-.BR -T .
+.BR \-T .
 .SH EXAMPLES
 Example scripts for (ba)sh and (t)csh are provided with the
 .BR getopt (1)
@@ -413,9 +413,9 @@
 routines.
 If it is set, parsing stops as soon as a parameter
 is found that is not an option or an option argument. All remaining 
-parameters are also interpreted as non-option parameters, regardless
+parameters are also interpreted as non\-option parameters, regardless
 whether they start with a 
-.RB ` - '.
+.RB ` \- '.
 .IP GETOPT_COMPATIBLE
 Forces
 .B getopt
diff --git a/getopt-1.1.2/getopt.c b/getopt/getopt.c
similarity index 98%
rename from getopt-1.1.2/getopt.c
rename to getopt/getopt.c
index 95c3b34..a22332a 100644
--- a/getopt-1.1.2/getopt.c
+++ b/getopt/getopt.c
@@ -34,7 +34,7 @@
  *   No important changes
  * Version 1.1.0: Tue Jun 30 2000
  *   Added NLS support (partly written by Arkadiusz Mi<B6>kiewicz 
- *     <misiek@pld.ORG.PL>)
+ *     <misiek@pld.org.pl>)
  */
 
 #include <stdio.h>
@@ -49,7 +49,7 @@
 #include "getopt.h"
 #endif
 
-#include "../lib/nls.h"
+#include "nls.h"
 
 /* NON_OPT is the code that is returned when a non-option is found in '+' 
    mode */
@@ -371,9 +371,12 @@
 	int opt;
 	int compatible=0;
 
+#if WITHOUT_GETTEXT
+#else
 	setlocale(LC_ALL,"");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	init_longopt();
 
@@ -438,7 +441,7 @@
 			quote=0;
 			break;
 		case 'V':
-			printf(_("getopt (enhanced) 1.1.2\n"));
+			printf(_("getopt (enhanced) 1.1.3\n"));
 			exit(0);
 		case '?':
 		case ':':
diff --git a/getopt-1.1.2/gnu/getopt.c b/getopt/gnu/getopt.c
similarity index 100%
rename from getopt-1.1.2/gnu/getopt.c
rename to getopt/gnu/getopt.c
diff --git a/getopt-1.1.2/gnu/getopt.h b/getopt/gnu/getopt.h
similarity index 100%
rename from getopt-1.1.2/gnu/getopt.h
rename to getopt/gnu/getopt.h
diff --git a/getopt-1.1.2/gnu/getopt1.c b/getopt/gnu/getopt1.c
similarity index 100%
rename from getopt-1.1.2/gnu/getopt1.c
rename to getopt/gnu/getopt1.c
diff --git a/hwclock/rtc.c b/hwclock/rtc.c
index b13a46a..bc9733b 100644
--- a/hwclock/rtc.c
+++ b/hwclock/rtc.c
@@ -332,7 +332,7 @@
 struct clock_ops *
 probe_for_rtc_clock(){
 	int rtc_fd = open_rtc();
-	if (rtc_fd > 0) {
+	if (rtc_fd >= 0) {
 		close(rtc_fd);
 		return &rtc;
 	}
diff --git a/lib/md5.h b/lib/md5.h
index b211ed2..83ec5b0 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -1,7 +1,7 @@
 #ifndef MD5_H
 #define MD5_H
 
-#if defined (__alpha__) || defined (__ia64__)
+#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__)
 typedef unsigned int uint32;
 #else
 typedef unsigned long uint32;
diff --git a/login-utils/login.c b/login-utils/login.c
index 8088878..da9b72f 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -1252,17 +1252,35 @@
 }
 #endif
 
-void
+/*
+ * Robert Ambrose writes:
+ * A couple of my users have a problem with login processes hanging around
+ * soaking up pts's.  What they seem to hung up on is trying to write out the
+ * message 'Login timed out after %d seconds' when the connection has already
+ * been dropped.
+ * What I did was add a second timeout while trying to write the message so
+ * the process just exits if the second timeout expires.
+ */
+
+static void
+timedout2(int sig) {
+	struct termio ti;
+    
+	/* reset echo */
+	ioctl(0, TCGETA, &ti);
+	ti.c_lflag |= ECHO;
+	ioctl(0, TCSETA, &ti);
+	exit(0);			/* %% */
+}
+
+static void
 timedout(int sig) {
-    struct termio ti;
-    
-    fprintf(stderr, _("Login timed out after %d seconds\n"), timeout);
-    
-    /* reset echo */
-    ioctl(0, TCGETA, &ti);
-    ti.c_lflag |= ECHO;
-    ioctl(0, TCSETA, &ti);
-    exit(0);			/* %% */
+	signal(SIGALRM, timedout2);
+	alarm(10);
+	fprintf(stderr, _("Login timed out after %d seconds\n"), timeout);
+	signal(SIGALRM, SIG_IGN);
+	alarm(0);
+	timedout2(0);
 }
 
 #ifndef USE_PAM
diff --git a/misc-utils/README.script b/misc-utils/README.script
deleted file mode 100644
index 83dfcc5..0000000
--- a/misc-utils/README.script
+++ /dev/null
@@ -1,7 +0,0 @@
-Here is a working version of the BSD script command which captures
-the output of a terminal session in a file.
-
-If you have libc-4.2 you don't need cfmakeraw.c or paths.h
-
-Rick Sladkey
-jrs@world.std.com
diff --git a/misc-utils/script.1 b/misc-utils/script.1
index 6e98773..b8e5437 100644
--- a/misc-utils/script.1
+++ b/misc-utils/script.1
@@ -40,6 +40,7 @@
 .Sh SYNOPSIS
 .Nm script
 .Op Fl a
+.Op Fl c Ar COMMAND
 .Op Fl f
 .Op Fl q
 .Op Fl t
@@ -69,6 +70,10 @@
 or
 .Pa typescript ,
 retaining the prior contents.
+.It Fl c Ar COMMAND
+Run the COMMAND rather than an interactive shell.
+This makes it easy for a script to capture the output of a program that
+behaves differently when its stdout is not a tty.
 .It Fl f
 Flush output after each write. This is nice for telecooperation:
 One person does `mkfifo foo; script -f foo' and another can
diff --git a/misc-utils/script.c b/misc-utils/script.c
index ec98ea1..fc913f4 100644
--- a/misc-utils/script.c
+++ b/misc-utils/script.c
@@ -91,6 +91,7 @@
 char	line[] = "/dev/ptyXX";
 #endif
 int	aflg = 0;
+char	*cflg = NULL;
 int	fflg = 0;
 int	qflg = 0;
 int	tflg = 0;
@@ -135,11 +136,14 @@
 		}
 	}
 
-	while ((ch = getopt(argc, argv, "afqt")) != -1)
+	while ((ch = getopt(argc, argv, "ac:fqt")) != -1)
 		switch((char)ch) {
 		case 'a':
 			aflg++;
 			break;
+		case 'c':
+			cflg = optarg;
+			break;
 		case 'f':
 			fflg++;
 			break;
@@ -284,7 +288,9 @@
 
 void
 doshell() {
-	/***
+	char *shname;
+
+#if 0
 	int t;
 
 	t = open(_PATH_TTY, O_RDWR);
@@ -292,7 +298,8 @@
 		(void) ioctl(t, TIOCNOTTY, (char *)0);
 		(void) close(t);
 	}
-	***/
+#endif
+
 	getslave();
 	(void) close(master);
 	(void) fclose(fscript);
@@ -300,11 +307,18 @@
 	(void) dup2(slave, 1);
 	(void) dup2(slave, 2);
 	(void) close(slave);
-#ifdef __linux__
-	execl(shell, strrchr(shell, '/') + 1, "-i", 0);
-#else
-	execl(shell, "sh", "-i", 0);
-#endif
+
+	shname = strrchr(shell, '/');
+	if (shname)
+		shname++;
+	else
+		shname = shell;
+
+	if (cflg)
+		execl(shell, shname, "-c", cflg, 0);
+	else
+		execl(shell, shname, "-i", 0);
+
 	perror(shell);
 	fail();
 }
diff --git a/mount/Makefile b/mount/Makefile
index 5e5ca58..9643494 100644
--- a/mount/Makefile
+++ b/mount/Makefile
@@ -72,7 +72,7 @@
 
 mount.o umount.o getusername.o: getusername.h
 
-mount.o umount.o losetup.o lomount.o: lomount.h loop.h
+mount.o umount.o losetup.o lomount.o: lomount.h loop.h my_dev_t.h
 
 swapon.o: swap_constants.h swapargs.h
 
@@ -118,12 +118,9 @@
 swapargs.h:
 	sh swap.configure
 
-loop.h:
-	sh mk_loop_h
-
 clean:
 	rm -f a.out core *~ *.o swapargs.h $(PROGS) $(MAYBE)
-	rm -f loop.h nfs_mountversion.h
+	rm -f nfs_mountversion.h
 
 clobber distclean realclean: clean
 	rm -f $(GEN_FILES)
diff --git a/mount/bind.c b/mount/bind.c
deleted file mode 100644
index 4af72a9..0000000
--- a/mount/bind.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-#include <sys/mount.h>
-
-main(int argc, char **argv) {
-	int ret;
-
-	ret = mount(argv[1], argv[2], "bind", MS_MGC_VAL, NULL);
-	if (ret)
-		perror("bind");
-	return ret;
-}
diff --git a/mount/fstab.c b/mount/fstab.c
index 408042c..85a5d2d 100644
--- a/mount/fstab.c
+++ b/mount/fstab.c
@@ -27,49 +27,49 @@
 
 static void
 get_mtab_info(void) {
-     struct stat mtab_stat;
+	struct stat mtab_stat;
 
-     if (!have_mtab_info) {
-	  if (lstat(MOUNTED, &mtab_stat))
-	       var_mtab_does_not_exist = 1;
-	  else if (S_ISLNK(mtab_stat.st_mode))
-	       var_mtab_is_a_symlink = 1;
-	  have_mtab_info = 1;
-     }
+	if (!have_mtab_info) {
+		if (lstat(MOUNTED, &mtab_stat))
+			var_mtab_does_not_exist = 1;
+		else if (S_ISLNK(mtab_stat.st_mode))
+			var_mtab_is_a_symlink = 1;
+		have_mtab_info = 1;
+	}
 }
 
 int
 mtab_does_not_exist(void) {
-     get_mtab_info();
-     return var_mtab_does_not_exist;
+	get_mtab_info();
+	return var_mtab_does_not_exist;
 }
 
 int
 mtab_is_a_symlink(void) {
-     get_mtab_info();
-     return var_mtab_is_a_symlink;
+	get_mtab_info();
+	return var_mtab_is_a_symlink;
 }
 
 int
 mtab_is_writable() {
-     static int ret = -1;
+	static int ret = -1;
 
-     /* Should we write to /etc/mtab upon an update?
-	Probably not if it is a symlink to /proc/mounts, since that
-	would create a file /proc/mounts in case the proc filesystem
-	is not mounted. */
-     if (mtab_is_a_symlink())
-	  return 0;
+	/* Should we write to /etc/mtab upon an update?
+	   Probably not if it is a symlink to /proc/mounts, since that
+	   would create a file /proc/mounts in case the proc filesystem
+	   is not mounted. */
+	if (mtab_is_a_symlink())
+		return 0;
 
-     if (ret == -1) {
-	  int fd = open(MOUNTED, O_RDWR | O_CREAT, 0644);
-	  if (fd >= 0) {
-	       close(fd);
-	       ret = 1;
-	  } else
-	       ret = 0;
-     }
-     return ret;
+	if (ret == -1) {
+		int fd = open(MOUNTED, O_RDWR | O_CREAT, 0644);
+		if (fd >= 0) {
+			close(fd);
+			ret = 1;
+		} else
+			ret = 0;
+	}
+	return ret;
 }
 
 /* Contents of mtab and fstab ---------------------------------*/
@@ -82,16 +82,16 @@
 
 struct mntentchn *
 mtab_head() {
-     if (!got_mtab)
-	  read_mounttable();
-     return &mounttable;
+	if (!got_mtab)
+		read_mounttable();
+	return &mounttable;
 }
 
 struct mntentchn *
 fstab_head() {
-     if (!got_fstab)
-	  read_fstab();
-     return &fstab;
+	if (!got_fstab)
+		read_fstab();
+	return &fstab;
 }
 
 static void
@@ -100,7 +100,7 @@
 	struct mntent *mnt;
 
 	while ((mnt = my_getmntent (mfp)) != NULL) {
-		if (!streq (mnt->mnt_type, MNTTYPE_IGNORE)) {
+		if (!streq(mnt->mnt_type, MNTTYPE_IGNORE)) {
 			mc->nxt = (struct mntentchn *) xmalloc(sizeof(*mc));
 			mc->nxt->prev = mc;
 			mc = mc->nxt;
@@ -125,48 +125,50 @@
  */
 static void
 read_mounttable() {
-     mntFILE *mfp;
-     const char *fnam;
-     struct mntentchn *mc = &mounttable;
+	mntFILE *mfp;
+	const char *fnam;
+	struct mntentchn *mc = &mounttable;
 
-     got_mtab = 1;
-     mc->nxt = mc->prev = NULL;
+	got_mtab = 1;
+	mc->nxt = mc->prev = NULL;
 
-     fnam = MOUNTED;
-     mfp = my_setmntent (fnam, "r");
-     if (mfp == NULL || mfp->mntent_fp == NULL) {
-	  int errsv = errno;
-	  fnam = PROC_MOUNTS;
-	  mfp = my_setmntent (fnam, "r");
-	  if (mfp == NULL || mfp->mntent_fp == NULL) {
-	       error(_("warning: can't open %s: %s"), MOUNTED, strerror (errsv));
-	       return;
-	  }
-	  if (verbose)
-	       printf (_("mount: could not open %s - using %s instead\n"),
-		       MOUNTED, PROC_MOUNTS);
-     }
-     read_mntentchn(mfp, fnam, mc);
+	fnam = MOUNTED;
+	mfp = my_setmntent (fnam, "r");
+	if (mfp == NULL || mfp->mntent_fp == NULL) {
+		int errsv = errno;
+		fnam = PROC_MOUNTS;
+		mfp = my_setmntent (fnam, "r");
+		if (mfp == NULL || mfp->mntent_fp == NULL) {
+			error(_("warning: can't open %s: %s"),
+			      MOUNTED, strerror (errsv));
+			return;
+		}
+		if (verbose)
+			printf (_("mount: could not open %s - "
+				  "using %s instead\n"),
+				MOUNTED, PROC_MOUNTS);
+	}
+	read_mntentchn(mfp, fnam, mc);
 }
 
 static void
 read_fstab() {
-     mntFILE *mfp = NULL;
-     const char *fnam;
-     struct mntentchn *mc = &fstab;
+	mntFILE *mfp = NULL;
+	const char *fnam;
+	struct mntentchn *mc = &fstab;
 
-     got_fstab = 1;
-     mc->nxt = mc->prev = NULL;
+	got_fstab = 1;
+	mc->nxt = mc->prev = NULL;
 
-     fnam = _PATH_FSTAB;
-     mfp = my_setmntent (fnam, "r");
-     if (mfp == NULL || mfp->mntent_fp == NULL) {
-     	  int errsv = errno;
-	  error(_("warning: can't open %s: %s"),
-		_PATH_FSTAB, strerror (errsv));
-	  return;
-     }
-     read_mntentchn(mfp, fnam, mc);
+	fnam = _PATH_FSTAB;
+	mfp = my_setmntent (fnam, "r");
+	if (mfp == NULL || mfp->mntent_fp == NULL) {
+		int errsv = errno;
+		error(_("warning: can't open %s: %s"),
+		      _PATH_FSTAB, strerror (errsv));
+		return;
+	}
+	read_mntentchn(mfp, fnam, mc);
 }
      
 
@@ -177,30 +179,62 @@
 
 	mc0 = mtab_head();
 	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
-		if (streq (mc->m.mnt_dir, name) ||
-		    streq (mc->m.mnt_fsname, name))
+		if (streq(mc->m.mnt_dir, name) ||
+		    streq(mc->m.mnt_fsname, name))
 			return mc;
 	return NULL;
 }
 
 /*
- * Given the name NAME, and the place MCPREV we found it last time,
+ * Given the directory name NAME, and the place MCPREV we found it last time,
  * try to find more occurrences.
  */ 
 struct mntentchn *
-getmntfilesbackward (const char *name, struct mntentchn *mcprev) {
+getmntdirbackward (const char *name, struct mntentchn *mcprev) {
 	struct mntentchn *mc, *mc0;
 
 	mc0 = mtab_head();
 	if (!mcprev)
 		mcprev = mc0;
 	for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
-		if (streq (mc->m.mnt_dir, name) ||
-		    streq (mc->m.mnt_fsname, name))
+		if (streq(mc->m.mnt_dir, name))
 			return mc;
 	return NULL;
 }
 
+/*
+ * Given the device name NAME, and the place MCPREV we found it last time,
+ * try to find more occurrences.
+ */ 
+struct mntentchn *
+getmntdevbackward (const char *name, struct mntentchn *mcprev) {
+	struct mntentchn *mc, *mc0;
+
+	mc0 = mtab_head();
+	if (!mcprev)
+		mcprev = mc0;
+	for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
+		if (streq(mc->m.mnt_fsname, name))
+			return mc;
+	return NULL;
+}
+
+/*
+ * Given the name NAME, check that it occurs precisely once as dir or dev.
+ */
+int
+is_mounted_once(const char *name) {
+	struct mntentchn *mc, *mc0;
+	int ct = 0;
+
+	mc0 = mtab_head();
+	for (mc = mc0->prev; mc && mc != mc0; mc = mc->prev)
+		if (streq(mc->m.mnt_dir, name) ||
+		    streq(mc->m.mnt_fsname, name))
+			ct++;
+	return (ct == 1);
+}
+
 /* Given the name FILE, try to find the option "loop=FILE" in mtab.  */ 
 struct mntentchn *
 getmntoptfile (const char *file) {
@@ -251,29 +285,29 @@
 
 	/* first attempt: names occur precisely as given */
 	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
-		if (streq (mc->m.mnt_dir, file) &&
-		    streq (mc->m.mnt_fsname, spec))
+		if (streq(mc->m.mnt_dir, file) &&
+		    streq(mc->m.mnt_fsname, spec))
 			return mc;
 
 	/* second attempt: names found after symlink resolution */
 	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
-		if ((streq (mc->m.mnt_dir, file) ||
-		     streq (canonicalize(mc->m.mnt_dir), file))
-		    && (streq (mc->m.mnt_fsname, spec) ||
-			streq (canonicalize(mc->m.mnt_fsname), spec)))
+		if ((streq(mc->m.mnt_dir, file) ||
+		     streq(canonicalize(mc->m.mnt_dir), file))
+		    && (streq(mc->m.mnt_fsname, spec) ||
+			streq(canonicalize(mc->m.mnt_fsname), spec)))
 			return mc;
 
 	/* third attempt: names found after LABEL= or UUID= resolution */
 	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) {
 		if (!strncmp (mc->m.mnt_fsname, "LABEL=", 6) &&
-		    (streq (mc->m.mnt_dir, file) ||
-		     streq (canonicalize(mc->m.mnt_dir), file))) {
+		    (streq(mc->m.mnt_dir, file) ||
+		     streq(canonicalize(mc->m.mnt_dir), file))) {
 			if (has_label(spec, mc->m.mnt_fsname+6))
 				return mc;
 		}
 		if (!strncmp (mc->m.mnt_fsname, "UUID=", 5) &&
-		    (streq (mc->m.mnt_dir, file) ||
-		     streq (canonicalize(mc->m.mnt_dir), file))) {
+		    (streq(mc->m.mnt_dir, file) ||
+		     streq(canonicalize(mc->m.mnt_dir), file))) {
 			if (has_uuid(spec, mc->m.mnt_fsname+5))
 				return mc;
 		}
@@ -288,7 +322,7 @@
 
 	mc0 = fstab_head();
 	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
-		if (streq (mc->m.mnt_dir, file))
+		if (streq(mc->m.mnt_dir, file))
 			return mc;
 	return NULL;
 }
@@ -300,7 +334,7 @@
 
 	mc0 = fstab_head();
 	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
-		if (streq (mc->m.mnt_fsname, spec))
+		if (streq(mc->m.mnt_fsname, spec))
 			return mc;
 	return NULL;
 }
@@ -529,7 +563,7 @@
 
 	/* find last occurrence of dir */
 	for (mc = mc0->prev; mc && mc != mc0; mc = mc->prev)
-		if (streq (mc->m.mnt_dir, dir))
+		if (streq(mc->m.mnt_dir, dir))
 			break;
 	if (mc && mc != mc0) {
 		if (instead == NULL) {
diff --git a/mount/fstab.h b/mount/fstab.h
index 820f418..b55b6b5 100644
--- a/mount/fstab.h
+++ b/mount/fstab.h
@@ -12,6 +12,7 @@
 int mtab_is_writable(void);
 int mtab_does_not_exist(void);
 int mtab_is_a_symlink(void);
+int is_mounted_once(const char *name);
 
 struct mntentchn {
 	struct mntentchn *nxt, *prev;
@@ -21,7 +22,8 @@
 struct mntentchn *mtab_head (void);
 struct mntentchn *getmntfile (const char *name);
 struct mntentchn *getmntoptfile (const char *file);
-struct mntentchn *getmntfilesbackward (const char *file, struct mntentchn *mc);
+struct mntentchn *getmntdirbackward (const char *dir, struct mntentchn *mc);
+struct mntentchn *getmntdevbackward (const char *dev, struct mntentchn *mc);
 
 struct mntentchn *fstab_head (void);
 struct mntentchn *getfsfile (const char *file);
diff --git a/mount/h/loop.h b/mount/h/loop.h
deleted file mode 100644
index 1bd7fa8..0000000
--- a/mount/h/loop.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * include/linux/loop.h
- *
- * Written by Theodore Ts'o, 3/29/93.
- *
- * Copyright 1993 by Theodore Ts'o.  Redistribution of this file is
- * permitted under the GNU Public License.
- */
-
-#define LO_NAME_SIZE	64
-#define LO_KEY_SIZE	32
-       
-struct loop_info {
-	int		lo_number;	/* ioctl r/o */
-	dev_t		lo_device; 	/* ioctl r/o */
-	unsigned long	lo_inode; 	/* ioctl r/o */
-	dev_t		lo_rdevice; 	/* ioctl r/o */
-	int		lo_offset;
-	int		lo_encrypt_type;
-	int		lo_encrypt_key_size; 	/* ioctl w/o */
-	int		lo_flags;	/* ioctl r/o */
-	char		lo_name[LO_NAME_SIZE];
-	unsigned char	lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
-	unsigned long	lo_init[2];
-	char		reserved[4];
-};
-
-#define LO_CRYPT_NONE	0
-#define LO_CRYPT_XOR	1
-#define LO_CRYPT_DES	2
-#define LO_CRYPT_IDEA	3
-#define MAX_LO_CRYPT	4
-
-#define LOOP_SET_FD	0x4C00
-#define LOOP_CLR_FD	0x4C01
-#define LOOP_SET_STATUS	0x4C02
-#define LOOP_GET_STATUS	0x4C03
diff --git a/mount/linux_fs.h b/mount/linux_fs.h
index 310f796..874eb8f 100644
--- a/mount/linux_fs.h
+++ b/mount/linux_fs.h
@@ -151,12 +151,12 @@
 
 #define HFS_SUPER_MAGIC 0x4244
 struct hfs_super_block {
-	u_char    s_magic[2];
+	u_char    s_magic[2];		/* drSigWord */
 	u_char    s_dummy[18];
-	u_char    s_blksize[4];
+	u_char    s_blksize[4];		/* drAlBlkSiz */
 };
-#define hfsmagic(s)	assemble2le(s.s_magic)
-#define hfsblksize(s)	assemble4le(s.s_blksize)
+#define hfsmagic(s)	assemble2be(s.s_magic)
+#define hfsblksize(s)	assemble4be(s.s_blksize)
 
 #define HPFS_SUPER_MAGIC 0xf995e849
 struct hpfs_super_block {
@@ -227,6 +227,16 @@
 }
 
 static inline int
+assemble2be(unsigned char *p) {
+	return (p[1] | (p[0] << 8));
+}
+
+static inline int
 assemble4le(unsigned char *p) {
 	return (p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24));
 }
+
+static inline int
+assemble4be(unsigned char *p) {
+	return (p[3] | (p[2] << 8) | (p[1] << 16) | (p[0] << 24));
+}
diff --git a/mount/lomount.c b/mount/lomount.c
index 97cd9a0..0874f3e 100644
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@ -2,13 +2,18 @@
 /* Added vfs mount options - aeb - 960223 */
 /* Removed lomount - aeb - 960224 */
 
-/* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
+/*
+ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
  * - added Native Language Support
- * Sun Mar 21 1999 - Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+ * 1999-03-21 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
  * - fixed strerr(errno) in gettext calls
+ * 2000-09-24 Marc Mutz <Marc@Mutz.com>
+ * - added -p option to pass passphrases via fd's to losetup/mount.
+ *   Used for encryption in non-interactive environments.
+ *   The idea behind xgetpass() is stolen from GnuPG, v.1.0.3.
  */
 
-#define PROC_DEVICES	"/proc/devices"
+#define LOOPMAJOR	7
 
 /*
  * losetup.c - setup and control loop devices
@@ -36,93 +41,114 @@
 extern void error (const char *fmt, ...);	/* idem */
 
 #ifdef LOOP_SET_FD
-struct crypt_type_struct {
-	int id;
-	char *name;
-} crypt_type_tbl[] = {
-	{ LO_CRYPT_NONE, "no" },
-	{ LO_CRYPT_NONE, "none" },
-	{ LO_CRYPT_XOR, "xor" },
-	{ LO_CRYPT_DES, "DES" },
-	{ -1, NULL   }
-};
 
-static int 
-crypt_type (const char *name) {
-	int i;
+static int
+loop_info64_to_old(const struct loop_info64 *info64, struct loop_info *info)
+{
+        memset(info, 0, sizeof(*info));
+        info->lo_number = info64->lo_number;
+        info->lo_device = info64->lo_device;
+        info->lo_inode = info64->lo_inode;
+        info->lo_rdevice = info64->lo_rdevice;
+        info->lo_offset = info64->lo_offset;
+        info->lo_encrypt_type = info64->lo_encrypt_type;
+        info->lo_encrypt_key_size = info64->lo_encrypt_key_size;
+        info->lo_flags = info64->lo_flags;
+        info->lo_init[0] = info64->lo_init[0];
+        info->lo_init[1] = info64->lo_init[1];
+        if (info->lo_encrypt_type == LO_CRYPT_CRYPTOAPI)
+                memcpy(info->lo_name, info64->lo_crypt_name, LO_NAME_SIZE);
+        else
+                memcpy(info->lo_name, info64->lo_file_name, LO_NAME_SIZE);
+        memcpy(info->lo_encrypt_key, info64->lo_encrypt_key, LO_KEY_SIZE);
 
-	if (name) {
-		for (i = 0; crypt_type_tbl[i].id != -1; i++)
-			if (!strcasecmp (name, crypt_type_tbl[i].name))
-				return crypt_type_tbl[i].id;
-	}
-	return -1;
+        /* error in case values were truncated */
+        if (info->lo_device != info64->lo_device ||
+            info->lo_rdevice != info64->lo_rdevice ||
+            info->lo_inode != info64->lo_inode ||
+            info->lo_offset != info64->lo_offset)
+                return -EOVERFLOW;
+
+        return 0;
 }
 
 #ifdef MAIN
-static char *
-crypt_name (int id) {
-	int i;
-
-	for (i = 0; crypt_type_tbl[i].id != -1; i++)
-		if (id == crypt_type_tbl[i].id)
-			return crypt_type_tbl[i].name;
-	return "undefined";
-}
 
 static int
-show_loop (char *device) {
+show_loop(char *device) {
 	struct loop_info loopinfo;
-	int fd;
+	struct loop_info64 loopinfo64;
+	int fd, errsv;
 
-	if ((fd = open (device, O_RDONLY)) < 0) {
+	if ((fd = open(device, O_RDONLY)) < 0) {
 		int errsv = errno;
 		fprintf(stderr, _("loop: can't open device %s: %s\n"),
 			device, strerror (errsv));
 		return 2;
 	}
-	if (ioctl (fd, LOOP_GET_STATUS, &loopinfo) < 0) {
-		int errsv = errno;
-		fprintf(stderr, _("loop: can't get info on device %s: %s\n"),
-			device, strerror (errsv));
-		close (fd);
-		return 1;
-	}
-	printf (_("%s: [%04x]:%ld (%s) offset %d, %s encryption\n"),
-		device, loopinfo.lo_device, loopinfo.lo_inode,
-		loopinfo.lo_name, loopinfo.lo_offset,
-		crypt_name (loopinfo.lo_encrypt_type));
-	close (fd);
 
-	return 0;
+	if (ioctl(fd, LOOP_GET_STATUS64, &loopinfo64) == 0) {
+
+		loopinfo64.lo_file_name[LO_NAME_SIZE-2] = '*';
+		loopinfo64.lo_file_name[LO_NAME_SIZE-1] = 0;
+		loopinfo64.lo_crypt_name[LO_NAME_SIZE-1] = 0;
+
+		printf("%s: [%04llx]:%llu (%s)",
+		       device, loopinfo64.lo_device, loopinfo64.lo_inode,
+		       loopinfo64.lo_file_name);
+
+		if (loopinfo64.lo_offset)
+			printf(_(", offset %lld"), loopinfo64.lo_offset);
+
+		if (loopinfo64.lo_sizelimit)
+			printf(_(", sizelimit %lld"), loopinfo64.lo_sizelimit);
+
+		if (loopinfo64.lo_encrypt_type ||
+		    loopinfo64.lo_crypt_name[0]) {
+			char *e = loopinfo64.lo_crypt_name;
+
+			if (*e == 0 && loopinfo64.lo_encrypt_type == 1)
+				e = "XOR";
+			printf(_(", encryption %s (type %d)"),
+			       e, loopinfo64.lo_encrypt_type);
+		}
+		printf("\n");
+		close (fd);
+		return 0;
+	}
+
+	if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) == 0) {
+		printf ("%s: [%04x]:%ld (%s)",
+			device, loopinfo.lo_device, loopinfo.lo_inode,
+			loopinfo.lo_name);
+
+		if (loopinfo.lo_offset)
+			printf(_(", offset %d"), loopinfo.lo_offset);
+
+		if (loopinfo.lo_encrypt_type)
+			printf(_(", encryption type %d\n"),
+			       loopinfo.lo_encrypt_type);
+
+		printf("\n");
+		close (fd);
+		return 0;
+	}
+
+	errsv = errno;
+	fprintf(stderr, _("loop: can't get info on device %s: %s\n"),
+		device, strerror (errsv));
+	close (fd);
+	return 1;
 }
 #endif
 
 int
 is_loop_device (const char *device) {
 	struct stat statbuf;
-	int loopmajor;
-#if 1
-	loopmajor = 7;
-#else
-	FILE *procdev;
-	char line[100], *cp;
 
-	loopmajor = 0;
-	if ((procdev = fopen(PROC_DEVICES, "r")) != NULL) {
-		while (fgets (line, sizeof(line), procdev)) {
-			if ((cp = strstr (line, " loop\n")) != NULL) {
-				*cp='\0';
-				loopmajor=atoi(line);
-				break;
-			}
-		}
-		fclose(procdev);
-	}
-#endif
-	return (loopmajor && stat(device, &statbuf) == 0 &&
+	return (stat(device, &statbuf) == 0 &&
 		S_ISBLK(statbuf.st_mode) &&
-		major(statbuf.st_rdev) == loopmajor);
+		major(statbuf.st_rdev) == LOOPMAJOR);
 }
 
 #define SIZE(a) (sizeof(a)/sizeof(a[0]))
@@ -134,10 +160,9 @@
 	   So, we just try /dev/loop[0-7]. */
 	char dev[20];
 	char *loop_formats[] = { "/dev/loop%d", "/dev/loop/%d" };
-	int i, j, fd, somedev = 0, someloop = 0, loop_known = 0;
+	int i, j, fd, somedev = 0, someloop = 0;
 	struct stat statbuf;
 	struct loop_info loopinfo;
-	FILE *procdev;
 
 	for (j = 0; j < SIZE(loop_formats); j++) {
 	    for(i = 0; i < 256; i++) {
@@ -160,73 +185,103 @@
 	    }
 	}
 
-	/* Nothing found. Why not? */
-	if ((procdev = fopen(PROC_DEVICES, "r")) != NULL) {
-		char line[100];
-		while (fgets (line, sizeof(line), procdev))
-			if (strstr (line, " loop\n")) {
-				loop_known = 1;
-				break;
-			}
-		fclose(procdev);
-		if (!loop_known)
-			loop_known = -1;
-	}
-
 	if (!somedev)
 		error(_("mount: could not find any device /dev/loop#"));
 	else if (!someloop) {
-	    if (loop_known == 1)
 		error(_(
-		    "mount: Could not find any loop device.\n"
-		    "       Maybe /dev/loop# has a wrong major number?"));
-	    else if (loop_known == -1)
-		error(_(
-		    "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'.)"),
-		      PROC_DEVICES);
-	    else
-		error(_(
-		    "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: Could not find any loop device. Maybe this kernel "
+		    "does not know\n"
+		    "       about the loop device? (If so, recompile or "
+		    "`modprobe loop'.)"));
 	} else
 		error(_("mount: could not find any free loop device"));
 	return 0;
 }
 
+/*
+ * A function to read the passphrase either from the terminal or from
+ * an open file descriptor.
+ */
+static char *
+xgetpass(int pfd, const char *prompt) {
+	char *pass;
+	int buflen, i;
+
+        if (pfd < 0) /* terminal */
+		return getpass(prompt);
+
+	pass = NULL;
+	buflen = 0;
+	for (i=0; ; i++) {
+		if (i >= buflen-1) {
+				/* we're running out of space in the buffer.
+				 * Make it bigger: */
+			char *tmppass = pass;
+			buflen += 128;
+			pass = realloc(tmppass, buflen);
+			if (pass == NULL) {
+				/* realloc failed. Stop reading. */
+				error("Out of memory while reading passphrase");
+				pass = tmppass; /* the old buffer hasn't changed */
+				break;
+			}
+		}
+		if (read(pfd, pass+i, 1) != 1 || pass[i] == '\n')
+			break;
+	}
+	if (pass == NULL)
+		return "";
+	else {
+		pass[i] = 0;
+		return pass;
+	}
+}
+
+static int
+digits_only(const char *s) {
+	while (*s)
+		if (!isdigit(*s++))
+			return 0;
+	return 1;
+}
+
 int
-set_loop (const char *device, const char *file, int offset,
-	  const char *encryption, int *loopro) {
-	struct loop_info loopinfo;
-	int fd, ffd, mode, i;
+set_loop(const char *device, const char *file, int offset,
+	 const char *encryption, int pfd, int *loopro) {
+	struct loop_info64 loopinfo64;
+	int fd, ffd, mode;
 	char *pass;
 
 	mode = (*loopro ? O_RDONLY : O_RDWR);
-	if ((ffd = open (file, mode)) < 0) {
+	if ((ffd = open(file, mode)) < 0) {
 		if (!*loopro && errno == EROFS)
-			ffd = open (file, mode = O_RDONLY);
+			ffd = open(file, mode = O_RDONLY);
 		if (ffd < 0) {
-			perror (file);
+			perror(file);
 			return 1;
 		}
 	}
-	if ((fd = open (device, mode)) < 0) {
+	if ((fd = open(device, mode)) < 0) {
 		perror (device);
 		return 1;
 	}
 	*loopro = (mode == O_RDONLY);
 
-	memset (&loopinfo, 0, sizeof (loopinfo));
-	xstrncpy (loopinfo.lo_name, file, LO_NAME_SIZE);
-	if (encryption && (loopinfo.lo_encrypt_type = crypt_type (encryption))
-	    < 0) {
-		fprintf (stderr, _("Unsupported encryption type %s\n"),
-			 encryption);
-		return 1;
+	memset(&loopinfo64, 0, sizeof(loopinfo64));
+
+	xstrncpy(loopinfo64.lo_file_name, file, LO_NAME_SIZE);
+
+	if (encryption && *encryption) {
+		if (digits_only(encryption)) {
+			loopinfo64.lo_encrypt_type = atoi(encryption);
+		} else {
+			loopinfo64.lo_encrypt_type = LO_CRYPT_CRYPTOAPI;
+			snprintf(loopinfo64.lo_crypt_name, LO_NAME_SIZE,
+				 "%s", encryption);
+		}
 	}
-	loopinfo.lo_offset = offset;
+
+	loopinfo64.lo_offset = offset;
 
 #ifdef MCL_FUTURE  
 	/*
@@ -241,53 +296,55 @@
 	}
 #endif
 
-	switch (loopinfo.lo_encrypt_type) {
+	switch (loopinfo64.lo_encrypt_type) {
 	case LO_CRYPT_NONE:
-		loopinfo.lo_encrypt_key_size = 0;
+		loopinfo64.lo_encrypt_key_size = 0;
 		break;
 	case LO_CRYPT_XOR:
-		pass = getpass (_("Password: "));
-		xstrncpy (loopinfo.lo_encrypt_key, pass, LO_KEY_SIZE);
-		loopinfo.lo_encrypt_key_size = strlen(loopinfo.lo_encrypt_key);
-		break;
-	case LO_CRYPT_DES:
-		pass = getpass (_("Password: "));
-		strncpy (loopinfo.lo_encrypt_key, pass, 8);
-		loopinfo.lo_encrypt_key[8] = 0;
-		loopinfo.lo_encrypt_key_size = 8;
-		pass = getpass (_("Init (up to 16 hex digits): "));
-		for (i = 0; i < 16 && pass[i]; i++)
-			if (isxdigit (pass[i])) {
-				loopinfo.lo_init[i >> 3] |= (pass[i] > '9' ?
-				  (islower (pass[i]) ? toupper (pass[i]) :
-				   pass[i])-'A'+10 : pass[i]-'0') << (i&7) * 4;
-			} else {
-				fprintf (stderr, _("Non-hex digit '%c'.\n"),
-					 pass[i]);
-				return 1;
-			}
+		pass = getpass(_("Password: "));
+		xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE);
+		loopinfo64.lo_encrypt_key_size =
+			strlen(loopinfo64.lo_encrypt_key);
 		break;
 	default:
-		fprintf (stderr,
-			 _("Don't know how to get key for encryption system %d\n"),
-			 loopinfo.lo_encrypt_type);
+		pass = xgetpass(pfd, _("Password: "));
+		xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE);
+		loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE;
+	}
+
+	if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
+		perror("ioctl: LOOP_SET_FD");
 		return 1;
 	}
-	if (ioctl (fd, LOOP_SET_FD, ffd) < 0) {
-		perror ("ioctl: LOOP_SET_FD");
-		return 1;
-	}
-	if (ioctl (fd, LOOP_SET_STATUS, &loopinfo) < 0) {
-		(void) ioctl (fd, LOOP_CLR_FD, 0);
-		perror ("ioctl: LOOP_SET_STATUS");
-		return 1;
-	}
-	close (fd);
 	close (ffd);
+
+	if (ioctl(fd, LOOP_SET_STATUS64, &loopinfo64) < 0) {
+		struct loop_info loopinfo;
+		int errsv = errno;
+
+		errno = loop_info64_to_old(&loopinfo64, &loopinfo);
+		if (errno) {
+			errno = errsv;
+			perror("ioctl: LOOP_SET_STATUS64");
+			goto fail;
+		}
+
+		if (ioctl(fd, LOOP_SET_STATUS, &loopinfo) < 0) {
+			perror("ioctl: LOOP_SET_STATUS");
+			goto fail;
+		}
+	}
+
+	close (fd);
 	if (verbose > 1)
 		printf(_("set_loop(%s,%s,%d): success\n"),
 		       device, file, offset);
 	return 0;
+
+ fail:
+	(void) ioctl (fd, LOOP_CLR_FD, 0);
+	close (fd);
+	return 1;
 }
 
 int 
@@ -388,29 +445,34 @@
 
 int
 main(int argc, char **argv) {
-	char *offset, *encryption;
-	int delete,off,c;
+	char *offset, *encryption, *passfd;
+	int delete, off, c;
 	int res = 0;
 	int ro = 0;
+	int pfd = -1;
 
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
 	delete = off = 0;
-	offset = encryption = NULL;
+	offset = encryption = passfd = NULL;
 	progname = argv[0];
-	while ((c = getopt(argc,argv,"de:o:v")) != -1) {
+	while ((c = getopt(argc,argv,"de:E:o:p:v")) != -1) {
 		switch (c) {
 		case 'd':
 			delete = 1;
 			break;
+		case 'E':
 		case 'e':
 			encryption = optarg;
 			break;
 		case 'o':
 			offset = optarg;
 			break;
+		case 'p':
+			passfd = optarg;
+			break;
 		case 'v':
 			verbose = 1;
 			break;
@@ -430,7 +492,10 @@
 	} else {
 		if (offset && sscanf(offset,"%d",&off) != 1)
 			usage();
-		res = set_loop(argv[optind],argv[optind+1],off,encryption,&ro);
+		if (passfd && sscanf(passfd,"%d",&pfd) != 1)
+			usage();
+		res = set_loop(argv[optind], argv[optind+1], off,
+			       encryption, pfd, &ro);
 	}
 	return res;
 }
diff --git a/mount/lomount.h b/mount/lomount.h
index 1a93c69..d81fc3b 100644
--- a/mount/lomount.h
+++ b/mount/lomount.h
@@ -1,5 +1,6 @@
 extern int verbose;
-extern int set_loop (const char *, const char *, int, const char *, int *);
-extern int del_loop (const char *);
-extern int is_loop_device (const char *);
-extern char * find_unused_loop_device (void);
+extern int set_loop(const char *, const char *, int, 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/loop.h b/mount/loop.h
new file mode 100644
index 0000000..951a5d1
--- /dev/null
+++ b/mount/loop.h
@@ -0,0 +1,51 @@
+#define LO_CRYPT_NONE	0
+#define LO_CRYPT_XOR	1
+#define LO_CRYPT_DES	2
+#define LO_CRYPT_CRYPTOAPI 18
+
+#define LOOP_SET_FD		0x4C00
+#define LOOP_CLR_FD		0x4C01
+#define LOOP_SET_STATUS		0x4C02
+#define LOOP_GET_STATUS		0x4C03
+#define LOOP_SET_STATUS64	0x4C04
+#define LOOP_GET_STATUS64	0x4C05
+
+#define LO_NAME_SIZE	64
+#define LO_KEY_SIZE	32
+
+#include "my_dev_t.h"
+
+struct loop_info {
+	int		lo_number;
+	my_dev_t	lo_device;
+	unsigned long	lo_inode;
+	my_dev_t	lo_rdevice;
+	int		lo_offset;
+	int		lo_encrypt_type;
+	int		lo_encrypt_key_size;
+	int		lo_flags;
+	char		lo_name[LO_NAME_SIZE];
+	unsigned char	lo_encrypt_key[LO_KEY_SIZE];
+	unsigned long	lo_init[2];
+	char		reserved[4];
+};
+
+/*
+ * Where to get __u8, __u32, __u64? Let us use unsigned char/int/long long
+ * and get punished when someone comes with 128-bit long longs.
+ */
+struct loop_info64 {
+	unsigned long long	lo_device;
+	unsigned long long	lo_inode;
+	unsigned long long	lo_rdevice;
+	unsigned long long	lo_offset;
+	unsigned long long	lo_sizelimit; /* bytes, 0 == max available */
+	unsigned int		lo_number;
+	unsigned int		lo_encrypt_type;
+	unsigned int		lo_encrypt_key_size;
+	unsigned int		lo_flags;
+	unsigned char		lo_file_name[LO_NAME_SIZE];
+	unsigned char		lo_crypt_name[LO_NAME_SIZE];
+	unsigned char		lo_encrypt_key[LO_KEY_SIZE];
+	unsigned long long	lo_init[2];
+};
diff --git a/mount/losetup.8 b/mount/losetup.8
index d364f4f..9a42d70 100644
--- a/mount/losetup.8
+++ b/mount/losetup.8
@@ -1,15 +1,18 @@
-.TH LOSETUP 8 "Nov 24 1993" "Linux" "MAINTENANCE COMMANDS"
+.TH LOSETUP 8 "2003-07-01" "Linux" "MAINTENANCE COMMANDS"
 .SH NAME
 losetup \- set up and control loop devices
 .SH SYNOPSIS
 .ad l
 .B losetup
 [
-.B \-e
+.RB [ \-e | \-E ]
 .I encryption
 ] [
 .B \-o
 .I offset
+] [
+.B \-p
+.I pfd
 ]
 .I loop_device file
 .br
@@ -25,27 +28,41 @@
 to detach loop devices and to query the status of a loop device. If only the
 \fIloop_device\fP argument is given, the status of the corresponding loop
 device is shown.
+
+.SS "Encryption"
+It is possible to specify transfer functions (for encryption/decryption
+or other purposes) using one of the
+.B \-E
+and
+.B \-e
+options.
+There are two mechanisms to specify the desired encryption: by number
+and by name. If an encryption is specified by number then one
+has to make sure that the Linux kernel knows about the encryption with that
+number, probably by patching the kernel. Standard numbers that are
+always present are 0 (no encryption) and 1 (XOR encryption).
+When the cryptoloop module is loaded (or compiled in), it uses number 18.
+This cryptoloop module wil take the name of an arbitrary encryption type
+and finds the module that knows how to perform that encryption.
+(Thus, either one uses a number different from 18 with the
+.B \-E
+option, or one uses a name with the
+.B \-e
+option.)
 .SH OPTIONS
 .IP \fB\-d\fP
-detach the file or device associated with the specified loop device.
-.IP "\fB\-e \fIencryption\fP"
-.RS
-enable data encryption. The following keywords are recognized:
-.IP \fBNONE\fP
-use no encryption (default).
-.PD 0
-.IP \fBXOR\fP
-use a simple XOR encryption.
-.IP \fBDES\fP
-use DES encryption. DES encryption is only available if the optional
-DES package has been added to the kernel. DES encryption uses an additional
-start value that is used to protect passwords against dictionary
-attacks.
-.PD
-.RE
+Detach the file or device associated with the specified loop device.
+.IP "\fB\-E \fIencryption_type\fP"
+Enable data encryption with specified number.
+.IP "\fB\-e \fIencryption_name\fP"
+Enable data encryption with specified name.
 .IP "\fB\-o \fIoffset\fP"
-the data start is moved \fIoffset\fP bytes into the specified file or
+The data start is moved \fIoffset\fP bytes into the specified file or
 device.
+.IP "\fB\-p \fInum\fP"
+Read the passphrase from file descriptor with number
+.I num
+instead of from the terminal.
 .SH RETURN VALUE
 .B losetup
 returns 0 on success, nonzero on failure. When
@@ -57,7 +74,7 @@
 
 .SH FILES
 .nf
-/dev/loop0,/dev/loop1,...   loop devices (major=7)
+/dev/loop0, /dev/loop1, ...   loop devices (major=7)
 .fi
 .SH EXAMPLE
 If you are using the loadable module you must have the module loaded
@@ -65,18 +82,23 @@
 .IP
 # insmod loop.o
 .LP
+Maybe also encryption modules are needed.
+.IP
+# insmod des.o
+# insmod cryptoloop.o
+.LP
 The following commands can be used as an example of using the loop device.
 .nf
 .IP
-dd if=/dev/zero of=/file bs=1k count=100
-losetup -e des /dev/loop0 /file
+# dd if=/dev/zero of=/file bs=1k count=100
+# losetup -e des /dev/loop0 /file
 Password:
 Init (up to 16 hex digits):
-mkfs -t ext2 /dev/loop0 100
-mount -t ext2 /dev/loop0 /mnt
+# mkfs -t ext2 /dev/loop0 100
+# mount -t ext2 /dev/loop0 /mnt
  ...
-umount /dev/loop0
-losetup -d /dev/loop0
+# umount /dev/loop0
+# losetup -d /dev/loop0
 .fi
 .LP
 If you are using the loadable module you may remove the module with
@@ -87,8 +109,8 @@
 .fi
 .SH RESTRICTION
 DES encryption is painfully slow. On the other hand, XOR is terribly weak.
-.SH AUTHORS
-.nf
-Original version: Theodore Ts'o <tytso@athena.mit.edu>
-Original DES by: Eric Young <eay@psych.psy.uq.oz.au>
-.fi
+.\" .SH AUTHORS
+.\" .nf
+.\" Original version: Theodore Ts'o <tytso@athena.mit.edu>
+.\" Original DES by: Eric Young <eay@psych.psy.uq.oz.au>
+.\" .fi
diff --git a/mount/mk_loop_h b/mount/mk_loop_h
deleted file mode 100644
index 86e76f3..0000000
--- a/mount/mk_loop_h
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# Figure out (i) the type of dev_t (ii) the defines for loop stuff
-#
-
-rm -f loop.h
-
-# Since 1.3.79 there is an include file <asm/posix_types.h>
-# that defines __kernel_dev_t.
-# (The file itself appeared in 1.3.78, but there it defined __dev_t.)
-# If it exists, we use it, or, rather, <linux/posix_types.h> which
-# avoids namespace pollution.  Otherwise we guess that __kernel_dev_t
-# is an unsigned short (which is true on i386, but false on alpha).
-
-if [ -f /usr/include/linux/posix_types.h ]; then
-   echo '#include <linux/posix_types.h>' >> loop.h
-   echo '#undef dev_t' >> loop.h
-   echo '#define dev_t __kernel_dev_t' >> loop.h
-else
-   echo '#undef dev_t' >> loop.h
-   echo '#define dev_t unsigned short' >> loop.h
-fi
-
-# Next we have to find the loop stuff itself.
-# First try kernel source, then a private version.
-
-if [ -f /usr/include/linux/loop.h ]; then
-   echo '#include <linux/loop.h>' >> loop.h
-else
-   echo '#include "h/loop.h"' >> loop.h
-fi
-
-echo '#undef dev_t' >> loop.h
-
diff --git a/mount/mntent.c b/mount/mntent.c
index a9a334f..f48da3d 100644
--- a/mount/mntent.c
+++ b/mount/mntent.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <string.h>		/* for index */
 #include <ctype.h>		/* for isdigit */
+#include <sys/stat.h>		/* for umask */
 #include "mntent.h"
 #include "sundries.h"		/* for xmalloc */
 #include "nls.h"
@@ -95,8 +96,10 @@
 mntFILE *
 my_setmntent (const char *file, char *mode) {
 	mntFILE *mfp = xmalloc(sizeof(*mfp));
+	mode_t old_umask = umask(077);
 
 	mfp->mntent_fp = fopen (file, mode);
+	umask(old_umask);
 	mfp->mntent_file = xstrdup(file);
 	mfp->mntent_errs = (mfp->mntent_fp == NULL);
 	mfp->mntent_softerrs = 0;
diff --git a/mount/mount.8 b/mount/mount.8
index 32a5e85..794cc32 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -224,6 +224,7 @@
 If no arguments are given to
 .BR mount ,
 this list is printed.
+
 When the
 .I proc
 filesystem is mounted (say at
@@ -241,7 +242,8 @@
 by a symbolic link to
 .IR /proc/mounts ,
 but some information is lost that way, and in particular
-working with the loop device will be less convenient.
+working with the loop device will be less convenient,
+and using the "user" option will fail.
 
 .SH OPTIONS
 The full set of options used by an invocation of
@@ -295,6 +297,9 @@
 command is trying to do. It can also be used to add entries for devices
 that were mounted earlier with the -n option.
 .TP
+.B \-i
+Don't call the /sbin/mount.<filesystem> helper even if it exists.
+.TP
 .B \-l
 Add the ext2, ext3 and XFS labels in the mount output. Mount must have
 permission to read the disk device (e.g. be suid root) for this to work.
@@ -310,6 +315,12 @@
 .I /etc
 is on a read-only file system.
 .TP
+.BI \-p " num"
+In case of a loop mount with encryption, read the passphrase from
+file descriptor
+.I num
+instead of from the terminal.
+.TP
 .B \-s
 Tolerate sloppy mount options rather than failing. This will ignore
 mount options not supported by a filesystem type. Not all filesystems
@@ -402,7 +413,7 @@
 Since various versions of the
 .I smbmount
 program have different calling conventions,
-.I /sbin/mount.smb
+.I /sbin/mount.smbfs
 may have to be a shell script that sets up the desired call.
 
 The type
@@ -1095,6 +1106,8 @@
 .TP
 .B unhide
 Also show hidden and associated files.
+(If the ordinary files and the associated or hidden files have
+the same filenames, this may make the ordinary files inaccessible.)
 .TP
 .B block=[512|1024|2048]
 Set the block size to the indicated value.
@@ -1116,11 +1129,21 @@
 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
-.B session=x
+.BI session= x
 Select number of session on multisession CD. (Since 2.3.4.)
 .TP
-.B sbsector=xxx
+.BI sbsector= xxx
 Session begins from sector xxx. (Since 2.3.4.)
+.LP
+The following options are the same as for vfat and specifying them only makes
+sense when using discs encoded using Microsoft's Joliet extensions.
+.TP
+.BI iocharset= value
+Character set to use for converting 16 bit Unicode characters on CD
+to 8 bit characters. The default is iso8859-1.
+.TP
+.B utf8
+Convert 16 bit Unicode characters on CD to UTF-8.
 
 .SH "Mount options for minix"
 None.
@@ -1133,16 +1156,16 @@
 system read-only. The file system can be made writeable again by remounting
 it.
 
-.SH "Mount options for ncp"
+.SH "Mount options for ncpfs"
 Just like
-.IR nfs ", the " ncp
+.IR nfs ", the " ncpfs
 implementation expects a binary argument (a
 .IR "struct ncp_mount_data" )
 to the mount system call. This argument is constructed by
 .BR ncpmount (8)
 and the current version of
 .B mount
-(2.6h) does not know anything about ncp.
+(2.12) does not know anything about ncpfs.
 
 .SH "Mount options for nfs"
 Instead of a textual option string, parsed by the kernel, the
@@ -1346,14 +1369,14 @@
 
 .SH "Mount options for smbfs"
 Just like
-.IR nfs ", the " smb
+.IR nfs ", the " smbfs
 implementation expects a binary argument (a
 .IR "struct smb_mount_data" )
 to the mount system call. This argument is constructed by
 .BR smbmount (8)
 and the current version of
 .B mount
-(2.9w) does not know anything about smb.
+(2.12) does not know anything about smbfs.
 
 .SH "Mount options for sysv"
 None.
diff --git a/mount/mount.c b/mount/mount.c
index 1da75d9..6059460 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -80,6 +80,9 @@
 /* True for fake mount (-f).  */
 static int fake = 0;
 
+/* True if we are allowed to call /sbin/mount.${FSTYPE} */
+static int external_allowed = 1;
+
 /* Don't write a entry in /etc/mtab (-n).  */
 static int nomtab = 0;
 
@@ -110,6 +113,9 @@
 /* True if ruid != euid.  */
 static int suid = 0;
 
+/* Contains the fd to read the passphrase from, if any. */
+static int pfd = -1;
+
 /* Map from -o and fstab option strings to the flag argument to mount(2).  */
 struct opt_map {
   const char *opt;		/* option name */
@@ -447,11 +453,16 @@
  */
 static int
 do_mount_syscall (struct mountargs *args) {
-     int ret = mount (args->spec, args->node, args->type,
-		      MS_MGC_VAL | (args->flags), args->data);
-     if (ret == 0)
-	  mountcount++;
-     return ret;
+	int flags = args->flags;
+	int ret;
+
+	if ((flags & MS_MGC_MSK) == 0)
+		flags |= MS_MGC_VAL;
+
+	ret = mount (args->spec, args->node, args->type, flags, args->data);
+	if (ret == 0)
+		mountcount++;
+	return ret;
 }
 
 /*
@@ -593,7 +604,8 @@
       if (verbose)
 	printf(_("mount: going to use the loop device %s\n"), *loopdev);
       offset = opt_offset ? strtoul(opt_offset, NULL, 0) : 0;
-      if (set_loop (*loopdev, *loopfile, offset, opt_encryption, &loopro)) {
+      if (set_loop(*loopdev, *loopfile, offset,
+		   opt_encryption, pfd, &loopro)) {
 	if (verbose)
 	  printf(_("mount: failed setting up loop device\n"));
 	return EX_FAIL;
@@ -652,6 +664,14 @@
 }
 
 static void
+set_pfd(char *s) {
+	if (!isdigit(*s))
+		die(EX_USAGE,
+		    _("mount: argument to -p or --pass-fd must be a number"));
+	pfd = atoi(optarg);
+}
+
+static void
 cdrom_setspeed(char *spec) {
 #define CDROM_SELECT_SPEED      0x5322  /* Set the CD-ROM speed */
     if (opt_speed) {
@@ -673,7 +693,6 @@
  *	If there is a special mount program for this type, exec it.
  * returns: 0: no exec was done, 1: exec was done, status has result
  */
-#define ALWAYS_STAT
 
 static int
 check_special_mountprog(char *spec, char *node, char *type, int flags,
@@ -682,16 +701,10 @@
   struct stat statbuf;
   int res;
 
-  if (type &&
-#ifndef ALWAYS_STAT
-     (streq (type, "smb") || streq (type, "ncp")
-      /* these are incorrect but perhaps used by smbmount or so */
-       || streq (type, "smbfs") || streq (type, "ncpfs")
-     )
-#else
-     (strlen (type) < 100)
-#endif
-  ) {
+  if (!external_allowed)
+      return 0;
+
+  if (type && strlen(type) < 100) {
        sprintf(mountprog, "/sbin/mount.%s", type);
        if (stat(mountprog, &statbuf) == 0) {
 	    res = fork();
@@ -767,7 +780,7 @@
   if (mount_all && (flags & MS_NOAUTO))
     return 0;
 
-  suid_check (spec, node, &flags, &user);
+  suid_check(spec, node, &flags, &user);
 
   mount_opts = extra_opts;
 
@@ -775,18 +788,19 @@
       cdrom_setspeed(spec);
 
   if (!(flags & MS_REMOUNT)) {
-      /* don't set up a (new) loop device if we only remount - this left
+      /*
+       * Don't set up a (new) loop device if we only remount - this left
        * stale assignments of files to loop devices. Nasty when used for
        * encryption.
        */
-      res = loop_check (&spec, &types, &flags, &loop, &loopdev, &loopfile);
+      res = loop_check(&spec, &types, &flags, &loop, &loopdev, &loopfile);
       if (res)
 	  return res;
   }
 
   /*
    * Call mount.TYPE for types that require a separate mount program.
-   * For the moment these types are ncp and smb. Maybe also vxfs.
+   * For the moment these types are ncpfs and smbfs. Maybe also vxfs.
    * All such special things must occur isolated in the types string.
    */
   if (check_special_mountprog (spec, node, types, flags, extra_opts, &status))
@@ -1136,10 +1150,10 @@
 	  printf(_("mount: no type was given - "
 		 "I'll assume nfs because of the colon\n"));
       } else if(!strncmp(spec, "//", 2)) {
-	types = "smb";
+	types = "smbfs";
 	if (verbose)
 	  printf(_("mount: no type was given - "
-		   "I'll assume smb because of the // prefix\n"));
+		   "I'll assume smbfs because of the // prefix\n"));
       }
   }
 
@@ -1356,6 +1370,7 @@
 	{ "rw", 0, 0, 'w' },
 	{ "options", 1, 0, 'o' },
 	{ "test-opts", 1, 0, 'O' },
+	{ "pass-fd", 1, 0, 'p' },
 	{ "types", 1, 0, 't' },
 	{ "bind", 0, 0, 128 },
 	{ "replace", 0, 0, 129 },
@@ -1365,6 +1380,7 @@
 	{ "move", 0, 0, 133 },
 	{ "guess-fstype", 1, 0, 134 },
 	{ "rbind", 0, 0, 135 },
+	{ "internal-only", 0, 0, 'i' },
 	{ NULL, 0, 0, 0 }
 };
 
@@ -1392,7 +1408,7 @@
 	  "       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"
 	));
 /*
@@ -1431,7 +1447,7 @@
 	initproctitle(argc, argv);
 #endif
 
-	while ((c = getopt_long (argc, argv, "afFhlL:no:O:rsU:vVwt:",
+	while ((c = getopt_long (argc, argv, "afFhilL:no:O:p:rsU:vVwt:",
 				 longopts, NULL)) != -1) {
 		switch (c) {
 		case 'a':	       /* mount everything in fstab */
@@ -1446,6 +1462,9 @@
 		case 'h':		/* help */
 			usage (stdout, 0);
 			break;
+		case 'i':
+			external_allowed = 0;
+			break;
 		case 'l':
 			list_with_volumelabel = 1;
 			break;
@@ -1467,6 +1486,9 @@
 			else
 				test_opts = xstrdup(optarg);
 			break;
+		case 'p':		/* fd on which to read passwd */
+			set_pfd(optarg);
+			break;
 		case 'r':		/* mount readonly */
 			readonly = 1;
 			readwrite = 0;
diff --git a/mount/mount.smb b/mount/mount.smbfs
similarity index 89%
rename from mount/mount.smb
rename to mount/mount.smbfs
index 845f310..990b695 100644
--- a/mount/mount.smb
+++ b/mount/mount.smbfs
@@ -1,11 +1,11 @@
 #!/bin/csh
 #
-# /sbin/mount.smb
+# /sbin/mount.smbfs
 # by Greg Galperin, MAR99 <grg@ai.mit.edu>
 # ver 1.1 MAR99	GRG	docs update: must escape special chars like $
 # ver 1.0 MAR99	GRG	original version
 #
-# Intent is to allow calls to mount with -t smb to work properly
+# Intent is to allow calls to mount with -t smbfs to work properly
 # (either manually or from an automounter).
 #
 # bugs:
@@ -17,7 +17,7 @@
 # To use this from autofs:
 #
 # have an entry of the form
-#	key	-fstype=smb,-Uadministrator,-Ppassword	://host/share
+#	key	-fstype=smbfs,-Uadministrator,-Ppassword	://host/share
 # in the appropriate /etc/auto.mountpoint file.
 #
 # This makes access to /mountpoint/key/ access smb //host/share/ 
@@ -32,7 +32,7 @@
 #
 ###########################################################################
 #
-# I get called in the form: /sbin/mount.smb //host/shr /mnt/tmp -o rw,arg1,arg2
+# I get called as: /sbin/mount.smbfs //host/shr /mnt/tmp -o rw,arg1,arg2
 #
 # It looks like mount tacks on either "rw" or "ro" as the first argument,
 # so I'm going to count on having exactly 5 arguments.
diff --git a/mount/mount_by_label.c b/mount/mount_by_label.c
index e2afcf0..524ec7c 100644
--- a/mount/mount_by_label.c
+++ b/mount/mount_by_label.c
@@ -125,6 +125,40 @@
 	return 1;
 }
 
+/*
+ * xvm is a proprietary sgi volume manager, it goes into /proc/partitions
+ * like this:
+ *
+ *   4     0    2210817 xvm/local/vol/myvolume/data/block
+ *   4     1    2210817 xvm/local/vol/myvolume/rt/block
+ *   4     2    2210817 xvm/local/vol/myvolume/log/block
+ *   4     3    2210818 xvm/local/vol/discs3/data/block
+ *
+ * The heuristics here are that the device should start with "xvm,"
+ * but should not end in "log/block" or "rt/block" - those are
+ * special devices for the xfs filesystem external log & realtime device.
+ */
+
+/*
+ * XVM support - Eric Sandeen
+ * Return 1 if this looks like an xvm device that should be scanned
+ */
+static int
+is_xvm(char *ptname)
+{
+	/*
+	 * Scan anything with "xvm" and "data" in its name.
+	 * That might pick up non-data xvm subvols if the
+	 * volumename contains the string 'data' but
+	 * that should be harmless.
+	 */
+
+	if (strstr(ptname, "xvm") && strstr(ptname, "data"))
+		return 1;
+
+	return 0;
+}
+
 static void
 uuidcache_init(void) {
 	char line[100];
@@ -193,7 +227,8 @@
 		/* devfs has .../disc and .../part1 etc. */
 
 		for(s = ptname; *s; s++);
-		if (isdigit(s[-1])) {
+		if (isdigit(s[-1]) || is_xvm(ptname)) {
+			
 		/*
 		 * Note: this is a heuristic only - there is no reason
 		 * why these devices should live in /dev.
diff --git a/mount/mount_guess_fstype.c b/mount/mount_guess_fstype.c
index 96b14d7..ab47b45 100644
--- a/mount/mount_guess_fstype.c
+++ b/mount/mount_guess_fstype.c
@@ -297,6 +297,8 @@
 	 else if ((!strncmp(xsb.fatsb.s_os, "MSDOS", 5) ||
 		   !strncmp(xsb.fatsb.s_os, "MSWIN", 5) ||
 		   !strncmp(xsb.fatsb.s_os, "MTOOL", 5) ||
+		   !strncmp(xsb.fatsb.s_os, "IBM", 3) ||
+		   !strncmp(xsb.fatsb.s_os, "DRDOS", 5) ||
 		   !strncmp(xsb.fatsb.s_os, "mkdosfs", 7) ||
 		   !strncmp(xsb.fatsb.s_os, "kmkdosfs", 8) ||
 		   /* Michal Svec: created by fdformat, old msdos utility for
@@ -359,13 +361,10 @@
              goto io_error;
 
         /* also check if block size is equal to 512 bytes,
-           since the hfs driver currently only has support
-           for block sizes of 512 bytes long, and to be
-           more accurate (sb magic is only a short int) */
-        if ((hfsmagic(hfssb) == HFS_SUPER_MAGIC &&
-	     hfsblksize(hfssb) == 0x20000) ||
-            (swapped(hfsmagic(hfssb)) == HFS_SUPER_MAGIC &&
-             hfsblksize(hfssb) == 0x200))
+	   or a multiple. (I see 1536 here.) */
+        if (hfsmagic(hfssb) == HFS_SUPER_MAGIC &&	/* always BE */
+	    hfsblksize(hfssb) != 0 &&
+	    (hfsblksize(hfssb) & 0x1ff) == 0)
              type = "hfs";
     }
 
diff --git a/mount/my_dev_t.h b/mount/my_dev_t.h
new file mode 100644
index 0000000..5ef9715
--- /dev/null
+++ b/mount/my_dev_t.h
@@ -0,0 +1,7 @@
+/* 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>
+#define my_dev_t __kernel_dev_t
diff --git a/mount/pivot_root.c b/mount/pivot_root.c
index faa0e4d..a844b48 100644
--- a/mount/pivot_root.c
+++ b/mount/pivot_root.c
@@ -2,8 +2,8 @@
 
 /* Written 2000 by Werner Almesberger */
 
-
 #include <stdio.h>
+#include <errno.h>	/* needed for <linux/unistd.h> below */
 
 #ifdef __ia64__
 # include <sys/syscall.h>
diff --git a/mount/realpath.c b/mount/realpath.c
index 61832ef..988d923 100644
--- a/mount/realpath.c
+++ b/mount/realpath.c
@@ -13,7 +13,7 @@
  * GNU Library Public License for more details.
  */
 
-#undef resolve_symlinks
+#define resolve_symlinks
 
 /*
  * This routine is part of libc.  We include it nevertheless,
diff --git a/mount/umount.c b/mount/umount.c
index 29feff4..eed00d8 100644
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -400,15 +400,23 @@
  * In both cases, it is best to try the last occurrence first.
  */
 static int
-umount_one_bw (const char *file, struct mntentchn *mc) {
-     int res = 1;
+umount_one_bw (const char *file, struct mntentchn *mc0) {
+	struct mntentchn *mc;
+	int res = 1;
 
-     while (res && mc) {
-	  res = umount_one(mc->m.mnt_fsname, mc->m.mnt_dir,
-			   mc->m.mnt_type, mc->m.mnt_opts, mc);
-	  mc = getmntfilesbackward (file, mc);
-     }
-     return res;
+	mc = mc0;
+	while (res && mc) {
+		res = umount_one(mc->m.mnt_fsname, mc->m.mnt_dir,
+				 mc->m.mnt_type, mc->m.mnt_opts, mc);
+		mc = getmntdirbackward(file, mc);
+	}
+	mc = mc0;
+	while (res && mc) {
+		res = umount_one(mc->m.mnt_fsname, mc->m.mnt_dir,
+				 mc->m.mnt_type, mc->m.mnt_opts, mc);
+		mc = getmntdevbackward(file, mc);
+	}
+	return res;
 }
 
 /* Unmount all filesystems of type VFSTYPES found in mtab.  Since we are
@@ -525,7 +533,6 @@
 	}
 	return 0;
 }
-/*=======================================================================*/
 
 static int
 umount_file (char *arg) {
@@ -534,19 +541,25 @@
 	string_list options;
 	int fstab_has_user, fstab_has_users, fstab_has_owner, ok;
 
-	file = canonicalize (arg); /* mtab paths are canonicalized */
+	file = canonicalize(arg); /* mtab paths are canonicalized */
 	if (verbose > 1)
 		printf(_("Trying to umount %s\n"), file);
 
-	mc = getmntfilesbackward (file, NULL);
+	mc = getmntdirbackward(file, NULL);
+	if (!mc)
+		mc = getmntdevbackward(file, NULL);
 	if (!mc && verbose)
 		printf(_("Could not find %s in mtab\n"), file);
 
 	if (suid) {
 		if (!mc)
-			die (2, _("umount: %s is not mounted (according to mtab)"), file);
-		if (getmntfilesbackward (file, mc))
-			die (2, _("umount: it seems %s is mounted multiple times"), file);
+			die(2,
+			    _("umount: %s is not mounted (according to mtab)"),
+			    file);
+		if (!is_mounted_once(file))
+			die(2,
+			    _("umount: it seems %s is mounted multiple times"),
+			    file);
 
 		/* If fstab contains the two lines
 		   /dev/sda1 /mnt/zip auto user,noauto  0 0
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f0c110a..1755994 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,7 +21,7 @@
 fdisk/llseek.c
 fdisk/partname.c
 fdisk/sfdisk.c
-getopt-1.1.2/getopt.c
+getopt/getopt.c
 hwclock/clock-ppc.c
 hwclock/cmos.c
 hwclock/hwclock.c
@@ -65,7 +65,6 @@
 misc-utils/setterm.c
 misc-utils/whereis.c
 misc-utils/write.c
-mount/bind.c
 mount/fstab.c
 mount/getusername.c
 mount/lomount.c
diff --git a/po/ca.po b/po/ca.po
index 78b41ae..6618474 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,24 +1,23 @@
 # translation of util-linux.po to Catalan
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Antoni Bella Perez <bella5@teleline.es>, 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.
 #
-# Antoni Bella Perez <bella5@teleline.es>, 2002.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-2.11u\n"
-"POT-Creation-Date: 2002-11-25 00:47+0100\n"
-"PO-Revision-Date: 2002-09-12 00:59+0200\n"
+"Project-Id-Version: util-linux-2.11z\n"
+"POT-Creation-Date: 2003-02-05 06:31-0500\n"
+"PO-Revision-Date: 2003-03-26 09:29+0100\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.0beta2\n"
+"X-Generator: KBabel 1.0.1\n"
 
 #: disk-utils/blockdev.c:60
 msgid "set read-only"
@@ -50,11 +49,11 @@
 
 #: disk-utils/blockdev.c:79
 msgid "set readahead"
-msgstr "inicialitzar la lectura avançada"
+msgstr "establir 'readahead'"
 
 #: disk-utils/blockdev.c:82
 msgid "get readahead"
-msgstr "obtindre la lectura avançada"
+msgstr "obtindre 'readahead'"
 
 #: disk-utils/blockdev.c:85
 msgid "flush buffers"
@@ -117,7 +116,7 @@
 
 #: 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"
@@ -125,7 +124,7 @@
 
 #: disk-utils/fdformat.c:60
 msgid "Verifying ... "
-msgstr "Verificant ... "
+msgstr "S'està verificant... "
 
 #: disk-utils/fdformat.c:71
 msgid "Read: "
@@ -143,7 +142,7 @@
 "Continuing ... "
 msgstr ""
 "dades incorrectes al cilindre %d\n"
-"Continuant ... "
+"Continuant... "
 
 #: disk-utils/fdformat.c:94
 #, c-format
@@ -152,13 +151,13 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
 #, c-format
 msgid "%s from %s\n"
-msgstr "%s des de %s\n"
+msgstr "%s provinent de %s\n"
 
 #: disk-utils/fdformat.c:130
 #, c-format
@@ -176,7 +175,7 @@
 
 #: disk-utils/fdformat.c:142
 msgid "Double"
-msgstr "Densitat doble"
+msgstr "Doble densitat"
 
 #: disk-utils/fdformat.c:142
 msgid "Single"
@@ -192,10 +191,10 @@
 " file       file to test\n"
 msgstr ""
 "usar: %s [-hv] [-x dir] fitxer\n"
-" -h         mostrà aquesta ajuda\n"
+" -h         mostra aquesta ajuda\n"
 " -x dir     extreu a dins del dir\n"
 " -v         mostra més missatges\n"
-" file       fitxer a provar\n"
+" fitxer     fitxer a comprovar\n"
 
 #: disk-utils/fsck.cramfs.c:191
 #, c-format
@@ -265,7 +264,7 @@
 #: 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
@@ -306,7 +305,7 @@
 
 #: disk-utils/fsck.minix.c:309
 msgid "Do you really want to continue"
-msgstr "N'esteu segur de que desitgeu continuar?"
+msgstr "N'esteu segur que desitgeu continuar?"
 
 #: disk-utils/fsck.minix.c:313
 msgid "check aborted.\n"
@@ -371,7 +370,7 @@
 
 #: disk-utils/fsck.minix.c:548
 msgid "Unable to write inodes"
-msgstr "No es pot escriure els ínodes"
+msgstr "No es poden escriure els ínodes"
 
 #: disk-utils/fsck.minix.c:577
 msgid "seek failed"
@@ -399,7 +398,7 @@
 
 #: disk-utils/fsck.minix.c:612
 msgid "Unable to allocate buffer for inode map"
-msgstr "No es pot assignar memòria temporal pel mapa de ínodes"
+msgstr "No es pot assignar memòria temporal per al mapa de ínodes"
 
 #: disk-utils/fsck.minix.c:620
 msgid "Unable to allocate buffer for inodes"
@@ -407,11 +406,11 @@
 
 #: disk-utils/fsck.minix.c:623
 msgid "Unable to allocate buffer for inode count"
-msgstr "No es pot assignar memòria temporal per al número de ínodes"
+msgstr "No es pot assignar memòria temporal per al nombre de ínodes"
 
 #: disk-utils/fsck.minix.c:626
 msgid "Unable to allocate buffer for zone count"
-msgstr "No es pot assignar memòria temporal per al número de zones"
+msgstr "No es pot assignar memòria temporal per al nombre de zones"
 
 #: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
@@ -423,7 +422,7 @@
 
 #: disk-utils/fsck.minix.c:632
 msgid "Unable to read inodes"
-msgstr "No es pot llegir els ínodes"
+msgstr "No es poden llegir els ínodes"
 
 #: disk-utils/fsck.minix.c:634
 msgid "Warning: Firstzone != Norm_firstzone\n"
@@ -442,7 +441,7 @@
 #: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
-msgstr "Primerazonadedades=%ld (%ld)\n"
+msgstr "Primerazonadades=%ld (%ld)\n"
 
 #: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
 #, c-format
@@ -475,7 +474,7 @@
 
 #: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
 msgid "Mark in use"
-msgstr "Marcar en us"
+msgstr "Marcar en ús"
 
 #: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
 #, c-format
@@ -484,7 +483,7 @@
 
 #: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
 msgid "Warning: inode count too big.\n"
-msgstr "Atenció: número de ínodes massa gran.\n"
+msgstr "Atenció: nombre d'ínodes massa gran.\n"
 
 #: disk-utils/fsck.minix.c:755
 msgid "root inode isn't a directory"
@@ -513,8 +512,7 @@
 #: 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 ""
-"El directori `%s' conté un número de ínode incorrecte per al fitxer '%.*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
 msgid " Remove"
@@ -561,12 +559,12 @@
 #: 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 "El ínode %d no s'usa; marcat com en us en el mapa de bits."
+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
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
-msgstr "S'està usant el ínode %d; marcat com a no en us en el mapa de bits."
+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
 #, c-format
@@ -580,7 +578,7 @@
 #: 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 "Zona %d: marcada com en us; 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
 msgid "Unmark"
@@ -589,12 +587,12 @@
 #: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
-msgstr "Zona %d: en us, comptada=%d\n"
+msgstr "Zona %d: en ús, comptada=%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 "Zona %d: no en us, comptada=%d\n"
+msgstr "Zona %d: no en ús, comptada=%d\n"
 
 #: disk-utils/fsck.minix.c:1220
 msgid "Set"
@@ -631,8 +629,7 @@
 #: disk-utils/fsck.minix.c:1350
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
-msgstr ""
-"Al sistema de fitxers en %s hi han elements estranys, s'han de comprovar.\n"
+msgstr "Al sistema de fitxers en %s hi han elements estranys, s'han de comprovar.\n"
 
 #: disk-utils/fsck.minix.c:1379
 #, c-format
@@ -751,7 +748,7 @@
 #: disk-utils/mkfs.bfs.c:192
 #, c-format
 msgid "blocks argument too large, max is %lu"
-msgstr "el número de blocs es massa gran, el màxim és de %lu"
+msgstr "el nombre de blocs es massa gran, el màxim és de %lu"
 
 #: disk-utils/mkfs.bfs.c:207
 msgid "too many inodes - max is 512"
@@ -833,12 +830,10 @@
 
 #: 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"
+msgstr "Useu: mkfs [-V] [-t tipus_sis._fitx.] [opcions_sis._fitx.]  dispositiu [mida]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Memòria esgotada\n"
@@ -848,8 +843,8 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versió %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
-#, fuzzy, c-format
+#: 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"
@@ -865,93 +860,86 @@
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"useu: %s [-h] [-v] [-e edició] [-i fitxer] [-n nom] nom_dir fitxer_eixida\n"
+"useu: %s [-v] [-b blksz] [-e edició] [-i fitxer] [-n nom] nom_dir fitxer_eixida\n"
 " -h         mostra aquesta ajuda\n"
 " -v         més missatges\n"
 " -E         converteix els avisos en errors (estatus d'eixida no cero)\n"
 " -e edició  estableix el nombre d'edició (part de fsid)\n"
 " -i fitxer  insereix una imatge de fitxer al sistema de fitxers (requereix\n"
-"            Linux >= 2.4.0)\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"
-" -s         ordena les entrades d directori (opció antiga, ignorar)\n"
-" -z         crear buits explícits (requereix Linux >= 2.3.39)\n"
+" -p         desplaça %d octets per al codi d'arrencada\n"
+" -s         ordena les entrades de directori (opció antiga, ignorar)\n"
+" -z         crear buits explícits (requereix >= 2.3.39)\n"
 " nom_dir    arrel del sistema de fitxers que serà comprimit\n"
 " fit._eix.  fitxer d'eixida\n"
 
-#: disk-utils/mkfs.cramfs.c:328
+#: 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 ""
 "Trobo que és massa llarg (%u octets), nom del fitxer `%s'.\n"
-" Si us plau, incrementeu MAX_INPUT_NAMELEN en mkcramfs.c i recompileu. "
-"Sortint.\n"
+" Si us plau, incrementeu MAX_INPUT_NAMELEN en mkcramfs.c i recompileu. Sortint.\n"
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr "sistema de fitxers massa gran.  Sortint.\n"
 
-#: disk-utils/mkfs.cramfs.c:507
-msgid ""
-"Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
-"Exiting.\n"
+#: disk-utils/mkfs.cramfs.c:514
+msgid "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
 "S'han excedit les MAXENTRIES. Incrementeu aquest valor en mkcramfs.c i\n"
 "recompileu.  Sortint.\n"
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: 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"
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr "%6.2f%% (%+d octets)\t%s\n"
 
-#: disk-utils/mkfs.cramfs.c:812
+#: 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 ""
-"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"
+msgid "warning: guestimate of required size (upper bound) is %LdMB, but maximum image size is %uMB.  We might die prematurely.\n"
+msgstr "atenció: s'estima que la mida requerida (cota superior) és %LdMB, però la mida màxima de la imatge és %uMB. Podria abortar prematurament.\n"
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
 msgstr "Incloguent: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr "Dades del directori: %d octets\n"
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr "Tot: %d kilooctets\n"
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, c-format
 msgid "Super block: %d bytes\n"
 msgstr "Super bloc: %d octets\n"
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr "CRC: %x\n"
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr "no hi ha prou espai per a l'imatge ROM (assignat %Ld, emprat %d)\n"
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr "ha fallat l'escriptura de l'imatge ROM (%d %d)\n"
@@ -960,43 +948,36 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: 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"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: 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"
 
-#: disk-utils/mkfs.cramfs.c:911
+#: 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"
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
-msgid ""
-"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr ""
-"atenció: els uids es trunquen a %u bits,  (Podria ser un problema de "
-"seguretat).\n"
+msgid "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "atenció: els uids es trunquen a %u bits,  (Podria ser un problema de seguretat).\n"
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
-msgid ""
-"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr ""
-"atenció: els gids es trunquen a %u bits.  (Podria ser un problema de "
-"seguretat).\n"
+msgid "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "atenció: els gids es trunquen a %u bits.  (Podria ser un problema de seguretat).\n"
 
-#: disk-utils/mkfs.cramfs.c:926
+#: 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 ""
-"ATENCIÓ: els nombres de dispositiu es trunquen a %u bits.  Amb seguretat "
-"que\n"
+"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
@@ -1023,7 +1004,7 @@
 
 #: disk-utils/mkfs.minix.c:268
 msgid "unable to write inode map"
-msgstr "No es pot escriure el mapa de ínodes"
+msgstr "No es pot escriure el mapa dels ínodes"
 
 #: disk-utils/mkfs.minix.c:270
 msgid "unable to write zone map"
@@ -1031,7 +1012,7 @@
 
 #: disk-utils/mkfs.minix.c:272
 msgid "unable to write inodes"
-msgstr "No es pot escriure els ínodes"
+msgstr "No es poden escriure els ínodes"
 
 #: disk-utils/mkfs.minix.c:281
 msgid "write failed in write_block"
@@ -1078,9 +1059,7 @@
 
 #: disk-utils/mkfs.minix.c:586
 msgid "bad blocks before data-area: cannot make fs"
-msgstr ""
-"Blocs incorrectes abans de l'àrea de dades: no es pot crear el sistema de "
-"fitxers"
+msgstr "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
 #, c-format
@@ -1127,9 +1106,7 @@
 #: disk-utils/mkswap.c:187
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
-msgstr ""
-"S'utilitza la mida de la pàgina %d especificada pel usuari, en comptes dels "
-"valors del sistema %d/%d\n"
+msgstr "S'utilitza la mida de la pàgina %d especificada pel usuari, en comptes dels valors del sistema %d/%d\n"
 
 #: disk-utils/mkswap.c:191
 #, c-format
@@ -1145,8 +1122,8 @@
 msgid "too many bad pages"
 msgstr "hi han masses pàgines incorrectes"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1145
+#: text-utils/more.c:2064 text-utils/more.c:2075
 msgid "Out of memory"
 msgstr "Memòria esgotada"
 
@@ -1208,12 +1185,12 @@
 
 #: disk-utils/mkswap.c:615
 msgid "Unable to set up swap-space: unreadable"
-msgstr "No es pot configurar l'espai d'intercanvi: no es pot llegir-la"
+msgstr "No es pot configurar l'espai d'intercanvi: no es pot llegir"
 
 #: disk-utils/mkswap.c:616
-#, fuzzy, c-format
+#, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
-msgstr "Configurant l'espai d'intercanvi versió %d, mida = %lu KiB\n"
+msgstr "Configurant l'espai d'intercanvi versió %d, mida = %llu KiB\n"
 
 #: disk-utils/mkswap.c:622
 msgid "unable to rewind swap-device"
@@ -1221,7 +1198,7 @@
 
 #: disk-utils/mkswap.c:625
 msgid "unable to write signature page"
-msgstr "no es pot escriure pàgina de la firma"
+msgstr "no es pot escriure la pàgina de la firma"
 
 #: disk-utils/mkswap.c:633
 msgid "fsync failed"
@@ -1249,11 +1226,8 @@
 
 #: disk-utils/setfdprm.c:102
 #, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"   %s [ -p ] dispositiu mida sectors capçals pistes stretch interval tassa "
-"spec1 format_interval\n"
+msgid "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+msgstr "   %s [ -p ] dispositiu mida sectors capçals pistes stretch interval tassa spec1 format_interval\n"
 
 #: disk-utils/setfdprm.c:105
 #, c-format
@@ -1265,11 +1239,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] dispositiu\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Inutilitzable"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Espai lliure"
 
@@ -1312,9 +1286,7 @@
 
 #: fdisk/cfdisk.c:429
 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"
+msgstr "Reinicieu el sistema per a assegurar-vos de que la taula de particions ha estat actualitzada correctament.\n"
 
 #: fdisk/cfdisk.c:432
 msgid ""
@@ -1326,7 +1298,7 @@
 "\n"
 "ATENCIÓ: Si heu creat o modificat alguna de les\n"
 "particions de DOS 6.x, si us plau consulteu la pàgina\n"
-"del manual de cfdis per a informació addicional.\n"
+"del manual de cfdisk per a informació addicional.\n"
 
 #: fdisk/cfdisk.c:527
 msgid "FATAL ERROR"
@@ -1370,7 +1342,7 @@
 
 #: fdisk/cfdisk.c:910
 msgid "Partition ends in the final partial cylinder"
-msgstr ""
+msgstr "La partició acaba en l'últim cilindre parcial"
 
 #: fdisk/cfdisk.c:934
 msgid "logical partitions not in disk order"
@@ -1385,16 +1357,12 @@
 msgstr "solapament de les particions lògiques ampliades"
 
 #: fdisk/cfdisk.c:969
-msgid ""
-"!!!! Internal error creating logical drive with no extended partition !!!!"
-msgstr ""
-"!!!! Error intern al crear una unitat lògica sense partició estesa !!!!"
+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
-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"
+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
 msgid "Menu item too long. Menu may look odd."
@@ -1404,703 +1372,677 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menú sense direcció; l'opció per defecte és horitzontal."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Tecla no permesa"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Premeu una tecla per a continuar"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2497
 msgid "Primary"
 msgstr "Primària"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Crear una nova partició primària"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2497
 msgid "Logical"
 msgstr "Lògica"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Crear una nova partició lògica"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "No crear cap partició"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Error intern !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Mida (en MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Principi"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Afegir partició al principi de l'espai lliure"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Final"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Afegir partició al final de l'espai lliure"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "No hi ha espai per a crear la partició estesa"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1512
 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:1524
+#: fdisk/cfdisk.c:1514
 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:1576
+#: fdisk/cfdisk.c:1566
 msgid "You specified more cylinders than fit on disk"
 msgstr "Heu especificat més cilindres dels que caben al disc"
 
-#: fdisk/cfdisk.c:1606
+#: fdisk/cfdisk.c:1596
 msgid "Cannot open disk drive"
 msgstr "No es pot obrir la unitat de disc"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1598 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:1629
+#: fdisk/cfdisk.c:1619
 msgid "Cannot get disk size"
 msgstr "No es pot obtindre la mida del disc"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Partició primària incorrecta"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Partició lògica incorrecta"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1789
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Atenció: Això pot destruir les dades del vostre disc!"
 
-#: fdisk/cfdisk.c:1803
+#: 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): "
+msgstr "Esteu segurs de que voleu escriure la taula de particions al disc? (si o no): "
 
-#: fdisk/cfdisk.c:1809
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1810
+#: 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:1812
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "si"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Si us plau escriviu `si' o `no'"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Escrivint la taula de particions al disc..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Taula de particions del disc, escrita"
 
+#: 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:1846
-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:1856
 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."
+msgstr "No hi han particions primàries marcades com a d'arrencada. Així la MBR del DOS no podrà arrencar."
 
-#: fdisk/cfdisk.c:1858
-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: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:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: 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: "
+msgstr "Escriviu el nom del fitxer o premeu Intro per a visualitzar-lo en pantalla: "
 
-#: fdisk/cfdisk.c:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: 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:1936
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unitat de disc: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Cap   "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Lòg"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Primària"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Lògica"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
 #: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2005
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Arren.(%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2007 fdisk/cfdisk.c:2503
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconegut (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2009
 #, c-format
 msgid "None (%02X)"
 msgstr "Cap (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: 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:2056
+#: fdisk/cfdisk.c:2046
 msgid "            First    Last\n"
-msgstr "            Primer   Últim\n"
+msgstr "             Primer   Últim\n"
 
-#: fdisk/cfdisk.c:2057
-msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
-msgstr ""
-" # Tipus     Sector   Sector  Despl. Longitud  (ID) Sistema Fitxers   "
-"Etiqueta\n"
+#: fdisk/cfdisk.c:2047
+msgid " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+msgstr " # Tipus     sector   sector  Despl. Longitud  (ID) Sistema Fitxers   Etiqueta\n"
 
-#: fdisk/cfdisk.c:2058
-msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
-msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+#: fdisk/cfdisk.c:2048
+msgid "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
+msgstr "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2131
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
-msgstr "         ----Inici----      -----Final----   Sector Número de\n"
+msgstr "         ----Inici-----      -----Final----   Sector Nombre de\n"
 
-#: fdisk/cfdisk.c:2142
+#: 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"
+msgstr " # Indi. Cap. Sec. Cil.  ID  Cap. Sec. Cil.   d'inici  sectors\n"
 
-#: fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2133
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "En cru"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Imprimir la taula utilitzant el format de dades en cru"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2269
 msgid "Sectors"
 msgstr "Sectors"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Imprimir la taula ordenada per sectors"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Taula"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Sols imprimir la taula de particions"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "No imprimir la taula"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Pantalla d'ajuda per a cfdisk"
 
-#: fdisk/cfdisk.c:2209
+#: 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:2210
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
-msgstr "aquest 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:2211
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
-msgstr "disc dur."
+msgstr "el vostre disc dur."
 
-#: fdisk/cfdisk.c:2213
+#: 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:2215
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
-msgstr "Comandament      Significat"
+msgstr "Comandament Significat"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
-msgstr "-------      -------"
+msgstr "----------- ----------"
 
-#: fdisk/cfdisk.c:2217
+#: 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:2218
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d         Suprimeix l'actual partició"
 
-#: fdisk/cfdisk.c:2219
+#: 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"
+msgstr "  g         Canvia paràmetres de cilindres, capçals i sectors per pista"
 
-#: fdisk/cfdisk.c:2220
+#: 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:2221
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "            que conegui el funcionament de la mateixa."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h         Imprimeix aquesta pantalla"
 
-#: fdisk/cfdisk.c:2223
+#: 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:2224
+#: 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:2225
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "            amb DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2226
+#: 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:2227
+#: 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"
+msgstr "  p         Imprimeix la taula de particions en la pantalla o en un fitxer"
 
-#: fdisk/cfdisk.c:2228
+#: 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:2229
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "            entre els que podeu escollir:"
 
-#: fdisk/cfdisk.c:2230
+#: 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:2231
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "               s - Taula ordenada per sectors"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "               t - Taula en format en cru"
 
-#: fdisk/cfdisk.c:2233
+#: 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:2234
+#: 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:2235
+#: 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:2236
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "            Alterna entre MB, sectors i cilindres"
 
-#: fdisk/cfdisk.c:2237
+#: 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:2238
+#: 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:2239
+#: 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:2240
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
-msgstr "             `no'"
+msgstr "            `no'"
 
-#: fdisk/cfdisk.c:2241
+#: 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:2242
+#: 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:2243
+#: 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:2244
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
-msgstr "  ?           Imprimir aquesta pantalla"
+msgstr "  ?           Imprimeix aquesta pantalla"
 
-#: fdisk/cfdisk.c:2246
+#: 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:2247
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "minúscules (excepte W per a escriure)."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2597 fdisk/fdisksunlabel.c:322
 #: fdisk/fdisksunlabel.c:324
 msgid "Cylinders"
 msgstr "Cilindres"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2267
 msgid "Change cylinder geometry"
 msgstr "Canviar la geometria dels cilindres"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:319
 msgid "Heads"
 msgstr "Capçals"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2268
 msgid "Change head geometry"
 msgstr "Canviar la geometria dels capçals"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2269
 msgid "Change sector geometry"
 msgstr "Canviar la geometria dels sectors"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2270
 msgid "Done"
 msgstr "Fet"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2270
 msgid "Done with changing geometry"
 msgstr "S'ha finalitzat el canvi de geometria"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2283
 msgid "Enter the number of cylinders: "
-msgstr "Escriviu el número de cilindres: "
+msgstr "Escriviu el nombre de cilindres: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2865
 msgid "Illegal cylinders value"
 msgstr "Valor dels cilindres no permes"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Escriviu el nombre de capçals: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2875
 msgid "Illegal heads value"
 msgstr "Valor dels capçals no permes"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
-msgstr "Escriviu el número de sectors per pista: "
+msgstr "Escriviu el nombre de sectors per pista: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2882
 msgid "Illegal sectors value"
 msgstr "Valor dels sectors no permes"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Escriviu el tipus del sistema de fitxers: "
 
-#: fdisk/cfdisk.c:2452
+#: 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:2454
+#: 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:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2472 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Arrencada"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2474
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc.(%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2477 fdisk/cfdisk.c:2480
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2485 fdisk/cfdisk.c:2488
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2496
 msgid "Pri/Log"
 msgstr "Pri/Lòg"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unitat de disc: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2578
 #, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "Mida: %lld octets, %ld MB"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2581
 #, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "Mida: %lld octets, %ld.%ld GB"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2585
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Capçals: %d   Sectors per pista: %d   Cilindres: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2589
 msgid "Name"
 msgstr "Nom"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2590
 msgid "Flags"
 msgstr "Etiquetes"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2591
 msgid "Part Type"
 msgstr "Tipus part."
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2592
 msgid "FS Type"
 msgstr "Tipus Sis.Fitx."
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2593
 msgid "[Label]"
 msgstr "[Etiqueta]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2595
 msgid "  Sectors"
 msgstr "  Sectors"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2599
 msgid "Size (MB)"
 msgstr "Mida (MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2601
 msgid "Size (GB)"
 msgstr "Mida (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2656
 msgid "Bootable"
 msgstr "Arrencada"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2656
 msgid "Toggle bootable flag of the current partition"
 msgstr "Establir l'etiqueta de la partició actual com d'arrencada"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2657
 msgid "Delete"
 msgstr "Suprimir"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2657
 msgid "Delete the current partition"
 msgstr "Suprimir l'actual partició"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2658
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2658
 msgid "Change disk geometry (experts only)"
 msgstr "Canviar la geometria del disc (sols usuaris experts)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2659
 msgid "Help"
 msgstr "Ajuda"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2659
 msgid "Print help screen"
 msgstr "Imprimir pantalla d'ajuda"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2660
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2660
 msgid "Maximize disk usage of the current partition (experts only)"
-msgstr ""
-"Maximitzar la utilització del disc en la partició actual (sols usuaris "
-"experts)"
+msgstr "Maximitzar la utilització del disc en la partició actual (sols usuaris experts)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2661
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2661
 msgid "Create new partition from free space"
 msgstr "Crear una nova partició des de l'espai lliure"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2662
 msgid "Print"
 msgstr "Imprimir"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2662
 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:2673
+#: fdisk/cfdisk.c:2663
 msgid "Quit"
 msgstr "Sortir"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2663
 msgid "Quit program without writing partition table"
 msgstr "Sortir del programa sense escriure la taula de particions"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2664
 msgid "Type"
 msgstr "Tipus"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2664
 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:2675
+#: fdisk/cfdisk.c:2665
 msgid "Units"
 msgstr "Unitats"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2665
 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:2676
+#: fdisk/cfdisk.c:2666
 msgid "Write"
 msgstr "Escriure"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2666
 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:2722
+#: fdisk/cfdisk.c:2712
 msgid "Cannot make this partition bootable"
 msgstr "No es pot fer aquesta partició arrencable"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2722
 msgid "Cannot delete an empty partition"
 msgstr "No es pot suprimir una partició buida"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2742 fdisk/cfdisk.c:2744
 msgid "Cannot maximize this partition"
 msgstr "No es pot maximitzar aquesta partició"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2752
 msgid "This partition is unusable"
 msgstr "Aquesta partició és inutilitzable"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2754
 msgid "This partition is already in use"
-msgstr "Aquesta partició ja està en us"
+msgstr "Aquesta partició ja està en ús"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2771
 msgid "Cannot change the type of an empty partition"
 msgstr "No es pot canviar el tipus d'una partició buida"
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2798 fdisk/cfdisk.c:2804
 msgid "No more partitions"
 msgstr "No hi ha més particions"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2811
 msgid "Illegal command"
 msgstr "Comandament no permès"
 
-#: fdisk/cfdisk.c:2831
-#, fuzzy
+#: fdisk/cfdisk.c:2821
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-2000 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:2838
+#: fdisk/cfdisk.c:2828
 #, c-format
 msgid ""
 "\n"
@@ -2120,19 +2062,19 @@
 "\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"
-"Us interactiu:\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"
 
@@ -2147,15 +2089,14 @@
 "-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"
+"Useu: 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
 msgid ""
@@ -2167,10 +2108,10 @@
 "  ...\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"
+"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
@@ -2438,8 +2379,7 @@
 #: fdisk/fdisk.c:666
 #, 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"
+msgstr "Atenció: s'ignoren les dades addicionals en la taula de particions %d\n"
 
 #: fdisk/fdisk.c:711
 msgid ""
@@ -2471,12 +2411,8 @@
 "Empreu el comandament 'b' per anar al mode BSD.\n"
 
 #: fdisk/fdisk.c:927
-msgid ""
-"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
-"disklabel\n"
-msgstr ""
-"El dispositiu no conté una taula de particions DOS vàlida, així com tampoc "
-"una etiqueta de disc Sun, SGI o OSF\n"
+msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
+msgstr "El dispositiu no conté una taula de particions DOS vàlida, així com tampoc una etiqueta de disc Sun, SGI o OSF\n"
 
 #: fdisk/fdisk.c:944
 msgid "Internal error\n"
@@ -2489,12 +2425,8 @@
 
 #: fdisk/fdisk.c:969
 #, 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à "
-"corregida amb w(rite)\n"
+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à corregida amb w(rite)\n"
 
 #: fdisk/fdisk.c:991
 msgid ""
@@ -2524,7 +2456,7 @@
 
 #: fdisk/fdisk.c:1148
 msgid "Partition number"
-msgstr "Número de partició"
+msgstr "Nombre de partició"
 
 #: fdisk/fdisk.c:1159
 #, c-format
@@ -2532,18 +2464,17 @@
 msgstr "Atenció: la partició %d és del tipus buit\n"
 
 #: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207
-#, fuzzy, c-format
+#, c-format
 msgid "Selected partition %d\n"
-msgstr "S'ignorarà la partició estesa addicional %d\n"
+msgstr "S'ha seleccionat la partició %d\n"
 
 #: fdisk/fdisk.c:1184
-#, fuzzy
 msgid "No partition is defined yet!\n"
-msgstr "No hi han particions definides\n"
+msgstr "No hi ha cap partició definida!\n"
 
 #: fdisk/fdisk.c:1210
 msgid "All primary partitions have been defined already!\n"
-msgstr ""
+msgstr "Ja s'han definit totes les particions primàries!\n"
 
 #: fdisk/fdisk.c:1220
 msgid "cylinder"
@@ -2654,9 +2585,9 @@
 msgstr "ha de ser (%d, %d, 1)\n"
 
 #: fdisk/fdisk.c:1469
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr "La partició %d no acaba en un límit de cilindre.\n"
+msgstr "La partició %i no acaba en un límit de cilindre.\n"
 
 #: fdisk/fdisk.c:1473
 #, c-format
@@ -2664,34 +2595,32 @@
 msgstr "ha de ser (%d, %d, %d)\n"
 
 #: fdisk/fdisk.c:1485
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
-msgstr "%s: No mida (%ld vs %ld) octets\n"
+msgstr ""
+"\n"
+"Disc %s: %ld MiB, %lld octets\n"
 
 #: fdisk/fdisk.c:1488
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 "\n"
-"Disc %s: %d capçals, %d sectors, %d cilindres\n"
-"\n"
+"Disc %s: %ld.%ld GiB, %lld octets\n"
 
 #: fdisk/fdisk.c:1490
-#, fuzzy, c-format
+#, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
-msgstr ""
-"\n"
-"Disc %s: %d capçals, %d sectors, %d cilindres\n"
-"\n"
+msgstr "%d capçals, %d sectors/pista, %d cilindres"
 
 #: fdisk/fdisk.c:1493
 #, c-format
 msgid ", total %lu sectors"
-msgstr ""
+msgstr ", total %lu sectors"
 
 #: fdisk/fdisk.c:1496
 #, c-format
@@ -2699,6 +2628,8 @@
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
+"Unitats = %s de %d * %d = %d octets\n"
+"\n"
 
 #: fdisk/fdisk.c:1604
 msgid ""
@@ -2798,8 +2729,7 @@
 #: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
 #, 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"
+msgstr "La partició %d ja està definida. Esborreu-la abans de tornar-la a afegir.\n"
 
 #: fdisk/fdisk.c:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
 #: fdisk/fdisksunlabel.c:522
@@ -2835,7 +2765,7 @@
 
 #: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
-msgstr "S'ha creat el màxim número de particions\n"
+msgstr "S'ha creat el màxim nombre de particions\n"
 
 #: fdisk/fdisk.c:2031
 msgid "You must delete some partition and add an extended partition first\n"
@@ -2863,7 +2793,7 @@
 #: fdisk/fdisk.c:2057
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
-msgstr "Número de partició invàlida pel tipus `%c'\n"
+msgstr "Nombre de partició no vàlid per al tipus `%c'\n"
 
 #: fdisk/fdisk.c:2093
 msgid ""
@@ -2921,20 +2851,19 @@
 
 #: fdisk/fdisk.c:2216
 msgid "Number of cylinders"
-msgstr "Número de cilindres"
+msgstr "Nombre de cilindres"
 
 #: fdisk/fdisk.c:2243
 msgid "Number of heads"
-msgstr "Número de capçals"
+msgstr "Nombre de capçals"
 
 #: fdisk/fdisk.c:2268
 msgid "Number of sectors"
-msgstr "Número de sectors"
+msgstr "Nombre de sectors"
 
 #: fdisk/fdisk.c:2271
 msgid "Warning: setting sector offset for DOS compatiblity\n"
-msgstr ""
-"Atenció: establint desplaçament del sector per a la compatibilitat amb DOS\n"
+msgstr "Atenció: establint desplaçament del sector per a la compatibilitat amb DOS\n"
 
 #: fdisk/fdisk.c:2346
 #, c-format
@@ -2958,25 +2887,17 @@
 
 #: fdisk/fdisk.c:2466
 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"
+msgstr "Aquest nucli cerca la mida del sector por si mateix; l'opció -b serà ignorada\n"
 
 #: fdisk/fdisk.c:2470
-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 "
-"dispositiu específic\n"
+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 dispositiu específic\n"
 
 #. OSF label, and no DOS label
 #: fdisk/fdisk.c:2529
 #, 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"
+msgstr "A l'entrar el mode d'etiqueta, s'ha detectat una etiqueta de disc OSF/1 en %s.\n"
 
 #: fdisk/fdisk.c:2539
 msgid "Command (m for help): "
@@ -3006,8 +2927,7 @@
 "\n"
 msgstr ""
 "\n"
-"\tHo sento, no hi ha menú d'usuaris experts per a les taules de particions "
-"SGI.\n"
+"\tHo sento, no hi ha menú d'usuaris experts per a les taules de particions SGI.\n"
 "\n"
 
 #: fdisk/fdiskaixlabel.c:28
@@ -3387,17 +3307,12 @@
 msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:158
-msgid ""
-"According to MIPS Computer Systems, Inc the Label must not contain more than "
-"512 bytes\n"
-msgstr ""
-"Segons la MIPS Computer Systems, Inc. l'etiqueta no pot contindre més de 512 "
-"octets\n"
+msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
+msgstr "Segons la MIPS Computer Systems, Inc. l'etiqueta no pot contindre més de 512 octets\n"
 
 #: fdisk/fdisksgilabel.c:177
 msgid "Detected sgi disklabel with wrong checksum.\n"
-msgstr ""
-"Detectada una etiqueta de disc sgi amb una suma de comprovació incorrecta.\n"
+msgstr "Detectada una etiqueta de disc sgi amb una suma de comprovació incorrecta.\n"
 
 #: fdisk/fdisksgilabel.c:200
 #, c-format
@@ -3482,8 +3397,7 @@
 "\tBootfile must have a fully qualified pathname.\n"
 msgstr ""
 "\n"
-"\tEl fitxer d'arrencada ha de tindre un nom de ruta completament "
-"qualificat.\n"
+"\tEl fitxer d'arrencada ha de tindre un nom de ruta completament qualificat.\n"
 
 #: fdisk/fdisksgilabel.c:321
 msgid ""
@@ -3493,8 +3407,7 @@
 msgstr ""
 "\n"
 "\tTingueu en compte que no es comprova l'existència del fitxer d'arrencada.\n"
-"\tEl valor per defecte SGI és \"/unix\" i per a la còpia de seguretat \"/"
-"unix.save\".\n"
+"\tEl valor per defecte SGI és \"/unix\" i per a la còpia de seguretat \"/unix.save\".\n"
 
 #: fdisk/fdisksgilabel.c:349
 #, c-format
@@ -3624,8 +3537,7 @@
 
 #: fdisk/fdisksgilabel.c:680
 msgid "You got a partition overlap on the disk. Fix it first!\n"
-msgstr ""
-"S'ha produït un solapament de particions en el disc. Corregiu això primer!\n"
+msgstr "S'ha produït un solapament de particions en el disc. Corregiu això primer!\n"
 
 #: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
 msgid ""
@@ -3637,8 +3549,7 @@
 
 #: fdisk/fdisksgilabel.c:705
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
-msgstr ""
-"Es produirà un solapament de particions en el disc. Corregiu això primer!\n"
+msgstr "Es produirà un solapament de particions en el disc. Corregiu això primer!\n"
 
 #: fdisk/fdisksgilabel.c:710
 #, c-format
@@ -3832,8 +3743,7 @@
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
-"Si desitgeu mantindre la compatibilitat amb SunOS/Solaris, considereu el "
-"deixar\n"
+"Si desitgeu mantindre la compatibilitat amb SunOS/Solaris, considereu el deixar\n"
 "aquesta partició com a Disc sencer (5), començant en 0, amb %u sectors\n"
 
 #: fdisk/fdisksunlabel.c:626
@@ -3889,11 +3799,11 @@
 
 #: fdisk/fdisksunlabel.c:701
 msgid "Number of alternate cylinders"
-msgstr "Número de cilindres alternatius"
+msgstr "Nombre de cilindres alternatius"
 
 #: fdisk/fdisksunlabel.c:734
 msgid "Number of physical cylinders"
-msgstr "Número de cilindres físics"
+msgstr "Nombre de cilindres físics"
 
 #: fdisk/i386_sys_types.c:7
 msgid "FAT12"
@@ -4304,8 +4214,7 @@
 
 #: fdisk/sfdisk.c:319
 msgid "partition restore file has wrong size - not restoring\n"
-msgstr ""
-"mida incorrecte del fitxer de restitució de la partició - no es restituirà\n"
+msgstr "mida incorrecte del fitxer de restitució de la partició - no es restituirà\n"
 
 #: fdisk/sfdisk.c:323
 msgid "out of memory?\n"
@@ -4374,7 +4283,7 @@
 "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ó: número improbable 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
@@ -4388,29 +4297,18 @@
 
 #: fdisk/sfdisk.c:538
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
-msgstr ""
-"%s de partició %s té un valor imposible per al capçal: %lu (hauria d'estar "
-"entre 0 i %lu)\n"
+msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr "%s de partició %s té un valor imposible per al capçal: %lu (hauria d'estar entre 0 i %lu)\n"
 
 #: fdisk/sfdisk.c:543
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
-"lu)\n"
-msgstr ""
-"%s de partició %s té un valor imposible per al sector: %lu (hauria d'estar "
-"entre 1 i %lu)\n"
+msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
+msgstr "%s de partició %s té un valor imposible per al sector: %lu (hauria d'estar entre 1 i %lu)\n"
 
 #: fdisk/sfdisk.c:548
 #, 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"
+msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
+msgstr "%s de partició %s té un valor imposible per als cilindres: %lu (hauria d'estar entre 0 i %lu)\n"
 
 #: fdisk/sfdisk.c:588
 msgid ""
@@ -4444,7 +4342,7 @@
 
 #: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
-msgstr "Format no reconegut - usant els sectors\n"
+msgstr "Format no reconegut; usant els sectors\n"
 
 #: fdisk/sfdisk.c:852
 #, c-format
@@ -4498,34 +4396,30 @@
 #: 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 ""
-"Unitats = megaoctets de 1048576 octets, blocs de 1024 octets, contant des de "
-"%d\n"
+"Unitats = MiB de 1048576 octets, blocs de 1024 octets, comptant des de %d\n"
 "\n"
 
 #: fdisk/sfdisk.c:887
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
+msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Disp. Arr.  Comen.  Acaba  MB     #blocs    Id  Sistema\n"
 
 #: fdisk/sfdisk.c:1047
 #, 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"
+msgstr "\t\tcomença: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1054
 #, 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"
+msgstr "\t\tacaba: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1057
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
-msgstr ""
-"la partició cava en el cilindre %ld, més enllà de l'acabament del disc\n"
+msgstr "la partició cava en el cilindre %ld, més enllà de l'acabament del disc\n"
 
 #: fdisk/sfdisk.c:1067
 msgid "No partitions found\n"
@@ -4554,8 +4448,7 @@
 #: fdisk/sfdisk.c:1131
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr ""
-"Atenció: la partició %s té una mida 0 però no està marcada com a buida\n"
+msgstr "Atenció: la partició %s té una mida 0 però no està marcada com a buida\n"
 
 #: fdisk/sfdisk.c:1134
 #, c-format
@@ -4630,8 +4523,7 @@
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 "Atenció: hi ha més d'una partició primària marcada com d'arrencada (activa)\n"
-"Això no és problema per al LILO, però el MBR del DOS no arrencarà aquest "
-"disc.\n"
+"Això no és problema per al LILO, però el MBR del DOS no arrencarà aquest disc.\n"
 
 #: fdisk/sfdisk.c:1252
 msgid ""
@@ -4647,29 +4539,30 @@
 "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"
-"Això no és problema per al LILO, però el MBR de DOS no arrencarà aquest "
-"disc.\n"
+"Això no és problema per al LILO, però el MBR de DOS no arrencarà aquest disc.\n"
+
+#: fdisk/sfdisk.c:1272
+msgid "start"
+msgstr "començament"
 
 #: fdisk/sfdisk.c:1275
 #, c-format
-msgid ""
-"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
-"partició %s: començament: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha "
-"trobat (%ld,%ld,%ld)\n"
+msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "partició %s: començament: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trobat (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1281
+msgid "end"
+msgstr "acaba"
 
 #: fdisk/sfdisk.c:1284
 #, 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 "
-"(%ld,%ld,%ld)\n"
+msgstr "partició %s: acaba: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trovat (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1287
 #, 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"
+msgstr "La partició %s acaba en el cilindre %ld, més enllà de l'acabament del disc\n"
 
 #: fdisk/sfdisk.c:1312
 #, c-format
@@ -4778,13 +4671,12 @@
 
 #: fdisk/sfdisk.c:2012
 msgid "Illegal type\n"
-msgstr "Tipus no permes\n"
+msgstr "Tipus no permés\n"
 
 #: fdisk/sfdisk.c:2044
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr ""
-"Atenció: la mida aconseguida (%lu) excedeix la màxima acceptable de (%lu)\n"
+msgstr "Atenció: la mida aconseguida (%lu) excedeix la màxima acceptable de (%lu)\n"
 
 #: fdisk/sfdisk.c:2050
 msgid "Warning: empty partition\n"
@@ -4822,10 +4714,8 @@
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 "Entrada en el següent format; els camps absents tenen un valor per defecte.\n"
-"<començament> <mida> <tipus [E,S,L,X,hex]> <arrencada [-,*]> <cil,capç,sec> "
-"<cil,capç,sec>\n"
-"Normalment sols necessitarieu especificar <començament> i <mida> (i potser "
-"<tipus>).\n"
+"<començament> <mida> <tipus [E,S,L,X,hex]> <arrencada [-,*]> <cil,capç,sec> <cil,capç,sec>\n"
+"Normalment sols necessitarieu especificar <començament> i <mida> (i potser <tipus>).\n"
 
 #: fdisk/sfdisk.c:2225
 msgid "version"
@@ -4850,8 +4740,7 @@
 
 #: fdisk/sfdisk.c:2235
 msgid "    -c [or --id]:        print or change partition Id"
-msgstr ""
-"    -c [o --id]:         Imprimeix o canvia l'identificador de la partició"
+msgstr "    -c [o --id]:         Imprimeix o canvia l'identificador de la partició"
 
 #: fdisk/sfdisk.c:2236
 msgid "    -l [or --list]:      list partitions of each device"
@@ -4859,22 +4748,15 @@
 
 #: fdisk/sfdisk.c:2237
 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"
+msgstr "    -d [o --dump]:       Igual, però amb un format adequat per l'entrada posterior"
 
 #: fdisk/sfdisk.c:2238
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
-msgstr ""
-"    -i [o --increment]:  Número de cilindres, etc. des de 1 en comptes de 0"
+msgstr "    -i [o --increment]:  Nombre de cilindres, etc. des de 1 en comptes de 0"
 
 #: fdisk/sfdisk.c:2239
-msgid ""
-"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
-"MB"
-msgstr ""
-"    -uS, -uB, -uC, -uM:  Accepta/reporta en unitats de sectors/blocs/"
-"cilindres/MB"
+msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
+msgstr "    -uS, -uB, -uC, -uM:  Accepta/reporta en unitats de sectors/blocs/cilindres/MB"
 
 #: fdisk/sfdisk.c:2240
 msgid "    -T [or --list-types]:list the known partition types"
@@ -4882,13 +4764,11 @@
 
 #: fdisk/sfdisk.c:2241
 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"
+msgstr "    -D [o --DOS]:        Per compatibilitat amb DOS: es perd una mica d'espai"
 
 #: fdisk/sfdisk.c:2242
 msgid "    -R [or --re-read]:   make kernel reread partition table"
-msgstr ""
-"    -R [o --re-read]:    Fa que el nucli rellegeixi la taula de particions"
+msgstr "    -R [o --re-read]:    Fa que el nucli rellegeixi la taula de particions"
 
 #: fdisk/sfdisk.c:2243
 msgid "    -N# :                change only the partition with number #"
@@ -4899,10 +4779,8 @@
 msgstr "    -n :                 No escriu realment al disc"
 
 #: fdisk/sfdisk.c:2245
-msgid ""
-"    -O file :            save the sectors that will be overwritten to file"
-msgstr ""
-"    -O fitxer :          Desa els sectors que es sobreescriuran en un fitxer"
+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:2246
 msgid "    -I file :            restore these sectors again"
@@ -4922,24 +4800,19 @@
 
 #: fdisk/sfdisk.c:2250
 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"
+msgstr "    -g [o --show-geometry]:  Imprimeix la idea del nucli de la geometria"
 
 #: fdisk/sfdisk.c:2251
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
-"    -x [o --show-extended]:  També mostra en l'eixida les particions "
-"esteses\n"
+"    -x [o --show-extended]:  També mostra en l'eixida les particions esteses\n"
 "                             o espera els seus descriptors en l'entrada"
 
 #: fdisk/sfdisk.c:2253
-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"
+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:2254
 msgid "    -q  [or --quiet]:      suppress warning messages"
@@ -4951,16 +4824,15 @@
 
 #: fdisk/sfdisk.c:2256
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
-msgstr ""
-"    -C# [o --cylinders #]: Estableix el número de cilindres que s'usaran"
+msgstr "    -C# [o --cylinders #]: Estableix el nombre de cilindres que s'usaran"
 
 #: fdisk/sfdisk.c:2257
 msgid "    -H# [or --heads #]:    set the number of heads to use"
-msgstr "    -H# [o --heads #]:     Estableix el número de capçals que s'usaran"
+msgstr "    -H# [o --heads #]:     Estableix el nombre de capçals que s'usaran"
 
 #: fdisk/sfdisk.c:2258
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
-msgstr "    -S# [o --sectors #]:   Estableix el número de sectors que s'usaran"
+msgstr "    -S# [o --sectors #]:   Estableix el nombre de sectors que s'usaran"
 
 #: fdisk/sfdisk.c:2259
 msgid "You can disable all consistency checking with:"
@@ -4968,8 +4840,7 @@
 
 #: fdisk/sfdisk.c:2260
 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"
+msgstr "    -f  [o --force]:       Farà el que li digueu, encara que sigui estúpid"
 
 #: fdisk/sfdisk.c:2266
 msgid "Usage:"
@@ -4983,8 +4854,7 @@
 #: fdisk/sfdisk.c:2268
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr ""
-"%s dispositiu n1 n2 ... activar particions n1 ..., desactivar la resta\n"
+msgstr "%s dispositiu n1 n2 ... activar particions n1 ..., desactivar la resta\n"
 
 #: fdisk/sfdisk.c:2269
 #, c-format
@@ -5002,7 +4872,7 @@
 
 #: fdisk/sfdisk.c:2576
 msgid "usage: sfdisk --print-id device partition-number\n"
-msgstr "useu: sfdisk --print-id dispositiu número_partició\n"
+msgstr "useu: sfdisk --print-id dispositiu partició_número\n"
 
 #: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --change-id device partition-number Id\n"
@@ -5010,7 +4880,7 @@
 
 #: fdisk/sfdisk.c:2580
 msgid "usage: sfdisk --id device partition-number [Id]\n"
-msgstr "useu: sfdisk --id dispositiu número_partició [Id]\n"
+msgstr "useu: sfdisk --id dispositiu partició_número [Id]\n"
 
 #: fdisk/sfdisk.c:2587
 msgid "can specify only one device (except with -l or -s)\n"
@@ -5075,7 +4945,7 @@
 
 #: fdisk/sfdisk.c:2863
 msgid "This disk is currently in use.\n"
-msgstr "Aquest disc està actualment en us.\n"
+msgstr "Aquest disc està actualment en ús.\n"
 
 #: fdisk/sfdisk.c:2880
 #, c-format
@@ -5099,9 +4969,9 @@
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
-"Aquest disc està actualment en us - reparticionar-lo probablement sigui\n"
-"una mala idea. Desmonteu tots els sistemes de fitxers i efectueu un\n"
-"swapoff en el disc des de les particions esteses.\n"
+"Aquest disc està actualment en ús; reparticionar-lo probablement sigui\n"
+"una mala idea. Desmunteu tots els sistemes de fitxers i efectueu un\n"
+"swapoff en totes les particions d'intercanvi del disc.\n"
 "Useu l'etiqueta --no-reread per a suprimir aquesta comprovació.\n"
 
 #: fdisk/sfdisk.c:2895
@@ -5180,97 +5050,91 @@
 "\tdd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Mireu fdisk(8).)\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Escolliu `getopt --help' per a obtindre més informació.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "opció llarga buida després de l'argument -l o --long"
 
-#: getopt-1.1.2/getopt.c:319
+#: 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"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Useu: getopt cadena_d'opcions paràmetres\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "      getopt [opcions] [--] cadena_d'opcions paràmetres\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "      getopt [opcions] -o|--options cadena_d'opcions [opcions] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "             paràmetres\n"
 
-#: getopt-1.1.2/getopt.c:328
-msgid ""
-"  -a, --alternative            Allow long options starting with single -\n"
-msgstr ""
-"  -a, --alternative            Permet opcions llargues amb un sol "
-"començament -\n"
+#: getopt/getopt.c:328
+msgid "  -a, --alternative            Allow long options starting with single -\n"
+msgstr "  -a, --alternative            Permet opcions llargues amb un sol començament -\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
-msgstr "  -h, --help                   Aquesta petita guia d'us\n"
+msgstr "  -h, --help                   Aquesta petita guia d'ús\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-msgstr ""
-"  -l, --longoptions=opc_llarg  Opcions llargues per a ser reconegudes\n"
+msgstr "  -l, --longoptions=opc_llarg  Opcions llargues per a ser reconegudes\n"
 
-#: getopt-1.1.2/getopt.c:331
-msgid ""
-"  -n, --name=progname          The name under which errors are reported\n"
-msgstr ""
-"  -n, --name=nom_programa      El nom sota el qual s'informa dels errors\n"
+#: getopt/getopt.c:331
+msgid "  -n, --name=progname          The name under which errors are reported\n"
+msgstr "  -n, --name=nom_programa      El nom sota el qual s'informa dels errors\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=cadena_opcions Opcions curtes per a ser reconegudes\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 "  -q, --quiet                  Deshabilita els informes d'error mitjançant\n"
 "                               getopt(3)\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           No hi ha eixida normal\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
 "  -s, --shell=shell            Estableix les convencions amb que es crida a\n"
 "                               l'interpret d'ordres\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Provar per a la versió getopt(1)\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -u, --unqote                 No posa entre cometes l'eixida\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Mostra la informació de la versió\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr "falta l'argument cadena_opcions"
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
-msgstr "getopt (millorat) 1.1.2\n"
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (millorat) 1.1.3\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "error intern; contacteu amb l'autor."
 
@@ -5308,8 +5172,7 @@
 #: hwclock/cmos.c:597
 #, 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"
+msgstr "%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"
@@ -5367,16 +5230,12 @@
 #: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr ""
-"Valors incorrectes en el rellotge del maquinari: %4d/%.2d/%.2d %.2d:%.2d:"
-"%.2d\n"
+msgstr "Valors incorrectes en el rellotge del maquinari: %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 ""
-"Hora del maquinari : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segons després de "
-"1969\n"
+msgstr "Hora del maquinari : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segons després de 1969\n"
 
 #: hwclock/hwclock.c:435
 #, c-format
@@ -5386,8 +5245,7 @@
 #: hwclock/hwclock.c:462
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
-msgstr ""
-"Establint l'hora del maquinari en %.2d:%.2d:%.2d = %ld segons des de 1969\n"
+msgstr "Establint l'hora del maquinari en %.2d:%.2d:%.2d = %ld segons des de 1969\n"
 
 #: hwclock/hwclock.c:468
 msgid "Clock not changed - testing only.\n"
@@ -5403,12 +5261,8 @@
 "Augmentant el retard fins al següent segon complet.\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 ""
-"Els registres del rellotge del maquinari conté valores invàlids (p.e. dia 50 "
-"del mes) o excedeixen el rang que poden usar (p.e. l'any 2095).\n"
+msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr "Els registres del rellotge del maquinari conté valores invàlids (p.e. dia 50 del mes) o excedeixen el rang que poden usar (p.e. l'any 2095).\n"
 
 #: hwclock/hwclock.c:555
 #, c-format
@@ -5438,9 +5292,7 @@
 
 #: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr ""
-"No es pot executar el programa 'date' en l'interpret de comandaments /bin/"
-"sh. popen() ha fallat"
+msgstr "No es pot executar el programa 'date' en l'interpret de comandaments /bin/sh. popen() ha fallat"
 
 #: hwclock/hwclock.c:622
 #, c-format
@@ -5465,15 +5317,13 @@
 #: 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 ""
-"El comandament date executat per %s retorna quelcom altre a un valor enter "
-"quan s'esperava el valor de l'hora convertida.\n"
+"El comandament date executat per %s retorna quelcom altre a un valor enter quan s'esperava el valor de l'hora convertida.\n"
 "El comandament fou:\n"
 "  %s\n"
 "La resposta fou:\n"
@@ -5485,12 +5335,8 @@
 msgstr "la cadena de la data %s equival a %ld segons des de 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 ""
-"El rellotge de maquinari no conté una hora vàlida, pel que no es pot "
-"establir l'hora del sistema a partir d'aquest valor.\n"
+msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
+msgstr "El rellotge de maquinari no conté una hora vàlida, pel que no es pot establir l'hora del sistema a partir d'aquest valor.\n"
 
 #: hwclock/hwclock.c:701
 msgid "Calling settimeofday:\n"
@@ -5508,9 +5354,7 @@
 
 #: hwclock/hwclock.c:707
 msgid "Not setting system clock because running in test mode.\n"
-msgstr ""
-"No configuro el rellotge del sistema donat que l'execució és en mode de "
-"prova.\n"
+msgstr "No configuro el rellotge del sistema donat que l'execució és en mode de prova.\n"
 
 #: hwclock/hwclock.c:716
 msgid "Must be superuser to set system clock.\n"
@@ -5521,12 +5365,8 @@
 msgstr "settimeofday() ha fallat"
 
 #: hwclock/hwclock.c:749
-msgid ""
-"Not adjusting drift factor because the Hardware Clock previously contained "
-"garbage.\n"
-msgstr ""
-"No s'ajusta el factor de desfase donat que el rellotge del maquinari "
-"contenia prèviament desperdicis.\n"
+msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
+msgstr "No s'ajusta el factor de desfase donat que el rellotge del maquinari contenia prèviament desperdicis.\n"
 
 #: hwclock/hwclock.c:754
 msgid ""
@@ -5538,22 +5378,16 @@
 "una calibració des del començament.\n"
 
 #: hwclock/hwclock.c:760
-msgid ""
-"Not adjusting drift factor because it has been less than a day since the "
-"last calibration.\n"
-msgstr ""
-"No s'ajusta el factor de desfase donat que fa menys d'un dia de la la última "
-"calibració.\n"
+msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
+msgstr "No s'ajusta el factor de desfase donat que fa menys d'un dia de la la última calibració.\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"
+"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 ""
-"El rellotje s'ha desfasat %.1f segons en els últims %d segons, tot i emprar "
-"un factor de desfase de %f segons diaris.\n"
+"El rellotje s'ha desfasat %.1f segons en els últims %d segons, tot i emprar un factor de desfase de %f segons diaris.\n"
 "Ajustan el factor de desfase en %f segons diaris\n"
 
 #: hwclock/hwclock.c:859
@@ -5564,9 +5398,7 @@
 #: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
-msgstr ""
-"Necessiteu inserir %d segons i refer la referència de l'hora tants %.6f "
-"segons enradera\n"
+msgstr "Necessiteu inserir %d segons i refer la referència de l'hora tants %.6f segons enradera\n"
 
 #: hwclock/hwclock.c:890
 msgid "Not updating adjtime file because of testing mode.\n"
@@ -5586,17 +5418,12 @@
 msgstr "Paràmetres d'ajustament del desfase no actualitzats.\n"
 
 #: hwclock/hwclock.c:956
-msgid ""
-"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr ""
-"El rellotje de maquinari no conté una hora vàlida, pel que no es pot ajustar-"
-"la.\n"
+msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr "El rellotje de maquinari no conté una hora vàlida, pel que no es pot ajustar.\n"
 
 #: hwclock/hwclock.c:988
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
-msgstr ""
-"L' ajustament necessari és inferior a un segon, pel que no s'estableix el "
-"rellotge.\n"
+msgstr "L' ajustament necessari és inferior a un segon, pel que no s'estableix al rellotge.\n"
 
 #: hwclock/hwclock.c:1014
 #, c-format
@@ -5613,13 +5440,11 @@
 
 #: 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 ""
-"El nucli té un valor de època per al rellotge de maquinari sols en les "
-"màquines Alpha.\n"
+"El nucli té un valor de època per al rellotge de maquinari sols en les màquines Alpha.\n"
 "Aquesta còpia de hwclock es va compilar per a una màquina no Alpha (pel que\n"
 "possiblement ara no s'executa en una màquina Alpha). No es pren cap acció.\n"
 
@@ -5633,12 +5458,8 @@
 msgstr "El nucli assumeix un valor de època de %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 ""
-"Per a establir el valor de època, haureu d'usar l'opció 'epoch' per a "
-"indicar a quin valor s'ha d'establir.\n"
+msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n"
+msgstr "Per a establir el valor de època, haureu d'usar l'opció 'epoch' per a indicar a quin valor s'ha d'establir.\n"
 
 #: hwclock/hwclock.c:1159
 #, c-format
@@ -5705,8 +5526,7 @@
 "  --date        Especifica el temps en que es desitja establir el RTC\n"
 "  --epoch=any   Especifica l'any que correspon al començament del valor de\n"
 "                l'època del RTC\n"
-"  --noadjfile   No accedir a /etc/adjtime. Requereix l'us de --utc o --"
-"localtime\n"
+"  --noadjfile   No accedir a /etc/adjtime. Requereix l'ús de --utc o --localtime\n"
 
 #: hwclock/hwclock.c:1223
 msgid ""
@@ -5731,21 +5551,13 @@
 
 #: hwclock/hwclock.c:1410
 #, c-format
-msgid ""
-"%s: The --utc and --localtime options are mutually exclusive.  You specified "
-"both.\n"
-msgstr ""
-"%s: Les opcions --utc i --localtime s'exclouen mutuament. Les heu "
-"especificat totes dues.\n"
+msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
+msgstr "%s: Les opcions --utc i --localtime s'exclouen mutuament. Les heu especificat totes dues.\n"
 
 #: hwclock/hwclock.c:1417
 #, c-format
-msgid ""
-"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
-"specified both.\n"
-msgstr ""
-"%s: Les opcions --adjust i --noadjfile s'exclouen mutuament. Les heu "
-"especificat totes dues.\n"
+msgid "%s: The --adjust and --noadjfile options are mutually exclusive.  You specified both.\n"
+msgstr "%s: Les opcions --adjust i --noadjfile s'exclouen mutuament. Les heu especificat totes dues.\n"
 
 #: hwclock/hwclock.c:1424
 #, c-format
@@ -5765,26 +5577,16 @@
 msgstr "Ho sento, sols el superusuari port canviar el rellotge del sistema.\n"
 
 #: hwclock/hwclock.c:1464
-msgid ""
-"Sorry, only the superuser can change the Hardware Clock epoch in the "
-"kernel.\n"
-msgstr ""
-"Ho sento, sols el superusuari pot canviar el valor de època del rellotge de "
-"maquinari en el nucli.\n"
+msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
+msgstr "Ho sento, sols el superusuari pot canviar el valor de època del rellotge de maquinari en el nucli.\n"
 
 #: hwclock/hwclock.c:1484
 msgid "Cannot access the Hardware Clock via any known method.\n"
-msgstr ""
-"No es pot accedir al rellotge de maquinari mitjançant un dels mètodes "
-"coneguts.\n"
+msgstr "No es pot accedir al rellotge de maquinari mitjançant un dels mètodes coneguts.\n"
 
 #: hwclock/hwclock.c:1488
-msgid ""
-"Use the --debug option to see the details of our search for an access "
-"method.\n"
-msgstr ""
-"Useu l'opció --debug per a veure els detalls de la recerca d'un mètode "
-"d'accés.\n"
+msgid "Use the --debug option to see the details of our search for an access method.\n"
+msgstr "Useu l'opció --debug per a veure els detalls de la recerca d'un mètode d'accés.\n"
 
 #: hwclock/kd.c:43
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
@@ -5794,7 +5596,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "Falla de ioctl KDGHWCLK al llegir l'hora"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr "Temps excedit durant l'espera del canvi d'hora.\n"
 
@@ -5819,110 +5621,95 @@
 msgid "KDGHWCLK ioctl failed"
 msgstr "Falla de ioctl KDGHWCLK"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "Falla de open() de %s"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, 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:171
+#: hwclock/rtc.c:170
 #, 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:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s no té funcions d'interrupció.  "
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
-msgstr ""
-"La comprovació de read() en %s ha fallat a l'esperar la senyal del rellotge"
+msgstr "La comprovació de read() en %s ha fallat a l'esperar la senyal del rellotge"
 
-#: hwclock/rtc.c:244
+#: hwclock/rtc.c:243
 #, 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ó"
+msgstr "La comprovació de ioctl() en %s ha fallat al desactivar les interrupcions d'actualització"
 
-#: hwclock/rtc.c:247
+#: hwclock/rtc.c:246
 #, 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ó"
+msgstr "La comprovació de ioctl() en %s ha fallat inesperadament a l'activar les interrupcions d'actualització"
 
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:305
 #, 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:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "La comprovació de ioctl(%s) ha finalitzat correctament.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "Error obrint %s"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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 ""
-"Per a modificar el valor de època del nucli, heu d'accedir al controlador "
-"del dispositiu 'rtc' de Linux mitjançant el fitxer especial de dispositiu %"
-"s. Aquest fitxer no existeix en aquest sistema.\n"
+msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s.  This file does not exist on this system.\n"
+msgstr "Per a modificar el valor de època del nucli, heu d'accedir al controlador del dispositiu 'rtc' de Linux mitjançant el fitxer especial de dispositiu %s. Aquest fitxer no existeix en aquest sistema.\n"
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr "No es pot obrir %s"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, 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:377
+#: hwclock/rtc.c:376
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr ""
-"s'ha llegit el valor de època %ld des de %s amb ioctl RTC_EPOCH_READ.\n"
+msgstr "s'ha llegit el valor de època %ld des de %s amb ioctl RTC_EPOCH_READ.\n"
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:397
+#: hwclock/rtc.c:396
 #, 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:415
+#: hwclock/rtc.c:414
 #, 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:420
+#: hwclock/rtc.c:419
 #, c-format
-msgid ""
-"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
-msgstr ""
-"El controlador de dispositiu del nucli per a %s no té el ioctl "
-"RTC_EPOCH_SET.\n"
+msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgstr "El controlador de dispositiu del nucli per a %s no té el ioctl RTC_EPOCH_SET.\n"
 
-#: hwclock/rtc.c:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "La comprovació de ioctl(RTC_EPOCH_SET) de %s ha fallat"
@@ -6059,22 +5846,16 @@
 #: 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 ""
-"Useu: %s [-hiLmw] [-l programa_d'accés] [-t temps_espera] [-I "
-"cadena_inicialització] [-H host_d'accés] velocitat_baudis,... línia "
-"[tipus_terminal]\n"
+"Useu: %s [-hiLmw] [-l programa_d'accés] [-t temps_espera] [-I cadena_inicialització] [-H host_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,... "
-"[tipus_terminal]\n"
+"\t    [-hiLmw] [-l programa_d'accés] [-t temps_espera] [-I cadena_inicialització] [-H host_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 pot fallar\n"
+msgstr "login: poca memòria; l'accés podria fallar\n"
 
 #: login-utils/checktty.c:105
 msgid "can't malloc for ttyclass"
@@ -6125,7 +5906,7 @@
 msgid "Password error."
 msgstr "Error de contrasenya."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
+#: 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:249
 #: mount/lomount.c:254
 msgid "Password: "
@@ -6179,8 +5960,7 @@
 
 #: login-utils/chfn.c:476
 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"
+msgstr "*NO* s'ha canviat la informació del finger. Probeu-ho altra vegada després.\n"
 
 #: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
@@ -6193,9 +5973,7 @@
 #: login-utils/chsh.c:130
 #, 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"
+msgstr "%s: El vostre intèrpret d'ordres no està en /etc/shells; canvi de l'intèrpret d'ordres denegat\n"
 
 #: login-utils/chsh.c:137
 #, c-format
@@ -6224,8 +6002,7 @@
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr ""
-"Useu: %s [ -s intèrpret_d'ordres ] [ --list-shells ] [ --help ] [ --"
-"version ]\n"
+"Useu: %s [ -s intèrpret_d'ordres ] [ --list-shells ] [ --help ] [ --version ]\n"
 "     [ nom_d'usuari ]\n"
 
 #: login-utils/chsh.c:303
@@ -6349,29 +6126,29 @@
 "\n"
 "interromput %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Error FATAL: no es pot reobrir tty: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
-msgstr ""
+msgstr "ERROR FATAL: terminal errònia"
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h sols per al superusuari.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "useu: login [-fp] [nom_usuari]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM ha fallat; avortant: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "No es pot inicialitzar PAM: %s"
@@ -6382,42 +6159,42 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
-msgstr "entrada: "
+msgstr "accés: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr "ENTRADA HA FALLAT %d DES DE %s PER A %s, %s"
+msgstr "ACCÉS INFRUCTUÓS %d DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
-"Entrada incorrecta\n"
+"Accés incorrecte\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
-msgstr "MASSES INTENTS D'ENTRADA (%d) DES DE %s PER A %s, %s"
+msgstr "MASSES INTENTS D'ACCÉS (%d) DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr "SESSIONS D'ENTRADA FALLIDES DES DE %s PER A %s, %s"
+msgstr "SESSIONS D'ACCÉS FALLIDES DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 "\n"
-"Entrada incorrecta\n"
+"Accés incorrecte\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
@@ -6425,44 +6202,44 @@
 "\n"
 "Problema a l'iniciar la sessió, avortat.\n"
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Nom d'usuari NUL en %s:%d. Avortat."
 
-#: login-utils/login.c:654
+#: 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."
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
 msgstr "login: Memòria esgotada\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Nom d'usuari ilegal"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
-msgstr "Entrada %s refusada en aquest terminal.\n"
+msgstr "Accés %s refusat en aquest terminal.\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr "ENTRADA %s REFUSADA DES DE %s EN TTY %s"
+msgstr "ACCÉS %s REFUSAT DES DE %s EN LA TTY %s"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr "ENTRADA %s REFUSADA EN TTY %s"
+msgstr "ACCÉS %s REFUSAT EN LA TTY %s"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
-msgstr "Entrada incorrecta\n"
+msgstr "Accés incorrecte\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -6470,153 +6247,153 @@
 "Masses usuaris en actiu en el sistema.\n"
 "Probeu-ho més tard.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
 msgstr "Teniu masses processos en execució.\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP EN %s PER %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
-msgstr "ENTRADA DE ROOT EN %s DES DE %s"
+msgstr "ACCÉS DE ROOT EN %s DES DE %s"
+
+#: login-utils/login.c:1074
+#, c-format
+msgid "ROOT LOGIN ON %s"
+msgstr "ACCÉS DE ROOT EN %s"
+
+#: login-utils/login.c:1077
+#, 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
 #, c-format
-msgid "ROOT LOGIN ON %s"
-msgstr "ENTRADA DE ROOT EN %s"
-
-#: login-utils/login.c:1083
-#, c-format
-msgid "LOGIN ON %s BY %s FROM %s"
-msgstr "ENTRADA EN %s PER %s DES DE %s"
-
-#: login-utils/login.c:1086
-#, c-format
 msgid "LOGIN ON %s BY %s"
-msgstr "ENTRADA EN %s PER %s"
+msgstr "ACCÉS EN %s PER %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
 msgstr "Teniu correu nou.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
 msgstr "Teniu correu.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: falla l'establiment del canvi: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ha fallat: %m"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr "setuid() ha fallat"
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr "No hi ha cap directori %s\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
-msgstr "Entrant amb el directori inicial = \"/\".\n"
+msgstr "Accedint amb el directori inicial = \"/\".\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
 msgstr "login: memòria esgotada per a l'script de l'ntèrpret d'ordres.\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
-msgstr "login: no he pogut executar l'script de l'ntèrpret d'ordres: %s.\n"
+msgstr "login: no s'ha pogut executar l'script de l'ntèrpret d'ordres: %s.\n"
 
-#: login-utils/login.c:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: no hi ha intèrpret d'ordres: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 "\n"
-"Entrada de %s: "
+"Accés de %s: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
-msgstr "nom d'entrada massa llarg.\n"
+msgstr "nom d'accés massa llarg.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "NOM massa llarg"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
-msgstr "els noms d'entrada no poden començar per '-'.\n"
+msgstr "els noms d'accés no poden començar per '-'.\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "masses salts de pàgina solitaris.\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "MASSES salts de pàgina"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
-msgstr "L'entrada ha esgotat el temps d'espera després de %d segons\n"
+msgstr "L'intent d'accés ha esgotat el temps d'espera després de %d segons\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
-msgstr "Última entrada: %.*s "
+msgstr "Últim accés: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "des de %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "en %.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
-msgstr "ENTRADA FALLIDA DES DE %s, %s"
+msgstr "ACCÉS FALLIT DES DE %s, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
-msgstr "ENTRADA FALLIDA EN %s, %s"
+msgstr "ACCÉS FALLIT EN %s, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr "%d ENTRADES FALLIDES DES DE %s, %s"
+msgstr "%d FALLES EN L'ACCÉS DES DE %s, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr "%d ENTRADES FALLIDES EN %s, %s"
+msgstr "%d FALLES EN L'ACCÉS EN %s, %s"
 
 #: login-utils/mesg.c:89
 msgid "is y\n"
-msgstr "és s\n"
+msgstr "és y\n"
 
 #: login-utils/mesg.c:92
 msgid "is n\n"
@@ -6640,7 +6417,7 @@
 
 #: login-utils/newgrp.c:90
 msgid "newgrp: Permission denied"
-msgstr "newgrp: Permis denegat"
+msgstr "newgrp: Permís denegat"
 
 #: login-utils/newgrp.c:97
 msgid "newgrp: setuid"
@@ -6652,9 +6429,7 @@
 
 #: login-utils/passwd.c:161
 msgid "The password must have at least 6 characters, try again.\n"
-msgstr ""
-"La contrasenya ha de tindre com a mínim 6 caràcters, probeu-ho altra "
-"vegada.\n"
+msgstr "La contrasenya ha de tindre com a mínim 6 caràcters, probeu-ho altra vegada.\n"
 
 #: login-utils/passwd.c:174
 msgid ""
@@ -6672,11 +6447,11 @@
 
 #: login-utils/passwd.c:188
 msgid "Please don't use something like your username as password!\n"
-msgstr "Si us plau no useu tal com el vostre nom d'usuari com a contrasenya.\n"
+msgstr "Si us plau, no useu tal com el vostre nom d'usuari com a contrasenya.\n"
 
 #: login-utils/passwd.c:199 login-utils/passwd.c:206
 msgid "Please don't use something like your realname as password!\n"
-msgstr "Si us plau no useu tal com el vostre nom real com a contrasenya.\n"
+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"
@@ -6697,7 +6472,7 @@
 
 #: login-utils/passwd.c:312
 msgid "Cannot find login name"
-msgstr "No es pot trobar el nom d'entada"
+msgstr "No es pot trobar el nom d'accés"
 
 #: login-utils/passwd.c:319 login-utils/passwd.c:326
 msgid "Only root can change the password for others.\n"
@@ -6714,7 +6489,7 @@
 
 #: login-utils/passwd.c:343
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Ho sento, sos es poden canviar les contrasenyes locals. Useu yppasswd."
+msgstr "Ho sento, sols es poden canviar les contrasenyes locals. Useu yppasswd."
 
 #: login-utils/passwd.c:349
 msgid "UID and username does not match, imposter!"
@@ -6761,7 +6536,7 @@
 #: login-utils/passwd.c:406
 #, c-format
 msgid "password changed by root, user %s"
-msgstr "contrasenya canviada pel root; usuari %s"
+msgstr "contrasenya canviada per al root; usuari %s"
 
 #: login-utils/passwd.c:413
 msgid "calling setpwnam to set password.\n"
@@ -6807,7 +6582,7 @@
 
 #: login-utils/shutdown.c:340
 msgid "Login is therefore prohibited."
-msgstr "Pel que l'entrada està prohibida."
+msgstr "Pel que l'accés està prohibit."
 
 #: login-utils/shutdown.c:362
 #, c-format
@@ -6899,7 +6674,7 @@
 
 #: login-utils/shutdown.c:594
 msgid "Cannot fork for umount, trying manually."
-msgstr "No es pot establir un canvi per a umount, provar manualment."
+msgstr "No es pot establir un canvi per a umount, provar-ho manualment."
 
 #: login-utils/shutdown.c:603
 #, c-format
@@ -6929,8 +6704,7 @@
 
 #: 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"
+msgstr "l'establiment del canvi a un sol usuari a l'intèrpret d'ordres ha fallat\n"
 
 #: login-utils/simpleinit.c:206
 msgid "error opening fifo\n"
@@ -6938,7 +6712,7 @@
 
 #: login-utils/simpleinit.c:210
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr ""
+msgstr "error d'inicialització close-on-exec sobre /dev/initctl"
 
 #: login-utils/simpleinit.c:257
 msgid "error running finalprog\n"
@@ -6973,7 +6747,7 @@
 msgid "fork failed\n"
 msgstr "l'establiment del canvi ha fallat\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1708
 msgid "exec failed\n"
 msgstr "l'execució (exec) ha fallat\n"
 
@@ -7035,8 +6809,7 @@
 #: login-utils/vipw.c:195
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
-msgstr ""
-"%s: no es pot desbloquejar %s: %s (els vostres canvis encara estan en %s)\n"
+msgstr "%s: no es pot desbloquejar %s: %s (els vostres canvis encara estan en %s)\n"
 
 #: login-utils/vipw.c:218
 #, c-format
@@ -7084,7 +6857,7 @@
 #: 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
@@ -7174,11 +6947,8 @@
 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] "
-"[ missatge ... ]\n"
+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] [ missatge ... ]\n"
 
 #: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
@@ -7274,12 +7044,12 @@
 msgid "Script started, file is %s\n"
 msgstr "Script executat, el fitxer és %s\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr "Script executat sobre (%s)"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
@@ -7288,210 +7058,210 @@
 "\n"
 "Script finalitzat (%s)"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script finalitzat, el fitxer és %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr "openpty ha fallat\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr "No queden pty\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:744
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Argument erroni, usant\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nom_terminal ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -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 "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NÚM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NÚM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file nom_fitxer_abocar ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq número_freqüència ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr "no es pot (des)activar el mode d'estalvi d'energia\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "Error de klogctl: %s\n"
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Error llegint %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr "Error escrivint un abocat de pantalla\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "no es pot llegir %s, i no es pot efectuar un abocat de ioctl\n"
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM no està definit.\n"
@@ -7506,7 +7276,7 @@
 
 #: misc-utils/write.c:110
 msgid "write: you have write permission turned off.\n"
-msgstr "write: teniu el permis d'escriptura desactivat.\n"
+msgstr "write: teniu el permís d'escriptura desactivat.\n"
 
 #: misc-utils/write.c:131
 #, c-format
@@ -7547,61 +7317,55 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Missatge des de %s@%s el %s a les %s ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "advertència: error al llegir %s: %s"
 
-#: mount/fstab.c:141 mount/fstab.c:164
+#: mount/fstab.c:142 mount/fstab.c:165
 #, c-format
 msgid "warning: can't open %s: %s"
 msgstr "advertència: no es pot obrir %s: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:146
 #, 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:387
+#: mount/fstab.c:413
 #, 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)"
+msgstr "no es pot crear el fitxer de blocat %s: %s (useu l'etiqueta -n per a modificar aquest valor)"
 
-#: mount/fstab.c:399
+#: mount/fstab.c:425
 #, 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)"
+msgstr "no es pot enllaçar el fitxer de blocat %s: %s (useu l'etiqueta -n per a modificar aquest valor)"
 
-#: mount/fstab.c:411
+#: mount/fstab.c:437
 #, 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)"
+msgstr "no es pot obrir el fitxer de blocat %s: %s (useu l'etiqueta -n per a modificar aquest valor)"
 
-#: mount/fstab.c:426
+#: mount/fstab.c:452
 #, 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:439
+#: mount/fstab.c:465
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "no es pot blocar al fitxer de blocat %s: %s"
 
-#: mount/fstab.c:441
+#: mount/fstab.c:467
 msgid "timed out"
 msgstr "temps d'espera excedit"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:474
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7610,22 +7374,22 @@
 "No es pot crear l'enllaç %s\n"
 "Potser hi hagi un fitxer de blocat obsolet?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:523 mount/fstab.c:559
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "no es pot obrir %s (%s) - mtab no actualitzat"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:567
 #, c-format
 msgid "error writing %s: %s"
 msgstr "error escrivint %s: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:575
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "error al canviar el mode de %s: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:593
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "no es pot reanomenar %s per %s: %s\n"
@@ -7722,8 +7486,7 @@
 
 #: mount/lomount.c:317
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr ""
-"Aquest mount s'ha compilat sense suport loop. Si us plau recompileu-lo.\n"
+msgstr "Aquest mount s'ha compilat sense suport loop. Si us plau, recompileu-lo.\n"
 
 #: mount/lomount.c:354
 #, c-format
@@ -7745,9 +7508,7 @@
 
 #: mount/lomount.c:443
 msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr ""
-"En temps de compilació el suport loop no estava disponible. Si us plau "
-"recompileu.\n"
+msgstr "Quan es va compilar el suport loop no estava disponible. Si us plau, recompileu.\n"
 
 #: mount/mntent.c:165
 #, c-format
@@ -7763,162 +7524,158 @@
 msgid "; rest of file ignored"
 msgstr "; la resta del fitxer s'ignorarà"
 
-#: mount/mount.c:385
+#: mount/mount.c:388
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: segons mtab, %s ja està muntat en %s"
 
-#: mount/mount.c:389
+#: mount/mount.c:392
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: segons mtab, %s està muntat en %s"
 
-#: mount/mount.c:410
+#: mount/mount.c:413
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: no es pot obrir %s per a escriptura: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:428 mount/mount.c:647
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: error escrivint %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:435
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: error al canviar el mode de %s: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:481
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s sembla espai d'intercanvi - no muntat"
 
-#: mount/mount.c:538
+#: mount/mount.c:541
 msgid "mount failed"
 msgstr "el muntatge ha fallat"
 
-#: mount/mount.c:540
+#: mount/mount.c:543
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: sols l'usuari root pot muntar %s en %s"
 
-#: mount/mount.c:568
+#: mount/mount.c:571
 msgid "mount: loop device specified twice"
 msgstr "mount: el dispositiu loop està especificat dues vegades"
 
-#: mount/mount.c:573
+#: mount/mount.c:576
 msgid "mount: type specified twice"
 msgstr "mount: el tipus està especificat dues vegades"
 
-#: mount/mount.c:585
+#: mount/mount.c:588
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: saltant-se la configuració d'un dispositiu loop\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:597
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: s'usarà el dispositiu loop %s\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:601
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: falla al configurar el dispositiu loop\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:605
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configuració correcta del dispositiu loop\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:642
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: no es pot obrir %s: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:665
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: no es pot obrir %s per a establir-ne la velocitat"
 
-#: mount/mount.c:665
+#: mount/mount.c:668
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount : no es pot establir la velocitat de: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:722 mount/mount.c:1296
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: no es pot establir el canvi: %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:802
 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'"
+msgstr "mount: aquesta versió ha estat compilada sense suport per al tipus `nfs'"
 
-#: mount/mount.c:845
+#: mount/mount.c:841
 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"
 
-#: mount/mount.c:856
-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 "
-"especificat cap"
+#: mount/mount.c:852
+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 especificat cap"
 
-#: mount/mount.c:859
+#: mount/mount.c:855
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: haureu d'especificar el tipus del sistema de fitxers"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:858
 msgid "mount: mount failed"
 msgstr "mount: el muntatge ha fallat"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:864 mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: el punt de muntatge %s no és un directori"
 
-#: mount/mount.c:870
+#: mount/mount.c:866
 msgid "mount: permission denied"
 msgstr "mount: permís denegat"
 
-#: mount/mount.c:872
+#: mount/mount.c:868
 msgid "mount: must be superuser to use 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:876 mount/mount.c:880
+#: mount/mount.c:872 mount/mount.c:876
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s està ocupat"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:878
 msgid "mount: proc already mounted"
 msgstr "mount: proc ja està muntat"
 
-#: mount/mount.c:884
+#: mount/mount.c:880
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ja està muntat o %s està ocupat"
 
-#: mount/mount.c:890
+#: mount/mount.c:886
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: el punt de muntatge %s no existeix"
 
-#: mount/mount.c:892
+#: mount/mount.c:888
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: el punt de muntatge %s és un enllaç simbòlic sense destí"
 
-#: mount/mount.c:895
+#: mount/mount.c:891
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: el dispositiu especial %s no existeix"
 
-#: mount/mount.c:905
+#: mount/mount.c:901
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7927,12 +7684,12 @@
 "mount: el dispositiu especial %s no existeix\n"
 "       (una ruta prefixada no és un directori)\n"
 
-#: mount/mount.c:918
+#: mount/mount.c:914
 #, 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:920
+#: mount/mount.c:916
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7941,150 +7698,144 @@
 "mount: tipus del sistema de fitxers incorrecte, opció incorrecta,\n"
 "       superbloc incorrecte en %s o masses sistemes de fitxers muntats"
 
-#: mount/mount.c:954
+#: mount/mount.c:950
 msgid "mount table full"
 msgstr "taula de dispositius muntats completa"
 
-#: mount/mount.c:956
+#: mount/mount.c:952
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: no es pot llegir el superbloc"
 
-#: mount/mount.c:960
+#: mount/mount.c:956
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: dispositiu desconegut"
 
-#: mount/mount.c:965
+#: mount/mount.c:961
 #, 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"
 
-#: mount/mount.c:977
+#: mount/mount.c:973
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablement volíeu referir-vos a %s"
 
-#: mount/mount.c:979
+#: mount/mount.c:975
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: potser volíeu referir-vos a iso9660 ?"
 
-#: mount/mount.c:982
+#: mount/mount.c:978
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
-msgstr ""
-"mount: %s té un número de dispositiu incorrecte o el tipus del sistema de "
-"fitxers %s no està suportat"
+msgstr "mount: %s té un número de dispositiu incorrecte o el tipus del sistema de fitxers %s no està suportat"
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:984
 #, 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:990
+#: mount/mount.c:986
 #, 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 coma un dispositiu de blocs\n"
-"       (potser `insmod controlador'?)"
+"mount: el nucli no reconeix %s com a un dispositiu de blocs\n"
+"       (potser fent `insmod controlador'?)"
 
-#: mount/mount.c:993
+#: mount/mount.c:989
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr "mount: %s no és un dispositiu de blocs (probeu amb `-o loop')"
+msgstr "mount: %s no és un dispositiu de blocs (proveu amb `-o loop')"
 
-#: mount/mount.c:996
+#: mount/mount.c:992
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s no és un dispositiu de blocs"
 
-#: mount/mount.c:999
+#: mount/mount.c:995
 #, 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:1002
+#: mount/mount.c:998
 msgid "block device "
 msgstr "dispositiu de blocs "
 
-#: mount/mount.c:1004
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr "mount : impossible de muntar %s%s com a sols lectura"
+msgstr "mount : no es pot muntar %s%s com a sols lectura"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
-msgstr ""
-"mount : %s%s està protegit contra escriptura, a més dona l'etiqueta "
-"explicita `-w'"
+msgstr "mount : %s%s està protegit contra escriptura però se li ha donat l'etiqueta explicita `-w'"
 
-#: mount/mount.c:1024
+#: mount/mount.c:1020
 #, 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"
+msgstr "mount: %s%s està protegit contra escriptura; es muntarà en sols lectura"
 
-#: mount/mount.c:1111
+#: mount/mount.c:1107
 #, 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:1115
+#: mount/mount.c:1111
 #, c-format
 msgid "mount: %s duplicate - not mounted"
-msgstr "mount: %s duplicada - no serà muntada"
+msgstr "mount: %s duplicada; no es muntarà"
 
-#: mount/mount.c:1125
+#: mount/mount.c:1121
 #, c-format
 msgid "mount: going to mount %s by %s\n"
 msgstr "mount: muntant %s per %s\n"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1122
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1122
 msgid "label"
 msgstr "etiqueta"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: mount/mount.c:1124 mount/mount.c:1573
 msgid "mount: no such partition found"
 msgstr "mount: no troba aquesta partició"
 
-#: mount/mount.c:1136
+#: mount/mount.c:1132
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
-msgstr "mount: no s'ha especificat cap tipus - assumiré nfs pels dos punts\n"
+msgstr "mount: no s'ha especificat cap tipus; s'assumeix nfs per als dos punts\n"
 
-#: mount/mount.c:1141
+#: mount/mount.c:1137
 msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
-msgstr "mount: no s'ha especificat cap tipus; s'assumeix smb, pel prefix //\n"
+msgstr "mount: no s'ha especificat cap tipus; s'assumeix smb per al prefix //\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1153
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: executant en segon plà \"%s\"\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1164
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: abandonant \"%s\"\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1241
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ja està muntat en %s\n"
 
-#: mount/mount.c:1376
-#, fuzzy
+#: mount/mount.c:1373
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8113,9 +7864,9 @@
 "      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.] quelcom lloc'.\n"
-"Els detalls en el /etc/fstab poden ser omesos.\n"
-"      mount -a                 : munta tot el indicat en el /etc/fstab\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"
@@ -8124,25 +7875,25 @@
 "un arbre de directoris ja visible en un altre lloc\n"
 "      mount --bind dir_antic dir_nou\n"
 "o moure un subarbre:\n"
-"      mount --move antic dir_nou\n"
-"Es pot donar un dispositiu mitjançant el nom, diguen /dev/hda1 o\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"
+"usant -U uuid. D'altres opcions: [-nfFrsvw] [-o opcions].\n"
 "Per a més detalls, escriviu man 8 mount.\n"
 
 #: mount/mount.c:1549
 msgid "mount: only root can do that"
-msgstr "mount: sols el root pot fer això"
+msgstr "mount: sols l'usuari root pot fer això"
 
 #: mount/mount.c:1554
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr "mount: no s'ha trobat a %s - s'està creant...\n"
+msgstr "mount: no s'ha trobat %s; s'està creant...\n"
 
 #: mount/mount.c:1568
 #, 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"
+msgstr "mount: l'etiqueta %s apareix en %s i %s; no s'ha muntat\n"
 
 #: mount/mount.c:1575
 #, c-format
@@ -8163,42 +7914,39 @@
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: no es pot trobar %s en %s o %s"
 
-#: mount/mount_by_label.c:259
+#: mount/mount_by_label.c:153
 #, 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 "
-"fet.\n"
+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 fet.\n"
 
-#: mount/mount_by_label.c:378
+#: mount/mount_by_label.c:272
 msgid "mount: bad UUID"
 msgstr "mount: UUID incorrecte"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:486
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: error a l'intentar endevinar el tipus del sistema de fitxers\n"
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:495
 #, 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"
 
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:498
 #, 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:499
+#: mount/mount_guess_fstype.c:501
 msgid "       and it looks like this is swapspace\n"
 msgstr "       i sembla que això és espai d'intercanvi\n"
 
-#: mount/mount_guess_fstype.c:501
+#: mount/mount_guess_fstype.c:503
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Provaré amb el tipus %s\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:591
 #, c-format
 msgid "Trying %s\n"
 msgstr "Provant amb %s\n"
@@ -8293,7 +8041,7 @@
 msgstr "error en la crida xstrndup"
 
 #: mount/swapon.c:64
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
@@ -8301,7 +8049,7 @@
 "       %s [-s]\n"
 msgstr ""
 "useu:   %s [-hV]\n"
-"        %s -a [-v]\n"
+"        %s -a [-e] [-v]\n"
 "        %s [-v] [-p prioritat] especial ...\n"
 "        %s [-s]\n"
 
@@ -8329,9 +8077,7 @@
 #: 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 "
-"suggereixen %04o\n"
+msgstr "swapon: atenció: %s teniu els permisos %04o que no son segurs, es suggereixen %04o\n"
 
 #: mount/swapon.c:205
 #, c-format
@@ -8433,18 +8179,16 @@
 
 #: mount/umount.c:426
 msgid "umount: cannot find list of filesystems to unmount"
-msgstr ""
-"umount: no es pot trobar la llista dels sistemes de fitxers per a desmuntar"
+msgstr "umount: no es pot trobar la llista dels sistemes de fitxers per a desmuntar"
 
 #: mount/umount.c:457
-#, fuzzy
 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]\n"
+"        umount -a [-f] [-r] [-n] [-v] [-t  tipus_sist._fitx._virtuals] [-O opcions]\n"
 "        umount [-f] [-r] [-n] [-v] especial | node...\n"
 
 #: mount/umount.c:539
@@ -8488,8 +8232,7 @@
 
 #: sys-utils/ctrlaltdel.c:27
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr ""
-"Haureu de ser el root per a establir el comportament de Ctrl-Alt-Supr.\n"
+msgstr "Haureu de ser el root per a establir el comportament de Ctrl-Alt-Supr.\n"
 
 #: sys-utils/ctrlaltdel.c:42
 msgid "Usage: ctrlaltdel hard|soft\n"
@@ -8501,19 +8244,16 @@
 "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 ""
-"Fitxer %s, per al valor del llindar %lu, el màxim de caràcters en fifo fou "
-"de %d\n"
+"Fitxer %s, per al valor del llindar %lu, el màxim de caràcters en fifo fou de %d\n"
 "i la velocitat de transferència màxima en caracteres per segon fou de %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 ""
-"Fitxer %s, per al valor del llindar %lu i el valor de temps en espera %lu, "
-"el màxim de caràcters en fifo fou de %d\n"
+"Fitxer %s, per al valor del llindar %lu i el valor de temps en espera %lu, el màxim de caràcters en fifo fou de %d\n"
 "i la velocitat de transferència màxima en caracteres per segon fou de %f\n"
 
 #: sys-utils/cytune.c:195
@@ -8543,12 +8283,8 @@
 
 #: 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 ""
-"Useu: %s [-q [-i interval]] ([-s valor]|[-S valor]) ([-t valor]|[-T valor]) "
-"[-g|-G] fitxer [fitxer...]\n"
+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"
 
 #: sys-utils/cytune.c:256 sys-utils/cytune.c:275 sys-utils/cytune.c:295
 #: sys-utils/cytune.c:345
@@ -8601,11 +8337,8 @@
 
 #: 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 enters, %lu/%lu caràcters; fifo: %lu llindar, %lu temps_espera, %lu "
-"màxim, %lu ara\n"
+msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu enters, %lu/%lu caràcters; fifo: %lu llindar, %lu temps_espera, %lu màxim, %lu ara\n"
 
 #: sys-utils/cytune.c:430
 #, c-format
@@ -8614,18 +8347,15 @@
 
 #: 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 enters, %lu caràcters; fifo: %lu llindar, %lu temps_espera, %lu "
-"màxim, %lu ara\n"
+msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu enters, %lu caràcters; fifo: %lu llindar, %lu temps_espera, %lu màxim, %lu ara\n"
 
 #: sys-utils/cytune.c:441
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f enters/seg.; %f rebut (caràcters/seg.)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Useu: %s [-c] [-n nivell] [-s mida_memòria_temporal]\n"
@@ -8732,11 +8462,8 @@
 
 #: sys-utils/ipcs.c:129
 #, c-format
-msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
-msgstr ""
-"%s proveeix d'informació sobre els recursos ipc per als quals teniu accés de "
-"lectura.\n"
+msgid "%s provides information on ipc facilities for which you have read access.\n"
+msgstr "%s proveeix d'informació sobre els recursos ipc per als quals teniu accés de lectura.\n"
 
 #: sys-utils/ipcs.c:131
 msgid ""
@@ -8778,9 +8505,7 @@
 
 #: 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 "
-"l'identificador\n"
+msgstr "-i id [-s -q -m] : detalls sobre els recursos identificats per l'identificador\n"
 
 #: sys-utils/ipcs.c:267
 msgid "kernel not configured for shared memory\n"
@@ -8795,7 +8520,7 @@
 #: sys-utils/ipcs.c:278
 #, c-format
 msgid "max number of segments = %ld\n"
-msgstr "nombre màx. de segments = %ld\n"
+msgstr "màx. nombre de segments = %ld\n"
 
 #: sys-utils/ipcs.c:280
 #, c-format
@@ -9167,9 +8892,9 @@
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr "octets=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "octets=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:615
 #, c-format
@@ -9271,14 +8996,11 @@
 
 #: 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 ] ] ]"
+msgstr "useu: rdev [ -rv ] [ -o DESPLAÇAMENT ] [ IMATGE [ VALOR [ DESPLAÇAMENT ] ] ]"
 
 #: sys-utils/rdev.c:70
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (o rdev /linux, etc.) mostra a l'actual dispositiu ROOT"
+msgid "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr "  rdev /dev/fd0  (o rdev /linux, etc.) mostra a l'actual dispositiu ROOT"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
@@ -9286,9 +9008,7 @@
 
 #: sys-utils/rdev.c:72
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              estableix el ROOTFLAGS (estat de sols "
-"lectura)"
+msgstr "  rdev -R /dev/fd0 1              estableix el ROOTFLAGS (estat de sols lectura)"
 
 #: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
@@ -9296,8 +9016,7 @@
 
 #: sys-utils/rdev.c:74
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
-"  rdev -v /dev/fd0 1              estableix el VIDEOMODE de l'arrencada"
+msgstr "  rdev -v /dev/fd0 1              estableix el VIDEOMODE de l'arrencada"
 
 #: sys-utils/rdev.c:75
 msgid "  rdev -o N ...                   use the byte offset N"
@@ -9316,28 +9035,30 @@
 msgstr "  vidmode ...                     el mateix que rdev -v"
 
 #: sys-utils/rdev.c:79
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+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"
 "                              1=tecla1, 2=tecla2, ... "
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"      usar -R 1 per a muntar l'arrel a sols lectura; -R 0 a lectura/"
-"escriptura."
+msgstr "      usar -R 1 per a muntar l'arrel a sols lectura; -R 0 a lectura/escriptura."
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
 msgstr "falta una coma"
 
-#: sys-utils/readprofile.c:60
+#: sys-utils/readprofile.c:67
+msgid "out of memory"
+msgstr "memòria esgotada"
+
+#: sys-utils/readprofile.c:113
 #, 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"
@@ -9348,55 +9069,49 @@
 "\t -V            print version and exit\n"
 msgstr ""
 "%s: Useu: \"%s [opcions]\n"
-"         -m <map.arq> (Valor predeterminat = \"%s\")\n"
-"         -p <fitxer>  (Valor predeterminat = \"%s\")\n"
-"         -M <mult>    Estableix el multiplicador del perfil en <mult>\n"
-"         -i           Sols mostra la informació sobre el pas de mostreig\n"
-"         -v           Mostra dades detallades\n"
-"         -a           Mostra tots els símbols, fins i tot si el nombre és 0\n"
-"         -b           Mostra els histogrames individuals dels comptadors\n"
-"         -r           Restableix tots els comptadors (sols el root)\n"
-"         -n           Desactiva la detecció auto. de l'ordre dels octets\n"
-"         -V           Mostra la versió i surt\n"
+"\t -m <fitxer_mapa> (Valor predeterminat = \"%s\" i \t\t\t\t  \"%s\")\n"
+"\t -p <fitxer>  (Valor predeterminat = \"%s\")\n"
+"\t -M <mult>    Estableix el multiplicador del perfil en <mult>\n"
+"\t -i           Sols mostra la informació sobre el pas de mostreig\n"
+"\t -v           Mostra dades detallades\n"
+"\t -a           Mostra tots els símbols, fins i tot si el nombre és 0\n"
+"\t -b           Mostra els histogrames individuals dels comptadors\n"
+"\t -r           Restableix tots els comptadors (sols el root)\n"
+"\t -n           Desactiva la detecció auto. de l'ordre dels octets\n"
+"\t -V           Mostra la versió i surt\n"
 
-#: sys-utils/readprofile.c:84
-msgid "out of memory"
-msgstr "memòria esgotada"
-
-#: sys-utils/readprofile.c:147
+#: sys-utils/readprofile.c:186
 #, c-format
-msgid "%s Version %s\n"
-msgstr "%s Versió %s\n"
+msgid "%s version %s\n"
+msgstr "%s versió %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:272
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Passa de probes: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:293 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): línia del mapa incorrecta\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:305
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: no es pot trobar \"_stext\" en %s\n"
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:331
 #, 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:323
+#: sys-utils/readprofile.c:372
 msgid "total"
 msgstr "total"
 
 #: sys-utils/renice.c:68
-msgid ""
-"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
-msgstr ""
-"useu: renice prioritat [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] usuaris ]\n"
+msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr "useu: renice prioritat [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] usuaris ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
@@ -9433,8 +9148,7 @@
 "          -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"
+"Useu: %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"
 
@@ -9539,11 +9253,8 @@
 msgstr "hexdump: valor del salt incorrecte.\n"
 
 #: text-utils/hexsyntax.c:131
-msgid ""
-"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-msgstr ""
-"hexdump: [-bcCdovx] [-e fmt] [-f fitxer_fmt] [-n longitud] [-s ometre] "
-"[fitxer ...]\n"
+msgid "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr "hexdump: [-bcCdovx] [-e fmt] [-f fitxer_fmt] [-n longitud] [-s ometre] [fitxer ...]\n"
 
 #: text-utils/more.c:263
 #, c-format
@@ -9600,14 +9311,13 @@
 msgstr "...retrocedir 1 pàgina"
 
 #: text-utils/more.c:1313
-#, fuzzy
 msgid "...skipping one line"
-msgstr "...ometent la línia %d"
+msgstr "...ometent una línia"
 
 #: text-utils/more.c:1315
-#, fuzzy, c-format
+#, c-format
 msgid "...skipping %d lines"
-msgstr "...ometent la línia %d"
+msgstr "...ometent %d línies"
 
 #: text-utils/more.c:1352
 msgid ""
@@ -9622,61 +9332,83 @@
 #: text-utils/more.c:1390
 msgid ""
 "\n"
-"Most commands optionally preceded by integer argument k.  Defaults in "
-"brackets.\n"
+"Most commands optionally preceded by integer argument k.  Defaults in brackets.\n"
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
+"\n"
+"La majoria de comandaments són precedits opcionalment per un argument k enter. Per omissió entre parèntesis.\n"
+"L'asterisc (*) indica que l'argument esdevé el nou per omissió.\n"
 
-#: text-utils/more.c:1395
+# a.b: Falta arranjar això de "kth"
+#: text-utils/more.c:1397
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
+"<espai>                 Mostra les següents k línies de text [la mida de la pantalla]\n"
+"z                       Mostra les següents k línies de text [la mida de la pantalla]*\n"
+"<intro>                 Mostra les següents k línies de text [1]*\n"
+"d o ctrl-D              Desplaça k línies [actualment són 11]*\n"
+"q o Q o <interrupció>   Surt de more\n"
+"s                       Salta endavant k línies de text [1]\n"
+"f                       Salta endavant k pantalles de text [1]\n"
+"b o ctrl-B              Salta endarrera k pantalles de text [1]\n"
+"'                       Vés a on va començar l'anterior recerca\n"
+"=                       Mostra el número de la línia actual\n"
+"/<expressió regular>    Cerca l'ocurrència k-enèssima de l'exp.reg. [1]\n"
+"n                       Cerca l'ocurrència k-enèssima de l'última exp.reg. [1]\n"
+"!<cmd> o :!<cmd>        Executa <cmd> en una subshell\n"
+"v                       Engega /usr/bin/vi a la línia actual\n"
+"ctrl-L                  Redibuixa la pantalla\n"
+":n                      Vés al k-enèssim fitxer següent [1]\n"
+":p                      Vés al k-enèssim fitxer anterior [1]\n"
+":f                      Mostra el nom del fitxer i el número de línia\n"
+".                       Repeteix el comandament anterior\n"
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1444 text-utils/more.c:1449
 msgid "[Press 'h' for instructions.]"
 msgstr "[Prémer 'h' per a les instruccions.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1483
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" línia %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1485
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[No és un fitxer] línia %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1569
 msgid "  Overflow\n"
 msgstr "  Desbordament\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1616
 msgid "...skipping\n"
 msgstr "...ometent\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1646
 msgid "Regular expression botch"
 msgstr "Error en l'expressió regular"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1658
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9684,15 +9416,15 @@
 "\n"
 "Patró no trobat\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1661 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr "Patró no trobat"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1722
 msgid "can't fork\n"
 msgstr "no es pot establir el canvi\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1761
 msgid ""
 "\n"
 "...Skipping "
@@ -9700,19 +9432,19 @@
 "\n"
 "...Saltant "
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1766
 msgid "...Skipping to file "
 msgstr "...Saltant al fitxer "
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1768
 msgid "...Skipping back to file "
 msgstr "...Retrocedint al fitxer "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2048
 msgid "Line too long"
 msgstr "Línia massa llarga"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2091
 msgid "No previous command to substitute for"
 msgstr "No hi ha cap comandament previ a substituir"
 
@@ -9745,14 +9477,12 @@
 #: 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"
+msgstr "hexdump: nombre total d'octets incorrecte per al caràcter de conversió %s.\n"
 
 #: text-utils/parse.c:490
 #, c-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
-msgstr ""
-"hexdump: %%s requereix un valor de precisió o un nombre total d'octets.\n"
+msgstr "hexdump: %%s requereix un valor de precisió o un nombre total d'octets.\n"
 
 #: text-utils/parse.c:496
 #, c-format
@@ -9764,40 +9494,38 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: caràcter de conversió %%%s incorrecte.\n"
 
-#: text-utils/pg.c:253
+#: 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"
+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"
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: l'opció requereix un argument -- %s\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: opció ilegal -- %s\n"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 msgid "...skipping forward\n"
 msgstr "...saltant endavant\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 msgid "...skipping backward\n"
 msgstr "...saltant enradera\n"
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 msgid "No next file"
 msgstr "No hi ha fitxer següent"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 msgid "No previous file"
 msgstr "No hi ha fitxer anterior"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Error de lectura del fitxer %s\n"
@@ -9805,50 +9533,50 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: EOF inesperat en el fitxer %s\n"
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Error desconegut en el fitxer %s\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: No es pot cerar el fitxer temporal\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 msgid "RE error: "
 msgstr "Error RE:"
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr "No es recorda la cadena de recerca"
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 msgid "Cannot open "
 msgstr "No es pot obrir"
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 msgid "saved"
 msgstr "desat"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": no es permet !comandament en el mode rflag.\n"
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 msgid "fork() failed, try again later\n"
 msgstr "la crida del sistema fork() ha fallat, proveu-ho després\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 msgid "(Next file: "
 msgstr "(Següent fitxer: "
 
@@ -9885,20 +9613,3 @@
 #: text-utils/ul.c:599
 msgid "Out of memory when growing buffer.\n"
 msgstr "Memòria esgotada a l'augmentar la mida de la memòria temporal.\n"
-
-#~ msgid "Partition %i does not end on cylinder boundary:\n"
-#~ msgstr "La partició %i no acaba en el límit del cilindre:\n"
-
-#~ msgid "Can't open help file"
-#~ msgstr "No es pot obrir el fitxer d'ajuda"
-
-#~ msgid ""
-#~ "\n"
-#~ "Disk %s: %d heads, %d sectors, %d cylinders\n"
-#~ "Units = %s of %d * %d bytes\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Disc %s: %d capçals, %d sectors, %d cilindres\n"
-#~ "Unitats = %s de %d * %d octets\n"
-#~ "\n"
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 28f6663..53e4eda 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -388,19 +388,20 @@
   {"   Primary", 314},
   {"   Logical", 315},
   {"Unknown", 316},
-  {"Boot (%02X)", 317},
-  {"Unknown (%02X)", 318},
-  {"None (%02X)", 319},
+  {"Boot", 317},
+  {"(%02X)", 318},
+  {"None", 319},
   {"Partition Table for %s\n", 320},
-  {"            First    Last\n", 321},
+  {"               First       Last\n", 321},
   {"\
- # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n", 322},
+ # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) \
+Flag\n", 322},
   {"\
--- ------- -------- --------- ------ --------- ---------------------- \
----------\n", 323},
-  {"         ---Starting---      ----Ending----    Start Number of\n", 324},
-  {" # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n", 325},
-  {"-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n", 326},
+-- ------- ----------- ----------- ------ ----------- -------------------- \
+----\n", 323},
+  {"         ---Starting---      ----Ending----    Start     Number of\n", 324},
+  {" # Flags Head Sect Cyl   ID  Head Sect Cyl     Sector    Sectors\n", 325},
+  {"-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n", 326},
   {"Raw", 327},
   {"Print the table using raw data format", 328},
   {"Sectors", 329},
@@ -461,54 +462,55 @@
   {"Enter filesystem type: ", 384},
   {"Cannot change FS Type to empty", 385},
   {"Cannot change FS Type to extended", 386},
-  {"Boot", 387},
-  {"Unk(%02X)", 388},
-  {", NC", 389},
-  {"NC", 390},
-  {"Pri/Log", 391},
+  {"Unk(%02X)", 387},
+  {", NC", 388},
+  {"NC", 389},
+  {"Pri/Log", 390},
+  {"Unknown (%02X)", 391},
   {"Disk Drive: %s", 392},
-  {"Size: %lld bytes, %ld MB", 393},
-  {"Size: %lld bytes, %ld.%ld GB", 394},
-  {"Heads: %d   Sectors per Track: %d   Cylinders: %d", 395},
+  {"Size: %lld bytes, %lld MB", 393},
+  {"Size: %lld bytes, %lld.%lld GB", 394},
+  {"Heads: %d   Sectors per Track: %d   Cylinders: %lld", 395},
   {"Name", 396},
   {"Flags", 397},
   {"Part Type", 398},
   {"FS Type", 399},
   {"[Label]", 400},
-  {"  Sectors", 401},
-  {"Size (MB)", 402},
-  {"Size (GB)", 403},
-  {"Bootable", 404},
-  {"Toggle bootable flag of the current partition", 405},
-  {"Delete", 406},
-  {"Delete the current partition", 407},
-  {"Geometry", 408},
-  {"Change disk geometry (experts only)", 409},
-  {"Help", 410},
-  {"Print help screen", 411},
-  {"Maximize", 412},
-  {"Maximize disk usage of the current partition (experts only)", 413},
-  {"New", 414},
-  {"Create new partition from free space", 415},
-  {"Print", 416},
-  {"Print partition table to the screen or to a file", 417},
-  {"Quit", 418},
-  {"Quit program without writing partition table", 419},
-  {"Type", 420},
-  {"Change the filesystem type (DOS, Linux, OS/2 and so on)", 421},
-  {"Units", 422},
-  {"Change units of the partition size display (MB, sect, cyl)", 423},
-  {"Write", 424},
-  {"Write partition table to disk (this might destroy data)", 425},
-  {"Cannot make this partition bootable", 426},
-  {"Cannot delete an empty partition", 427},
-  {"Cannot maximize this partition", 428},
-  {"This partition is unusable", 429},
-  {"This partition is already in use", 430},
-  {"Cannot change the type of an empty partition", 431},
-  {"No more partitions", 432},
-  {"Illegal command", 433},
-  {"Copyright (C) 1994-2002 Kevin E. Martin & aeb\n", 434},
+  {"    Sectors", 401},
+  {"  Cylinders", 402},
+  {"  Size (MB)", 403},
+  {"  Size (GB)", 404},
+  {"Bootable", 405},
+  {"Toggle bootable flag of the current partition", 406},
+  {"Delete", 407},
+  {"Delete the current partition", 408},
+  {"Geometry", 409},
+  {"Change disk geometry (experts only)", 410},
+  {"Help", 411},
+  {"Print help screen", 412},
+  {"Maximize", 413},
+  {"Maximize disk usage of the current partition (experts only)", 414},
+  {"New", 415},
+  {"Create new partition from free space", 416},
+  {"Print", 417},
+  {"Print partition table to the screen or to a file", 418},
+  {"Quit", 419},
+  {"Quit program without writing partition table", 420},
+  {"Type", 421},
+  {"Change the filesystem type (DOS, Linux, OS/2 and so on)", 422},
+  {"Units", 423},
+  {"Change units of the partition size display (MB, sect, cyl)", 424},
+  {"Write", 425},
+  {"Write partition table to disk (this might destroy data)", 426},
+  {"Cannot make this partition bootable", 427},
+  {"Cannot delete an empty partition", 428},
+  {"Cannot maximize this partition", 429},
+  {"This partition is unusable", 430},
+  {"This partition is already in use", 431},
+  {"Cannot change the type of an empty partition", 432},
+  {"No more partitions", 433},
+  {"Illegal command", 434},
+  {"Copyright (C) 1994-2002 Kevin E. Martin & aeb\n", 435},
   {"\
 \n\
 Usage:\n\
@@ -524,7 +526,7 @@
 -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", 435},
+\n", 436},
   {"\
 Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n\
        fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n\
@@ -533,65 +535,65 @@
 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", 436},
+-b 2048: (for certain MO disks) use 2048-byte sectors\n", 437},
   {"\
 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", 437},
-  {"Unable to open %s\n", 438},
-  {"Unable to read %s\n", 439},
-  {"Unable to seek on %s\n", 440},
-  {"Unable to write %s\n", 441},
-  {"BLKGETSIZE ioctl failed on %s\n", 442},
-  {"Unable to allocate any more memory\n", 443},
-  {"Fatal error\n", 444},
-  {"Command action", 445},
-  {"   a   toggle a read only flag", 446},
-  {"   b   edit bsd disklabel", 447},
-  {"   c   toggle the mountable flag", 448},
-  {"   d   delete a partition", 449},
-  {"   l   list known partition types", 450},
-  {"   m   print this menu", 451},
-  {"   n   add a new partition", 452},
-  {"   o   create a new empty DOS partition table", 453},
-  {"   p   print the partition table", 454},
-  {"   q   quit without saving changes", 455},
-  {"   s   create a new empty Sun disklabel", 456},
-  {"   t   change a partition's system id", 457},
-  {"   u   change display/entry units", 458},
-  {"   v   verify the partition table", 459},
-  {"   w   write table to disk and exit", 460},
-  {"   x   extra functionality (experts only)", 461},
-  {"   a   select bootable partition", 462},
-  {"   b   edit bootfile entry", 463},
-  {"   c   select sgi swap partition", 464},
-  {"   a   toggle a bootable flag", 465},
-  {"   c   toggle the dos compatibility flag", 466},
-  {"   a   change number of alternate cylinders", 467},
-  {"   c   change number of cylinders", 468},
-  {"   d   print the raw data in the partition table", 469},
-  {"   e   change number of extra sectors per cylinder", 470},
-  {"   h   change number of heads", 471},
-  {"   i   change interleave factor", 472},
-  {"   o   change rotation speed (rpm)", 473},
-  {"   r   return to main menu", 474},
-  {"   s   change number of sectors/track", 475},
-  {"   y   change number of physical cylinders", 476},
-  {"   b   move beginning of data in a partition", 477},
-  {"   e   list extended partitions", 478},
-  {"   g   create an IRIX (SGI) partition table", 479},
-  {"   f   fix partition order", 480},
-  {"You must set", 481},
-  {"heads", 482},
-  {"sectors", 483},
-  {"cylinders", 484},
+  ...\n", 438},
+  {"Unable to open %s\n", 439},
+  {"Unable to read %s\n", 440},
+  {"Unable to seek on %s\n", 441},
+  {"Unable to write %s\n", 442},
+  {"BLKGETSIZE ioctl failed on %s\n", 443},
+  {"Unable to allocate any more memory\n", 444},
+  {"Fatal error\n", 445},
+  {"Command action", 446},
+  {"   a   toggle a read only flag", 447},
+  {"   b   edit bsd disklabel", 448},
+  {"   c   toggle the mountable flag", 449},
+  {"   d   delete a partition", 450},
+  {"   l   list known partition types", 451},
+  {"   m   print this menu", 452},
+  {"   n   add a new partition", 453},
+  {"   o   create a new empty DOS partition table", 454},
+  {"   p   print the partition table", 455},
+  {"   q   quit without saving changes", 456},
+  {"   s   create a new empty Sun disklabel", 457},
+  {"   t   change a partition's system id", 458},
+  {"   u   change display/entry units", 459},
+  {"   v   verify the partition table", 460},
+  {"   w   write table to disk and exit", 461},
+  {"   x   extra functionality (experts only)", 462},
+  {"   a   select bootable partition", 463},
+  {"   b   edit bootfile entry", 464},
+  {"   c   select sgi swap partition", 465},
+  {"   a   toggle a bootable flag", 466},
+  {"   c   toggle the dos compatibility flag", 467},
+  {"   a   change number of alternate cylinders", 468},
+  {"   c   change number of cylinders", 469},
+  {"   d   print the raw data in the partition table", 470},
+  {"   e   change number of extra sectors per cylinder", 471},
+  {"   h   change number of heads", 472},
+  {"   i   change interleave factor", 473},
+  {"   o   change rotation speed (rpm)", 474},
+  {"   r   return to main menu", 475},
+  {"   s   change number of sectors/track", 476},
+  {"   y   change number of physical cylinders", 477},
+  {"   b   move beginning of data in a partition", 478},
+  {"   e   list extended partitions", 479},
+  {"   g   create an IRIX (SGI) partition table", 480},
+  {"   f   fix partition order", 481},
+  {"You must set", 482},
+  {"heads", 483},
+  {"sectors", 484},
+  {"cylinders", 485},
   {"\
 %s%s.\n\
-You can do this from the extra functions menu.\n", 485},
-  {" and ", 486},
+You can do this from the extra functions menu.\n", 486},
+  {" and ", 487},
   {"\
 \n\
 The number of cylinders for this disk is set to %d.\n\
@@ -599,168 +601,168 @@
 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", 487},
-  {"Bad offset in primary extended partition\n", 488},
-  {"Warning: deleting partitions after %d\n", 489},
-  {"Warning: extra link pointer in partition table %d\n", 490},
-  {"Warning: ignoring extra data in partition table %d\n", 491},
+   (e.g., DOS FDISK, OS/2 FDISK)\n", 488},
+  {"Bad offset in primary extended partition\n", 489},
+  {"Warning: deleting partitions after %d\n", 490},
+  {"Warning: extra link pointer in partition table %d\n", 491},
+  {"Warning: ignoring extra data in partition table %d\n", 492},
   {"\
 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", 492},
-  {"Note: sector size is %d (not %d)\n", 493},
-  {"You will not be able to write the partition table.\n", 494},
+\n", 493},
+  {"Note: sector size is %d (not %d)\n", 494},
+  {"You will not be able to write the partition table.\n", 495},
   {"\
 This disk has both DOS and BSD magic.\n\
-Give the 'b' command to go to BSD mode.\n", 495},
+Give the 'b' command to go to BSD mode.\n", 496},
   {"\
 Device contains neither a valid DOS partition table, nor Sun, SGI or OSF \
-disklabel\n", 496},
-  {"Internal error\n", 497},
-  {"Ignoring extra extended partition %d\n", 498},
+disklabel\n", 497},
+  {"Internal error\n", 498},
+  {"Ignoring extra extended partition %d\n", 499},
   {"\
 Warning: invalid flag 0x%04x of partition table %d will be corrected by w\
-(rite)\n", 499},
+(rite)\n", 500},
   {"\
 \n\
-got EOF thrice - exiting..\n", 500},
-  {"Hex code (type L to list codes): ", 501},
-  {"%s (%d-%d, default %d): ", 502},
-  {"Using default value %d\n", 503},
-  {"Value out of range.\n", 504},
-  {"Partition number", 505},
-  {"Warning: partition %d has empty type\n", 506},
-  {"Selected partition %d\n", 507},
-  {"No partition is defined yet!\n", 508},
-  {"All primary partitions have been defined already!\n", 509},
-  {"cylinder", 510},
-  {"sector", 511},
-  {"Changing display/entry units to %s\n", 512},
-  {"WARNING: Partition %d is an extended partition\n", 513},
-  {"DOS Compatibility flag is set\n", 514},
-  {"DOS Compatibility flag is not set\n", 515},
-  {"Partition %d does not exist yet!\n", 516},
+got EOF thrice - exiting..\n", 501},
+  {"Hex code (type L to list codes): ", 502},
+  {"%s (%u-%u, default %u): ", 503},
+  {"Using default value %u\n", 504},
+  {"Value out of range.\n", 505},
+  {"Partition number", 506},
+  {"Warning: partition %d has empty type\n", 507},
+  {"Selected partition %d\n", 508},
+  {"No partition is defined yet!\n", 509},
+  {"All primary partitions have been defined already!\n", 510},
+  {"cylinder", 511},
+  {"sector", 512},
+  {"Changing display/entry units to %s\n", 513},
+  {"WARNING: Partition %d is an extended partition\n", 514},
+  {"DOS Compatibility flag is set\n", 515},
+  {"DOS Compatibility flag is not set\n", 516},
+  {"Partition %d does not exist yet!\n", 517},
   {"\
 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", 517},
+a partition using the `d' command.\n", 518},
   {"\
 You cannot change a partition into an extended one or vice versa\n\
-Delete it first.\n", 518},
+Delete it first.\n", 519},
   {"\
 Consider leaving partition 3 as Whole disk (5),\n\
 as SunOS/Solaris expects it and even Linux likes it.\n\
-\n", 519},
+\n", 520},
   {"\
 Consider leaving partition 9 as volume header (0),\n\
 and partition 11 as entire volume (6)as IRIX expects it.\n\
-\n", 520},
-  {"Changed system type of partition %d to %x (%s)\n", 521},
-  {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 522},
-  {"     phys=(%d, %d, %d) ", 523},
-  {"logical=(%d, %d, %d)\n", 524},
-  {"Partition %d has different physical/logical endings:\n", 525},
-  {"Partition %i does not start on cylinder boundary:\n", 526},
-  {"should be (%d, %d, 1)\n", 527},
-  {"Partition %i does not end on cylinder boundary.\n", 528},
-  {"should be (%d, %d, %d)\n", 529},
+\n", 521},
+  {"Changed system type of partition %d to %x (%s)\n", 522},
+  {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 523},
+  {"     phys=(%d, %d, %d) ", 524},
+  {"logical=(%d, %d, %d)\n", 525},
+  {"Partition %d has different physical/logical endings:\n", 526},
+  {"Partition %i does not start on cylinder boundary:\n", 527},
+  {"should be (%d, %d, 1)\n", 528},
+  {"Partition %i does not end on cylinder boundary.\n", 529},
+  {"should be (%d, %d, %d)\n", 530},
   {"\
 \n\
-Disk %s: %ld MB, %lld bytes\n", 530},
+Disk %s: %ld MB, %lld bytes\n", 531},
   {"\
 \n\
-Disk %s: %ld.%ld GB, %lld bytes\n", 531},
-  {"%d heads, %d sectors/track, %d cylinders", 532},
-  {", total %lu sectors", 533},
+Disk %s: %ld.%ld GB, %lld bytes\n", 532},
+  {"%d heads, %d sectors/track, %d cylinders", 533},
+  {", total %llu sectors", 534},
   {"\
 Units = %s of %d * %d = %d bytes\n\
-\n", 534},
+\n", 535},
   {"\
 Nothing to do. Ordering is correct already.\n\
-\n", 535},
-  {"%*s Boot    Start       End    Blocks   Id  System\n", 536},
-  {"Device", 537},
+\n", 536},
+  {"%*s Boot      Start         End      Blocks   Id  System\n", 537},
+  {"Device", 538},
   {"\
 \n\
-Partition table entries are not in disk order\n", 538},
+Partition table entries are not in disk order\n", 539},
   {"\
 \n\
 Disk %s: %d heads, %d sectors, %d cylinders\n\
-\n", 539},
-  {"Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n", 540},
-  {"Warning: partition %d contains sector 0\n", 541},
-  {"Partition %d: head %d greater than maximum %d\n", 542},
-  {"Partition %d: sector %d greater than maximum %d\n", 543},
-  {"Partitions %d: cylinder %d greater than maximum %d\n", 544},
-  {"Partition %d: previous sectors %d disagrees with total %d\n", 545},
-  {"Warning: bad start-of-data in partition %d\n", 546},
-  {"Warning: partition %d overlaps partition %d.\n", 547},
-  {"Warning: partition %d is empty\n", 548},
-  {"Logical partition %d not entirely in partition %d\n", 549},
-  {"Total allocated sectors %d greater than the maximum %d\n", 550},
-  {"%d unallocated sectors\n", 551},
-  {"Partition %d is already defined.  Delete it before re-adding it.\n", 552},
-  {"First %s", 553},
-  {"Sector %d is already allocated\n", 554},
-  {"No free sectors available\n", 555},
-  {"Last %s or +size or +sizeM or +sizeK", 556},
+\n", 540},
+  {"Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n", 541},
+  {"Warning: partition %d contains sector 0\n", 542},
+  {"Partition %d: head %d greater than maximum %d\n", 543},
+  {"Partition %d: sector %d greater than maximum %d\n", 544},
+  {"Partitions %d: cylinder %d greater than maximum %d\n", 545},
+  {"Partition %d: previous sectors %d disagrees with total %d\n", 546},
+  {"Warning: bad start-of-data in partition %d\n", 547},
+  {"Warning: partition %d overlaps partition %d.\n", 548},
+  {"Warning: partition %d is empty\n", 549},
+  {"Logical partition %d not entirely in partition %d\n", 550},
+  {"Total allocated sectors %d greater than the maximum %d\n", 551},
+  {"%d unallocated sectors\n", 552},
+  {"Partition %d is already defined.  Delete it before re-adding it.\n", 553},
+  {"First %s", 554},
+  {"Sector %d is already allocated\n", 555},
+  {"No free sectors available\n", 556},
+  {"Last %s or +size or +sizeM or +sizeK", 557},
   {"\
 \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", 557},
-  {"The maximum number of partitions has been created\n", 558},
-  {"You must delete some partition and add an extended partition first\n", 559},
+\tWARNING: This will destroy the present disk contents.\n", 558},
+  {"The maximum number of partitions has been created\n", 559},
+  {"You must delete some partition and add an extended partition first\n", 560},
   {"\
 Command action\n\
    %s\n\
-   p   primary partition (1-4)\n", 560},
-  {"l   logical (5 or over)", 561},
-  {"e   extended", 562},
-  {"Invalid partition number for type `%c'\n", 563},
+   p   primary partition (1-4)\n", 561},
+  {"l   logical (5 or over)", 562},
+  {"e   extended", 563},
+  {"Invalid partition number for type `%c'\n", 564},
   {"\
 The partition table has been altered!\n\
-\n", 564},
-  {"Calling ioctl() to re-read partition table.\n", 565},
+\n", 565},
+  {"Calling ioctl() to re-read partition table.\n", 566},
   {"\
 \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", 566},
+The new table will be used at the next reboot.\n", 567},
   {"\
 \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", 567},
-  {"Syncing disks.\n", 568},
-  {"Partition %d has no data area\n", 569},
-  {"New beginning of data", 570},
-  {"Expert command (m for help): ", 571},
-  {"Number of cylinders", 572},
-  {"Number of heads", 573},
-  {"Number of sectors", 574},
-  {"Warning: setting sector offset for DOS compatiblity\n", 575},
-  {"Disk %s doesn't contain a valid partition table\n", 576},
-  {"Cannot open %s\n", 577},
-  {"cannot open %s\n", 578},
-  {"%c: unknown command\n", 579},
-  {"This kernel finds the sector size itself - -b option ignored\n", 580},
+information.\n", 568},
+  {"Syncing disks.\n", 569},
+  {"Partition %d has no data area\n", 570},
+  {"New beginning of data", 571},
+  {"Expert command (m for help): ", 572},
+  {"Number of cylinders", 573},
+  {"Number of heads", 574},
+  {"Number of sectors", 575},
+  {"Warning: setting sector offset for DOS compatiblity\n", 576},
+  {"Disk %s doesn't contain a valid partition table\n", 577},
+  {"Cannot open %s\n", 578},
+  {"cannot open %s\n", 579},
+  {"%c: unknown command\n", 580},
+  {"This kernel finds the sector size itself - -b option ignored\n", 581},
   {"\
 Warning: the -b (set sector size) option should be used with one specified \
-device\n", 581},
-  {"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n", 582},
-  {"Command (m for help): ", 583},
+device\n", 582},
+  {"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n", 583},
+  {"Command (m for help): ", 584},
   {"\
 \n\
-The current boot file is: %s\n", 584},
-  {"Please enter the name of the new boot file: ", 585},
-  {"Boot file unchanged\n", 586},
+The current boot file is: %s\n", 585},
+  {"Please enter the name of the new boot file: ", 586},
+  {"Boot file unchanged\n", 587},
   {"\
 \n\
 \tSorry, no experts menu for SGI partition tables available.\n\
-\n", 587},
+\n", 588},
   {"\
 \n\
 \tThere is a valid AIX label on this disk.\n\
@@ -773,94 +775,94 @@
 \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).", 588},
+\t   machine.  (Otherwise you become an AIXpert).", 589},
   {"\
 \n\
-BSD label for device: %s\n", 589},
-  {"   d   delete a BSD partition", 590},
-  {"   e   edit drive data", 591},
-  {"   i   install bootstrap", 592},
-  {"   l   list known filesystem types", 593},
-  {"   n   add a new BSD partition", 594},
-  {"   p   print BSD partition table", 595},
-  {"   s   show complete disklabel", 596},
-  {"   t   change a partition's filesystem id", 597},
-  {"   u   change units (cylinders/sectors)", 598},
-  {"   w   write disklabel to disk", 599},
-  {"   x   link BSD partition to non-BSD partition", 600},
-  {"Partition %s has invalid starting sector 0.\n", 601},
-  {"Reading disklabel of %s at sector %d.\n", 602},
-  {"There is no *BSD partition on %s.\n", 603},
-  {"BSD disklabel command (m for help): ", 604},
-  {"type: %s\n", 605},
-  {"type: %d\n", 606},
-  {"disk: %.*s\n", 607},
-  {"label: %.*s\n", 608},
-  {"flags:", 609},
-  {" removable", 610},
-  {" ecc", 611},
-  {" badsect", 612},
-  {"bytes/sector: %ld\n", 613},
-  {"sectors/track: %ld\n", 614},
-  {"tracks/cylinder: %ld\n", 615},
-  {"sectors/cylinder: %ld\n", 616},
-  {"cylinders: %ld\n", 617},
-  {"rpm: %d\n", 618},
-  {"interleave: %d\n", 619},
-  {"trackskew: %d\n", 620},
-  {"cylinderskew: %d\n", 621},
-  {"headswitch: %ld\t\t# milliseconds\n", 622},
-  {"track-to-track seek: %ld\t# milliseconds\n", 623},
-  {"drivedata: ", 624},
+BSD label for device: %s\n", 590},
+  {"   d   delete a BSD partition", 591},
+  {"   e   edit drive data", 592},
+  {"   i   install bootstrap", 593},
+  {"   l   list known filesystem types", 594},
+  {"   n   add a new BSD partition", 595},
+  {"   p   print BSD partition table", 596},
+  {"   s   show complete disklabel", 597},
+  {"   t   change a partition's filesystem id", 598},
+  {"   u   change units (cylinders/sectors)", 599},
+  {"   w   write disklabel to disk", 600},
+  {"   x   link BSD partition to non-BSD partition", 601},
+  {"Partition %s has invalid starting sector 0.\n", 602},
+  {"Reading disklabel of %s at sector %d.\n", 603},
+  {"There is no *BSD partition on %s.\n", 604},
+  {"BSD disklabel command (m for help): ", 605},
+  {"type: %s\n", 606},
+  {"type: %d\n", 607},
+  {"disk: %.*s\n", 608},
+  {"label: %.*s\n", 609},
+  {"flags:", 610},
+  {" removable", 611},
+  {" ecc", 612},
+  {" badsect", 613},
+  {"bytes/sector: %ld\n", 614},
+  {"sectors/track: %ld\n", 615},
+  {"tracks/cylinder: %ld\n", 616},
+  {"sectors/cylinder: %ld\n", 617},
+  {"cylinders: %ld\n", 618},
+  {"rpm: %d\n", 619},
+  {"interleave: %d\n", 620},
+  {"trackskew: %d\n", 621},
+  {"cylinderskew: %d\n", 622},
+  {"headswitch: %ld\t\t# milliseconds\n", 623},
+  {"track-to-track seek: %ld\t# milliseconds\n", 624},
+  {"drivedata: ", 625},
   {"\
 \n\
-%d partitions:\n", 625},
-  {"#       start       end      size     fstype   [fsize bsize   cpg]\n", 626},
-  {"Writing disklabel to %s.\n", 627},
-  {"%s contains no disklabel.\n", 628},
-  {"Do you want to create a disklabel? (y/n) ", 629},
-  {"bytes/sector", 630},
-  {"sectors/track", 631},
-  {"tracks/cylinder", 632},
-  {"sectors/cylinder", 633},
-  {"Must be <= sectors/track * tracks/cylinder (default).\n", 634},
-  {"rpm", 635},
-  {"interleave", 636},
-  {"trackskew", 637},
-  {"cylinderskew", 638},
-  {"headswitch", 639},
-  {"track-to-track seek", 640},
-  {"Bootstrap: %sboot -> boot%s (%s): ", 641},
-  {"Bootstrap overlaps with disk label!\n", 642},
-  {"Bootstrap installed on %s.\n", 643},
-  {"Partition (a-%c): ", 644},
-  {"This partition already exists.\n", 645},
-  {"Warning: too many partitions (%d, maximum is %d).\n", 646},
+%d partitions:\n", 626},
+  {"#       start       end      size     fstype   [fsize bsize   cpg]\n", 627},
+  {"Writing disklabel to %s.\n", 628},
+  {"%s contains no disklabel.\n", 629},
+  {"Do you want to create a disklabel? (y/n) ", 630},
+  {"bytes/sector", 631},
+  {"sectors/track", 632},
+  {"tracks/cylinder", 633},
+  {"sectors/cylinder", 634},
+  {"Must be <= sectors/track * tracks/cylinder (default).\n", 635},
+  {"rpm", 636},
+  {"interleave", 637},
+  {"trackskew", 638},
+  {"cylinderskew", 639},
+  {"headswitch", 640},
+  {"track-to-track seek", 641},
+  {"Bootstrap: %sboot -> boot%s (%s): ", 642},
+  {"Bootstrap overlaps with disk label!\n", 643},
+  {"Bootstrap installed on %s.\n", 644},
+  {"Partition (a-%c): ", 645},
+  {"This partition already exists.\n", 646},
+  {"Warning: too many partitions (%d, maximum is %d).\n", 647},
   {"\
 \n\
-Syncing disks.\n", 647},
-  {"SGI volhdr", 648},
-  {"SGI trkrepl", 649},
-  {"SGI secrepl", 650},
-  {"SGI raw", 651},
-  {"SGI bsd", 652},
-  {"SGI sysv", 653},
-  {"SGI volume", 654},
-  {"SGI efs", 655},
-  {"SGI lvol", 656},
-  {"SGI rlvol", 657},
-  {"SGI xfs", 658},
-  {"SGI xfslog", 659},
-  {"SGI xlv", 660},
-  {"SGI xvm", 661},
-  {"Linux swap", 662},
-  {"Linux native", 663},
-  {"Linux LVM", 664},
-  {"Linux RAID", 665},
+Syncing disks.\n", 648},
+  {"SGI volhdr", 649},
+  {"SGI trkrepl", 650},
+  {"SGI secrepl", 651},
+  {"SGI raw", 652},
+  {"SGI bsd", 653},
+  {"SGI sysv", 654},
+  {"SGI volume", 655},
+  {"SGI efs", 656},
+  {"SGI lvol", 657},
+  {"SGI rlvol", 658},
+  {"SGI xfs", 659},
+  {"SGI xfslog", 660},
+  {"SGI xlv", 661},
+  {"SGI xvm", 662},
+  {"Linux swap", 663},
+  {"Linux native", 664},
+  {"Linux LVM", 665},
+  {"Linux RAID", 666},
   {"\
 According to MIPS Computer Systems, Inc the Label must not contain more than \
-512 bytes\n", 666},
-  {"Detected sgi disklabel with wrong checksum.\n", 667},
+512 bytes\n", 667},
+  {"Detected sgi disklabel with wrong checksum.\n", 668},
   {"\
 \n\
 Disk %s (SGI disk label): %d heads, %d sectors\n\
@@ -868,141 +870,145 @@
 %d extra sects/cyl, interleave %d:1\n\
 %s\n\
 Units = %s of %d * 512 bytes\n\
-\n", 668},
+\n", 669},
   {"\
 \n\
 Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n\
 Units = %s of %d * 512 bytes\n\
-\n", 669},
+\n", 670},
   {"\
 ----- partitions -----\n\
-Pt# %*s  Info     Start       End   Sectors  Id  System\n", 670},
+Pt# %*s  Info     Start       End   Sectors  Id  System\n", 671},
   {"\
 ----- Bootinfo -----\n\
 Bootfile: %s\n\
------ Directory Entries -----\n", 671},
-  {"%2d: %-10s sector%5u size%8u\n", 672},
+----- Directory Entries -----\n", 672},
+  {"%2d: %-10s sector%5u size%8u\n", 673},
   {"\
 \n\
 Invalid Bootfile!\n\
 \tThe bootfile must be an absolute non-zero pathname,\n\
-\te.g. \"/unix\" or \"/unix.save\".\n", 673},
+\te.g. \"/unix\" or \"/unix.save\".\n", 674},
   {"\
 \n\
-\tName of Bootfile too long:  16 bytes maximum.\n", 674},
+\tName of Bootfile too long:  16 bytes maximum.\n", 675},
   {"\
 \n\
-\tBootfile must have a fully qualified pathname.\n", 675},
+\tBootfile must have a fully qualified pathname.\n", 676},
   {"\
 \n\
 \tBe aware, that the bootfile is not checked for existence.\n\
-\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 676},
+\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 677},
   {"\
 \n\
-\tBootfile is changed to \"%s\".\n", 677},
-  {"More than one entire disk entry present.\n", 678},
-  {"No partitions defined\n", 679},
-  {"IRIX likes when Partition 11 covers the entire disk.\n", 680},
+\tBootfile is changed to \"%s\".\n", 678},
+  {"More than one entire disk entry present.\n", 679},
+  {"No partitions defined\n", 680},
+  {"IRIX likes when Partition 11 covers the entire disk.\n", 681},
   {"\
 The entire disk partition should start at block 0,\n\
-not at diskblock %d.\n", 681},
+not at diskblock %d.\n", 682},
   {"\
 The entire disk partition is only %d diskblock large,\n\
-but the disk is %d diskblocks long.\n", 682},
-  {"One Partition (#11) should cover the entire disk.\n", 683},
-  {"Partition %d does not start on cylinder boundary.\n", 684},
-  {"Partition %d does not end on cylinder boundary.\n", 685},
-  {"The Partition %d and %d overlap by %d sectors.\n", 686},
-  {"Unused gap of %8d sectors - sectors %8d-%d\n", 687},
+but the disk is %d diskblocks long.\n", 683},
+  {"One Partition (#11) should cover the entire disk.\n", 684},
+  {"Partition %d does not start on cylinder boundary.\n", 685},
+  {"Partition %d does not end on cylinder boundary.\n", 686},
+  {"The Partition %d and %d overlap by %d sectors.\n", 687},
+  {"Unused gap of %8u sectors - sectors %8u-%u\n", 688},
   {"\
 \n\
-The boot partition does not exist.\n", 688},
+The boot partition does not exist.\n", 689},
   {"\
 \n\
-The swap partition does not exist.\n", 689},
+The swap partition does not exist.\n", 690},
   {"\
 \n\
-The swap partition has no swap type.\n", 690},
-  {"\tYou have chosen an unusual boot file name.\n", 691},
-  {"Sorry You may change the Tag of non-empty partitions.\n", 692},
+The swap partition has no swap type.\n", 691},
+  {"\tYou have chosen an unusual boot file name.\n", 692},
+  {"Sorry You may change the Tag of non-empty partitions.\n", 693},
   {"\
 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", 693},
-  {"YES\n", 694},
-  {"Do You know, You got a partition overlap on the disk?\n", 695},
-  {"Attempting to generate entire disk entry automatically.\n", 696},
-  {"The entire disk is already covered with partitions.\n", 697},
-  {"You got a partition overlap on the disk. Fix it first!\n", 698},
+Type YES if you are sure about tagging this partition differently.\n", 694},
+  {"YES\n", 695},
+  {"Do You know, You got a partition overlap on the disk?\n", 696},
+  {"Attempting to generate entire disk entry automatically.\n", 697},
+  {"The entire disk is already covered with partitions.\n", 698},
+  {"You got a partition overlap on the disk. Fix it first!\n", 699},
   {"\
 It is highly recommended that eleventh partition\n\
-covers the entire disk and is of type `SGI volume'\n", 699},
-  {"You will get a partition overlap on the disk. Fix it first!\n", 700},
-  {" Last %s", 701},
+covers the entire disk and is of type `SGI volume'\n", 700},
+  {"You will get a partition overlap on the disk. Fix it first!\n", 701},
+  {" Last %s", 702},
   {"\
 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", 702},
-  {"Trying to keep parameters of partition %d.\n", 703},
-  {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 704},
-  {"Empty", 705},
-  {"SunOS root", 706},
-  {"SunOS swap", 707},
-  {"SunOS usr", 708},
-  {"Whole disk", 709},
-  {"SunOS stand", 710},
-  {"SunOS var", 711},
-  {"SunOS home", 712},
-  {"Linux raid autodetect", 713},
+\n", 703},
+  {"\
+Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %\
+d.\n\
+This value may be truncated for devices > 33.8 GB.\n", 704},
+  {"Trying to keep parameters of partition %d.\n", 705},
+  {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 706},
+  {"Empty", 707},
+  {"SunOS root", 708},
+  {"SunOS swap", 709},
+  {"SunOS usr", 710},
+  {"Whole disk", 711},
+  {"SunOS stand", 712},
+  {"SunOS var", 713},
+  {"SunOS home", 714},
+  {"Linux raid autodetect", 715},
   {"\
 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", 714},
-  {"Autoconfigure found a %s%s%s\n", 715},
+or force a fresh label (s command in main menu)\n", 716},
+  {"Autoconfigure found a %s%s%s\n", 717},
   {"\
 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", 716},
+\n", 718},
   {"\
 Drive type\n\
    ?   auto configure\n\
-   0   custom (with hardware detected defaults)", 717},
-  {"Select type (? for auto, 0 for custom): ", 718},
-  {"Autoconfigure failed.\n", 719},
-  {"Sectors/track", 720},
-  {"Alternate cylinders", 721},
-  {"Physical cylinders", 722},
-  {"Rotation speed (rpm)", 723},
-  {"Interleave factor", 724},
-  {"Extra sectors per cylinder", 725},
-  {"You may change all the disk params from the x menu", 726},
-  {"3,5\" floppy", 727},
-  {"Linux custom", 728},
-  {"Partition %d doesn't end on cylinder boundary\n", 729},
-  {"Partition %d overlaps with others in sectors %d-%d\n", 730},
-  {"Unused gap - sectors 0-%d\n", 731},
-  {"Unused gap - sectors %d-%d\n", 732},
+   0   custom (with hardware detected defaults)", 719},
+  {"Select type (? for auto, 0 for custom): ", 720},
+  {"Autoconfigure failed.\n", 721},
+  {"Sectors/track", 722},
+  {"Alternate cylinders", 723},
+  {"Physical cylinders", 724},
+  {"Rotation speed (rpm)", 725},
+  {"Interleave factor", 726},
+  {"Extra sectors per cylinder", 727},
+  {"You may change all the disk params from the x menu", 728},
+  {"3,5\" floppy", 729},
+  {"Linux custom", 730},
+  {"Partition %d doesn't end on cylinder boundary\n", 731},
+  {"Partition %d overlaps with others in sectors %d-%d\n", 732},
+  {"Unused gap - sectors 0-%d\n", 733},
+  {"Unused gap - sectors %d-%d\n", 734},
   {"\
 Other partitions already cover the whole disk.\n\
-Delete some/shrink them before retry.\n", 733},
+Delete some/shrink them before retry.\n", 735},
   {"\
 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", 734},
+to %d %s\n", 736},
   {"\
 If you want to maintain SunOS/Solaris compatibility, consider leaving this\n\
-partition as Whole disk (5), starting at 0, with %u sectors\n", 735},
+partition as Whole disk (5), starting at 0, with %u sectors\n", 737},
   {"\
 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): ", 736},
+tagged with 82 (Linux swap): ", 738},
   {"\
 \n\
 Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n\
@@ -1010,459 +1016,461 @@
 %d extra sects/cyl, interleave %d:1\n\
 %s\n\
 Units = %s of %d * 512 bytes\n\
-\n", 737},
+\n", 739},
   {"\
 \n\
 Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n\
 Units = %s of %d * 512 bytes\n\
-\n", 738},
-  {"%*s Flag    Start       End    Blocks   Id  System\n", 739},
-  {"Number of alternate cylinders", 740},
-  {"Number of physical cylinders", 741},
-  {"FAT12", 742},
-  {"XENIX root", 743},
-  {"XENIX usr", 744},
-  {"FAT16 <32M", 745},
-  {"Extended", 746},
-  {"FAT16", 747},
-  {"HPFS/NTFS", 748},
-  {"AIX", 749},
-  {"AIX bootable", 750},
-  {"OS/2 Boot Manager", 751},
-  {"Win95 FAT32", 752},
-  {"Win95 FAT32 (LBA)", 753},
-  {"Win95 FAT16 (LBA)", 754},
-  {"Win95 Ext'd (LBA)", 755},
-  {"OPUS", 756},
-  {"Hidden FAT12", 757},
-  {"Compaq diagnostics", 758},
-  {"Hidden FAT16 <32M", 759},
-  {"Hidden FAT16", 760},
-  {"Hidden HPFS/NTFS", 761},
-  {"AST SmartSleep", 762},
-  {"Hidden Win95 FAT32", 763},
-  {"Hidden Win95 FAT32 (LBA)", 764},
-  {"Hidden Win95 FAT16 (LBA)", 765},
-  {"NEC DOS", 766},
-  {"Plan 9", 767},
-  {"PartitionMagic recovery", 768},
-  {"Venix 80286", 769},
-  {"PPC PReP Boot", 770},
-  {"SFS", 771},
-  {"QNX4.x", 772},
-  {"QNX4.x 2nd part", 773},
-  {"QNX4.x 3rd part", 774},
-  {"OnTrack DM", 775},
-  {"OnTrack DM6 Aux1", 776},
-  {"CP/M", 777},
-  {"OnTrack DM6 Aux3", 778},
-  {"OnTrackDM6", 779},
-  {"EZ-Drive", 780},
-  {"Golden Bow", 781},
-  {"Priam Edisk", 782},
-  {"SpeedStor", 783},
-  {"GNU HURD or SysV", 784},
-  {"Novell Netware 286", 785},
-  {"Novell Netware 386", 786},
-  {"DiskSecure Multi-Boot", 787},
-  {"PC/IX", 788},
-  {"Old Minix", 789},
-  {"Minix / old Linux", 790},
-  {"OS/2 hidden C: drive", 791},
-  {"Linux extended", 792},
-  {"NTFS volume set", 793},
-  {"Amoeba", 794},
-  {"Amoeba BBT", 795},
-  {"BSD/OS", 796},
-  {"IBM Thinkpad hibernation", 797},
-  {"FreeBSD", 798},
-  {"OpenBSD", 799},
-  {"NeXTSTEP", 800},
-  {"Darwin UFS", 801},
-  {"NetBSD", 802},
-  {"Darwin boot", 803},
-  {"BSDI fs", 804},
-  {"BSDI swap", 805},
-  {"Boot Wizard hidden", 806},
-  {"Solaris boot", 807},
-  {"DRDOS/sec (FAT-12)", 808},
-  {"DRDOS/sec (FAT-16 < 32M)", 809},
-  {"DRDOS/sec (FAT-16)", 810},
-  {"Syrinx", 811},
-  {"Non-FS data", 812},
-  {"CP/M / CTOS / ...", 813},
-  {"Dell Utility", 814},
-  {"BootIt", 815},
-  {"DOS access", 816},
-  {"DOS R/O", 817},
-  {"BeOS fs", 818},
-  {"EFI GPT", 819},
-  {"EFI (FAT-12/16/32)", 820},
-  {"Linux/PA-RISC boot", 821},
-  {"DOS secondary", 822},
-  {"LANstep", 823},
-  {"BBT", 824},
-  {"seek error on %s - cannot seek to %lu\n", 825},
-  {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 826},
-  {"out of memory - giving up\n", 827},
-  {"read error on %s - cannot read sector %lu\n", 828},
-  {"ERROR: sector %lu does not have an msdos signature\n", 829},
-  {"write error on %s - cannot write sector %lu\n", 830},
-  {"cannot open partition sector save file (%s)\n", 831},
-  {"write error on %s\n", 832},
-  {"cannot stat partition restore file (%s)\n", 833},
-  {"partition restore file has wrong size - not restoring\n", 834},
-  {"out of memory?\n", 835},
-  {"cannot open partition restore file (%s)\n", 836},
-  {"error reading %s\n", 837},
-  {"cannot open device %s for writing\n", 838},
-  {"error writing sector %lu on %s\n", 839},
-  {"Disk %s: cannot get size\n", 840},
-  {"Disk %s: cannot get geometry\n", 841},
+\n", 740},
+  {"%*s Flag    Start       End    Blocks   Id  System\n", 741},
+  {"Number of alternate cylinders", 742},
+  {"Number of physical cylinders", 743},
+  {"FAT12", 744},
+  {"XENIX root", 745},
+  {"XENIX usr", 746},
+  {"FAT16 <32M", 747},
+  {"Extended", 748},
+  {"FAT16", 749},
+  {"HPFS/NTFS", 750},
+  {"AIX", 751},
+  {"AIX bootable", 752},
+  {"OS/2 Boot Manager", 753},
+  {"W95 FAT32", 754},
+  {"W95 FAT32 (LBA)", 755},
+  {"W95 FAT16 (LBA)", 756},
+  {"W95 Ext'd (LBA)", 757},
+  {"OPUS", 758},
+  {"Hidden FAT12", 759},
+  {"Compaq diagnostics", 760},
+  {"Hidden FAT16 <32M", 761},
+  {"Hidden FAT16", 762},
+  {"Hidden HPFS/NTFS", 763},
+  {"AST SmartSleep", 764},
+  {"Hidden W95 FAT32", 765},
+  {"Hidden W95 FAT32 (LBA)", 766},
+  {"Hidden W95 FAT16 (LBA)", 767},
+  {"NEC DOS", 768},
+  {"Plan 9", 769},
+  {"PartitionMagic recovery", 770},
+  {"Venix 80286", 771},
+  {"PPC PReP Boot", 772},
+  {"SFS", 773},
+  {"QNX4.x", 774},
+  {"QNX4.x 2nd part", 775},
+  {"QNX4.x 3rd part", 776},
+  {"OnTrack DM", 777},
+  {"OnTrack DM6 Aux1", 778},
+  {"CP/M", 779},
+  {"OnTrack DM6 Aux3", 780},
+  {"OnTrackDM6", 781},
+  {"EZ-Drive", 782},
+  {"Golden Bow", 783},
+  {"Priam Edisk", 784},
+  {"SpeedStor", 785},
+  {"GNU HURD or SysV", 786},
+  {"Novell Netware 286", 787},
+  {"Novell Netware 386", 788},
+  {"DiskSecure Multi-Boot", 789},
+  {"PC/IX", 790},
+  {"Old Minix", 791},
+  {"Minix / old Linux", 792},
+  {"OS/2 hidden C: drive", 793},
+  {"Linux extended", 794},
+  {"NTFS volume set", 795},
+  {"Amoeba", 796},
+  {"Amoeba BBT", 797},
+  {"BSD/OS", 798},
+  {"IBM Thinkpad hibernation", 799},
+  {"FreeBSD", 800},
+  {"OpenBSD", 801},
+  {"NeXTSTEP", 802},
+  {"Darwin UFS", 803},
+  {"NetBSD", 804},
+  {"Darwin boot", 805},
+  {"BSDI fs", 806},
+  {"BSDI swap", 807},
+  {"Boot Wizard hidden", 808},
+  {"Solaris boot", 809},
+  {"DRDOS/sec (FAT-12)", 810},
+  {"DRDOS/sec (FAT-16 < 32M)", 811},
+  {"DRDOS/sec (FAT-16)", 812},
+  {"Syrinx", 813},
+  {"Non-FS data", 814},
+  {"CP/M / CTOS / ...", 815},
+  {"Dell Utility", 816},
+  {"BootIt", 817},
+  {"DOS access", 818},
+  {"DOS R/O", 819},
+  {"BeOS fs", 820},
+  {"EFI GPT", 821},
+  {"EFI (FAT-12/16/32)", 822},
+  {"Linux/PA-RISC boot", 823},
+  {"DOS secondary", 824},
+  {"LANstep", 825},
+  {"BBT", 826},
+  {"seek error on %s - cannot seek to %lu\n", 827},
+  {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 828},
+  {"out of memory - giving up\n", 829},
+  {"read error on %s - cannot read sector %lu\n", 830},
+  {"ERROR: sector %lu does not have an msdos signature\n", 831},
+  {"write error on %s - cannot write sector %lu\n", 832},
+  {"cannot open partition sector save file (%s)\n", 833},
+  {"write error on %s\n", 834},
+  {"cannot stat partition restore file (%s)\n", 835},
+  {"partition restore file has wrong size - not restoring\n", 836},
+  {"out of memory?\n", 837},
+  {"cannot open partition restore file (%s)\n", 838},
+  {"error reading %s\n", 839},
+  {"cannot open device %s for writing\n", 840},
+  {"error writing sector %lu on %s\n", 841},
+  {"Disk %s: cannot get size\n", 842},
+  {"Disk %s: cannot get geometry\n", 843},
   {"\
 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", 842},
-  {"Warning: HDIO_GETGEO says that there are %lu heads\n", 843},
-  {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 844},
-  {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 845},
+[Use the --force option if you really want this]\n", 844},
+  {"Warning: HDIO_GETGEO says that there are %lu heads\n", 845},
+  {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 846},
+  {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 847},
   {"\
 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", 846},
+This will give problems with all software that uses C/H/S addressing.\n", 848},
   {"\
 \n\
-Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 847},
+Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 849},
   {"\
-%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 848},
+%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 850},
   {"\
 %s of partition %s has impossible value for sector: %lu (should be in 1-%\
-lu)\n", 849},
+lu)\n", 851},
   {"\
 %s of partition %s has impossible value for cylinders: %lu (should be in 0-%\
-lu)\n", 850},
+lu)\n", 852},
   {"\
 Id  Name\n\
-\n", 851},
-  {"Re-reading the partition table ...\n", 852},
+\n", 853},
+  {"Re-reading the partition table ...\n", 854},
   {"\
 The command to re-read the partition table failed\n\
-Reboot your system now, before using mkfs\n", 853},
-  {"Error closing %s\n", 854},
-  {"%s: no such partition\n", 855},
-  {"unrecognized format - using sectors\n", 856},
-  {"# partition table of %s\n", 857},
-  {"unimplemented format - using %s\n", 858},
+Reboot your system now, before using mkfs\n", 855},
+  {"Error closing %s\n", 856},
+  {"%s: no such partition\n", 857},
+  {"unrecognized format - using sectors\n", 858},
+  {"# partition table of %s\n", 859},
+  {"unimplemented format - using %s\n", 860},
   {"\
 Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n\
-\n", 859},
-  {"   Device Boot Start     End   #cyls    #blocks   Id  System\n", 860},
+\n", 861},
+  {"   Device Boot Start     End   #cyls    #blocks   Id  System\n", 862},
   {"\
 Units = sectors of 512 bytes, counting from %d\n\
-\n", 861},
-  {"   Device Boot    Start       End   #sectors  Id  System\n", 862},
+\n", 863},
+  {"   Device Boot    Start       End   #sectors  Id  System\n", 864},
   {"\
 Units = blocks of 1024 bytes, counting from %d\n\
-\n", 863},
-  {"   Device Boot   Start       End    #blocks   Id  System\n", 864},
-  {"\
-Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n\
 \n", 865},
-  {"   Device Boot Start   End     MB    #blocks   Id  System\n", 866},
-  {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 867},
-  {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 868},
-  {"partition ends on cylinder %ld, beyond the end of the disk\n", 869},
-  {"No partitions found\n", 870},
+  {"   Device Boot   Start       End    #blocks   Id  System\n", 866},
+  {"\
+Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n\
+\n", 867},
+  {"   Device Boot Start   End    MiB    #blocks   Id  System\n", 868},
+  {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 869},
+  {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 870},
+  {"partition ends on cylinder %ld, beyond the end of the disk\n", 871},
+  {"No partitions found\n", 872},
   {"\
 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", 871},
-  {"no partition table present.\n", 872},
-  {"strange, only %d partitions defined.\n", 873},
-  {"Warning: partition %s has size 0 but is not marked Empty\n", 874},
-  {"Warning: partition %s has size 0 and is bootable\n", 875},
-  {"Warning: partition %s has size 0 and nonzero start\n", 876},
-  {"Warning: partition %s ", 877},
-  {"is not contained in partition %s\n", 878},
-  {"Warning: partitions %s ", 879},
-  {"and %s overlap\n", 880},
+For this listing I'll assume that geometry.\n", 873},
+  {"no partition table present.\n", 874},
+  {"strange, only %d partitions defined.\n", 875},
+  {"Warning: partition %s has size 0 but is not marked Empty\n", 876},
+  {"Warning: partition %s has size 0 and is bootable\n", 877},
+  {"Warning: partition %s has size 0 and nonzero start\n", 878},
+  {"Warning: partition %s ", 879},
+  {"is not contained in partition %s\n", 880},
+  {"Warning: partitions %s ", 881},
+  {"and %s overlap\n", 882},
   {"\
 Warning: partition %s contains part of the partition table (sector %lu),\n\
-and will destroy it when filled\n", 881},
-  {"Warning: partition %s starts at sector 0\n", 882},
-  {"Warning: partition %s extends past end of disk\n", 883},
+and will destroy it when filled\n", 883},
+  {"Warning: partition %s starts at sector 0\n", 884},
+  {"Warning: partition %s extends past end of disk\n", 885},
   {"\
 Among the primary partitions, at most one can be extended\n\
- (although this is not a problem under Linux)\n", 884},
-  {"Warning: partition %s does not start at a cylinder boundary\n", 885},
-  {"Warning: partition %s does not end at a cylinder boundary\n", 886},
+ (although this is not a problem under Linux)\n", 886},
+  {"Warning: partition %s does not start at a cylinder boundary\n", 887},
+  {"Warning: partition %s does not end at a cylinder boundary\n", 888},
   {"\
 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", 887},
-  {"\
-Warning: usually one can boot from primary partitions only\n\
-LILO disregards the `bootable' flag.\n", 888},
-  {"\
-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", 889},
   {"\
-partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 890},
-  {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 891},
-  {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 892},
+Warning: usually one can boot from primary partitions only\n\
+LILO disregards the `bootable' flag.\n", 890},
+  {"\
+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", 891},
+  {"start", 892},
+  {"\
+partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 893},
+  {"end", 894},
+  {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 895},
+  {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 896},
   {"\
 Warning: shifted start of the extd partition from %ld to %ld\n\
-(For listing purposes only. Do not change its contents.)\n", 893},
+(For listing purposes only. Do not change its contents.)\n", 897},
   {"\
 Warning: extended partition does not start at a cylinder boundary.\n\
-DOS and Linux will interpret the contents differently.\n", 894},
-  {"too many partitions - ignoring those past nr (%d)\n", 895},
-  {"tree of partitions?\n", 896},
-  {"detected Disk Manager - unable to handle that\n", 897},
-  {"DM6 signature found - giving up\n", 898},
-  {"strange..., an extended partition of size 0?\n", 899},
-  {"strange..., a BSD partition of size 0?\n", 900},
-  {" %s: unrecognized partition\n", 901},
-  {"-n flag was given: Nothing changed\n", 902},
-  {"Failed saving the old sectors - aborting\n", 903},
-  {"Failed writing the partition on %s\n", 904},
-  {"long or incomplete input line - quitting\n", 905},
-  {"input error: `=' expected after %s field\n", 906},
-  {"input error: unexpected character %c after %s field\n", 907},
-  {"unrecognized input: %s\n", 908},
-  {"number too big\n", 909},
-  {"trailing junk after number\n", 910},
-  {"no room for partition descriptor\n", 911},
-  {"cannot build surrounding extended partition\n", 912},
-  {"too many input fields\n", 913},
-  {"No room for more\n", 914},
-  {"Illegal type\n", 915},
-  {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 916},
-  {"Warning: empty partition\n", 917},
-  {"Warning: bad partition start (earliest %lu)\n", 918},
-  {"unrecognized bootable flag - choose - or *\n", 919},
-  {"partial c,h,s specification?\n", 920},
-  {"Extended partition not where expected\n", 921},
-  {"bad input\n", 922},
-  {"too many partitions\n", 923},
+DOS and Linux will interpret the contents differently.\n", 898},
+  {"too many partitions - ignoring those past nr (%d)\n", 899},
+  {"tree of partitions?\n", 900},
+  {"detected Disk Manager - unable to handle that\n", 901},
+  {"DM6 signature found - giving up\n", 902},
+  {"strange..., an extended partition of size 0?\n", 903},
+  {"strange..., a BSD partition of size 0?\n", 904},
+  {" %s: unrecognized partition\n", 905},
+  {"-n flag was given: Nothing changed\n", 906},
+  {"Failed saving the old sectors - aborting\n", 907},
+  {"Failed writing the partition on %s\n", 908},
+  {"long or incomplete input line - quitting\n", 909},
+  {"input error: `=' expected after %s field\n", 910},
+  {"input error: unexpected character %c after %s field\n", 911},
+  {"unrecognized input: %s\n", 912},
+  {"number too big\n", 913},
+  {"trailing junk after number\n", 914},
+  {"no room for partition descriptor\n", 915},
+  {"cannot build surrounding extended partition\n", 916},
+  {"too many input fields\n", 917},
+  {"No room for more\n", 918},
+  {"Illegal type\n", 919},
+  {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 920},
+  {"Warning: empty partition\n", 921},
+  {"Warning: bad partition start (earliest %lu)\n", 922},
+  {"unrecognized bootable flag - choose - or *\n", 923},
+  {"partial c,h,s specification?\n", 924},
+  {"Extended partition not where expected\n", 925},
+  {"bad input\n", 926},
+  {"too many partitions\n", 927},
   {"\
 Input in the following format; absent fields get a default value.\n\
 <start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n\
-Usually you only need to specify <start> and <size> (and perhaps <type>).\n", 924},
-  {"version", 925},
-  {"Usage: %s [options] device ...\n", 926},
-  {"device: something like /dev/hda or /dev/sda", 927},
-  {"useful options:", 928},
-  {"    -s [or --show-size]: list size of a partition", 929},
-  {"    -c [or --id]:        print or change partition Id", 930},
-  {"    -l [or --list]:      list partitions of each device", 931},
-  {"    -d [or --dump]:      idem, but in a format suitable for later input", 932},
-  {"    -i [or --increment]: number cylinders etc. from 1 instead of from 0", 933},
+Usually you only need to specify <start> and <size> (and perhaps <type>).\n", 928},
+  {"version", 929},
+  {"Usage: %s [options] device ...\n", 930},
+  {"device: something like /dev/hda or /dev/sda", 931},
+  {"useful options:", 932},
+  {"    -s [or --show-size]: list size of a partition", 933},
+  {"    -c [or --id]:        print or change partition Id", 934},
+  {"    -l [or --list]:      list partitions of each device", 935},
+  {"    -d [or --dump]:      idem, but in a format suitable for later input", 936},
+  {"    -i [or --increment]: number cylinders etc. from 1 instead of from 0", 937},
   {"\
     -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/\
-MB", 934},
-  {"    -T [or --list-types]:list the known partition types", 935},
-  {"    -D [or --DOS]:       for DOS-compatibility: waste a little space", 936},
-  {"    -R [or --re-read]:   make kernel reread partition table", 937},
-  {"    -N# :                change only the partition with number #", 938},
-  {"    -n :                 do not actually write to disk", 939},
+MB", 938},
+  {"    -T [or --list-types]:list the known partition types", 939},
+  {"    -D [or --DOS]:       for DOS-compatibility: waste a little space", 940},
+  {"    -R [or --re-read]:   make kernel reread partition table", 941},
+  {"    -N# :                change only the partition with number #", 942},
+  {"    -n :                 do not actually write to disk", 943},
   {"\
-    -O file :            save the sectors that will be overwritten to file", 940},
-  {"    -I file :            restore these sectors again", 941},
-  {"    -v [or --version]:   print version", 942},
-  {"    -? [or --help]:      print this message", 943},
-  {"dangerous options:", 944},
-  {"    -g [or --show-geometry]: print the kernel's idea of the geometry", 945},
+    -O file :            save the sectors that will be overwritten to file", 944},
+  {"    -I file :            restore these sectors again", 945},
+  {"    -v [or --version]:   print version", 946},
+  {"    -? [or --help]:      print this message", 947},
+  {"dangerous options:", 948},
+  {"    -g [or --show-geometry]: print the kernel's idea of the geometry", 949},
   {"\
     -x [or --show-extended]: also list extended partitions on output\n\
-                             or expect descriptors for them on input", 946},
+                             or expect descriptors for them on input", 950},
   {"\
-    -L  [or --Linux]:      do not complain about things irrelevant for Linux", 947},
-  {"    -q  [or --quiet]:      suppress warning messages", 948},
-  {"    You can override the detected geometry using:", 949},
-  {"    -C# [or --cylinders #]:set the number of cylinders to use", 950},
-  {"    -H# [or --heads #]:    set the number of heads to use", 951},
-  {"    -S# [or --sectors #]:  set the number of sectors to use", 952},
-  {"You can disable all consistency checking with:", 953},
-  {"    -f  [or --force]:      do what I say, even if it is stupid", 954},
-  {"Usage:", 955},
-  {"%s device\t\t list active partitions on device\n", 956},
-  {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 957},
-  {"%s -An device\t activate partition n, inactivate the other ones\n", 958},
-  {"no command?\n", 959},
-  {"total: %d blocks\n", 960},
-  {"usage: sfdisk --print-id device partition-number\n", 961},
-  {"usage: sfdisk --change-id device partition-number Id\n", 962},
-  {"usage: sfdisk --id device partition-number [Id]\n", 963},
-  {"can specify only one device (except with -l or -s)\n", 964},
-  {"cannot open %s read-write\n", 965},
-  {"cannot open %s for reading\n", 966},
-  {"%s: OK\n", 967},
-  {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 968},
-  {"BLKGETSIZE ioctl failed for %s\n", 969},
-  {"bad active byte: 0x%x instead of 0x80\n", 970},
+    -L  [or --Linux]:      do not complain about things irrelevant for Linux", 951},
+  {"    -q  [or --quiet]:      suppress warning messages", 952},
+  {"    You can override the detected geometry using:", 953},
+  {"    -C# [or --cylinders #]:set the number of cylinders to use", 954},
+  {"    -H# [or --heads #]:    set the number of heads to use", 955},
+  {"    -S# [or --sectors #]:  set the number of sectors to use", 956},
+  {"You can disable all consistency checking with:", 957},
+  {"    -f  [or --force]:      do what I say, even if it is stupid", 958},
+  {"Usage:", 959},
+  {"%s device\t\t list active partitions on device\n", 960},
+  {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 961},
+  {"%s -An device\t activate partition n, inactivate the other ones\n", 962},
+  {"no command?\n", 963},
+  {"total: %d blocks\n", 964},
+  {"usage: sfdisk --print-id device partition-number\n", 965},
+  {"usage: sfdisk --change-id device partition-number Id\n", 966},
+  {"usage: sfdisk --id device partition-number [Id]\n", 967},
+  {"can specify only one device (except with -l or -s)\n", 968},
+  {"cannot open %s read-write\n", 969},
+  {"cannot open %s for reading\n", 970},
+  {"%s: OK\n", 971},
+  {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 972},
+  {"BLKGETSIZE ioctl failed for %s\n", 973},
+  {"bad active byte: 0x%x instead of 0x80\n", 974},
   {"\
 Done\n\
-\n", 971},
+\n", 975},
   {"\
 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", 972},
-  {"partition %s has id %x and is not hidden\n", 973},
-  {"Bad Id %lx\n", 974},
-  {"This disk is currently in use.\n", 975},
-  {"Fatal error: cannot find %s\n", 976},
-  {"Warning: %s is not a block device\n", 977},
-  {"Checking that no-one is using this disk right now ...\n", 978},
+but the DOS MBR will only boot a disk with 1 active partition.\n", 976},
+  {"partition %s has id %x and is not hidden\n", 977},
+  {"Bad Id %lx\n", 978},
+  {"This disk is currently in use.\n", 979},
+  {"Fatal error: cannot find %s\n", 980},
+  {"Warning: %s is not a block device\n", 981},
+  {"Checking that no-one is using this disk right now ...\n", 982},
   {"\
 \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", 979},
-  {"Use the --force flag to overrule all checks.\n", 980},
-  {"OK\n", 981},
-  {"Old situation:\n", 982},
-  {"Partition %d does not exist, cannot change it\n", 983},
-  {"New situation:\n", 984},
+Use the --no-reread flag to suppress this check.\n", 983},
+  {"Use the --force flag to overrule all checks.\n", 984},
+  {"OK\n", 985},
+  {"Old situation:\n", 986},
+  {"Partition %d does not exist, cannot change it\n", 987},
+  {"New situation:\n", 988},
   {"\
 I don't like these partitions - nothing changed.\n\
-(If you really want this, use the --force option.)\n", 985},
-  {"I don't like this - probably you should answer No\n", 986},
-  {"Are you satisfied with this? [ynq] ", 987},
-  {"Do you want to write this to disk? [ynq] ", 988},
+(If you really want this, use the --force option.)\n", 989},
+  {"I don't like this - probably you should answer No\n", 990},
+  {"Are you satisfied with this? [ynq] ", 991},
+  {"Do you want to write this to disk? [ynq] ", 992},
   {"\
 \n\
-sfdisk: premature end of input\n", 989},
-  {"Quitting - nothing changed\n", 990},
-  {"Please answer one of y,n,q\n", 991},
+sfdisk: premature end of input\n", 993},
+  {"Quitting - nothing changed\n", 994},
+  {"Please answer one of y,n,q\n", 995},
   {"\
 Successfully wrote the new partition table\n\
-\n", 992},
+\n", 996},
   {"\
 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", 993},
-  {"Try `getopt --help' for more information.\n", 994},
-  {"empty long option after -l or --long argument", 995},
-  {"unknown shell after -s or --shell argument", 996},
-  {"Usage: getopt optstring parameters\n", 997},
-  {"       getopt [options] [--] optstring parameters\n", 998},
-  {"       getopt [options] -o|--options optstring [options] [--]\n", 999},
-  {"              parameters\n", 1000},
+(See fdisk(8).)\n", 997},
+  {"Try `getopt --help' for more information.\n", 998},
+  {"empty long option after -l or --long argument", 999},
+  {"unknown shell after -s or --shell argument", 1000},
+  {"Usage: getopt optstring parameters\n", 1001},
+  {"       getopt [options] [--] optstring parameters\n", 1002},
+  {"       getopt [options] -o|--options optstring [options] [--]\n", 1003},
+  {"              parameters\n", 1004},
   {"\
-  -a, --alternative            Allow long options starting with single -\n", 1001},
-  {"  -h, --help                   This small usage guide\n", 1002},
-  {"  -l, --longoptions=longopts   Long options to be recognized\n", 1003},
+  -a, --alternative            Allow long options starting with single -\n", 1005},
+  {"  -h, --help                   This small usage guide\n", 1006},
+  {"  -l, --longoptions=longopts   Long options to be recognized\n", 1007},
   {"\
-  -n, --name=progname          The name under which errors are reported\n", 1004},
-  {"  -o, --options=optstring      Short options to be recognized\n", 1005},
-  {"  -q, --quiet                  Disable error reporting by getopt(3)\n", 1006},
-  {"  -Q, --quiet-output           No normal output\n", 1007},
-  {"  -s, --shell=shell            Set shell quoting conventions\n", 1008},
-  {"  -T, --test                   Test for getopt(1) version\n", 1009},
-  {"  -u, --unqote                 Do not quote the output\n", 1010},
-  {"  -V, --version                Output version information\n", 1011},
-  {"missing optstring argument", 1012},
-  {"getopt (enhanced) 1.1.2\n", 1013},
-  {"internal error, contact the author.", 1014},
-  {"booted from MILO\n", 1015},
-  {"Ruffian BCD clock\n", 1016},
-  {"clockport adjusted to 0x%x\n", 1017},
-  {"funky TOY!\n", 1018},
-  {"%s: atomic %s failed for 1000 iterations!", 1019},
-  {"Cannot open /dev/port: %s", 1020},
-  {"I failed to get permission because I didn't try.\n", 1021},
-  {"%s is unable to get I/O port access:  the iopl(3) call failed.\n", 1022},
-  {"Probably you need root privileges.\n", 1023},
-  {"Assuming hardware clock is kept in %s time.\n", 1024},
-  {"UTC", 1025},
-  {"local", 1026},
-  {"%s: Warning: unrecognized third line in adjtime file\n", 1027},
-  {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 1028},
-  {"Last drift adjustment done at %ld seconds after 1969\n", 1029},
-  {"Last calibration done at %ld seconds after 1969\n", 1030},
-  {"Hardware clock is on %s time\n", 1031},
-  {"unknown", 1032},
-  {"Waiting for clock tick...\n", 1033},
-  {"...got clock tick\n", 1034},
-  {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 1035},
-  {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1036},
-  {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 1037},
-  {"Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1038},
-  {"Clock not changed - testing only.\n", 1039},
+  -n, --name=progname          The name under which errors are reported\n", 1008},
+  {"  -o, --options=optstring      Short options to be recognized\n", 1009},
+  {"  -q, --quiet                  Disable error reporting by getopt(3)\n", 1010},
+  {"  -Q, --quiet-output           No normal output\n", 1011},
+  {"  -s, --shell=shell            Set shell quoting conventions\n", 1012},
+  {"  -T, --test                   Test for getopt(1) version\n", 1013},
+  {"  -u, --unqote                 Do not quote the output\n", 1014},
+  {"  -V, --version                Output version information\n", 1015},
+  {"missing optstring argument", 1016},
+  {"getopt (enhanced) 1.1.3\n", 1017},
+  {"internal error, contact the author.", 1018},
+  {"booted from MILO\n", 1019},
+  {"Ruffian BCD clock\n", 1020},
+  {"clockport adjusted to 0x%x\n", 1021},
+  {"funky TOY!\n", 1022},
+  {"%s: atomic %s failed for 1000 iterations!", 1023},
+  {"Cannot open /dev/port: %s", 1024},
+  {"I failed to get permission because I didn't try.\n", 1025},
+  {"%s is unable to get I/O port access:  the iopl(3) call failed.\n", 1026},
+  {"Probably you need root privileges.\n", 1027},
+  {"Assuming hardware clock is kept in %s time.\n", 1028},
+  {"UTC", 1029},
+  {"local", 1030},
+  {"%s: Warning: unrecognized third line in adjtime file\n", 1031},
+  {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 1032},
+  {"Last drift adjustment done at %ld seconds after 1969\n", 1033},
+  {"Last calibration done at %ld seconds after 1969\n", 1034},
+  {"Hardware clock is on %s time\n", 1035},
+  {"unknown", 1036},
+  {"Waiting for clock tick...\n", 1037},
+  {"...got clock tick\n", 1038},
+  {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 1039},
+  {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1040},
+  {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 1041},
+  {"Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1042},
+  {"Clock not changed - testing only.\n", 1043},
   {"\
 Time elapsed since reference time has been %.6f seconds.\n\
-Delaying further to reach the next full second.\n", 1040},
+Delaying further to reach the next full second.\n", 1044},
   {"\
 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", 1041},
-  {"%s  %.6f seconds\n", 1042},
-  {"No --date option specified.\n", 1043},
-  {"--date argument too long\n", 1044},
+50th day of month) or beyond the range we can handle (e.g. Year 2095).\n", 1045},
+  {"%s  %.6f seconds\n", 1046},
+  {"No --date option specified.\n", 1047},
+  {"--date argument too long\n", 1048},
   {"\
 The value of the --date option is not a valid date.\n\
-In particular, it contains quotation marks.\n", 1045},
-  {"Issuing date command: %s\n", 1046},
-  {"Unable to run 'date' program in /bin/sh shell. popen() failed", 1047},
-  {"response from date command = %s\n", 1048},
+In particular, it contains quotation marks.\n", 1049},
+  {"Issuing date command: %s\n", 1050},
+  {"Unable to run 'date' program in /bin/sh shell. popen() failed", 1051},
+  {"response from date command = %s\n", 1052},
   {"\
 The date command issued by %s returned unexpected results.\n\
 The command was:\n\
   %s\n\
 The response was:\n\
-  %s\n", 1049},
+  %s\n", 1053},
   {"\
 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", 1050},
-  {"date string %s equates to %ld seconds since 1969.\n", 1051},
+ %s\n", 1054},
+  {"date string %s equates to %ld seconds since 1969.\n", 1055},
   {"\
 The Hardware Clock does not contain a valid time, so we cannot set the \
-System Time from it.\n", 1052},
-  {"Calling settimeofday:\n", 1053},
-  {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 1054},
-  {"\ttz.tz_minuteswest = %d\n", 1055},
-  {"Not setting system clock because running in test mode.\n", 1056},
-  {"Must be superuser to set system clock.\n", 1057},
-  {"settimeofday() failed", 1058},
+System Time from it.\n", 1056},
+  {"Calling settimeofday:\n", 1057},
+  {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 1058},
+  {"\ttz.tz_minuteswest = %d\n", 1059},
+  {"Not setting system clock because running in test mode.\n", 1060},
+  {"Must be superuser to set system clock.\n", 1061},
+  {"settimeofday() failed", 1062},
   {"\
 Not adjusting drift factor because the Hardware Clock previously contained \
-garbage.\n", 1059},
+garbage.\n", 1063},
   {"\
 Not adjusting drift factor because last calibration time is zero,\n\
-so history is bad and calibration startover is necessary.\n", 1060},
+so history is bad and calibration startover is necessary.\n", 1064},
   {"\
 Not adjusting drift factor because it has been less than a day since the \
-last calibration.\n", 1061},
+last calibration.\n", 1065},
   {"\
 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", 1062},
-  {"Time since last adjustment is %d seconds\n", 1063},
-  {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1064},
-  {"Not updating adjtime file because of testing mode.\n", 1065},
+Adjusting drift factor by %f seconds/day\n", 1066},
+  {"Time since last adjustment is %d seconds\n", 1067},
+  {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1068},
+  {"Not updating adjtime file because of testing mode.\n", 1069},
   {"\
 Would have written the following to %s:\n\
-%s", 1066},
-  {"Drift adjustment parameters not updated.\n", 1067},
+%s", 1070},
+  {"Drift adjustment parameters not updated.\n", 1071},
   {"\
-The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1068},
-  {"Needed adjustment is less than one second, so not setting clock.\n", 1069},
-  {"Using %s.\n", 1070},
-  {"No usable clock interface found.\n", 1071},
-  {"Unable to set system clock.\n", 1072},
+The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1072},
+  {"Needed adjustment is less than one second, so not setting clock.\n", 1073},
+  {"Using %s.\n", 1074},
+  {"No usable clock interface found.\n", 1075},
+  {"Unable to set system clock.\n", 1076},
   {"\
 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", 1073},
-  {"Unable to get the epoch value from the kernel.\n", 1074},
-  {"Kernel is assuming an epoch value of %lu\n", 1075},
+(and thus is presumably not running on an Alpha now).  No action taken.\n", 1077},
+  {"Unable to get the epoch value from the kernel.\n", 1078},
+  {"Kernel is assuming an epoch value of %lu\n", 1079},
   {"\
 To set the epoch value, you must use the 'epoch' option to tell to what \
-value to set it.\n", 1076},
-  {"Not setting the epoch to %d - testing only.\n", 1077},
-  {"Unable to set the epoch value in the kernel.\n", 1078},
+value to set it.\n", 1080},
+  {"Not setting the epoch to %d - testing only.\n", 1081},
+  {"Unable to set the epoch value in the kernel.\n", 1082},
   {"\
 hwclock - query and set the hardware clock (RTC)\n\
 \n\
@@ -1490,558 +1498,558 @@
   --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", 1079},
+                either --utc or --localtime\n", 1083},
   {"\
   --jensen, --arc, --srm, --funky-toy\n\
-                tell hwclock the type of alpha you have (see hwclock(8))\n", 1080},
-  {"%s takes no non-option arguments.  You supplied %d.\n", 1081},
+                tell hwclock the type of alpha you have (see hwclock(8))\n", 1084},
+  {"%s takes no non-option arguments.  You supplied %d.\n", 1085},
   {"\
 You have specified multiple functions.\n\
-You can only perform one function at a time.\n", 1082},
+You can only perform one function at a time.\n", 1086},
   {"\
 %s: The --utc and --localtime options are mutually exclusive.  You specified \
-both.\n", 1083},
+both.\n", 1087},
   {"\
 %s: The --adjust and --noadjfile options are mutually exclusive.  You \
-specified both.\n", 1084},
-  {"%s: With --noadjfile, you must specify either --utc or --localtime\n", 1085},
-  {"No usable set-to time.  Cannot set clock.\n", 1086},
-  {"Sorry, only the superuser can change the Hardware Clock.\n", 1087},
-  {"Sorry, only the superuser can change the System Clock.\n", 1088},
+specified both.\n", 1088},
+  {"%s: With --noadjfile, you must specify either --utc or --localtime\n", 1089},
+  {"No usable set-to time.  Cannot set clock.\n", 1090},
+  {"Sorry, only the superuser can change the Hardware Clock.\n", 1091},
+  {"Sorry, only the superuser can change the System Clock.\n", 1092},
   {"\
 Sorry, only the superuser can change the Hardware Clock epoch in the \
-kernel.\n", 1089},
-  {"Cannot access the Hardware Clock via any known method.\n", 1090},
+kernel.\n", 1093},
+  {"Cannot access the Hardware Clock via any known method.\n", 1094},
   {"\
 Use the --debug option to see the details of our search for an access \
-method.\n", 1091},
-  {"Waiting in loop for time from KDGHWCLK to change\n", 1092},
-  {"KDGHWCLK ioctl to read time failed", 1093},
-  {"Timed out waiting for time change.\n", 1094},
-  {"KDGHWCLK ioctl to read time failed in loop", 1095},
-  {"ioctl() failed to read time from %s", 1096},
-  {"ioctl KDSHWCLK failed", 1097},
-  {"Can't open /dev/tty1 or /dev/vc/1", 1098},
-  {"KDGHWCLK ioctl failed", 1099},
-  {"open() of %s failed", 1100},
-  {"ioctl() to %s to read the time failed.\n", 1101},
-  {"Waiting in loop for time from %s to change\n", 1102},
-  {"%s does not have interrupt functions. ", 1103},
-  {"read() to %s to wait for clock tick failed", 1104},
-  {"ioctl() to %s to turn off update interrupts failed", 1105},
-  {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1106},
-  {"ioctl() to %s to set the time failed.\n", 1107},
-  {"ioctl(%s) was successful.\n", 1108},
-  {"Open of %s failed", 1109},
+method.\n", 1095},
+  {"Waiting in loop for time from KDGHWCLK to change\n", 1096},
+  {"KDGHWCLK ioctl to read time failed", 1097},
+  {"Timed out waiting for time change.\n", 1098},
+  {"KDGHWCLK ioctl to read time failed in loop", 1099},
+  {"ioctl() failed to read time from %s", 1100},
+  {"ioctl KDSHWCLK failed", 1101},
+  {"Can't open /dev/tty1 or /dev/vc/1", 1102},
+  {"KDGHWCLK ioctl failed", 1103},
+  {"open() of %s failed", 1104},
+  {"ioctl() to %s to read the time failed.\n", 1105},
+  {"Waiting in loop for time from %s to change\n", 1106},
+  {"%s does not have interrupt functions. ", 1107},
+  {"read() to %s to wait for clock tick failed", 1108},
+  {"ioctl() to %s to turn off update interrupts failed", 1109},
+  {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1110},
+  {"ioctl() to %s to set the time failed.\n", 1111},
+  {"ioctl(%s) was successful.\n", 1112},
+  {"Open of %s failed", 1113},
   {"\
 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", 1110},
-  {"Unable to open %s", 1111},
-  {"ioctl(RTC_EPOCH_READ) to %s failed", 1112},
-  {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1113},
-  {"The epoch value may not be less than 1900.  You requested %ld\n", 1114},
-  {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1115},
+this system.\n", 1114},
+  {"Unable to open %s", 1115},
+  {"ioctl(RTC_EPOCH_READ) to %s failed", 1116},
+  {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1117},
+  {"The epoch value may not be less than 1900.  You requested %ld\n", 1118},
+  {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1119},
   {"\
-The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1116},
-  {"ioctl(RTC_EPOCH_SET) to %s failed", 1117},
-  {"calling open_tty\n", 1118},
-  {"calling termio_init\n", 1119},
-  {"writing init string\n", 1120},
-  {"before autobaud\n", 1121},
-  {"waiting for cr-lf\n", 1122},
-  {"read %c\n", 1123},
-  {"reading login name\n", 1124},
-  {"%s: can't exec %s: %m", 1125},
-  {"can't malloc initstring", 1126},
-  {"bad timeout value: %s", 1127},
-  {"after getopt loop\n", 1128},
-  {"exiting parseargs\n", 1129},
-  {"entered parse_speeds\n", 1130},
-  {"bad speed: %s", 1131},
-  {"too many alternate speeds", 1132},
-  {"exiting parsespeeds\n", 1133},
-  {"/dev: chdir() failed: %m", 1134},
-  {"/dev/%s: not a character device", 1135},
-  {"open(2)\n", 1136},
-  {"/dev/%s: cannot open as standard input: %m", 1137},
-  {"%s: not open for read/write", 1138},
-  {"duping\n", 1139},
-  {"%s: dup problem: %m", 1140},
-  {"term_io 2\n", 1141},
-  {"user", 1142},
-  {"users", 1143},
-  {"%s: read: %m", 1144},
-  {"%s: input overrun", 1145},
+The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1120},
+  {"ioctl(RTC_EPOCH_SET) to %s failed", 1121},
+  {"calling open_tty\n", 1122},
+  {"calling termio_init\n", 1123},
+  {"writing init string\n", 1124},
+  {"before autobaud\n", 1125},
+  {"waiting for cr-lf\n", 1126},
+  {"read %c\n", 1127},
+  {"reading login name\n", 1128},
+  {"%s: can't exec %s: %m", 1129},
+  {"can't malloc initstring", 1130},
+  {"bad timeout value: %s", 1131},
+  {"after getopt loop\n", 1132},
+  {"exiting parseargs\n", 1133},
+  {"entered parse_speeds\n", 1134},
+  {"bad speed: %s", 1135},
+  {"too many alternate speeds", 1136},
+  {"exiting parsespeeds\n", 1137},
+  {"/dev: chdir() failed: %m", 1138},
+  {"/dev/%s: not a character device", 1139},
+  {"open(2)\n", 1140},
+  {"/dev/%s: cannot open as standard input: %m", 1141},
+  {"%s: not open for read/write", 1142},
+  {"duping\n", 1143},
+  {"%s: dup problem: %m", 1144},
+  {"term_io 2\n", 1145},
+  {"user", 1146},
+  {"users", 1147},
+  {"%s: read: %m", 1148},
+  {"%s: input overrun", 1149},
   {"\
 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", 1146},
-  {"login: memory low, login may fail\n", 1147},
-  {"can't malloc for ttyclass", 1148},
-  {"can't malloc for grplist", 1149},
-  {"Login on %s from %s denied by default.\n", 1150},
-  {"Login on %s from %s denied.\n", 1151},
-  {"%s: you (user %d) don't exist.\n", 1152},
-  {"%s: user \"%s\" does not exist.\n", 1153},
-  {"%s: can only change local entries; use yp%s instead.\n", 1154},
-  {"Changing finger information for %s.\n", 1155},
-  {"Password error.", 1156},
-  {"Password: ", 1157},
-  {"Incorrect password.", 1158},
-  {"Finger information not changed.\n", 1159},
-  {"Usage: %s [ -f full-name ] [ -o office ] ", 1160},
+line baud_rate,... [termtype]\n", 1150},
+  {"login: memory low, login may fail\n", 1151},
+  {"can't malloc for ttyclass", 1152},
+  {"can't malloc for grplist", 1153},
+  {"Login on %s from %s denied by default.\n", 1154},
+  {"Login on %s from %s denied.\n", 1155},
+  {"%s: you (user %d) don't exist.\n", 1156},
+  {"%s: user \"%s\" does not exist.\n", 1157},
+  {"%s: can only change local entries; use yp%s instead.\n", 1158},
+  {"Changing finger information for %s.\n", 1159},
+  {"Password error.", 1160},
+  {"Password: ", 1161},
+  {"Incorrect password.", 1162},
+  {"Finger information not changed.\n", 1163},
+  {"Usage: %s [ -f full-name ] [ -o office ] ", 1164},
   {"\
 [ -p office-phone ]\n\
-\t[ -h home-phone ] ", 1161},
-  {"[ --help ] [ --version ]\n", 1162},
+\t[ -h home-phone ] ", 1165},
+  {"[ --help ] [ --version ]\n", 1166},
   {"\
 \n\
-Aborted.\n", 1163},
-  {"field is too long.\n", 1164},
-  {"'%c' is not allowed.\n", 1165},
-  {"Control characters are not allowed.\n", 1166},
-  {"Finger information *NOT* changed.  Try again later.\n", 1167},
-  {"Finger information changed.\n", 1168},
-  {"malloc failed", 1169},
-  {"%s: Your shell is not in /etc/shells, shell change denied\n", 1170},
-  {"Changing shell for %s.\n", 1171},
-  {"New shell", 1172},
-  {"Shell not changed.\n", 1173},
-  {"Shell *NOT* changed.  Try again later.\n", 1174},
-  {"Shell changed.\n", 1175},
+Aborted.\n", 1167},
+  {"field is too long.\n", 1168},
+  {"'%c' is not allowed.\n", 1169},
+  {"Control characters are not allowed.\n", 1170},
+  {"Finger information *NOT* changed.  Try again later.\n", 1171},
+  {"Finger information changed.\n", 1172},
+  {"malloc failed", 1173},
+  {"%s: Your shell is not in /etc/shells, shell change denied\n", 1174},
+  {"Changing shell for %s.\n", 1175},
+  {"New shell", 1176},
+  {"Shell not changed.\n", 1177},
+  {"Shell *NOT* changed.  Try again later.\n", 1178},
+  {"Shell changed.\n", 1179},
   {"\
 Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n\
-       [ username ]\n", 1176},
-  {"%s: shell must be a full path name.\n", 1177},
-  {"%s: \"%s\" does not exist.\n", 1178},
-  {"%s: \"%s\" is not executable.\n", 1179},
-  {"%s: '%c' is not allowed.\n", 1180},
-  {"%s: Control characters are not allowed.\n", 1181},
-  {"Warning: \"%s\" is not listed in /etc/shells\n", 1182},
-  {"%s: \"%s\" is not listed in /etc/shells.\n", 1183},
-  {"%s: use -l option to see list\n", 1184},
-  {"Warning: \"%s\" is not listed in /etc/shells.\n", 1185},
-  {"Use %s -l to see list.\n", 1186},
-  {"No known shells.\n", 1187},
-  {"couldn't open /dev/urandom", 1188},
-  {"couldn't read random data from /dev/urandom", 1189},
-  {"can't open %s for reading", 1190},
-  {"can't stat(%s)", 1191},
-  {"%s doesn't have the correct filemodes", 1192},
-  {"can't read data from %s", 1193},
-  {"Can't read %s, exiting.", 1194},
-  {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1195},
-  {"  still logged in", 1196},
+       [ username ]\n", 1180},
+  {"%s: shell must be a full path name.\n", 1181},
+  {"%s: \"%s\" does not exist.\n", 1182},
+  {"%s: \"%s\" is not executable.\n", 1183},
+  {"%s: '%c' is not allowed.\n", 1184},
+  {"%s: Control characters are not allowed.\n", 1185},
+  {"Warning: \"%s\" is not listed in /etc/shells\n", 1186},
+  {"%s: \"%s\" is not listed in /etc/shells.\n", 1187},
+  {"%s: use -l option to see list\n", 1188},
+  {"Warning: \"%s\" is not listed in /etc/shells.\n", 1189},
+  {"Use %s -l to see list.\n", 1190},
+  {"No known shells.\n", 1191},
+  {"couldn't open /dev/urandom", 1192},
+  {"couldn't read random data from /dev/urandom", 1193},
+  {"can't open %s for reading", 1194},
+  {"can't stat(%s)", 1195},
+  {"%s doesn't have the correct filemodes", 1196},
+  {"can't read data from %s", 1197},
+  {"Can't read %s, exiting.", 1198},
+  {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1199},
+  {"  still logged in", 1200},
   {"\
 \n\
-wtmp begins %s", 1197},
-  {"last: malloc failure.\n", 1198},
-  {"last: gethostname", 1199},
+wtmp begins %s", 1201},
+  {"last: malloc failure.\n", 1202},
+  {"last: gethostname", 1203},
   {"\
 \n\
-interrupted %10.10s %5.5s \n", 1200},
-  {"FATAL: can't reopen tty: %s", 1201},
-  {"FATAL: bad tty", 1202},
-  {"login: -h for super-user only.\n", 1203},
-  {"usage: login [-fp] [username]\n", 1204},
-  {"login: PAM Failure, aborting: %s\n", 1205},
-  {"Couldn't initialize PAM: %s", 1206},
-  {"login: ", 1207},
-  {"FAILED LOGIN %d FROM %s FOR %s, %s", 1208},
+interrupted %10.10s %5.5s \n", 1204},
+  {"FATAL: can't reopen tty: %s", 1205},
+  {"FATAL: bad tty", 1206},
+  {"login: -h for super-user only.\n", 1207},
+  {"usage: login [-fp] [username]\n", 1208},
+  {"login: PAM Failure, aborting: %s\n", 1209},
+  {"Couldn't initialize PAM: %s", 1210},
+  {"login: ", 1211},
+  {"FAILED LOGIN %d FROM %s FOR %s, %s", 1212},
   {"\
 Login incorrect\n\
-\n", 1209},
-  {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1210},
-  {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1211},
+\n", 1213},
+  {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1214},
+  {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1215},
   {"\
 \n\
-Login incorrect\n", 1212},
+Login incorrect\n", 1216},
   {"\
 \n\
-Session setup problem, abort.\n", 1213},
-  {"NULL user name in %s:%d. Abort.", 1214},
-  {"Invalid user name \"%s\" in %s:%d. Abort.", 1215},
-  {"login: Out of memory\n", 1216},
-  {"Illegal username", 1217},
-  {"%s login refused on this terminal.\n", 1218},
-  {"LOGIN %s REFUSED FROM %s ON TTY %s", 1219},
-  {"LOGIN %s REFUSED ON TTY %s", 1220},
-  {"Login incorrect\n", 1221},
+Session setup problem, abort.\n", 1217},
+  {"NULL user name in %s:%d. Abort.", 1218},
+  {"Invalid user name \"%s\" in %s:%d. Abort.", 1219},
+  {"login: Out of memory\n", 1220},
+  {"Illegal username", 1221},
+  {"%s login refused on this terminal.\n", 1222},
+  {"LOGIN %s REFUSED FROM %s ON TTY %s", 1223},
+  {"LOGIN %s REFUSED ON TTY %s", 1224},
+  {"Login incorrect\n", 1225},
   {"\
 Too many users logged on already.\n\
-Try again later.\n", 1222},
-  {"You have too many processes running.\n", 1223},
-  {"DIALUP AT %s BY %s", 1224},
-  {"ROOT LOGIN ON %s FROM %s", 1225},
-  {"ROOT LOGIN ON %s", 1226},
-  {"LOGIN ON %s BY %s FROM %s", 1227},
-  {"LOGIN ON %s BY %s", 1228},
-  {"You have new mail.\n", 1229},
-  {"You have mail.\n", 1230},
-  {"login: failure forking: %s", 1231},
-  {"TIOCSCTTY failed: %m", 1232},
-  {"setuid() failed", 1233},
-  {"No directory %s!\n", 1234},
-  {"Logging in with home = \"/\".\n", 1235},
-  {"login: no memory for shell script.\n", 1236},
-  {"login: couldn't exec shell script: %s.\n", 1237},
-  {"login: no shell: %s.\n", 1238},
+Try again later.\n", 1226},
+  {"You have too many processes running.\n", 1227},
+  {"DIALUP AT %s BY %s", 1228},
+  {"ROOT LOGIN ON %s FROM %s", 1229},
+  {"ROOT LOGIN ON %s", 1230},
+  {"LOGIN ON %s BY %s FROM %s", 1231},
+  {"LOGIN ON %s BY %s", 1232},
+  {"You have new mail.\n", 1233},
+  {"You have mail.\n", 1234},
+  {"login: failure forking: %s", 1235},
+  {"TIOCSCTTY failed: %m", 1236},
+  {"setuid() failed", 1237},
+  {"No directory %s!\n", 1238},
+  {"Logging in with home = \"/\".\n", 1239},
+  {"login: no memory for shell script.\n", 1240},
+  {"login: couldn't exec shell script: %s.\n", 1241},
+  {"login: no shell: %s.\n", 1242},
   {"\
 \n\
-%s login: ", 1239},
-  {"login name much too long.\n", 1240},
-  {"NAME too long", 1241},
-  {"login names may not start with '-'.\n", 1242},
-  {"too many bare linefeeds.\n", 1243},
-  {"EXCESSIVE linefeeds", 1244},
-  {"Login timed out after %d seconds\n", 1245},
-  {"Last login: %.*s ", 1246},
-  {"from %.*s\n", 1247},
-  {"on %.*s\n", 1248},
-  {"LOGIN FAILURE FROM %s, %s", 1249},
-  {"LOGIN FAILURE ON %s, %s", 1250},
-  {"%d LOGIN FAILURES FROM %s, %s", 1251},
-  {"%d LOGIN FAILURES ON %s, %s", 1252},
-  {"is y\n", 1253},
-  {"is n\n", 1254},
-  {"usage: mesg [y | n]\n", 1255},
-  {"newgrp: Who are you?", 1256},
-  {"newgrp: setgid", 1257},
-  {"newgrp: No such group.", 1258},
-  {"newgrp: Permission denied", 1259},
-  {"newgrp: setuid", 1260},
-  {"No shell", 1261},
-  {"The password must have at least 6 characters, try again.\n", 1262},
+%s login: ", 1243},
+  {"login name much too long.\n", 1244},
+  {"NAME too long", 1245},
+  {"login names may not start with '-'.\n", 1246},
+  {"too many bare linefeeds.\n", 1247},
+  {"EXCESSIVE linefeeds", 1248},
+  {"Login timed out after %d seconds\n", 1249},
+  {"Last login: %.*s ", 1250},
+  {"from %.*s\n", 1251},
+  {"on %.*s\n", 1252},
+  {"LOGIN FAILURE FROM %s, %s", 1253},
+  {"LOGIN FAILURE ON %s, %s", 1254},
+  {"%d LOGIN FAILURES FROM %s, %s", 1255},
+  {"%d LOGIN FAILURES ON %s, %s", 1256},
+  {"is y\n", 1257},
+  {"is n\n", 1258},
+  {"usage: mesg [y | n]\n", 1259},
+  {"newgrp: Who are you?", 1260},
+  {"newgrp: setgid", 1261},
+  {"newgrp: No such group.", 1262},
+  {"newgrp: Permission denied", 1263},
+  {"newgrp: setuid", 1264},
+  {"No shell", 1265},
+  {"The password must have at least 6 characters, try again.\n", 1266},
   {"\
 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", 1263},
-  {"You cannot reuse the old password.\n", 1264},
-  {"Please don't use something like your username as password!\n", 1265},
-  {"Please don't use something like your realname as password!\n", 1266},
-  {"Usage: passwd [username [password]]\n", 1267},
-  {"Only root may use the one and two argument forms.\n", 1268},
-  {"Usage: passwd [-foqsvV] [user [password]]\n", 1269},
-  {"Can't exec %s: %s\n", 1270},
-  {"Cannot find login name", 1271},
-  {"Only root can change the password for others.\n", 1272},
-  {"Too many arguments.\n", 1273},
-  {"Can't find username anywhere. Is `%s' really a user?", 1274},
-  {"Sorry, I can only change local passwords. Use yppasswd instead.", 1275},
-  {"UID and username does not match, imposter!", 1276},
-  {"Changing password for %s\n", 1277},
-  {"Enter old password: ", 1278},
-  {"Illegal password, imposter.", 1279},
-  {"Enter new password: ", 1280},
-  {"Password not changed.", 1281},
-  {"Re-type new password: ", 1282},
-  {"You misspelled it. Password not changed.", 1283},
-  {"password changed, user %s", 1284},
-  {"ROOT PASSWORD CHANGED", 1285},
-  {"password changed by root, user %s", 1286},
-  {"calling setpwnam to set password.\n", 1287},
-  {"Password *NOT* changed.  Try again later.\n", 1288},
-  {"Password changed.\n", 1289},
-  {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1290},
-  {"Shutdown process aborted", 1291},
-  {"%s: Only root can shut a system down.\n", 1292},
-  {"That must be tomorrow, can't you wait till then?\n", 1293},
-  {"for maintenance; bounce, bounce", 1294},
-  {"timeout = %d, quiet = %d, reboot = %d\n", 1295},
-  {"The system is being shut down within 5 minutes", 1296},
-  {"Login is therefore prohibited.", 1297},
-  {"rebooted by %s: %s", 1298},
-  {"halted by %s: %s", 1299},
+characters. See passwd(1) for more information.\n", 1267},
+  {"You cannot reuse the old password.\n", 1268},
+  {"Please don't use something like your username as password!\n", 1269},
+  {"Please don't use something like your realname as password!\n", 1270},
+  {"Usage: passwd [username [password]]\n", 1271},
+  {"Only root may use the one and two argument forms.\n", 1272},
+  {"Usage: passwd [-foqsvV] [user [password]]\n", 1273},
+  {"Can't exec %s: %s\n", 1274},
+  {"Cannot find login name", 1275},
+  {"Only root can change the password for others.\n", 1276},
+  {"Too many arguments.\n", 1277},
+  {"Can't find username anywhere. Is `%s' really a user?", 1278},
+  {"Sorry, I can only change local passwords. Use yppasswd instead.", 1279},
+  {"UID and username does not match, imposter!", 1280},
+  {"Changing password for %s\n", 1281},
+  {"Enter old password: ", 1282},
+  {"Illegal password, imposter.", 1283},
+  {"Enter new password: ", 1284},
+  {"Password not changed.", 1285},
+  {"Re-type new password: ", 1286},
+  {"You misspelled it. Password not changed.", 1287},
+  {"password changed, user %s", 1288},
+  {"ROOT PASSWORD CHANGED", 1289},
+  {"password changed by root, user %s", 1290},
+  {"calling setpwnam to set password.\n", 1291},
+  {"Password *NOT* changed.  Try again later.\n", 1292},
+  {"Password changed.\n", 1293},
+  {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1294},
+  {"Shutdown process aborted", 1295},
+  {"%s: Only root can shut a system down.\n", 1296},
+  {"That must be tomorrow, can't you wait till then?\n", 1297},
+  {"for maintenance; bounce, bounce", 1298},
+  {"timeout = %d, quiet = %d, reboot = %d\n", 1299},
+  {"The system is being shut down within 5 minutes", 1300},
+  {"Login is therefore prohibited.", 1301},
+  {"rebooted by %s: %s", 1302},
+  {"halted by %s: %s", 1303},
   {"\
 \n\
-Why am I still alive after reboot?", 1300},
+Why am I still alive after reboot?", 1304},
   {"\
 \n\
-Now you can turn off the power...", 1301},
-  {"Calling kernel power-off facility...\n", 1302},
-  {"Error powering off\t%s\n", 1303},
-  {"Executing the program \"%s\" ...\n", 1304},
-  {"Error executing\t%s\n", 1305},
-  {"URGENT: broadcast message from %s:", 1306},
-  {"System going down in %d hours %d minutes", 1307},
-  {"System going down in 1 hour %d minutes", 1308},
-  {"System going down in %d minutes\n", 1309},
-  {"System going down in 1 minute\n", 1310},
-  {"System going down IMMEDIATELY!\n", 1311},
-  {"\t... %s ...\n", 1312},
-  {"Cannot fork for swapoff. Shrug!", 1313},
-  {"Cannot exec swapoff, hoping umount will do the trick.", 1314},
-  {"Cannot fork for umount, trying manually.", 1315},
-  {"Cannot exec %s, trying umount.\n", 1316},
-  {"Cannot exec umount, giving up on umount.", 1317},
-  {"Unmounting any remaining filesystems...", 1318},
-  {"shutdown: Couldn't umount %s: %s\n", 1319},
-  {"Booting to single user mode.\n", 1320},
-  {"exec of single user shell failed\n", 1321},
-  {"fork of single user shell failed\n", 1322},
-  {"error opening fifo\n", 1323},
-  {"error setting close-on-exec on /dev/initctl", 1324},
-  {"error running finalprog\n", 1325},
-  {"error forking finalprog\n", 1326},
+Now you can turn off the power...", 1305},
+  {"Calling kernel power-off facility...\n", 1306},
+  {"Error powering off\t%s\n", 1307},
+  {"Executing the program \"%s\" ...\n", 1308},
+  {"Error executing\t%s\n", 1309},
+  {"URGENT: broadcast message from %s:", 1310},
+  {"System going down in %d hours %d minutes", 1311},
+  {"System going down in 1 hour %d minutes", 1312},
+  {"System going down in %d minutes\n", 1313},
+  {"System going down in 1 minute\n", 1314},
+  {"System going down IMMEDIATELY!\n", 1315},
+  {"\t... %s ...\n", 1316},
+  {"Cannot fork for swapoff. Shrug!", 1317},
+  {"Cannot exec swapoff, hoping umount will do the trick.", 1318},
+  {"Cannot fork for umount, trying manually.", 1319},
+  {"Cannot exec %s, trying umount.\n", 1320},
+  {"Cannot exec umount, giving up on umount.", 1321},
+  {"Unmounting any remaining filesystems...", 1322},
+  {"shutdown: Couldn't umount %s: %s\n", 1323},
+  {"Booting to single user mode.\n", 1324},
+  {"exec of single user shell failed\n", 1325},
+  {"fork of single user shell failed\n", 1326},
+  {"error opening fifo\n", 1327},
+  {"error setting close-on-exec on /dev/initctl", 1328},
+  {"error running finalprog\n", 1329},
+  {"error forking finalprog\n", 1330},
   {"\
 \n\
-Wrong password.\n", 1327},
-  {"lstat of path failed\n", 1328},
-  {"stat of path failed\n", 1329},
-  {"open of directory failed\n", 1330},
-  {"fork failed\n", 1331},
-  {"exec failed\n", 1332},
-  {"cannot open inittab\n", 1333},
-  {"no TERM or cannot stat tty\n", 1334},
-  {"error stopping service: \"%s\"", 1335},
-  {"too many iov's (change code in wall/ttymsg.c)", 1336},
-  {"excessively long line arg", 1337},
-  {"cannot fork", 1338},
-  {"fork: %s", 1339},
-  {"%s: BAD ERROR", 1340},
-  {"%s: the password file is busy.\n", 1341},
-  {"%s: the group file is busy.\n", 1342},
-  {"%s: the %s file is busy (%s present)\n", 1343},
-  {"%s: can't link %s: %s\n", 1344},
-  {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1345},
-  {"%s: Cannot fork\n", 1346},
-  {"%s: %s unchanged\n", 1347},
-  {"%s: no changes made\n", 1348},
-  {"You are using shadow groups on this system.\n", 1349},
-  {"You are using shadow passwords on this system.\n", 1350},
-  {"Would you like to edit %s now [y/n]? ", 1351},
-  {"usage: %s [file]\n", 1352},
-  {"%s: can't open temporary file.\n", 1353},
-  {"Broadcast Message from %s@%s", 1354},
-  {"%s: will not read %s - use stdin.\n", 1355},
-  {"%s: can't read %s.\n", 1356},
-  {"%s: can't stat temporary file.\n", 1357},
-  {"%s: can't read temporary file.\n", 1358},
-  {"illegal month value: use 1-12", 1359},
-  {"illegal year value: use 1-9999", 1360},
-  {"%s %d", 1361},
-  {"usage: cal [-13smjyV] [[month] year]\n", 1362},
-  {"usage: %s [+format] [day month year]\n", 1363},
-  {"St. Tib's Day", 1364},
-  {"%s: unknown signal %s\n", 1365},
-  {"%s: can't find process \"%s\"\n", 1366},
-  {"%s: unknown signal %s; valid signals:\n", 1367},
-  {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1368},
-  {"       %s -l [ signal ]\n", 1369},
-  {"logger: %s: %s.\n", 1370},
-  {"logger: unknown facility name: %s.\n", 1371},
-  {"logger: unknown priority name: %s.\n", 1372},
+Wrong password.\n", 1331},
+  {"lstat of path failed\n", 1332},
+  {"stat of path failed\n", 1333},
+  {"open of directory failed\n", 1334},
+  {"fork failed\n", 1335},
+  {"exec failed\n", 1336},
+  {"cannot open inittab\n", 1337},
+  {"no TERM or cannot stat tty\n", 1338},
+  {"error stopping service: \"%s\"", 1339},
+  {"too many iov's (change code in wall/ttymsg.c)", 1340},
+  {"excessively long line arg", 1341},
+  {"cannot fork", 1342},
+  {"fork: %s", 1343},
+  {"%s: BAD ERROR", 1344},
+  {"%s: the password file is busy.\n", 1345},
+  {"%s: the group file is busy.\n", 1346},
+  {"%s: the %s file is busy (%s present)\n", 1347},
+  {"%s: can't link %s: %s\n", 1348},
+  {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1349},
+  {"%s: Cannot fork\n", 1350},
+  {"%s: %s unchanged\n", 1351},
+  {"%s: no changes made\n", 1352},
+  {"You are using shadow groups on this system.\n", 1353},
+  {"You are using shadow passwords on this system.\n", 1354},
+  {"Would you like to edit %s now [y/n]? ", 1355},
+  {"usage: %s [file]\n", 1356},
+  {"%s: can't open temporary file.\n", 1357},
+  {"Broadcast Message from %s@%s", 1358},
+  {"%s: will not read %s - use stdin.\n", 1359},
+  {"%s: can't read %s.\n", 1360},
+  {"%s: can't stat temporary file.\n", 1361},
+  {"%s: can't read temporary file.\n", 1362},
+  {"illegal month value: use 1-12", 1363},
+  {"illegal year value: use 1-9999", 1364},
+  {"%s %d", 1365},
+  {"usage: cal [-13smjyV] [[month] year]\n", 1366},
+  {"usage: %s [+format] [day month year]\n", 1367},
+  {"St. Tib's Day", 1368},
+  {"%s: unknown signal %s\n", 1369},
+  {"%s: can't find process \"%s\"\n", 1370},
+  {"%s: unknown signal %s; valid signals:\n", 1371},
+  {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1372},
+  {"       %s -l [ signal ]\n", 1373},
+  {"logger: %s: %s.\n", 1374},
+  {"logger: unknown facility name: %s.\n", 1375},
+  {"logger: unknown priority name: %s.\n", 1376},
   {"\
-usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1373},
-  {"usage: look [-dfa] [-t char] string [file]\n", 1374},
-  {"Could not open %s\n", 1375},
-  {"Got %d bytes from %s\n", 1376},
-  {"namei: unable to get current directory - %s\n", 1377},
-  {"namei: unable to chdir to %s - %s (%d)\n", 1378},
-  {"usage: namei [-mx] pathname [pathname ...]\n", 1379},
-  {"namei: could not chdir to root!\n", 1380},
-  {"namei: could not stat root!\n", 1381},
-  {"namei: buf overflow\n", 1382},
-  {" ? could not chdir into %s - %s (%d)\n", 1383},
-  {" ? problems reading symlink %s - %s (%d)\n", 1384},
-  {"  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1385},
-  {"namei: unknown file type 0%06o on file %s\n", 1386},
-  {"%s: out of memory\n", 1387},
-  {"%s: renaming %s to %s failed: %s\n", 1388},
-  {"call: %s from to files...\n", 1389},
+usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1377},
+  {"usage: look [-dfa] [-t char] string [file]\n", 1378},
+  {"Could not open %s\n", 1379},
+  {"Got %d bytes from %s\n", 1380},
+  {"namei: unable to get current directory - %s\n", 1381},
+  {"namei: unable to chdir to %s - %s (%d)\n", 1382},
+  {"usage: namei [-mx] pathname [pathname ...]\n", 1383},
+  {"namei: could not chdir to root!\n", 1384},
+  {"namei: could not stat root!\n", 1385},
+  {"namei: buf overflow\n", 1386},
+  {" ? could not chdir into %s - %s (%d)\n", 1387},
+  {" ? problems reading symlink %s - %s (%d)\n", 1388},
+  {"  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1389},
+  {"namei: unknown file type 0%06o on file %s\n", 1390},
+  {"%s: out of memory\n", 1391},
+  {"%s: renaming %s to %s failed: %s\n", 1392},
+  {"call: %s from to files...\n", 1393},
   {"\
 Warning: `%s' is a link.\n\
 Use `%s [options] %s' if you really want to use it.\n\
-Script not started.\n", 1390},
-  {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1391},
-  {"Script started, file is %s\n", 1392},
-  {"Script started on %s", 1393},
+Script not started.\n", 1394},
+  {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1395},
+  {"Script started, file is %s\n", 1396},
+  {"Script started on %s", 1397},
   {"\
 \n\
-Script done on %s", 1394},
-  {"Script done, file is %s\n", 1395},
-  {"openpty failed\n", 1396},
-  {"Out of pty's\n", 1397},
-  {"%s: Argument error, usage\n", 1398},
-  {"  [ -term terminal_name ]\n", 1399},
-  {"  [ -reset ]\n", 1400},
-  {"  [ -initialize ]\n", 1401},
-  {"  [ -cursor [on|off] ]\n", 1402},
-  {"  [ -snow [on|off] ]\n", 1403},
-  {"  [ -softscroll [on|off] ]\n", 1404},
-  {"  [ -repeat [on|off] ]\n", 1405},
-  {"  [ -appcursorkeys [on|off] ]\n", 1406},
-  {"  [ -linewrap [on|off] ]\n", 1407},
-  {"  [ -default ]\n", 1408},
-  {"  [ -foreground black|blue|green|cyan", 1409},
-  {"|red|magenta|yellow|white|default ]\n", 1410},
-  {"  [ -background black|blue|green|cyan", 1411},
-  {"  [ -ulcolor black|grey|blue|green|cyan", 1412},
-  {"|red|magenta|yellow|white ]\n", 1413},
-  {"  [ -ulcolor bright blue|green|cyan", 1414},
-  {"  [ -hbcolor black|grey|blue|green|cyan", 1415},
-  {"  [ -hbcolor bright blue|green|cyan", 1416},
-  {"  [ -standout [ attr ] ]\n", 1417},
-  {"  [ -inversescreen [on|off] ]\n", 1418},
-  {"  [ -bold [on|off] ]\n", 1419},
-  {"  [ -half-bright [on|off] ]\n", 1420},
-  {"  [ -blink [on|off] ]\n", 1421},
-  {"  [ -reverse [on|off] ]\n", 1422},
-  {"  [ -underline [on|off] ]\n", 1423},
-  {"  [ -store ]\n", 1424},
-  {"  [ -clear [all|rest] ]\n", 1425},
-  {"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n", 1426},
-  {"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n", 1427},
-  {"  [ -regtabs [1-160] ]\n", 1428},
-  {"  [ -blank [0-60] ]\n", 1429},
-  {"  [ -dump   [1-NR_CONSOLES] ]\n", 1430},
-  {"  [ -append [1-NR_CONSOLES] ]\n", 1431},
-  {"  [ -file dumpfilename ]\n", 1432},
-  {"  [ -msg [on|off] ]\n", 1433},
-  {"  [ -msglevel [0-8] ]\n", 1434},
-  {"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1435},
-  {"  [ -powerdown [0-60] ]\n", 1436},
-  {"  [ -blength [0-2000] ]\n", 1437},
-  {"  [ -bfreq freqnumber ]\n", 1438},
-  {"cannot (un)set powersave mode\n", 1439},
-  {"klogctl error: %s\n", 1440},
-  {"Error reading %s\n", 1441},
-  {"Error writing screendump\n", 1442},
-  {"couldn't read %s, and cannot ioctl dump\n", 1443},
-  {"%s: $TERM is not defined.\n", 1444},
-  {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1445},
-  {"write: can't find your tty's name\n", 1446},
-  {"write: you have write permission turned off.\n", 1447},
-  {"write: %s is not logged in on %s.\n", 1448},
-  {"write: %s has messages disabled on %s\n", 1449},
-  {"usage: write user [tty]\n", 1450},
-  {"write: %s is not logged in\n", 1451},
-  {"write: %s has messages disabled\n", 1452},
-  {"write: %s is logged in more than once; writing to %s\n", 1453},
-  {"Message from %s@%s (as %s) on %s at %s ...", 1454},
-  {"Message from %s@%s on %s at %s ...", 1455},
-  {"warning: error reading %s: %s", 1456},
-  {"warning: can't open %s: %s", 1457},
-  {"mount: could not open %s - using %s instead\n", 1458},
-  {"can't create lock file %s: %s (use -n flag to override)", 1459},
-  {"can't link lock file %s: %s (use -n flag to override)", 1460},
-  {"can't open lock file %s: %s (use -n flag to override)", 1461},
-  {"Can't lock lock file %s: %s\n", 1462},
-  {"can't lock lock file %s: %s", 1463},
-  {"timed out", 1464},
+Script done on %s", 1398},
+  {"Script done, file is %s\n", 1399},
+  {"openpty failed\n", 1400},
+  {"Out of pty's\n", 1401},
+  {"%s: Argument error, usage\n", 1402},
+  {"  [ -term terminal_name ]\n", 1403},
+  {"  [ -reset ]\n", 1404},
+  {"  [ -initialize ]\n", 1405},
+  {"  [ -cursor [on|off] ]\n", 1406},
+  {"  [ -snow [on|off] ]\n", 1407},
+  {"  [ -softscroll [on|off] ]\n", 1408},
+  {"  [ -repeat [on|off] ]\n", 1409},
+  {"  [ -appcursorkeys [on|off] ]\n", 1410},
+  {"  [ -linewrap [on|off] ]\n", 1411},
+  {"  [ -default ]\n", 1412},
+  {"  [ -foreground black|blue|green|cyan", 1413},
+  {"|red|magenta|yellow|white|default ]\n", 1414},
+  {"  [ -background black|blue|green|cyan", 1415},
+  {"  [ -ulcolor black|grey|blue|green|cyan", 1416},
+  {"|red|magenta|yellow|white ]\n", 1417},
+  {"  [ -ulcolor bright blue|green|cyan", 1418},
+  {"  [ -hbcolor black|grey|blue|green|cyan", 1419},
+  {"  [ -hbcolor bright blue|green|cyan", 1420},
+  {"  [ -standout [ attr ] ]\n", 1421},
+  {"  [ -inversescreen [on|off] ]\n", 1422},
+  {"  [ -bold [on|off] ]\n", 1423},
+  {"  [ -half-bright [on|off] ]\n", 1424},
+  {"  [ -blink [on|off] ]\n", 1425},
+  {"  [ -reverse [on|off] ]\n", 1426},
+  {"  [ -underline [on|off] ]\n", 1427},
+  {"  [ -store ]\n", 1428},
+  {"  [ -clear [all|rest] ]\n", 1429},
+  {"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n", 1430},
+  {"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n", 1431},
+  {"  [ -regtabs [1-160] ]\n", 1432},
+  {"  [ -blank [0-60] ]\n", 1433},
+  {"  [ -dump   [1-NR_CONSOLES] ]\n", 1434},
+  {"  [ -append [1-NR_CONSOLES] ]\n", 1435},
+  {"  [ -file dumpfilename ]\n", 1436},
+  {"  [ -msg [on|off] ]\n", 1437},
+  {"  [ -msglevel [0-8] ]\n", 1438},
+  {"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1439},
+  {"  [ -powerdown [0-60] ]\n", 1440},
+  {"  [ -blength [0-2000] ]\n", 1441},
+  {"  [ -bfreq freqnumber ]\n", 1442},
+  {"cannot (un)set powersave mode\n", 1443},
+  {"klogctl error: %s\n", 1444},
+  {"Error reading %s\n", 1445},
+  {"Error writing screendump\n", 1446},
+  {"couldn't read %s, and cannot ioctl dump\n", 1447},
+  {"%s: $TERM is not defined.\n", 1448},
+  {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1449},
+  {"write: can't find your tty's name\n", 1450},
+  {"write: you have write permission turned off.\n", 1451},
+  {"write: %s is not logged in on %s.\n", 1452},
+  {"write: %s has messages disabled on %s\n", 1453},
+  {"usage: write user [tty]\n", 1454},
+  {"write: %s is not logged in\n", 1455},
+  {"write: %s has messages disabled\n", 1456},
+  {"write: %s is logged in more than once; writing to %s\n", 1457},
+  {"Message from %s@%s (as %s) on %s at %s ...", 1458},
+  {"Message from %s@%s on %s at %s ...", 1459},
+  {"warning: error reading %s: %s", 1460},
+  {"warning: can't open %s: %s", 1461},
+  {"mount: could not open %s - using %s instead\n", 1462},
+  {"can't create lock file %s: %s (use -n flag to override)", 1463},
+  {"can't link lock file %s: %s (use -n flag to override)", 1464},
+  {"can't open lock file %s: %s (use -n flag to override)", 1465},
+  {"Can't lock lock file %s: %s\n", 1466},
+  {"can't lock lock file %s: %s", 1467},
+  {"timed out", 1468},
   {"\
 Cannot create link %s\n\
-Perhaps there is a stale lock file?\n", 1465},
-  {"cannot open %s (%s) - mtab not updated", 1466},
-  {"error writing %s: %s", 1467},
-  {"error changing mode of %s: %s\n", 1468},
-  {"can't rename %s to %s: %s\n", 1469},
-  {"loop: can't open device %s: %s\n", 1470},
-  {"loop: can't get info on device %s: %s\n", 1471},
-  {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1472},
-  {"mount: could not find any device /dev/loop#", 1473},
+Perhaps there is a stale lock file?\n", 1469},
+  {"cannot open %s (%s) - mtab not updated", 1470},
+  {"error writing %s: %s", 1471},
+  {"error changing mode of %s: %s\n", 1472},
+  {"can't rename %s to %s: %s\n", 1473},
+  {"loop: can't open device %s: %s\n", 1474},
+  {"loop: can't get info on device %s: %s\n", 1475},
+  {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1476},
+  {"mount: could not find any device /dev/loop#", 1477},
   {"\
 mount: Could not find any loop device.\n\
-       Maybe /dev/loop# has a wrong major number?", 1474},
+       Maybe /dev/loop# has a wrong major number?", 1478},
   {"\
 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'.)", 1475},
+       (If so, then recompile or `insmod loop.o'.)", 1479},
   {"\
 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?", 1476},
-  {"mount: could not find any free loop device", 1477},
-  {"Unsupported encryption type %s\n", 1478},
-  {"Couldn't lock into memory, exiting.\n", 1479},
-  {"Init (up to 16 hex digits): ", 1480},
-  {"Non-hex digit '%c'.\n", 1481},
-  {"Don't know how to get key for encryption system %d\n", 1482},
-  {"set_loop(%s,%s,%d): success\n", 1483},
-  {"loop: can't delete device %s: %s\n", 1484},
-  {"del_loop(%s): success\n", 1485},
-  {"This mount was compiled without loop support. Please recompile.\n", 1486},
+       maybe /dev/loop# has the wrong major number?", 1480},
+  {"mount: could not find any free loop device", 1481},
+  {"Unsupported encryption type %s\n", 1482},
+  {"Couldn't lock into memory, exiting.\n", 1483},
+  {"Init (up to 16 hex digits): ", 1484},
+  {"Non-hex digit '%c'.\n", 1485},
+  {"Don't know how to get key for encryption system %d\n", 1486},
+  {"set_loop(%s,%s,%d): success\n", 1487},
+  {"loop: can't delete device %s: %s\n", 1488},
+  {"del_loop(%s): success\n", 1489},
+  {"This mount was compiled without loop support. Please recompile.\n", 1490},
   {"\
 usage:\n\
   %s loop_device                                      # give info\n\
   %s -d loop_device                                   # delete\n\
-  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1487},
-  {"not enough memory", 1488},
-  {"No loop support was available at compile time. Please recompile.\n", 1489},
-  {"[mntent]: warning: no final newline at the end of %s\n", 1490},
-  {"[mntent]: line %d in %s is bad%s\n", 1491},
-  {"; rest of file ignored", 1492},
-  {"mount: according to mtab, %s is already mounted on %s", 1493},
-  {"mount: according to mtab, %s is mounted on %s", 1494},
-  {"mount: can't open %s for writing: %s", 1495},
-  {"mount: error writing %s: %s", 1496},
-  {"mount: error changing mode of %s: %s", 1497},
-  {"%s looks like swapspace - not mounted", 1498},
-  {"mount failed", 1499},
-  {"mount: only root can mount %s on %s", 1500},
-  {"mount: loop device specified twice", 1501},
-  {"mount: type specified twice", 1502},
-  {"mount: skipping the setup of a loop device\n", 1503},
-  {"mount: going to use the loop device %s\n", 1504},
-  {"mount: failed setting up loop device\n", 1505},
-  {"mount: setup loop device successfully\n", 1506},
-  {"mount: can't open %s: %s", 1507},
-  {"mount: cannot open %s for setting speed", 1508},
-  {"mount: cannot set speed: %s", 1509},
-  {"mount: cannot fork: %s", 1510},
-  {"mount: this version was compiled without support for the type `nfs'", 1511},
-  {"mount: failed with nfs mount version 4, trying 3..\n", 1512},
+  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1491},
+  {"not enough memory", 1492},
+  {"No loop support was available at compile time. Please recompile.\n", 1493},
+  {"[mntent]: warning: no final newline at the end of %s\n", 1494},
+  {"[mntent]: line %d in %s is bad%s\n", 1495},
+  {"; rest of file ignored", 1496},
+  {"mount: according to mtab, %s is already mounted on %s", 1497},
+  {"mount: according to mtab, %s is mounted on %s", 1498},
+  {"mount: can't open %s for writing: %s", 1499},
+  {"mount: error writing %s: %s", 1500},
+  {"mount: error changing mode of %s: %s", 1501},
+  {"%s looks like swapspace - not mounted", 1502},
+  {"mount failed", 1503},
+  {"mount: only root can mount %s on %s", 1504},
+  {"mount: loop device specified twice", 1505},
+  {"mount: type specified twice", 1506},
+  {"mount: skipping the setup of a loop device\n", 1507},
+  {"mount: going to use the loop device %s\n", 1508},
+  {"mount: failed setting up loop device\n", 1509},
+  {"mount: setup loop device successfully\n", 1510},
+  {"mount: can't open %s: %s", 1511},
+  {"mount: cannot open %s for setting speed", 1512},
+  {"mount: cannot set speed: %s", 1513},
+  {"mount: cannot fork: %s", 1514},
+  {"mount: this version was compiled without support for the type `nfs'", 1515},
+  {"mount: failed with nfs mount version 4, trying 3..\n", 1516},
   {"\
-mount: I could not determine the filesystem type, and none was specified", 1513},
-  {"mount: you must specify the filesystem type", 1514},
-  {"mount: mount failed", 1515},
-  {"mount: mount point %s is not a directory", 1516},
-  {"mount: permission denied", 1517},
-  {"mount: must be superuser to use mount", 1518},
-  {"mount: %s is busy", 1519},
-  {"mount: proc already mounted", 1520},
-  {"mount: %s already mounted or %s busy", 1521},
-  {"mount: mount point %s does not exist", 1522},
-  {"mount: mount point %s is a symbolic link to nowhere", 1523},
-  {"mount: special device %s does not exist", 1524},
+mount: I could not determine the filesystem type, and none was specified", 1517},
+  {"mount: you must specify the filesystem type", 1518},
+  {"mount: mount failed", 1519},
+  {"mount: mount point %s is not a directory", 1520},
+  {"mount: permission denied", 1521},
+  {"mount: must be superuser to use mount", 1522},
+  {"mount: %s is busy", 1523},
+  {"mount: proc already mounted", 1524},
+  {"mount: %s already mounted or %s busy", 1525},
+  {"mount: mount point %s does not exist", 1526},
+  {"mount: mount point %s is a symbolic link to nowhere", 1527},
+  {"mount: special device %s does not exist", 1528},
   {"\
 mount: special device %s does not exist\n\
-       (a path prefix is not a directory)\n", 1525},
-  {"mount: %s not mounted already, or bad option", 1526},
+       (a path prefix is not a directory)\n", 1529},
+  {"mount: %s not mounted already, or bad option", 1530},
   {"\
 mount: wrong fs type, bad option, bad superblock on %s,\n\
-       or too many mounted file systems", 1527},
-  {"mount table full", 1528},
-  {"mount: %s: can't read superblock", 1529},
-  {"mount: %s: unknown device", 1530},
-  {"mount: fs type %s not supported by kernel", 1531},
-  {"mount: probably you meant %s", 1532},
-  {"mount: maybe you meant iso9660 ?", 1533},
-  {"mount: %s has wrong device number or fs type %s not supported", 1534},
-  {"mount: %s is not a block device, and stat fails?", 1535},
+       or too many mounted file systems", 1531},
+  {"mount table full", 1532},
+  {"mount: %s: can't read superblock", 1533},
+  {"mount: %s: unknown device", 1534},
+  {"mount: fs type %s not supported by kernel", 1535},
+  {"mount: probably you meant %s", 1536},
+  {"mount: maybe you meant iso9660 ?", 1537},
+  {"mount: %s has wrong device number or fs type %s not supported", 1538},
+  {"mount: %s is not a block device, and stat fails?", 1539},
   {"\
 mount: the kernel does not recognize %s as a block device\n\
-       (maybe `insmod driver'?)", 1536},
-  {"mount: %s is not a block device (maybe try `-o loop'?)", 1537},
-  {"mount: %s is not a block device", 1538},
-  {"mount: %s is not a valid block device", 1539},
-  {"block device ", 1540},
-  {"mount: cannot mount %s%s read-only", 1541},
-  {"mount: %s%s is write-protected but explicit `-w' flag given", 1542},
-  {"mount: %s%s is write-protected, mounting read-only", 1543},
-  {"mount: the label %s occurs on both %s and %s\n", 1544},
-  {"mount: %s duplicate - not mounted", 1545},
-  {"mount: going to mount %s by %s\n", 1546},
-  {"UUID", 1547},
-  {"label", 1548},
-  {"mount: no such partition found", 1549},
-  {"mount: no type was given - I'll assume nfs because of the colon\n", 1550},
-  {"mount: no type was given - I'll assume smb because of the // prefix\n", 1551},
-  {"mount: backgrounding \"%s\"\n", 1552},
-  {"mount: giving up \"%s\"\n", 1553},
-  {"mount: %s already mounted on %s\n", 1554},
+       (maybe `insmod driver'?)", 1540},
+  {"mount: %s is not a block device (maybe try `-o loop'?)", 1541},
+  {"mount: %s is not a block device", 1542},
+  {"mount: %s is not a valid block device", 1543},
+  {"block device ", 1544},
+  {"mount: cannot mount %s%s read-only", 1545},
+  {"mount: %s%s is write-protected but explicit `-w' flag given", 1546},
+  {"mount: %s%s is write-protected, mounting read-only", 1547},
+  {"mount: the label %s occurs on both %s and %s\n", 1548},
+  {"mount: %s duplicate - not mounted", 1549},
+  {"mount: going to mount %s by %s\n", 1550},
+  {"UUID", 1551},
+  {"label", 1552},
+  {"mount: no such partition found", 1553},
+  {"mount: no type was given - I'll assume nfs because of the colon\n", 1554},
+  {"mount: no type was given - I'll assume smbfs because of the // prefix\n", 1555},
+  {"mount: backgrounding \"%s\"\n", 1556},
+  {"mount: giving up \"%s\"\n", 1557},
+  {"mount: %s already mounted on %s\n", 1558},
   {"\
 Usage: mount -V                 : print version\n\
        mount -h                 : print this help\n\
@@ -2062,294 +2070,297 @@
        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\
-For many more details, say  man 8 mount .\n", 1555},
-  {"mount: only root can do that", 1556},
-  {"mount: no %s found - creating it..\n", 1557},
-  {"mount: the label %s occurs on both %s and %s - not mounted\n", 1558},
-  {"mount: mounting %s\n", 1559},
-  {"nothing was mounted", 1560},
-  {"mount: cannot find %s in %s", 1561},
-  {"mount: can't find %s in %s or %s", 1562},
+Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n\
+For many more details, say  man 8 mount .\n", 1559},
+  {"mount: argument to -p or --pass-fd must be a number", 1560},
+  {"mount: only root can do that", 1561},
+  {"mount: no %s found - creating it..\n", 1562},
+  {"mount: the label %s occurs on both %s and %s - not mounted\n", 1563},
+  {"mount: mounting %s\n", 1564},
+  {"nothing was mounted", 1565},
+  {"mount: cannot find %s in %s", 1566},
+  {"mount: can't find %s in %s or %s", 1567},
   {"\
-mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1563},
-  {"mount: bad UUID", 1564},
-  {"mount: error while guessing filesystem type\n", 1565},
-  {"mount: you didn't specify a filesystem type for %s\n", 1566},
-  {"       I will try all types mentioned in %s or %s\n", 1567},
-  {"       and it looks like this is swapspace\n", 1568},
-  {"       I will try type %s\n", 1569},
-  {"Trying %s\n", 1570},
-  {"mount: excessively long host:dir argument\n", 1571},
-  {"mount: warning: multiple hostnames not supported\n", 1572},
-  {"mount: directory to mount not in host:dir format\n", 1573},
-  {"mount: can't get address for %s\n", 1574},
-  {"mount: got bad hp->h_length\n", 1575},
-  {"mount: excessively long option argument\n", 1576},
-  {"Warning: Unrecognized proto= option.\n", 1577},
-  {"Warning: Option namlen is not supported.\n", 1578},
-  {"unknown nfs mount parameter: %s=%d\n", 1579},
-  {"Warning: option nolock is not supported.\n", 1580},
-  {"unknown nfs mount option: %s%s\n", 1581},
-  {"mount: got bad hp->h_length?\n", 1582},
-  {"NFS over TCP is not supported.\n", 1583},
-  {"nfs socket", 1584},
-  {"nfs bindresvport", 1585},
-  {"nfs server reported service unavailable", 1586},
-  {"used portmapper to find NFS port\n", 1587},
-  {"using port %d for nfs deamon\n", 1588},
-  {"nfs connect", 1589},
-  {"unknown nfs status return value: %d", 1590},
-  {"bug in xstrndup call", 1591},
+mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1568},
+  {"mount: bad UUID", 1569},
+  {"mount: error while guessing filesystem type\n", 1570},
+  {"mount: you didn't specify a filesystem type for %s\n", 1571},
+  {"       I will try all types mentioned in %s or %s\n", 1572},
+  {"       and it looks like this is swapspace\n", 1573},
+  {"       I will try type %s\n", 1574},
+  {"Trying %s\n", 1575},
+  {"mount: excessively long host:dir argument\n", 1576},
+  {"mount: warning: multiple hostnames not supported\n", 1577},
+  {"mount: directory to mount not in host:dir format\n", 1578},
+  {"mount: can't get address for %s\n", 1579},
+  {"mount: got bad hp->h_length\n", 1580},
+  {"mount: excessively long option argument\n", 1581},
+  {"Warning: Unrecognized proto= option.\n", 1582},
+  {"Warning: Option namlen is not supported.\n", 1583},
+  {"unknown nfs mount parameter: %s=%d\n", 1584},
+  {"Warning: option nolock is not supported.\n", 1585},
+  {"unknown nfs mount option: %s%s\n", 1586},
+  {"mount: got bad hp->h_length?\n", 1587},
+  {"NFS over TCP is not supported.\n", 1588},
+  {"nfs socket", 1589},
+  {"nfs bindresvport", 1590},
+  {"nfs server reported service unavailable", 1591},
+  {"used portmapper to find NFS port\n", 1592},
+  {"using port %d for nfs deamon\n", 1593},
+  {"nfs connect", 1594},
+  {"unknown nfs status return value: %d", 1595},
+  {"bug in xstrndup call", 1596},
   {"\
 usage: %s [-hV]\n\
        %s -a [-e] [-v]\n\
        %s [-v] [-p priority] special ...\n\
-       %s [-s]\n", 1592},
+       %s [-s]\n", 1597},
   {"\
 usage: %s [-hV]\n\
        %s -a [-v]\n\
-       %s [-v] special ...\n", 1593},
-  {"%s on %s\n", 1594},
-  {"swapon: cannot stat %s: %s\n", 1595},
-  {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1596},
-  {"swapon: Skipping file %s - it appears to have holes.\n", 1597},
-  {"Not superuser.\n", 1598},
-  {"%s: cannot open %s: %s\n", 1599},
-  {"umount: compiled without support for -f\n", 1600},
-  {"host: %s, directory: %s\n", 1601},
-  {"umount: can't get address for %s\n", 1602},
-  {"umount: got bad hostp->h_length\n", 1603},
-  {"umount: %s: invalid block device", 1604},
-  {"umount: %s: not mounted", 1605},
-  {"umount: %s: can't write superblock", 1606},
-  {"umount: %s: device is busy", 1607},
-  {"umount: %s: not found", 1608},
-  {"umount: %s: must be superuser to umount", 1609},
-  {"umount: %s: block devices not permitted on fs", 1610},
-  {"umount: %s: %s", 1611},
-  {"no umount2, trying umount...\n", 1612},
-  {"could not umount %s - trying %s instead\n", 1613},
-  {"umount: %s busy - remounted read-only\n", 1614},
-  {"umount: could not remount %s read-only\n", 1615},
-  {"%s umounted\n", 1616},
-  {"umount: cannot find list of filesystems to unmount", 1617},
+       %s [-v] special ...\n", 1598},
+  {"%s on %s\n", 1599},
+  {"swapon: cannot stat %s: %s\n", 1600},
+  {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1601},
+  {"swapon: Skipping file %s - it appears to have holes.\n", 1602},
+  {"Not superuser.\n", 1603},
+  {"%s: cannot open %s: %s\n", 1604},
+  {"umount: compiled without support for -f\n", 1605},
+  {"host: %s, directory: %s\n", 1606},
+  {"umount: can't get address for %s\n", 1607},
+  {"umount: got bad hostp->h_length\n", 1608},
+  {"umount: %s: invalid block device", 1609},
+  {"umount: %s: not mounted", 1610},
+  {"umount: %s: can't write superblock", 1611},
+  {"umount: %s: device is busy", 1612},
+  {"umount: %s: not found", 1613},
+  {"umount: %s: must be superuser to umount", 1614},
+  {"umount: %s: block devices not permitted on fs", 1615},
+  {"umount: %s: %s", 1616},
+  {"no umount2, trying umount...\n", 1617},
+  {"could not umount %s - trying %s instead\n", 1618},
+  {"umount: %s busy - remounted read-only\n", 1619},
+  {"umount: could not remount %s read-only\n", 1620},
+  {"%s umounted\n", 1621},
+  {"umount: cannot find list of filesystems to unmount", 1622},
   {"\
 Usage: umount [-hV]\n\
        umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n\
-       umount [-f] [-r] [-n] [-v] special | node...\n", 1618},
-  {"Trying to umount %s\n", 1619},
-  {"Could not find %s in mtab\n", 1620},
-  {"umount: %s is not mounted (according to mtab)", 1621},
-  {"umount: it seems %s is mounted multiple times", 1622},
-  {"umount: %s is not in the fstab (and you are not root)", 1623},
-  {"umount: %s mount disagrees with the fstab", 1624},
-  {"umount: only root can unmount %s from %s", 1625},
-  {"umount: only root can do that", 1626},
-  {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1627},
-  {"Usage: ctrlaltdel hard|soft\n", 1628},
+       umount [-f] [-r] [-n] [-v] special | node...\n", 1623},
+  {"Trying to umount %s\n", 1624},
+  {"Could not find %s in mtab\n", 1625},
+  {"umount: %s is not mounted (according to mtab)", 1626},
+  {"umount: it seems %s is mounted multiple times", 1627},
+  {"umount: %s is not in the fstab (and you are not root)", 1628},
+  {"umount: %s mount disagrees with the fstab", 1629},
+  {"umount: only root can unmount %s from %s", 1630},
+  {"umount: only root can do that", 1631},
+  {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1632},
+  {"Usage: ctrlaltdel hard|soft\n", 1633},
   {"\
 File %s, For threshold value %lu, Maximum characters in fifo were %d,\n\
-and the maximum transfer rate in characters/second was %f\n", 1629},
+and the maximum transfer rate in characters/second was %f\n", 1634},
   {"\
 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", 1630},
-  {"Invalid interval value: %s\n", 1631},
-  {"Invalid set value: %s\n", 1632},
-  {"Invalid default value: %s\n", 1633},
-  {"Invalid set time value: %s\n", 1634},
-  {"Invalid default time value: %s\n", 1635},
+and the maximum transfer rate in characters/second was %f\n", 1635},
+  {"Invalid interval value: %s\n", 1636},
+  {"Invalid set value: %s\n", 1637},
+  {"Invalid default value: %s\n", 1638},
+  {"Invalid set time value: %s\n", 1639},
+  {"Invalid default time value: %s\n", 1640},
   {"\
 Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) \
-[-g|-G] file [file...]\n", 1636},
-  {"Can't open %s: %s\n", 1637},
-  {"Can't set %s to threshold %d: %s\n", 1638},
-  {"Can't set %s to time threshold %d: %s\n", 1639},
-  {"Can't get threshold for %s: %s\n", 1640},
-  {"Can't get timeout for %s: %s\n", 1641},
-  {"%s: %ld current threshold and %ld current timeout\n", 1642},
-  {"%s: %ld default threshold and %ld default timeout\n", 1643},
-  {"Can't set signal handler", 1644},
-  {"gettimeofday failed", 1645},
-  {"Can't issue CYGETMON on %s: %s\n", 1646},
+[-g|-G] file [file...]\n", 1641},
+  {"Can't open %s: %s\n", 1642},
+  {"Can't set %s to threshold %d: %s\n", 1643},
+  {"Can't set %s to time threshold %d: %s\n", 1644},
+  {"Can't get threshold for %s: %s\n", 1645},
+  {"Can't get timeout for %s: %s\n", 1646},
+  {"%s: %ld current threshold and %ld current timeout\n", 1647},
+  {"%s: %ld default threshold and %ld default timeout\n", 1648},
+  {"Can't set signal handler", 1649},
+  {"gettimeofday failed", 1650},
+  {"Can't issue CYGETMON on %s: %s\n", 1651},
   {"\
-%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1647},
-  {"   %f int/sec; %f rec, %f send (char/sec)\n", 1648},
+%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1652},
+  {"   %f int/sec; %f rec, %f send (char/sec)\n", 1653},
   {"\
-%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1649},
-  {"   %f int/sec; %f rec (char/sec)\n", 1650},
-  {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1651},
-  {"invalid id: %s\n", 1652},
-  {"cannot remove id %s (%s)\n", 1653},
-  {"deprecated usage: %s {shm | msg | sem} id ...\n", 1654},
-  {"unknown resource type: %s\n", 1655},
-  {"resource(s) deleted\n", 1656},
+%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1654},
+  {"   %f int/sec; %f rec (char/sec)\n", 1655},
+  {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1656},
+  {"invalid id: %s\n", 1657},
+  {"cannot remove id %s (%s)\n", 1658},
+  {"deprecated usage: %s {shm | msg | sem} id ...\n", 1659},
+  {"unknown resource type: %s\n", 1660},
+  {"resource(s) deleted\n", 1661},
   {"\
 usage: %s [ [-q msqid] [-m shmid] [-s semid]\n\
-          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1657},
-  {"%s: illegal option -- %c\n", 1658},
-  {"%s: illegal key (%s)\n", 1659},
-  {"permission denied for key", 1660},
-  {"already removed key", 1661},
-  {"invalid key", 1662},
-  {"unknown error in key", 1663},
-  {"permission denied for id", 1664},
-  {"invalid id", 1665},
-  {"already removed id", 1666},
-  {"unknown error in id", 1667},
-  {"%s: %s (%s)\n", 1668},
-  {"%s: unknown argument: %s\n", 1669},
-  {"usage : %s -asmq -tclup \n", 1670},
-  {"\t%s [-s -m -q] -i id\n", 1671},
-  {"\t%s -h for help.\n", 1672},
+          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1662},
+  {"%s: illegal option -- %c\n", 1663},
+  {"%s: illegal key (%s)\n", 1664},
+  {"permission denied for key", 1665},
+  {"already removed key", 1666},
+  {"invalid key", 1667},
+  {"unknown error in key", 1668},
+  {"permission denied for id", 1669},
+  {"invalid id", 1670},
+  {"already removed id", 1671},
+  {"unknown error in id", 1672},
+  {"%s: %s (%s)\n", 1673},
+  {"%s: unknown argument: %s\n", 1674},
+  {"usage : %s -asmq -tclup \n", 1675},
+  {"\t%s [-s -m -q] -i id\n", 1676},
+  {"\t%s -h for help.\n", 1677},
   {"\
-%s provides information on ipc facilities for which you have read access.\n", 1673},
+%s provides information on ipc facilities for which you have read access.\n", 1678},
   {"\
 Resource Specification:\n\
 \t-m : shared_mem\n\
-\t-q : messages\n", 1674},
+\t-q : messages\n", 1679},
   {"\
 \t-s : semaphores\n\
-\t-a : all (default)\n", 1675},
+\t-a : all (default)\n", 1680},
   {"\
 Output Format:\n\
 \t-t : time\n\
 \t-p : pid\n\
-\t-c : creator\n", 1676},
+\t-c : creator\n", 1681},
   {"\
 \t-l : limits\n\
-\t-u : summary\n", 1677},
-  {"-i id [-s -q -m] : details on resource identified by id\n", 1678},
-  {"kernel not configured for shared memory\n", 1679},
-  {"------ Shared Memory Limits --------\n", 1680},
-  {"max number of segments = %ld\n", 1681},
-  {"max seg size (kbytes) = %ld\n", 1682},
-  {"max total shared memory (kbytes) = %ld\n", 1683},
-  {"min seg size (bytes) = %ld\n", 1684},
-  {"------ Shared Memory Status --------\n", 1685},
-  {"segments allocated %d\n", 1686},
-  {"pages allocated %ld\n", 1687},
-  {"pages resident  %ld\n", 1688},
-  {"pages swapped   %ld\n", 1689},
-  {"Swap performance: %ld attempts\t %ld successes\n", 1690},
-  {"------ Shared Memory Segment Creators/Owners --------\n", 1691},
-  {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1692},
-  {"shmid", 1693},
-  {"perms", 1694},
-  {"cuid", 1695},
-  {"cgid", 1696},
-  {"uid", 1697},
-  {"gid", 1698},
-  {"------ Shared Memory Attach/Detach/Change Times --------\n", 1699},
-  {"%-10s %-10s %-20s %-20s %-20s\n", 1700},
-  {"owner", 1701},
-  {"attached", 1702},
-  {"detached", 1703},
-  {"changed", 1704},
-  {"------ Shared Memory Creator/Last-op --------\n", 1705},
-  {"%-10s %-10s %-10s %-10s\n", 1706},
-  {"cpid", 1707},
-  {"lpid", 1708},
-  {"------ Shared Memory Segments --------\n", 1709},
-  {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1710},
-  {"key", 1711},
-  {"bytes", 1712},
-  {"nattch", 1713},
-  {"status", 1714},
-  {"Not set", 1715},
-  {"dest", 1716},
-  {"locked", 1717},
-  {"kernel not configured for semaphores\n", 1718},
-  {"------ Semaphore Limits --------\n", 1719},
-  {"max number of arrays = %d\n", 1720},
-  {"max semaphores per array = %d\n", 1721},
-  {"max semaphores system wide = %d\n", 1722},
-  {"max ops per semop call = %d\n", 1723},
-  {"semaphore max value = %d\n", 1724},
-  {"------ Semaphore Status --------\n", 1725},
-  {"used arrays = %d\n", 1726},
-  {"allocated semaphores = %d\n", 1727},
-  {"------ Semaphore Arrays Creators/Owners --------\n", 1728},
-  {"semid", 1729},
-  {"------ Shared Memory Operation/Change Times --------\n", 1730},
-  {"%-8s %-10s %-26.24s %-26.24s\n", 1731},
-  {"last-op", 1732},
-  {"last-changed", 1733},
-  {"------ Semaphore Arrays --------\n", 1734},
-  {"%-10s %-10s %-10s %-10s %-10s\n", 1735},
-  {"nsems", 1736},
-  {"kernel not configured for message queues\n", 1737},
-  {"------ Messages: Limits --------\n", 1738},
-  {"max queues system wide = %d\n", 1739},
-  {"max size of message (bytes) = %d\n", 1740},
-  {"default max size of queue (bytes) = %d\n", 1741},
-  {"------ Messages: Status --------\n", 1742},
-  {"allocated queues = %d\n", 1743},
-  {"used headers = %d\n", 1744},
-  {"used space = %d bytes\n", 1745},
-  {"------ Message Queues: Creators/Owners --------\n", 1746},
-  {"msqid", 1747},
-  {"------ Message Queues Send/Recv/Change Times --------\n", 1748},
-  {"%-8s %-10s %-20s %-20s %-20s\n", 1749},
-  {"send", 1750},
-  {"recv", 1751},
-  {"change", 1752},
-  {"------ Message Queues PIDs --------\n", 1753},
-  {"lspid", 1754},
-  {"lrpid", 1755},
-  {"------ Message Queues --------\n", 1756},
-  {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1757},
-  {"used-bytes", 1758},
-  {"messages", 1759},
+\t-u : summary\n", 1682},
+  {"-i id [-s -q -m] : details on resource identified by id\n", 1683},
+  {"kernel not configured for shared memory\n", 1684},
+  {"------ Shared Memory Limits --------\n", 1685},
+  {"max number of segments = %ld\n", 1686},
+  {"max seg size (kbytes) = %ld\n", 1687},
+  {"max total shared memory (kbytes) = %ld\n", 1688},
+  {"min seg size (bytes) = %ld\n", 1689},
+  {"------ Shared Memory Status --------\n", 1690},
+  {"segments allocated %d\n", 1691},
+  {"pages allocated %ld\n", 1692},
+  {"pages resident  %ld\n", 1693},
+  {"pages swapped   %ld\n", 1694},
+  {"Swap performance: %ld attempts\t %ld successes\n", 1695},
+  {"------ Shared Memory Segment Creators/Owners --------\n", 1696},
+  {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1697},
+  {"shmid", 1698},
+  {"perms", 1699},
+  {"cuid", 1700},
+  {"cgid", 1701},
+  {"uid", 1702},
+  {"gid", 1703},
+  {"------ Shared Memory Attach/Detach/Change Times --------\n", 1704},
+  {"%-10s %-10s %-20s %-20s %-20s\n", 1705},
+  {"owner", 1706},
+  {"attached", 1707},
+  {"detached", 1708},
+  {"changed", 1709},
+  {"------ Shared Memory Creator/Last-op --------\n", 1710},
+  {"%-10s %-10s %-10s %-10s\n", 1711},
+  {"cpid", 1712},
+  {"lpid", 1713},
+  {"------ Shared Memory Segments --------\n", 1714},
+  {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1715},
+  {"key", 1716},
+  {"bytes", 1717},
+  {"nattch", 1718},
+  {"status", 1719},
+  {"Not set", 1720},
+  {"dest", 1721},
+  {"locked", 1722},
+  {"kernel not configured for semaphores\n", 1723},
+  {"------ Semaphore Limits --------\n", 1724},
+  {"max number of arrays = %d\n", 1725},
+  {"max semaphores per array = %d\n", 1726},
+  {"max semaphores system wide = %d\n", 1727},
+  {"max ops per semop call = %d\n", 1728},
+  {"semaphore max value = %d\n", 1729},
+  {"------ Semaphore Status --------\n", 1730},
+  {"used arrays = %d\n", 1731},
+  {"allocated semaphores = %d\n", 1732},
+  {"------ Semaphore Arrays Creators/Owners --------\n", 1733},
+  {"semid", 1734},
+  {"------ Shared Memory Operation/Change Times --------\n", 1735},
+  {"%-8s %-10s %-26.24s %-26.24s\n", 1736},
+  {"last-op", 1737},
+  {"last-changed", 1738},
+  {"------ Semaphore Arrays --------\n", 1739},
+  {"%-10s %-10s %-10s %-10s %-10s\n", 1740},
+  {"nsems", 1741},
+  {"kernel not configured for message queues\n", 1742},
+  {"------ Messages: Limits --------\n", 1743},
+  {"max queues system wide = %d\n", 1744},
+  {"max size of message (bytes) = %d\n", 1745},
+  {"default max size of queue (bytes) = %d\n", 1746},
+  {"------ Messages: Status --------\n", 1747},
+  {"allocated queues = %d\n", 1748},
+  {"used headers = %d\n", 1749},
+  {"used space = %d bytes\n", 1750},
+  {"------ Message Queues: Creators/Owners --------\n", 1751},
+  {"msqid", 1752},
+  {"------ Message Queues Send/Recv/Change Times --------\n", 1753},
+  {"%-8s %-10s %-20s %-20s %-20s\n", 1754},
+  {"send", 1755},
+  {"recv", 1756},
+  {"change", 1757},
+  {"------ Message Queues PIDs --------\n", 1758},
+  {"lspid", 1759},
+  {"lrpid", 1760},
+  {"------ Message Queues --------\n", 1761},
+  {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1762},
+  {"used-bytes", 1763},
+  {"messages", 1764},
   {"\
 \n\
-Shared memory Segment shmid=%d\n", 1760},
-  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1761},
-  {"mode=%#o\taccess_perms=%#o\n", 1762},
-  {"bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1763},
-  {"att_time=%-26.24s\n", 1764},
-  {"det_time=%-26.24s\n", 1765},
-  {"change_time=%-26.24s\n", 1766},
+Shared memory Segment shmid=%d\n", 1765},
+  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1766},
+  {"mode=%#o\taccess_perms=%#o\n", 1767},
+  {"bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1768},
+  {"att_time=%-26.24s\n", 1769},
+  {"det_time=%-26.24s\n", 1770},
+  {"change_time=%-26.24s\n", 1771},
   {"\
 \n\
-Message Queue msqid=%d\n", 1767},
-  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1768},
-  {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1769},
-  {"send_time=%-26.24s\n", 1770},
-  {"rcv_time=%-26.24s\n", 1771},
+Message Queue msqid=%d\n", 1772},
+  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1773},
+  {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1774},
+  {"send_time=%-26.24s\n", 1775},
+  {"rcv_time=%-26.24s\n", 1776},
   {"\
 \n\
-Semaphore Array semid=%d\n", 1772},
-  {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1773},
-  {"mode=%#o, access_perms=%#o\n", 1774},
-  {"nsems = %ld\n", 1775},
-  {"otime = %-26.24s\n", 1776},
-  {"ctime = %-26.24s\n", 1777},
-  {"semnum", 1778},
-  {"value", 1779},
-  {"ncount", 1780},
-  {"zcount", 1781},
-  {"pid", 1782},
-  {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1783},
+Semaphore Array semid=%d\n", 1777},
+  {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1778},
+  {"mode=%#o, access_perms=%#o\n", 1779},
+  {"nsems = %ld\n", 1780},
+  {"otime = %-26.24s\n", 1781},
+  {"ctime = %-26.24s\n", 1782},
+  {"semnum", 1783},
+  {"value", 1784},
+  {"ncount", 1785},
+  {"zcount", 1786},
+  {"pid", 1787},
+  {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1788},
   {"\
-  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device", 1784},
-  {"  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2", 1785},
-  {"  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)", 1786},
-  {"  rdev -r /dev/fd0 627            set the RAMDISK size", 1787},
-  {"  rdev -v /dev/fd0 1              set the bootup VIDEOMODE", 1788},
-  {"  rdev -o N ...                   use the byte offset N", 1789},
-  {"  rootflags ...                   same as rdev -R", 1790},
-  {"  ramsize ...                     same as rdev -r", 1791},
-  {"  vidmode ...                     same as rdev -v", 1792},
+  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device", 1789},
+  {"  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2", 1790},
+  {"  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)", 1791},
+  {"  rdev -r /dev/fd0 627            set the RAMDISK size", 1792},
+  {"  rdev -v /dev/fd0 1              set the bootup VIDEOMODE", 1793},
+  {"  rdev -o N ...                   use the byte offset N", 1794},
+  {"  rootflags ...                   same as rdev -R", 1795},
+  {"  ramsize ...                     same as rdev -r", 1796},
+  {"  vidmode ...                     same as rdev -v", 1797},
   {"\
-Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1793},
-  {"      use -R 1 to mount root readonly, -R 0 for read/write.", 1794},
-  {"missing comma", 1795},
+Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1798},
+  {"      use -R 1 to mount root readonly, -R 0 for read/write.", 1799},
+  {"missing comma", 1800},
+  {"out of memory", 1801},
   {"\
 %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\
@@ -2357,153 +2368,152 @@
 \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", 1796},
-  {"out of memory", 1797},
-  {"%s Version %s\n", 1798},
-  {"Sampling_step: %i\n", 1799},
-  {"%s: %s(%i): wrong map line\n", 1800},
-  {"%s: can't find \"_stext\" in %s\n", 1801},
-  {"%s: profile address out of range. Wrong map file?\n", 1802},
-  {"total", 1803},
+\t -V            print version and exit\n", 1802},
+  {"%s version %s\n", 1803},
+  {"Sampling_step: %i\n", 1804},
+  {"%s: %s(%i): wrong map line\n", 1805},
+  {"%s: can't find \"_stext\" in %s\n", 1806},
+  {"%s: profile address out of range. Wrong map file?\n", 1807},
+  {"total", 1808},
   {"\
-usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1804},
-  {"renice: %s: unknown user\n", 1805},
-  {"renice: %s: bad value\n", 1806},
-  {"getpriority", 1807},
-  {"setpriority", 1808},
-  {"%d: old priority %d, new priority %d\n", 1809},
-  {"usage: %s program [arg ...]\n", 1810},
+usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1809},
+  {"renice: %s: unknown user\n", 1810},
+  {"renice: %s: bad value\n", 1811},
+  {"getpriority", 1812},
+  {"setpriority", 1813},
+  {"%d: old priority %d, new priority %d\n", 1814},
+  {"usage: %s program [arg ...]\n", 1815},
   {"\
 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", 1811},
-  {"malloc error", 1812},
-  {"%s: bad value\n", 1813},
-  {"%s: %s not an lp device.\n", 1814},
-  {"%s status is %d", 1815},
-  {", busy", 1816},
-  {", ready", 1817},
-  {", out of paper", 1818},
-  {", on-line", 1819},
-  {", error", 1820},
-  {"LPGETIRQ error", 1821},
-  {"%s using IRQ %d\n", 1822},
-  {"%s using polling\n", 1823},
-  {"col: bad -l argument %s.\n", 1824},
-  {"usage: col [-bfpx] [-l nline]\n", 1825},
-  {"col: write error.\n", 1826},
-  {"col: warning: can't back up %s.\n", 1827},
-  {"past first line", 1828},
-  {"-- line already flushed", 1829},
-  {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1830},
-  {"line too long", 1831},
-  {"usage: column [-tx] [-c columns] [file ...]\n", 1832},
-  {"hexdump: bad length value.\n", 1833},
-  {"hexdump: bad skip value.\n", 1834},
+          -T [on|off] ]\n", 1816},
+  {"malloc error", 1817},
+  {"%s: bad value\n", 1818},
+  {"%s: %s not an lp device.\n", 1819},
+  {"%s status is %d", 1820},
+  {", busy", 1821},
+  {", ready", 1822},
+  {", out of paper", 1823},
+  {", on-line", 1824},
+  {", error", 1825},
+  {"LPGETIRQ error", 1826},
+  {"%s using IRQ %d\n", 1827},
+  {"%s using polling\n", 1828},
+  {"col: bad -l argument %s.\n", 1829},
+  {"usage: col [-bfpx] [-l nline]\n", 1830},
+  {"col: write error.\n", 1831},
+  {"col: warning: can't back up %s.\n", 1832},
+  {"past first line", 1833},
+  {"-- line already flushed", 1834},
+  {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1835},
+  {"line too long", 1836},
+  {"usage: column [-tx] [-c columns] [file ...]\n", 1837},
+  {"hexdump: bad length value.\n", 1838},
+  {"hexdump: bad skip value.\n", 1839},
   {"\
-hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1835},
-  {"usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n", 1836},
+hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1840},
+  {"usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n", 1841},
   {"\
 \n\
 *** %s: directory ***\n\
-\n", 1837},
+\n", 1842},
   {"\
 \n\
 ******** %s: Not a text file ********\n\
-\n", 1838},
-  {"[Use q or Q to quit]", 1839},
-  {"--More--", 1840},
-  {"(Next file: %s)", 1841},
-  {"[Press space to continue, 'q' to quit.]", 1842},
-  {"...back %d pages", 1843},
-  {"...back 1 page", 1844},
-  {"...skipping one line", 1845},
-  {"...skipping %d lines", 1846},
+\n", 1843},
+  {"[Use q or Q to quit]", 1844},
+  {"--More--", 1845},
+  {"(Next file: %s)", 1846},
+  {"[Press space to continue, 'q' to quit.]", 1847},
+  {"...back %d pages", 1848},
+  {"...back 1 page", 1849},
+  {"...skipping one line", 1850},
+  {"...skipping %d lines", 1851},
   {"\
 \n\
 ***Back***\n\
-\n", 1847},
+\n", 1852},
   {"\
 \n\
 Most commands optionally preceded by integer argument k.  Defaults in \
 brackets.\n\
-Star (*) indicates argument becomes new default.\n", 1848},
+Star (*) indicates argument becomes new default.\n", 1853},
   {"\
-<space>\t\t\tDisplay next k lines of text [current screen size]\n\
-z\t\t\tDisplay next k lines of text [current screen size]*\n\
-<return>\t\tDisplay next k lines of text [1]*\n\
-d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n\
-q or Q or <interrupt>\tExit from more\n\
-s\t\t\tSkip forward k lines of text [1]\n\
-f\t\t\tSkip forward k screenfuls of text [1]\n\
-b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n\
-'\t\t\tGo to place where previous search started\n\
-=\t\t\tDisplay current line number\n\
-/<regular expression>\tSearch for kth occurrence of regular expression [1]\n\
-n\t\t\tSearch for kth occurrence of last r.e [1]\n\
-!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n\
-v\t\t\tStart up /usr/bin/vi at current line\n\
-ctrl-L\t\t\tRedraw screen\n\
-:n\t\t\tGo to kth next file [1]\n\
-:p\t\t\tGo to kth previous file [1]\n\
-:f\t\t\tDisplay current file name and line number\n\
-.\t\t\tRepeat previous command\n", 1849},
-  {"[Press 'h' for instructions.]", 1850},
-  {"\"%s\" line %d", 1851},
-  {"[Not a file] line %d", 1852},
-  {"  Overflow\n", 1853},
-  {"...skipping\n", 1854},
-  {"Regular expression botch", 1855},
+<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", 1854},
+  {"[Press 'h' for instructions.]", 1855},
+  {"\"%s\" line %d", 1856},
+  {"[Not a file] line %d", 1857},
+  {"  Overflow\n", 1858},
+  {"...skipping\n", 1859},
+  {"Regular expression botch", 1860},
   {"\
 \n\
-Pattern not found\n", 1856},
-  {"Pattern not found", 1857},
-  {"can't fork\n", 1858},
+Pattern not found\n", 1861},
+  {"Pattern not found", 1862},
+  {"can't fork\n", 1863},
   {"\
 \n\
-...Skipping ", 1859},
-  {"...Skipping to file ", 1860},
-  {"...Skipping back to file ", 1861},
-  {"Line too long", 1862},
-  {"No previous command to substitute for", 1863},
-  {"od: od(1) has been deprecated for hexdump(1).\n", 1864},
-  {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1865},
-  {"; see strings(1).", 1866},
-  {"hexdump: can't read %s.\n", 1867},
-  {"hexdump: line too long.\n", 1868},
-  {"hexdump: byte count with multiple conversion characters.\n", 1869},
-  {"hexdump: bad byte count for conversion character %s.\n", 1870},
-  {"hexdump: %%s requires a precision or a byte count.\n", 1871},
-  {"hexdump: bad format {%s}\n", 1872},
-  {"hexdump: bad conversion character %%%s.\n", 1873},
+...Skipping ", 1864},
+  {"...Skipping to file ", 1865},
+  {"...Skipping back to file ", 1866},
+  {"Line too long", 1867},
+  {"No previous command to substitute for", 1868},
+  {"od: od(1) has been deprecated for hexdump(1).\n", 1869},
+  {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1870},
+  {"; see strings(1).", 1871},
+  {"hexdump: can't read %s.\n", 1872},
+  {"hexdump: line too long.\n", 1873},
+  {"hexdump: byte count with multiple conversion characters.\n", 1874},
+  {"hexdump: bad byte count for conversion character %s.\n", 1875},
+  {"hexdump: %%s requires a precision or a byte count.\n", 1876},
+  {"hexdump: bad format {%s}\n", 1877},
+  {"hexdump: bad conversion character %%%s.\n", 1878},
   {"\
-%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n", 1874},
-  {"%s: option requires an argument -- %s\n", 1875},
-  {"%s: illegal option -- %s\n", 1876},
-  {"...skipping forward\n", 1877},
-  {"...skipping backward\n", 1878},
-  {"No next file", 1879},
-  {"No previous file", 1880},
-  {"%s: Read error from %s file\n", 1881},
-  {"%s: Unexpected EOF in %s file\n", 1882},
-  {"%s: Unknown error in %s file\n", 1883},
-  {"%s: Cannot create tempfile\n", 1884},
-  {"RE error: ", 1885},
-  {"(EOF)", 1886},
-  {"No remembered search string", 1887},
-  {"Cannot open ", 1888},
-  {"saved", 1889},
-  {": !command not allowed in rflag mode.\n", 1890},
-  {"fork() failed, try again later\n", 1891},
-  {"(Next file: ", 1892},
-  {"Unable to allocate bufferspace\n", 1893},
-  {"usage: rev [file ...]\n", 1894},
-  {"usage: %s [ -i ] [ -tTerm ] file...\n", 1895},
-  {"trouble reading terminfo", 1896},
-  {"Unknown escape sequence in input: %o, %o\n", 1897},
-  {"Unable to allocate buffer.\n", 1898},
-  {"Input line too long.\n", 1899},
-  {"Out of memory when growing buffer.\n", 1900},
+%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n", 1879},
+  {"%s: option requires an argument -- %s\n", 1880},
+  {"%s: illegal option -- %s\n", 1881},
+  {"...skipping forward\n", 1882},
+  {"...skipping backward\n", 1883},
+  {"No next file", 1884},
+  {"No previous file", 1885},
+  {"%s: Read error from %s file\n", 1886},
+  {"%s: Unexpected EOF in %s file\n", 1887},
+  {"%s: Unknown error in %s file\n", 1888},
+  {"%s: Cannot create tempfile\n", 1889},
+  {"RE error: ", 1890},
+  {"(EOF)", 1891},
+  {"No remembered search string", 1892},
+  {"Cannot open ", 1893},
+  {"saved", 1894},
+  {": !command not allowed in rflag mode.\n", 1895},
+  {"fork() failed, try again later\n", 1896},
+  {"(Next file: ", 1897},
+  {"Unable to allocate bufferspace\n", 1898},
+  {"usage: rev [file ...]\n", 1899},
+  {"usage: %s [ -i ] [ -tTerm ] file...\n", 1900},
+  {"trouble reading terminfo", 1901},
+  {"Unknown escape sequence in input: %o, %o\n", 1902},
+  {"Unable to allocate buffer.\n", 1903},
+  {"Input line too long.\n", 1904},
+  {"Out of memory when growing buffer.\n", 1905},
 };
 
-int _msg_tbl_length = 1900;
+int _msg_tbl_length = 1905;
diff --git a/po/cs.po b/po/cs.po
index 947738f..327a5a0 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: 2002-11-25 00:47+0100\n"
+"POT-Creation-Date: 2003-06-13 00:50+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"
@@ -147,7 +147,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -746,7 +746,7 @@
 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:2166
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
 #, c-format
 msgid "Device: %s\n"
 msgstr "Zaøízení: %s\n"
@@ -819,8 +819,8 @@
 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-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Nedostatek pamìti!\n"
@@ -830,7 +830,7 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs verze %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
+#: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
 "usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
@@ -848,72 +848,72 @@
 " outfile    output file\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:328
+#: 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 ""
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:507
+#: disk-utils/mkfs.cramfs.c:514
 msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
 msgstr ""
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:812
+#: 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 ""
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, fuzzy, c-format
 msgid "Including: %s\n"
 msgstr "Chybné id: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, fuzzy, c-format
 msgid "Super block: %d bytes\n"
 msgstr "pou¾itý prostor (v bajtech) = %d\n"
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
@@ -922,33 +922,33 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 #, fuzzy
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "Varování: poèet i-uzlù je pøíli¹ veliký.\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:926
+#: disk-utils/mkfs.cramfs.c:933
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -1098,8 +1098,8 @@
 msgid "too many bad pages"
 msgstr "pøíli¹ mnoho chybných stránek"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: 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 "Nedostatek pamìti"
 
@@ -1219,11 +1219,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "         %s [ -c | -y | -n ] zaøízení\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
 msgid "Unusable"
 msgstr "Nepou¾itelné"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
 msgid "Free Space"
 msgstr "Volný prostor"
 
@@ -1362,230 +1362,230 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Nabídka nemá zadaný smìr. Pou¾ívám horizontální."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Chybná klávesa"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Stisknìte klávesu pro pokraèování"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2512
 msgid "Primary"
 msgstr "Primární"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Vytvoøit nový primární diskový oddíl"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2512
 msgid "Logical"
 msgstr "Logický"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Vytvoøit nový logický diskový oddíl"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
 msgid "Cancel"
 msgstr "Zru¹it"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Nevytváøet diskový oddíl"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Vnitøní chyba !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Velikost (v MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Zaèátek"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Vytvoøit diskový oddíl na zaèátku volného prostoru"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Vytvoøit diskový oddíl na konci volného prostoru"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "Pro roz¹íøený diskový oddíl není dostatek místa"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1527
 #, fuzzy
 msgid "No partition table or unknown signature on partition table"
 msgstr "Chybný podpis na tabulce rozdìlení disku"
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1529
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1576
+#: fdisk/cfdisk.c:1581
 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:1606
+#: fdisk/cfdisk.c:1611
 msgid "Cannot open disk drive"
 msgstr "Disk nelze otevøít"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
 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:1629
+#: fdisk/cfdisk.c:1634
 msgid "Cannot get disk size"
 msgstr "Velikost disku nelze zjistit"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1659
 msgid "Bad primary partition"
 msgstr "Chybný primární diskový oddíl"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1689
 msgid "Bad logical partition"
 msgstr "Chybný logický diskový oddíl"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1804
 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:1803
+#: fdisk/cfdisk.c:1808
 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:1809
+#: fdisk/cfdisk.c:1814
 msgid "no"
 msgstr "ne"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1815
 msgid "Did not write partition table to disk"
 msgstr "Tabulka rozdìlení disku nebyla ulo¾ena"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1817
 msgid "yes"
 msgstr "ano"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1820
 msgid "Please enter `yes' or `no'"
 msgstr "Zadejte `ano' èi `ne'"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1824
 msgid "Writing partition table to disk..."
 msgstr "Ukládám tabulku rozdìlení disku na disk"
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
 msgid "Wrote partition table to disk"
 msgstr "Tabulka rozdìlení disku byla ulo¾ena na disk"
 
-#: fdisk/cfdisk.c:1846
+#: fdisk/cfdisk.c:1851
 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:1856
+#: fdisk/cfdisk.c:1861
 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:1858
+#: fdisk/cfdisk.c:1863
 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:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Zadejte název souboru èi stisknìte RETURN pro zobrazení: "
 
-#: fdisk/cfdisk.c:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Soubor '%s' nelze otevøít"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1941
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disk: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1943
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1950
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1970
 msgid "   None   "
 msgstr "  ®ádný  "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1972
 msgid "   Pri/Log"
 msgstr "  Pri/Log"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1974
 msgid "   Primary"
 msgstr "  Primární"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1976
 msgid "   Logical"
 msgstr "  Logický"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2020
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Startovací (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Neznámý (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2024
 #, c-format
 msgid "None (%02X)"
 msgstr "®ádný (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabulka rozdìlení disku pro %s\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2061
 msgid "            First    Last\n"
 msgstr "            První    Poslední\n"
 
-#: fdisk/cfdisk.c:2057
+#: fdisk/cfdisk.c:2062
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Typ      Sektor   Sektor   Posun   Délka    ID systému souborù     "
 "Pøíznaky\n"
 
-#: fdisk/cfdisk.c:2058
+#: fdisk/cfdisk.c:2063
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1594,461 +1594,461 @@
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2146
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "        ---Poèátek---       ----Konec----   Poèáteèní\n"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2147
 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:2143
+#: fdisk/cfdisk.c:2148
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Raw"
 msgstr "Pøímý"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Print the table using raw data format"
 msgstr "Vytisknout tabulku v pøímém datovém formátu"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
 msgid "Sectors"
 msgstr "Sektory"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2182
 msgid "Print the table ordered by sectors"
 msgstr "Vytisknout tabulku seøazenou dle sektorù"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Table"
 msgstr "Tabulka"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Just print the partition table"
 msgstr "Vytisknout pouze tabulku rozdìlení disku"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2184
 msgid "Don't print the table"
 msgstr "Netisknout tabulku"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2212
 msgid "Help Screen for cfdisk"
 msgstr "Nápovìda pro cfdisk"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2214
 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:2210
+#: fdisk/cfdisk.c:2215
 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:2211
+#: fdisk/cfdisk.c:2216
 msgid "disk drive."
 msgstr "diskových oddílù na Va¹em pevném disku."
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2218
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2220
 msgid "Command      Meaning"
 msgstr "Pøíkaz      Význam"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2221
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2222
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Pøepne aktuálnímu oddílu pøíznak startovatelnosti"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2223
 msgid "  d          Delete the current partition"
 msgstr "  d          Sma¾e aktuální oddíl"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2224
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Zmìní geometrii"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2225
 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:2221
+#: fdisk/cfdisk.c:2226
 msgid "             know what they are doing."
 msgstr "             kteøí vìdí, co èiní."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2227
 msgid "  h          Print this screen"
 msgstr "  h          Vypí¹e tuto nápovìdu"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2228
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximálnì zvìt¹í aktuální diskový oddíl "
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2229
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Poznámka: Toto mù¾e uèinit oddíl nekompatibilní s"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2230
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2 ..."
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2231
 msgid "  n          Create new partition from free space"
 msgstr "  n          Vytvoøit na volném místì nový oddíl"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2232
 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:2228
+#: fdisk/cfdisk.c:2233
 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:2229
+#: fdisk/cfdisk.c:2234
 msgid "             that you can choose from:"
 msgstr "             z nìkolika formátù:"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2235
 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:2231
+#: fdisk/cfdisk.c:2236
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabulka seøazená dle sektorù"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2237
 msgid "                t - Table in raw format"
 msgstr "                t - Tabulka v pøímém formátu"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2238
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Ukonèí program bez ulo¾ení tabulky rozdìlení disku"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2239
 msgid "  t          Change the filesystem type"
 msgstr "  t          Zmìní typ systému souborù"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2240
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Zmìní jednotky pro zobrazení velikosti oddílu"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2241
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Cykluje mezi MB, sektory a cylindry"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2242
 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:2238
+#: fdisk/cfdisk.c:2243
 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:2239
+#: fdisk/cfdisk.c:2244
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             nebo odmítnout napsáním `yes' nebo"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2245
 msgid "             `no'"
 msgstr "             `no'"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2246
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nahoru       Pøesune kurzor na pøedcházející oddíl."
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2247
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Dolù         Pøesune kurzor na dal¹í oddíl."
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2248
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Pøekreslí obrazovku"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2249
 msgid "  ?          Print this screen"
 msgstr "  ?          Vypí¹e tuto nápovìdu"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2251
 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:2247
+#: fdisk/cfdisk.c:2252
 msgid "case letters (except for Writes)."
 msgstr "(s vyjímkou zápisu - W)."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
-#: fdisk/fdisksunlabel.c:324
+#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cylindry"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2282
 msgid "Change cylinder geometry"
 msgstr "Zmìní geometrii cylindrù"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Hlavy"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2283
 msgid "Change head geometry"
 msgstr "Zmìní geometrii hlav"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2284
 msgid "Change sector geometry"
 msgstr "Zmìní geometrii sektorù"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done"
 msgstr "Hotovo"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done with changing geometry"
 msgstr "Geometrie zmìnìna"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2298
 msgid "Enter the number of cylinders: "
 msgstr "Zadejte poèet cylindrù: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
 msgid "Illegal cylinders value"
 msgstr "Chybný poèet cylindrù"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2316
 msgid "Enter the number of heads: "
 msgstr "Zadejte poèet hlav: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
 msgid "Illegal heads value"
 msgstr "Chybný poèet hlav"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2329
 msgid "Enter the number of sectors per track: "
 msgstr "Zadejte poèet sektorù na stopu: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
 msgid "Illegal sectors value"
 msgstr "Chybný poèet sektorù"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2439
 msgid "Enter filesystem type: "
 msgstr "Zadejte typ systému souborù: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2457
 msgid "Cannot change FS Type to empty"
 msgstr "Nelze nastavit typ SS na prázdný"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2459
 msgid "Cannot change FS Type to extended"
 msgstr "Nelze nastavit typ SS na roz¹íøený"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Startovací"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2489
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Nez(%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2511
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2587
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disk: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2593
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "Velikost v bajtech: %lld"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2596
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "Velikost v bajtech: %lld"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2600
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Hlav: %d   Sektorù na stopu: %d   Cylindrù: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2604
 msgid "Name"
 msgstr "Název"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2605
 msgid "Flags"
 msgstr "Pøíznaky"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2606
 msgid "Part Type"
 msgstr "Typ oddílu"
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2607
 msgid "FS Type"
 msgstr "Typ SS"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2608
 msgid "[Label]"
 msgstr "[Popis]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2610
 msgid "  Sectors"
 msgstr " Sektory"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2614
 msgid "Size (MB)"
 msgstr "Velikost (MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2616
 msgid "Size (GB)"
 msgstr "Velikost (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Bootable"
 msgstr "Start"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Toggle bootable flag of the current partition"
 msgstr "Pøepne pøíznak startovatelnosti aktuálnímu diskovému oddílu"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete"
 msgstr "Smazat"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete the current partition"
 msgstr "Sma¾e aktuální diskový oddíl"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Change disk geometry (experts only)"
 msgstr "Zmìní geometrii disku (pouze pro odborníky)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Help"
 msgstr "Nápovìda"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Print help screen"
 msgstr "Vypí¹e nápovìdu"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize"
 msgstr "Zvìt¹ení"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 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:2671
+#: fdisk/cfdisk.c:2676
 msgid "New"
 msgstr "Nový"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "Create new partition from free space"
 msgstr "Vytvoøí nový diskový oddíl ve volném prostoru"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print"
 msgstr "Tisk"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 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:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit program without writing partition table"
 msgstr "Ukonèí program bez ulo¾ení tabulky rozdìlení disku"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Type"
 msgstr "Druh"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 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:2675
+#: fdisk/cfdisk.c:2680
 msgid "Units"
 msgstr "Jednotky"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 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:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write"
 msgstr "Ulo¾it"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 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:2722
+#: fdisk/cfdisk.c:2727
 msgid "Cannot make this partition bootable"
 msgstr "Tento oddíl nelze nastavit jako startovací."
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2737
 msgid "Cannot delete an empty partition"
 msgstr "Prázdný diskový oddíl nelze smazat."
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
 msgid "Cannot maximize this partition"
 msgstr "Tento diskový oddíl nelze zvìt¹it."
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2767
 msgid "This partition is unusable"
 msgstr "Tento diskový oddíl je nepou¾itelný."
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2769
 msgid "This partition is already in use"
 msgstr "Tento diskový oddíl je ji¾ pou¾íván."
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2786
 msgid "Cannot change the type of an empty partition"
 msgstr "Typ prázdného diskového oddílu nelze zmìnit."
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
 msgid "No more partitions"
 msgstr "®ádné dal¹í diskové oddíly"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2826
 msgid "Illegal command"
 msgstr "Chybný pøíkaz"
 
-#: fdisk/cfdisk.c:2831
+#: fdisk/cfdisk.c:2836
 #, 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:2838
+#: fdisk/cfdisk.c:2843
 #, c-format
 msgid ""
 "\n"
@@ -2328,11 +2328,11 @@
 msgid "heads"
 msgstr "hlavy"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "sektory"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470
+#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cylindry"
@@ -2456,74 +2456,74 @@
 msgstr "©estnáctkovì (L vypí¹e kódy):"
 
 #: fdisk/fdisk.c:1069
-#, c-format
-msgid "%s (%d-%d, default %d): "
+#, fuzzy, c-format
+msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, implicitnì %d): "
 
-#: fdisk/fdisk.c:1134
-#, c-format
-msgid "Using default value %d\n"
+#: fdisk/fdisk.c:1136
+#, fuzzy, c-format
+msgid "Using default value %u\n"
 msgstr "Pou¾ívám implicitní hodnotu %d\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1140
 msgid "Value out of range.\n"
 msgstr "Hodnota je mimo meze.\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1150
 msgid "Partition number"
 msgstr "Èíslo diskového oddílu"
 
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1161
 #, 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:1181 fdisk/fdisk.c:1207
+#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Nadbyteèný roz¹íøený diskový oddíl %d ignorován.\n"
 
-#: fdisk/fdisk.c:1184
+#: fdisk/fdisk.c:1186
 #, fuzzy
 msgid "No partition is defined yet!\n"
 msgstr "Nejsou definovány ¾ádné diskové oddíly\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1212
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "cylinder"
 msgstr "cylindr"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1231
 #, 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:1240
+#: fdisk/fdisk.c:1242
 #, 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:1251
+#: fdisk/fdisk.c:1253
 msgid "DOS Compatibility flag is set\n"
 msgstr "Pøíznak DOSOVÉ kompatibility je nastaven.\n"
 
-#: fdisk/fdisk.c:1255
+#: fdisk/fdisk.c:1257
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Pøíznak DOSOVÉ kompatibility není nastaven.\n"
 
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1357
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Diskový oddíl %d zatím neexistuje!\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1362
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2534,7 +2534,7 @@
 "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:1361
+#: fdisk/fdisk.c:1371
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2542,7 +2542,7 @@
 "Nemù¾ete mìnit bì¾né diskové oddíly na roz¹íøené a zpìt. Nejdøíve jej "
 "sma¾te.\n"
 
-#: fdisk/fdisk.c:1370
+#: fdisk/fdisk.c:1380
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2552,7 +2552,7 @@
 "nebo» SunOS/Solaris to oèekává a i Linux tomu dává pøednost.\n"
 "\n"
 
-#: fdisk/fdisk.c:1376
+#: fdisk/fdisk.c:1386
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2563,60 +2563,60 @@
 "a diskový oddíl 11 jako celý svazek (6), nebo» IRIX to oèekává.\n"
 "\n"
 
-#: fdisk/fdisk.c:1389
+#: fdisk/fdisk.c:1399
 #, 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:1443
+#: fdisk/fdisk.c:1453
 #, 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:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyz=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logický=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1451
+#: fdisk/fdisk.c:1461
 #, 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:1460
+#: fdisk/fdisk.c:1470
 #, 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:1463
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "mìlo by být (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1469
+#: fdisk/fdisk.c:1479
 #, 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:1473
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "mìlo by být (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1485
+#: fdisk/fdisk.c:1495
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1498
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2626,7 +2626,7 @@
 "Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1500
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -2634,19 +2634,19 @@
 "Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1493
+#: fdisk/fdisk.c:1503
 #, c-format
 msgid ", total %lu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1496
+#: fdisk/fdisk.c:1506
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1604
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2654,16 +2654,16 @@
 "Diskové oddíly jsou ji¾ seøazeny.\n"
 "\n"
 
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1678
 #, 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:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
 msgid "Device"
 msgstr "Zaøízení"
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1716
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2671,7 +2671,7 @@
 "\n"
 "Diskové oddíly jsou chybnì seøazeny\n"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
@@ -2682,93 +2682,93 @@
 "Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1728
 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:1762
+#: fdisk/fdisk.c:1772
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varování: diskový oddíl %d obsahuje sektor 0\n"
 
-#: fdisk/fdisk.c:1765
+#: fdisk/fdisk.c:1775
 #, 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:1768
+#: fdisk/fdisk.c:1778
 #, 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:1771
+#: fdisk/fdisk.c:1781
 #, 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:1775
+#: fdisk/fdisk.c:1785
 #, 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:1807
+#: fdisk/fdisk.c:1817
 #, 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:1815
+#: fdisk/fdisk.c:1825
 #, 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:1835
+#: fdisk/fdisk.c:1845
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varování: diskový oddíl %d je prázdný.\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1850
 #, 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:1846
+#: fdisk/fdisk.c:1856
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "Celkový poèet alokovaných sektorù (%d) je vìt¹í ne¾ maximum (%d).\n"
 
-#: fdisk/fdisk.c:1849
+#: fdisk/fdisk.c:1859
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "nealokovaných sektorù: %d\n"
 
-#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
+#: fdisk/fdisk.c:1872 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:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
-#: fdisk/fdisksunlabel.c:522
+#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "První %s"
 
-#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
+#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d je ji¾ alokován\n"
 
-#: fdisk/fdisk.c:1937
+#: fdisk/fdisk.c:1947
 msgid "No free sectors available\n"
 msgstr "Nejsou ¾ádné volné sektory.\n"
 
-#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
+#: fdisk/fdisk.c:1956 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:2011
+#: fdisk/fdisk.c:2021
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2776,15 +2776,15 @@
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2033 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:2031
+#: fdisk/fdisk.c:2041
 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:2036
+#: fdisk/fdisk.c:2046
 #, c-format
 msgid ""
 "Command action\n"
@@ -2795,30 +2795,30 @@
 "   %s\n"
 "   p   primární diskový oddíl (1-4)\n"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "l   logical (5 or over)"
 msgstr "l   logický diskový oddíl (5 nebo více)"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "e   extended"
 msgstr "e   roz¹íøený diskový oddíl"
 
-#: fdisk/fdisk.c:2057
+#: fdisk/fdisk.c:2067
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Chybné èíslo diskového oddílu pro typ `%c'.\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2103
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr "Tabulka rozdìlení disku byla zmìnìna!\n"
 
-#: fdisk/fdisk.c:2102
+#: fdisk/fdisk.c:2112
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Volám ioctl() pro znovunaètení tabulky rozdìlení disku.\n"
 
-#: fdisk/fdisk.c:2118
+#: fdisk/fdisk.c:2128
 #, c-format
 msgid ""
 "\n"
@@ -2827,7 +2827,7 @@
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2138
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2839,65 +2839,65 @@
 "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:2135
+#: fdisk/fdisk.c:2145
 msgid "Syncing disks.\n"
 msgstr "Synchronizují se disky.\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Diskový oddíl %d neobsahuje datovou oblast.\n"
 
-#: fdisk/fdisk.c:2187
+#: fdisk/fdisk.c:2197
 msgid "New beginning of data"
 msgstr "Nový zaèátek dat"
 
-#: fdisk/fdisk.c:2203
+#: fdisk/fdisk.c:2213
 msgid "Expert command (m for help): "
 msgstr "Pøíkaz pro odborníky (m pro nápovìdu): "
 
-#: fdisk/fdisk.c:2216
+#: fdisk/fdisk.c:2226
 msgid "Number of cylinders"
 msgstr "Poèet cylindrù"
 
-#: fdisk/fdisk.c:2243
+#: fdisk/fdisk.c:2253
 msgid "Number of heads"
 msgstr "Poèet hlav"
 
-#: fdisk/fdisk.c:2268
+#: fdisk/fdisk.c:2278
 msgid "Number of sectors"
 msgstr "Poèet sektorù"
 
-#: fdisk/fdisk.c:2271
+#: fdisk/fdisk.c:2281
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varování: nastaven posun sektoru kvùli kompatibilitì s DOSEM\n"
 
-#: fdisk/fdisk.c:2346
+#: fdisk/fdisk.c:2356
 #, 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:2360
+#: fdisk/fdisk.c:2370
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s nelze otevøít.\n"
 
-#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s nelze otevøít.\n"
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2408
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "pøíkaz %c není znám\n"
 
-#: fdisk/fdisk.c:2466
+#: fdisk/fdisk.c:2476
 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:2470
+#: fdisk/fdisk.c:2480
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2907,18 +2907,18 @@
 "          zadaným zaøízením.\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2529
+#: fdisk/fdisk.c:2539
 #, 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:2539
+#: fdisk/fdisk.c:2549
 msgid "Command (m for help): "
 msgstr "Pøíkaz (m pro nápovìdu): "
 
-#: fdisk/fdisk.c:2555
+#: fdisk/fdisk.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -2927,15 +2927,15 @@
 "\n"
 "Aktuální startovací soubor: %s\n"
 
-#: fdisk/fdisk.c:2557
+#: fdisk/fdisk.c:2567
 msgid "Please enter the name of the new boot file: "
 msgstr "Zadejte název nového startovacího souboru: "
 
-#: fdisk/fdisk.c:2559
+#: fdisk/fdisk.c:2569
 msgid "Boot file unchanged\n"
 msgstr "Startovací soubor nebyl zmìnìn.\n"
 
-#: fdisk/fdisk.c:2624
+#: fdisk/fdisk.c:2642
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3251,87 +3251,87 @@
 "\n"
 "Synchronizují se disky.\n"
 
-#: fdisk/fdisksgilabel.c:78
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "Hlavièka SGI svazku"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
 msgstr "SGI svazek"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI xfslog"
 msgstr "SGI xfslog"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:92
 msgid "SGI xlv"
 msgstr "SGI xlv"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:93
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
 msgstr "Linux nativní"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:95
+#: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:163
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
 msgstr ""
 "Popis nesmí podle MIPS Computer Systems, Inc obsahovat více ne¾ 512 bajtù\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Nalezl jsem sgi popis disku s chybným kontrolním souètem.\n"
 
@@ -3387,12 +3387,13 @@
 "Startovací soubor: %s\n"
 "----- adresáøové polo¾ky -----\n"
 
-#: fdisk/fdisksgilabel.c:250
+#: fdisk/fdisksgilabel.c:248
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor%5u velikost%8u\n"
 
-#: fdisk/fdisksgilabel.c:304
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3404,7 +3405,7 @@
 "\tStartovací soubor musí být zadán plným názvem, napø.\n"
 "\t\"/unix\" èi \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:311
+#: fdisk/fdisksgilabel.c:308
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3412,7 +3413,7 @@
 "\n"
 "\tNázev startovacího souboru je pøíli¹ dlouhý: 16 bajtù je maximum.\n"
 
-#: fdisk/fdisksgilabel.c:316
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3420,7 +3421,7 @@
 "\n"
 "\tStartovací soubor musí být zadán plným názvem.\n"
 
-#: fdisk/fdisksgilabel.c:321
+#: fdisk/fdisksgilabel.c:320
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3430,7 +3431,7 @@
 "Uvìdomte si, ¾e existence startovacího souboru není ovìøována.\n"
 "\tImplicitnì se pou¾ije \"/unix\" a jako záloha \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:349
+#: fdisk/fdisksgilabel.c:346
 #, c-format
 msgid ""
 "\n"
@@ -3439,19 +3440,19 @@
 "\n"
 "\tStartovací soubor byl zmìnìn na \"%s\".\n"
 
-#: fdisk/fdisksgilabel.c:447
+#: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
 msgstr "Existuje více ne¾ jedna polo¾ka celého disku.\n"
 
-#: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
 msgstr "Nejsou definovány ¾ádné diskové oddíly\n"
 
-#: fdisk/fdisksgilabel.c:462
+#: fdisk/fdisksgilabel.c:449
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "IRIX preferuje, kdy¾ Diskový oddíl 11 zaujímá celý disk.\n"
 
-#: fdisk/fdisksgilabel.c:464
+#: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3460,7 +3461,7 @@
 "Diskový oddíl zaujímající celý disk by mìl zaèínat blokem 0,\n"
 "nikoliv blokem %d.\n"
 
-#: fdisk/fdisksgilabel.c:468
+#: fdisk/fdisksgilabel.c:457
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3469,31 +3470,31 @@
 "Diskový oddíl zaujímající celý disk má velikost  v blocích pouze %d,\n"
 "ale velikost disku v blocích je %d.\n"
 
-#: fdisk/fdisksgilabel.c:475
+#: fdisk/fdisksgilabel.c:463
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "Jeden Diskový Oddíl (#11) by mìl zaujímat celý disk.\n"
 
-#: fdisk/fdisksgilabel.c:487
+#: fdisk/fdisksgilabel.c:473
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "Diskový oddíl %d nezaèíná na hranici cylindru.\n"
 
-#: fdisk/fdisksgilabel.c:494
+#: fdisk/fdisksgilabel.c:479
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "Diskový oddíl %d nekonèí na hranici cylindru.\n"
 
-#: fdisk/fdisksgilabel.c:502
+#: fdisk/fdisksgilabel.c:486
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Diskové oddíly %d a %d se navzájem pøekrývají %d sektory.\n"
 
-#: fdisk/fdisksgilabel.c:511 fdisk/fdisksgilabel.c:531
-#, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, fuzzy, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
 msgstr "Nevyu¾ívaný prostor o velikosti v sektorech %8d - sektory %8d-%d\n"
 
-#: fdisk/fdisksgilabel.c:544
+#: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
@@ -3501,7 +3502,7 @@
 "\n"
 "Startovací diskový oddíl neexistuje.\n"
 
-#: fdisk/fdisksgilabel.c:548
+#: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
@@ -3509,7 +3510,7 @@
 "\n"
 "Diskový oddíl pro odkládací prostor neexistuje.\n"
 
-#: fdisk/fdisksgilabel.c:553
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
@@ -3517,15 +3518,16 @@
 "\n"
 "Diskový oddíl pro odkládací prostor nemá zadán typ.\n"
 
-#: fdisk/fdisksgilabel.c:557
+#: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVybral jste si neobvyklý název pro startovací soubor.\n"
 
-#: fdisk/fdisksgilabel.c:568
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr "Lituji, mù¾ete mìnit znaèku neprázdných diskových oddílù.\n"
 
-#: fdisk/fdisksgilabel.c:575
+#: 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"
@@ -3539,28 +3541,28 @@
 "Zadejte YES, pokud jste si jist, ¾e chcete oznaèit tento diskový oddíl "
 "jinak.\n"
 
-#: fdisk/fdisksgilabel.c:580 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
 msgid "YES\n"
 msgstr ""
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:606
+#: fdisk/fdisksgilabel.c:577
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "Víte, ¾e na Va¹em disku se diskové oddíly pøekrývají?\n"
 
-#: fdisk/fdisksgilabel.c:668
+#: fdisk/fdisksgilabel.c:637
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "Pokou¹ím se automaticky vytvoøit polo¾ku pro celý disk.\n"
 
-#: fdisk/fdisksgilabel.c:675
+#: fdisk/fdisksgilabel.c:642
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "Diskové oddíly ji¾ zabírají celý prostor disky.\n"
 
-#: fdisk/fdisksgilabel.c:680
+#: fdisk/fdisksgilabel.c:646
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr "Diskové oddíly se pøekrývají. Nejprve to opravte!\n"
 
-#: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
+#: 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"
@@ -3568,17 +3570,17 @@
 "Doporuèuje se, aby jedenáctý diskový oddíl zaujímal celý\n"
 "prostor disku a byl typu `SGI svazek'\n"
 
-#: fdisk/fdisksgilabel.c:705
+#: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Takto se diskové oddíly budou navzájem pøekrývat. Nejprve to opravte!\n"
 
-#: fdisk/fdisksgilabel.c:710
+#: fdisk/fdisksgilabel.c:676
 #, c-format
 msgid " Last %s"
 msgstr " Poslední %s"
 
-#: fdisk/fdisksgilabel.c:732
+#: 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"
@@ -3590,12 +3592,20 @@
 "pochopitelnì dostupná.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:758
+#: 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 ""
+
+#: fdisk/fdisksgilabel.c:738
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Pokou¹ím se zachovat parametry diskového oddílu %d.\n"
 
-#: fdisk/fdisksgilabel.c:760
+#: fdisk/fdisksgilabel.c:740
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tZAÈÁTEK=%d\tDÉLKA=%d\n"
@@ -3683,63 +3693,63 @@
 msgid "Autoconfigure failed.\n"
 msgstr "Automatická konfigurace selhala.\n"
 
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Sektorù/stopu"
 
-#: fdisk/fdisksunlabel.c:327
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Alternativní cylindry"
 
-#: fdisk/fdisksunlabel.c:330
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Fyzické cylindry"
 
-#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
 msgid "Rotation speed (rpm)"
 msgstr "Rychlost otáèení (otm)"
 
-#: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
 msgid "Interleave factor"
 msgstr "Interleave faktor"
 
-#: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektory na cylindr"
 
-#: fdisk/fdisksunlabel.c:352
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "V¹echny parametry disku mù¾ete zmìnit z nabídky x"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "3,5\" pru¾ný disk"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "Linux u¾ivatelský"
 
-#: fdisk/fdisksunlabel.c:446
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Diskový oddíl %d nekonèí na hranici cylindru.\n"
 
-#: fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:462
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Diskový oddíl %d pøesahuje do jiných v sektorech %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:488
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Nevyu¾ívaný prostor - sektory 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Nevyu¾ívaný prostor - sektory %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3747,7 +3757,7 @@
 "Jiné diskové oddíly ji¾ zaujímá celý disk.\n"
 "Sma¾te/zmen¹ete nìjaké a zkuste to znovu.\n"
 
-#: fdisk/fdisksunlabel.c:593
+#: fdisk/fdisksunlabel.c:589
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3757,7 +3767,7 @@
 "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:613
+#: fdisk/fdisksunlabel.c:609
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3767,7 +3777,7 @@
 "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:626
+#: fdisk/fdisksunlabel.c:622
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3781,7 +3791,7 @@
 "Zadejte YES, pokud jste si jist, ¾e chcete tento diskový oddíl oznaèit 82\n"
 "(odkládací prostor pro Linux): "
 
-#: fdisk/fdisksunlabel.c:657
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid ""
 "\n"
@@ -3800,7 +3810,7 @@
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:671
+#: fdisk/fdisksunlabel.c:667
 #, c-format
 msgid ""
 "\n"
@@ -3813,16 +3823,16 @@
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:676
+#: fdisk/fdisksunlabel.c:672
 #, 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:701
+#: fdisk/fdisksunlabel.c:697
 msgid "Number of alternate cylinders"
 msgstr "Poèet alternativních cylindrù"
 
-#: fdisk/fdisksunlabel.c:734
+#: fdisk/fdisksunlabel.c:730
 msgid "Number of physical cylinders"
 msgstr "Poèet fyzických cylindrù"
 
@@ -4424,9 +4434,9 @@
 msgstr "   Zaøíz  Boot   Zaèátek     Konec #bloky   Id  Systém\n"
 
 #: fdisk/sfdisk.c:885
-#, c-format
+#, fuzzy, 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 ""
 "Jednotky = megabajty po 1048576 bajtech, bloky po 1024 bajtech, poèítáno od %"
@@ -4435,7 +4445,7 @@
 
 #: fdisk/sfdisk.c:887
 #, fuzzy
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
+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
@@ -4575,6 +4585,11 @@
 "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
+#, fuzzy
+msgid "start"
+msgstr "stav"
+
 #: fdisk/sfdisk.c:1275
 #, c-format
 msgid ""
@@ -4583,6 +4598,11 @@
 "diskový oddíl %s: zaèátek: (c,h,s) pøedpoklad (%ld,%ld,%ld), nalezeno\n"
 "(%ld,%ld,%ld)\n"
 
+#: fdisk/sfdisk.c:1281
+#, fuzzy
+msgid "end"
+msgstr "odeslání"
+
 #: fdisk/sfdisk.c:1284
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4646,100 +4666,100 @@
 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:1577
+#: fdisk/sfdisk.c:1579
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Chyba pøi ukládání starých sektorù - konèím\n"
 
-#: fdisk/sfdisk.c:1582
+#: fdisk/sfdisk.c:1584
 #, 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:1659
+#: fdisk/sfdisk.c:1661
 msgid "long or incomplete input line - quitting\n"
 msgstr "pøíli¹ dlouhý èi neúplný øádek - konèím\n"
 
-#: fdisk/sfdisk.c:1695
+#: fdisk/sfdisk.c:1697
 #, 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:1702
+#: fdisk/sfdisk.c:1704
 #, 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:1708
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nerozpoznaný vstup: %s\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
 msgstr "èíslo je pøíli¹ veliké\n"
 
-#: fdisk/sfdisk.c:1754
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
 msgstr "nesmysly za èíslem\n"
 
-#: fdisk/sfdisk.c:1875
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
 msgstr "není místo pro popis diskového oddílu\n"
 
-#: fdisk/sfdisk.c:1908
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
 msgstr "okolní roz¹iøující diskový oddíl nelze vytvoøit\n"
 
-#: fdisk/sfdisk.c:1959
+#: fdisk/sfdisk.c:1961
 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:1993
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
 msgstr "Ji¾ nejsou volné bloky\n"
 
-#: fdisk/sfdisk.c:2012
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
 msgstr "Chybný typ\n"
 
-#: fdisk/sfdisk.c:2044
+#: fdisk/sfdisk.c:2046
 #, 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:2050
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
 msgstr "Varování: prázdný diskový oddíl\n"
 
-#: fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2066
 #, 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:2077
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nerozpoznaný pøíznak 'startovací' - zvolte - èi *\n"
 
-#: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
 msgstr "neúplná c,h,s specifikace?\n"
 
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
 msgstr "Roz¹íøený diskový oddíl na neoèekávaném místì\n"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
 msgstr "chybný vstup\n"
 
-#: fdisk/sfdisk.c:2172
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
 msgstr "pøíli¹ mnoho diskových oddílù\n"
 
-#: fdisk/sfdisk.c:2205
+#: 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"
@@ -4751,100 +4771,100 @@
 "<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:2225
+#: fdisk/sfdisk.c:2227
 msgid "version"
 msgstr "verze"
 
-#: fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Pou¾ití: %s [pøepínaèe] zaøízení ...\n"
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "zaøízení: nìco jako /dev/hda èi /dev/sda"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
 msgstr "u¾iteèné pøepínaèe:"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2236
 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:2235
+#: fdisk/sfdisk.c:2237
 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:2236
+#: fdisk/sfdisk.c:2238
 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:2237
+#: fdisk/sfdisk.c:2239
 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:2238
+#: fdisk/sfdisk.c:2240
 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:2239
+#: fdisk/sfdisk.c:2241
 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:2240
+#: fdisk/sfdisk.c:2242
 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:2241
+#: fdisk/sfdisk.c:2243
 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:2242
+#: fdisk/sfdisk.c:2244
 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:2243
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                zmìní pouze diskový oddíl s èíslem #"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ¾ádné zmìny nebudou ulo¾eny na disk"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2247
 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:2246
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I SOUBOR :            obnoví tyto sektory ze SOUBORU"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [èi --version]:   vypí¹e informace o verzi"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [èi --help]:      vypí¹e tuto nápovìdu"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
 msgstr "nebezpeèné pøepínaèe:"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2252
 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:2251
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4852,116 +4872,116 @@
 "    -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:2253
+#: fdisk/sfdisk.c:2255
 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:2254
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [èi --quiet]:      nebude vypisovat varovné hlá¹ky"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
 msgstr "    Nalezenou geometrii mù¾ete pøepsat pomocí:"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2258
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [èi --cylinders #]:nastaví poèet cylindrù"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2259
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [èi --heads #]:    nastaví poèet hlav"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2260
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [èi --sectors #]:  nastaví poèet cylindrù"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
 msgstr "Ovìøování konzistence mù¾ete vypnout pomocí:"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2262
 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:2266
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
 msgstr "Pou¾ití:"
 
-#: fdisk/sfdisk.c:2267
+#: fdisk/sfdisk.c:2269
 #, 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:2268
+#: fdisk/sfdisk.c:2270
 #, 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:2269
+#: fdisk/sfdisk.c:2271
 #, 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:2421
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
 msgstr "¾ádný pøíkaz?\n"
 
-#: fdisk/sfdisk.c:2539
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "celkový poèet blokù: %d\n"
 
-#: fdisk/sfdisk.c:2576
+#: fdisk/sfdisk.c:2578
 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:2578
+#: fdisk/sfdisk.c:2580
 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:2580
+#: fdisk/sfdisk.c:2582
 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:2587
+#: fdisk/sfdisk.c:2589
 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:2613
+#: fdisk/sfdisk.c:2615
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s nelze otevøít.\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2617
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s pro ètení nelze otevøít"
 
-#: fdisk/sfdisk.c:2640
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2657
+#: fdisk/sfdisk.c:2659
 #, 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:2674
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "volání BLKGETSIZE ioctl pro %s selhalo\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2754
 #, 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:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
@@ -4969,7 +4989,7 @@
 "Hotovo\n"
 "\n"
 
-#: fdisk/sfdisk.c:2777
+#: fdisk/sfdisk.c:2781
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -4979,35 +4999,35 @@
 "MBR\n"
 "nastartuje pouze z disku s jedním aktivním diskovým oddílem.\n"
 
-#: fdisk/sfdisk.c:2791
+#: fdisk/sfdisk.c:2795
 #, 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:2848
+#: fdisk/sfdisk.c:2852
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id %lx je chybné\n"
 
-#: fdisk/sfdisk.c:2863
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
 msgstr "Tento disk je právì pou¾íván.\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatální chyba: %s nelze nalézt\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2887
 #, 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:2889
+#: fdisk/sfdisk.c:2893
 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:2891
+#: fdisk/sfdisk.c:2895
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5020,28 +5040,28 @@
 "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:2895
+#: fdisk/sfdisk.c:2899
 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:2899
+#: fdisk/sfdisk.c:2903
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2908
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
 msgstr "Stará situace:\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2916
 #, 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:2920
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
 msgstr "Nová situace:\n"
 
-#: fdisk/sfdisk.c:2925
+#: fdisk/sfdisk.c:2929
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5049,19 +5069,19 @@
 "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:2928
+#: fdisk/sfdisk.c:2932
 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:2933
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Vyhovuje Vám to? [ynq] "
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Ulo¾it na disk? [ynq] "
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5069,15 +5089,15 @@
 "\n"
 "sfdisk: pøedèasný konec vstupu\n"
 
-#: fdisk/sfdisk.c:2942
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
 msgstr "Konèím - nebyly uèinìny ¾ádné zmìny\n"
 
-#: fdisk/sfdisk.c:2948
+#: fdisk/sfdisk.c:2952
 msgid "Please answer one of y,n,q\n"
 msgstr "Odpovìzte prosím y,n èi q\n"
 
-#: fdisk/sfdisk.c:2956
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5085,7 +5105,7 @@
 "Nová tabulka rozdìlení disku byla úspì¹nì ulo¾ena.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2962
+#: 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"
@@ -5097,92 +5117,93 @@
 "bla7\n"
 "bs=512 count=1' (viz fdisk(8)).\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Více informací získáte pøíkazem `getopt --help'.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "prázdná dlouhá volba po pøepínaèi -l èi --long"
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "neznámý shell po pøepínaèi -s èi --shell"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Pou¾ití: getopt øetìzec-s-volbami pøepínaèe\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [volby] [--] øetìzec-s-volbami pøepínaèe\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [volby] -o|--options øetìzec-s-volbami [volby] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "              argumenty\n"
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Akceptuje dlouhé volby zaèínající jedním -\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Vypí¹e tuto nápovìdu\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=dlouhvol   Rozpoznávané dlouhé volby\n"
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 "  -n, --name=názevprog          Název, pod kterým jsou oznamovány chyby\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=krátvol        Rozpoznávané krátké volby\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 "  -q, --quiet                  Vypne oznamování chyb pomocí getopt(3)\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           ®ádný normální výstup\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=shell            Nastaví konvence uzavíraní\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Testuje verzi getopt(1)\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -u, --unqote                 neuzavøe výstuo do uvozovek\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Vypí¹e informace o verzi\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr "chybí øetìzec-s-volbami"
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
+#: getopt/getopt.c:444
+#, fuzzy
+msgid "getopt (enhanced) 1.1.3\n"
 msgstr "getopt (roz¹íøené) 1.1.2\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "Vnitøní chyba, oznamte ji autorovi."
 
@@ -5684,7 +5705,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "volání KDGHWCLK ioctl selhalo."
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr "V Èasovém limitu se nepodaøilo zjistit èas.\n"
 
@@ -5709,57 +5730,57 @@
 msgid "KDGHWCLK ioctl failed"
 msgstr "volání ioctl KDGHWCLK selhalo"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "%s nelze otevøít - volání open() selhalo"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, 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:171
+#: hwclock/rtc.c:170
 #, 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:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s nemá pøeru¹ovací funkce. "
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, 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:244
+#: hwclock/rtc.c:243
 #, 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:247
+#: hwclock/rtc.c:246
 #, 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:306
+#: hwclock/rtc.c:305
 #, 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:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "Volání ioctl(%s) bylo úspì¹né.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "%s nelze otevøít."
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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' "
@@ -5770,17 +5791,17 @@
 "pomocí\n"
 "zvlá¹tního souboru %s. Tento soubor na tomto systému souborù neexistuje.\n"
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr "%s nelze otevøít"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "volání(RTC_EPOCH_READ) pro %s selhalo"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
@@ -5789,24 +5810,24 @@
 #. 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:397
+#: hwclock/rtc.c:396
 #, 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:415
+#: hwclock/rtc.c:414
 #, 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:420
+#: hwclock/rtc.c:419
 #, 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:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "volání ioctl(RTC_EPOCH_SET) pro %s selhalo"
@@ -6006,9 +6027,8 @@
 msgid "Password error."
 msgstr "Chybné heslo."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249
-#: mount/lomount.c:254
+#: 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
 msgid "Password: "
 msgstr "Heslo: "
 
@@ -6228,29 +6248,29 @@
 "\n"
 "pøeru¹en %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, fuzzy, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "mount: %s nelze otevøít: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: pøepínaè -h mù¾e pou¾ít pouze superu¾ivatel\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "Pou¾ití: login [fp] [u¾ivatelské jméno]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: chyba PAM, konèím: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM nelze inicializovat: %s"
@@ -6261,16 +6281,16 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "Pøihla¹ovací jméno:"
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "%1$d. CHYBNÉ PØIHLÁ©ENÍ U®IVATELE %3$s Z %2$s, %4$s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -6278,17 +6298,17 @@
 "Chybné pøihlá¹ení\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "PØÍLI© MNOHO (%1$d) POKUSÙ U®IVATELE %3$s O PØIHLÁ©ENÍ Z %2$s, %4$s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "NEÚSPÌ©NÉ PØIHLÁ©ENÍ U®IVATELE %2$s Z %1$s, %3$s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -6296,51 +6316,51 @@
 "\n"
 "Chybné pøihlá¹ení\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 #, fuzzy
 msgid "login: Out of memory\n"
 msgstr "%s: Nedostatek pamìti!\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Chybné u¾ivatelské jméno"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "pøihlá¹ení u¾ivatele %s na tomto terminálu odmítnuto\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE %s Z %s NA TTY %s ODMÍTNUTO"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE %s NA TTY %s ODMÍTNUTO"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Chybné pøihlá¹ení\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -6348,84 +6368,84 @@
 "Ji¾ je pøihlá¹eno pøíli¹ mnoho u¾ivatelù.\n"
 "Zkuste to opìt pozdìji.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
 msgstr "Máte spu¹tìno pøíli¹ mnoho procesù.\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, 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:1077
+#: login-utils/login.c:1071
 #, 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:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE ROOT NA TTY %s"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, 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:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 #, fuzzy
 msgid "You have new mail.\n"
 msgstr "Máte %spo¹tu.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 #, fuzzy
 msgid "You have mail.\n"
 msgstr "Máte %spo¹tu.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: volání fork selhalo: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr "volání setuid() selhalo"
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Adresáø %s neexistuje!\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr "Pøihla¹uji s domácím adresáøem nastaveným na \"/\".\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
 msgstr "login: nedostatek pamìti pro skript shellu.\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: skript shellu %s nelze spustit.\n"
 
-#: login-utils/login.c:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ¾ádný shell: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6434,62 +6454,62 @@
 "\n"
 "Pøihla¹ovací jméno na %s: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "pøihla¹ovací jméno je pøíli¹ dlouhé.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "JMÉNO je pøíli¹ dlouhé"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
 msgstr "pøihla¹ovací jméno nesmí zaèínat '-'.\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "pøíli¹ mnoho znakù LF\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "PØÍLI© mnoho znakù LF"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, 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:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Poslední pøihlá¹ení: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "z %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "%.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "CHYBNÉ PØIHLÁ©ENÍ U®IVATELE %2$s Z %1$s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, 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:1388
+#: login-utils/login.c:1382
 #, 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:1391
+#: login-utils/login.c:1385
 #, 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"
@@ -6851,7 +6871,7 @@
 msgid "fork failed\n"
 msgstr "volání fork selhalo\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
 msgstr "volání exec selhalo\n"
 
@@ -7155,12 +7175,12 @@
 msgid "Script started, file is %s\n"
 msgstr "Script spu¹tìn. Soubor je %s.\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr "Script spu¹tìn %s"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
@@ -7169,210 +7189,210 @@
 "\n"
 "Script ukonèen %s"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script utils. Soubor je %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr "volání openpty selhalo\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr "Nejsou ¾ádná dal¹í volná pty\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:744
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Chybný pøepínaè, pou¾ití\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term název terminálu]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ atribut ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -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 "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file soubor pro ulo¾ení ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq frekvence ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr "¹etøící re¾im nelze vypnout/zapnout\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "chyba klogctl: %s\n"
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Chyba pøi ètení %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr "Chyba pøi ukládání obrazu obrazovky\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "nelze èíst %s a nelze provést dump pomocí volání ioctl\n"
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: promìnná TERM není nastavena.\n"
@@ -7428,17 +7448,17 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Zpráva od %s@%s na %s v %s ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "varování: chyba pøi ètení %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 "varování: %s nelze otevøít: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s nelze otevøít - pou¾ívám %s\n"
@@ -7447,42 +7467,42 @@
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:415
 #, 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:399
+#: mount/fstab.c:427
 #, 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:411
+#: mount/fstab.c:439
 #, 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:426
+#: mount/fstab.c:454
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Zamykací soubor %s nelze zamknout: %s\n"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:467
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Zamykací soubor %s nelze zamknout: %s"
 
-#: mount/fstab.c:441
+#: mount/fstab.c:469
 msgid "timed out"
 msgstr "vypr¹el èas"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:476
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7491,46 +7511,46 @@
 "Odkaz %s nelze vytvoøit.\n"
 "Není nìkde zastaralý zamykací soubor?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:525 mount/fstab.c:561
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "nelze otevøít %s (%s) - mtab nebyl aktualizován"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:569
 #, c-format
 msgid "error writing %s: %s"
 msgstr "chyba pøi zápisu %s: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:577
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "chyba pøi zmìnì módu %s: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:595
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s nelze pøejmenovat na %s: %s\n"
 
-#: mount/lomount.c:80
+#: mount/lomount.c:173
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: zaøízení %s nelze otevøít: %s\n"
 
-#: mount/lomount.c:86
+#: mount/lomount.c:179
 #, 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:91
-#, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\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:177
+#: 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:181
+#: mount/lomount.c:249
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -7538,7 +7558,7 @@
 "mount: ¾ádné loop zaøízení nelze nalézt.\n"
 "       Nemá /dev/loop# chybné vìt¹í èíslo zaøízení?"
 
-#: mount/lomount.c:185
+#: mount/lomount.c:253
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -7549,7 +7569,7 @@
 "       nezná loop zaøízení. Pokud je tomu tak, pak jej znovu pøelo¾te,\n"
 "       èi zkuste `insmod loop.o'."
 
-#: mount/lomount.c:191
+#: 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"
@@ -7561,241 +7581,289 @@
 "má\n"
 "       chybné vìt¹í èíslo?"
 
-#: mount/lomount.c:195
+#: 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:225
-#, c-format
-msgid "Unsupported encryption type %s\n"
-msgstr "Nepodporovaný ¹ifrovací typ %s\n"
+#: mount/lomount.c:359
+#, fuzzy, c-format
+msgid "Error: unable to open %s for reading\n"
+msgstr "%s pro ètení nelze otevøít"
 
-#: mount/lomount.c:239
+#: mount/lomount.c:444 mount/lomount.c:478
+#, fuzzy
+msgid "Retype password: "
+msgstr "Potvrïte nové heslo: "
+
+#: mount/lomount.c:456
+#, fuzzy
+msgid "Error: gpg key file decryption failed\n"
+msgstr "adresáø nelze otevøít\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:472
+#, 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"
+msgstr ""
+
+#: mount/lomount.c:611
+#, 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 "Nelze zamknout v pamìti. Konèím.\n"
 
-#: mount/lomount.c:258
+#: mount/lomount.c:654
 msgid "Init (up to 16 hex digits): "
 msgstr "Init (a¾ 16 ¹estnáctkových èíslic): "
 
-#: mount/lomount.c:265
+#: mount/lomount.c:661
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Ne¹estnáctková èíslice '%c'.\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:764
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr "Nevím jak získat klíè pro ¹ifrovací systém %d\n"
 
-#: mount/lomount.c:288
+#: 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:299
-#, c-format
-msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: zaøízení %s nelze smazat: %s\n"
-
-#: mount/lomount.c:309
-#, c-format
-msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s): úspìch\n"
-
-#: mount/lomount.c:317
-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:354
+#: mount/lomount.c:831
 #, 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"
+"  %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 ""
-"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:372 mount/sundries.c:30 mount/sundries.c:45
-#: mount/sundries.c:244
+#: 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:443
-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/lomount.c:945
+#, fuzzy
+msgid "Error: unable to open /etc/fstab for reading\n"
+msgstr "%s pro ètení nelze otevøít"
 
-#: mount/mntent.c:165
+#: 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/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: varování: %s není ukonèeno novou øádkou\n"
 
-#: mount/mntent.c:216
+#: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: øádek %d v %s je chybný%s\n"
 
-#: mount/mntent.c:219
+#: mount/mntent.c:222
 msgid "; rest of file ignored"
 msgstr "; ignoruji zbytek souboru"
 
-#: mount/mount.c:385
+#: mount/mount.c:396
 #, 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:389
+#: mount/mount.c:400
 #, 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:410
+#: mount/mount.c:421
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s nelze otevøít pro zápis: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:436 mount/mount.c:660
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: chyba pøi zápisu %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:443
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: chyba pøi zmìnì módu %s: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:494
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s vypadá jako odkládací prostor - nepøipojeno"
 
-#: mount/mount.c:538
+#: mount/mount.c:554
 msgid "mount failed"
 msgstr "pøipojení se nezdaøilo"
 
-#: mount/mount.c:540
+#: mount/mount.c:556
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: pouze superu¾ivatel mù¾e pøipojit %s na %s"
 
-#: mount/mount.c:568
+#: mount/mount.c:584
 msgid "mount: loop device specified twice"
 msgstr "mount: zaøízení loop bylo zadáno dvakrát"
 
-#: mount/mount.c:573
+#: mount/mount.c:589
 msgid "mount: type specified twice"
 msgstr "mount: typ byl zadán dvakrát"
 
-#: mount/mount.c:585
+#: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: pøeskakuji nastavení loop zaøízení\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: chystám se pou¾ít zaøízení loop %s\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:614
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: nepodaøilo se nastavit zaøízení loop\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:618
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: zaøízení loop bylo korektnì nastaveno\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:655
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s nelze otevøít: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:678
 #, fuzzy, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: %s nelze pro nastavení rychlosti otevøít"
 
-#: mount/mount.c:665
+#: mount/mount.c:681
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: rychlost nelze nastavit: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:735 mount/mount.c:1309
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: volání fork selhalo: %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:815
 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:845
+#: mount/mount.c:854
 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:856
+#: mount/mount.c:865
 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:859
+#: mount/mount.c:868
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: musíte zadat typ systému souborù"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:871
 msgid "mount: mount failed"
 msgstr "mount: pøipojení se nezdaøilo"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:877 mount/mount.c:912
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: pøípojný bod %s není adresáøem"
 
-#: mount/mount.c:870
+#: mount/mount.c:879
 msgid "mount: permission denied"
 msgstr "mount: pøístup odmítnut"
 
-#: mount/mount.c:872
+#: mount/mount.c:881
 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:876 mount/mount.c:880
+#: mount/mount.c:885 mount/mount.c:889
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s je ji¾ pøipojeno"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:891
 msgid "mount: proc already mounted"
 msgstr "mount: proc je ji¾ pøipojeno"
 
-#: mount/mount.c:884
+#: mount/mount.c:893
 #, 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:890
+#: mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: pøípojný bod %s neexistuje"
 
-#: mount/mount.c:892
+#: mount/mount.c:901
 #, 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:895
+#: mount/mount.c:904
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: speciální zaøízení %s neexistuje"
 
-#: mount/mount.c:905
+#: mount/mount.c:914
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7804,12 +7872,12 @@
 "mount: speciální zaøízení %s neexistuje\n"
 "              (název cesty nezaèíná adresáøem)\n"
 
-#: mount/mount.c:918
+#: mount/mount.c:927
 #, 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:920
+#: mount/mount.c:929
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7818,46 +7886,46 @@
 "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:954
+#: mount/mount.c:963
 msgid "mount table full"
 msgstr "tabulka pøipojení je plná"
 
-#: mount/mount.c:956
+#: mount/mount.c:965
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok nelze pøeèíst"
 
-#: mount/mount.c:960
+#: mount/mount.c:969
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: blokové zaøízení %s je neznámé"
 
-#: mount/mount.c:965
+#: mount/mount.c:974
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: typ ss %s není podporován jádrem"
 
-#: mount/mount.c:977
+#: mount/mount.c:986
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: pravdìpodobnì jste myslel %s"
 
-#: mount/mount.c:979
+#: mount/mount.c:988
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: mo¾ná jste myslel iso9660 ?"
 
-#: mount/mount.c:982
+#: mount/mount.c:991
 #, 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:988
+#: mount/mount.c:997
 #, 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:990
+#: mount/mount.c:999
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7865,97 +7933,97 @@
 msgstr ""
 "mount: jádro nerozpoznalo %s jako blokové zaøízení (mo¾ná `insmod ovladaè'?)"
 
-#: mount/mount.c:993
+#: mount/mount.c:1002
 #, 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:996
+#: mount/mount.c:1005
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s není blokovým zaøízením"
 
-#: mount/mount.c:999
+#: mount/mount.c:1008
 #, 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:1002
+#: mount/mount.c:1011
 msgid "block device "
 msgstr "blokové zaøízení"
 
-#: mount/mount.c:1004
+#: mount/mount.c:1013
 #, 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:1008
+#: mount/mount.c:1017
 #, 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:1024
+#: mount/mount.c:1033
 #, 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:1111
+#: mount/mount.c:1120
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s\n"
 msgstr ""
 
-#: mount/mount.c:1115
+#: mount/mount.c:1124
 #, fuzzy, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr "umount: %s není pøipojeno"
 
-#: mount/mount.c:1125
+#: 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:1126
+#: mount/mount.c:1135
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "label"
 msgstr "popis"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: 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:1136
+#: mount/mount.c:1145
 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:1141
+#: mount/mount.c:1150
 #, fuzzy
-msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
-msgstr "mount: nebyl zadán typ - budu pou¾ívat nfs kvùli dvojteèce\n"
+msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
+msgstr "mount: nebyl zadán typ - budu pou¾ívat smbfs kvùli dvojteèce\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1166
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: pracuji na pozadí \"%s\"\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1177
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: konèím \"%s\"\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1254
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s je ji¾ pøipojeno na %s\n"
 
-#: mount/mount.c:1376
+#: mount/mount.c:1386
 #, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -7977,7 +8045,7 @@
 "       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 fd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Pou¾ití: mount -V               : vypí¹e informace o verzi\n"
@@ -8004,75 +8072,75 @@
 "Dal¹í pøepínaèe: [-nfFrsvw] [-o volby].\n"
 "Dal¹í informace viz man(8).\n"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1563
 msgid "mount: only root can do that"
 msgstr "mount: toto mù¾e provést pouze superu¾ivatel"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1568
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nebylo nalezeno - vytváøím jej..\n"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1582
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
 msgstr ""
 
-#: mount/mount.c:1575
+#: mount/mount.c:1589
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: pøipojuji %s\n"
 
-#: mount/mount.c:1584
+#: mount/mount.c:1598
 msgid "nothing was mounted"
 msgstr "nebyl pøipojen ¾ádný diskový oddíl"
 
-#: mount/mount.c:1599
+#: mount/mount.c:1613
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s nelze v %s nalézt"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1628
 #, 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:259
+#: mount/mount_by_label.c:189
 #, 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:378
+#: mount/mount_by_label.c:309
 msgid "mount: bad UUID"
 msgstr "mount: chybné UUID"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:483
 #, fuzzy
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: musíte zadat typ systému souborù"
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:492
 #, 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:496
+#: mount/mount_guess_fstype.c:495
 #, 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:499
+#: mount/mount_guess_fstype.c:498
 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:501
+#: mount/mount_guess_fstype.c:500
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Vyzkou¹ím typ %s\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:588
 #, c-format
 msgid "Trying %s\n"
 msgstr "Pou¾ívám %s.\n"
@@ -8166,7 +8234,7 @@
 msgid "bug in xstrndup call"
 msgstr "chyba ve volání xstrndup"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:74
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8179,7 +8247,7 @@
 "         %s [-v] [-p priorita] zvlá¹tní soubor ...\n"
 "         %s [-s]\n"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:84
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8191,33 +8259,101 @@
 "         %s [-v] [-p priorita] zvlá¹tní soubor ...\n"
 "         %s [-s]\n"
 
-#: mount/swapon.c:178 mount/swapon.c:242
+#: 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
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:182
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: volání stat pro %s selhalo: %s\n"
 
-#: mount/swapon.c:193
+#: mount/swapon.c:216
 #, 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:205
+#: mount/swapon.c:228
 #, 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:248
+#: mount/swapon.c:271
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:312 mount/swapon.c:401
+#: 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
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s nelze otevøít: %s\n"
@@ -8347,17 +8483,17 @@
 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:564
+#: mount/umount.c:566
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: pøipojení %s neodpovídá fstab"
 
-#: mount/umount.c:598
+#: mount/umount.c:602
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "unmount: pouze u¾ivatel root mù¾e odpojit %s ze %s"
 
-#: mount/umount.c:669
+#: mount/umount.c:671
 msgid "umount: only root can do that"
 msgstr "umount: toto mù¾e provést pouze u¾ivatel root"
 
@@ -8498,7 +8634,7 @@
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f pøer/sek; %f pøíj (znak/sek)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Pou¾ití: %s [-c] [-n úroveò] [-s velikost bufferu]\n"
@@ -9196,12 +9332,13 @@
 msgid "missing comma"
 msgstr "chybí èárka"
 
-#: sys-utils/readprofile.c:60
+#: sys-utils/readprofile.c:115
 #, fuzzy, 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"
@@ -9221,37 +9358,32 @@
 "\t -r            vynuluje ve¹keré èítaèe (pouze root)\n"
 "\t -V            vypí¹e informace o verzi a skonèí\n"
 
-#: sys-utils/readprofile.c:84
-#, fuzzy
-msgid "out of memory"
-msgstr "nedostatek pamìti?\n"
-
-#: sys-utils/readprofile.c:147
-#, c-format
-msgid "%s Version %s\n"
+#: sys-utils/readprofile.c:188
+#, fuzzy, c-format
+msgid "%s version %s\n"
 msgstr "%s Verze %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Profilovací_krok: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): chybný map øádek\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:308
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: \"_stext\" nelze v %s nalézt\n"
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:334
 #, 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:323
+#: sys-utils/readprofile.c:375
 msgid "total"
 msgstr "celkem"
 
@@ -9463,17 +9595,17 @@
 msgid "...back 1 page"
 msgstr "...pøeskakuji zpìt o poèet stran: %d"
 
-#: text-utils/more.c:1313
+#: text-utils/more.c:1314
 #, fuzzy
 msgid "...skipping one line"
 msgstr "...pøeskakuji o poèet øádkù: %d"
 
-#: text-utils/more.c:1315
+#: text-utils/more.c:1316
 #, fuzzy, c-format
 msgid "...skipping %d lines"
 msgstr "...pøeskakuji o poèet øádkù: %d"
 
-#: text-utils/more.c:1352
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
@@ -9482,7 +9614,7 @@
 "\n"
 "***Zpìt***\n"
 
-#: text-utils/more.c:1390
+#: text-utils/more.c:1391
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9495,27 +9627,28 @@
 "jsou v hranatých závorkách. Hvìzdièka (*) znamená, ¾e hodnota argumentu se\n"
 "stane implicitní.\n"
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1398
+#, fuzzy
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
 "<mezerník>\t\tZobrazí dal¹ích k øádkù textu. [aktuální velikost\n"
 "\t\t\tobrazovky]\n"
@@ -9540,33 +9673,33 @@
 ":f\t\t\tVypí¹e jméno aktuálního souboru a èíslo aktuálního øádku\n"
 ".\t\t\tZopakuje pøedcházející pøíkaz\n"
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
 msgstr "[Stisknìte 'h' pro nápovìdu.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" øádek %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Nejedná se o soubor] øádek %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
 msgstr "  Pøeteèení\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1642
 msgid "...skipping\n"
 msgstr "...vynechávám\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
 msgstr "Chyba v regulárním výrazu"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9574,15 +9707,15 @@
 "\n"
 "Vzorek nebyl nalezen\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr "Vzorek nebyl nalezen"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1748
 msgid "can't fork\n"
 msgstr "volání fork selhalo\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
@@ -9590,21 +9723,21 @@
 "\n"
 "...Vynechávám "
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1792
 #, fuzzy
 msgid "...Skipping to file "
 msgstr "...Pøecházím "
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1794
 #, fuzzy
 msgid "...Skipping back to file "
 msgstr "zpìt na soubor "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2074
 msgid "Line too long"
 msgstr "Øádek je pøíli¹ dlouhý"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
 msgstr "Neexistuje ¾ádný pøíkaz, jen¾ by bylo mo¾no nahradit"
 
@@ -9654,43 +9787,43 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: chybný znak v konverzi %%%s.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "pøepínaè `%s' vy¾aduje argument\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "Chybná klávesa"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...vynechávám\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...vynechávám\n"
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 #, fuzzy
 msgid "No next file"
 msgstr "(Dal¹í soubor: %s)"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 #, fuzzy
 msgid "No previous file"
 msgstr "Nejsou definovány ¾ádné diskové oddíly\n"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: chyba zápisu na %s\n"
@@ -9698,54 +9831,54 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: chyba zápisu na %s\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: doèasný soubor nelze èíst.\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 #, fuzzy
 msgid "RE error: "
 msgstr ", chyba"
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 #, fuzzy
 msgid "Cannot open "
 msgstr "%s nelze otevøít.\n"
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 #, fuzzy
 msgid "saved"
 msgstr "odeslání"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "Heslo *NEBYLO* zmìnìno. Zkuste to pozdìji.\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 #, fuzzy
 msgid "(Next file: "
 msgstr "(Dal¹í soubor: %s)"
@@ -9784,6 +9917,31 @@
 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 "del_loop(%s): success\n"
+#~ msgstr "del_loop(%s): úspìch\n"
+
+#~ msgid "This mount was compiled without loop support. Please recompile.\n"
+#~ msgstr ""
+#~ "Tento program byl pøelo¾en bez podpory pro loop. Pøelo¾te jej znovu.\n"
+
+#~ 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 ""
+#~ "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"
+
+#~ 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"
+
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Diskový oddíl %i nekonèí na hranici cylindru:\n"
 
diff --git a/po/da.po b/po/da.po
index 703000d..83b14fe 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,25 +1,26 @@
+# translation of 4639.0.util-linux-2.11z.da.po to Danish
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # Danske beskeder for util-linux.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Claus Hindsgaul <claus_h@image.dk>, 2001-2002.
-# Claus Sørensen <cs@klid.dk>, 2000.
-# Keld Jørn Simonsen <keld@dkuug.dk>, 2000.
 #
 # 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.
+# Claus Hindsgaul <claus_h@image.dk>, 2001-2003.
+# Claus Sørensen <cs@klid.dk>, 2000.
+# Keld Jørn Simonsen <keld@dkuug.dk>, 2000.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11x\n"
-"POT-Creation-Date: 2002-11-25 00:47+0100\n"
-"PO-Revision-Date: 2002-11-07 09:14GMT\n"
+"Project-Id-Version: 4639.0.util-linux-2.11z.da\n"
+"POT-Creation-Date: 2003-02-05 06:31-0500\n"
+"PO-Revision-Date: 2003-07-10 10:47GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.6\n"
+"X-Generator: KBabel 1.0.1\n"
 
 #: disk-utils/blockdev.c:60
 msgid "set read-only"
@@ -153,7 +154,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -286,9 +287,7 @@
 #: disk-utils/fsck.cramfs.c:608
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
-msgstr ""
-"%s: ugyldigt cramfs--katalogdata-afslutning (%ld) != fildatabegyndelse (%"
-"ld)\n"
+msgstr "%s: ugyldigt cramfs--katalogdata-afslutning (%ld) != fildatabegyndelse (%ld)\n"
 
 #: disk-utils/fsck.cramfs.c:616
 #, c-format
@@ -834,8 +833,8 @@
 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-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Hukommelse opbrugt!\n"
@@ -845,7 +844,7 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs version %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
+#: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
 "usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
@@ -876,7 +875,7 @@
 " katalognavn roden af det filsystem, der skal komprimeres\n"
 " udfil      uddatafil\n"
 
-#: disk-utils/mkfs.cramfs.c:328
+#: disk-utils/mkfs.cramfs.c:335
 #, c-format
 msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
@@ -885,70 +884,61 @@
 "Fandt meget langt (%u byte) filnavn '%s'.\n"
 " Forøg MAX_INPUT_NAMELEN i mkcramfs.c og genoversæt.  Afslutter.\n"
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr "for stort filsystem.  Afslutter.\n"
 
-#: disk-utils/mkfs.cramfs.c:507
-msgid ""
-"Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
-"Exiting.\n"
-msgstr ""
-"Overskrider MAXENTRIES.  Forøg denne værdi i mkcramfs.c og genoversæt  "
-"Afslutter.\n"
+#: disk-utils/mkfs.cramfs.c:514
+msgid "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  Exiting.\n"
+msgstr "Overskrider MAXENTRIES.  Forøg denne værdi i mkcramfs.c og genoversæt  Afslutter.\n"
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr "AAARGH: blok blev \"komprimeret\" til > 2*bloklængden (%ld)\n"
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr "%6.2f%% (%+d byte)\t%s\n"
 
-#: disk-utils/mkfs.cramfs.c:812
+#: 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 ""
-"advarsel: et gæt på den nødvendige størrelse (øvre grænse) er %LdMB, men det "
-"maksimale aftryksstørrelse er %uMB.  Vi bliver muligvis ikke færdige.\n"
+msgid "warning: guestimate of required size (upper bound) is %LdMB, but maximum image size is %uMB.  We might die prematurely.\n"
+msgstr "advarsel: et gæt på den nødvendige størrelse (øvre grænse) er %LdMB, men det maksimale aftryksstørrelse er %uMB.  Vi bliver muligvis ikke færdige.\n"
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
 msgstr "Medtager: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr "Katalogdata: %d byte\n"
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr "I alt: %d kilobyte\n"
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, c-format
 msgid "Super block: %d bytes\n"
 msgstr "Superblok: %d byte\n"
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr "CRC: %x\n"
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
-msgstr ""
-"der er frigjort for lidt plads til ROM-aftrykket (%Ld frigjort, %d brugt)\n"
+msgstr "der er frigjort for lidt plads til ROM-aftrykket (%Ld frigjort, %d brugt)\n"
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr "skrivning af ROM-aftryk mislykkedes (%d %d)\n"
@@ -957,41 +947,36 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "advarsel: filnavne afkortet til 255 byte.\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr "advarsel: filer oversprunget p.g.a. fejl.\n"
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr "advarsel: filstørrelser afkortet til %luMB (minus 1 byte).\n"
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
-msgid ""
-"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr ""
-"advarsel: uids forkortet til %u bit.  (Dette kan give sikkerhedsproblemer.)\n"
+msgid "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "advarsel: uids forkortet til %u bit.  (Dette kan give sikkerhedsproblemer.)\n"
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
-msgid ""
-"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr ""
-"advarsel: gids forkortet til %u bit.  (Dette kan give sikkerhedsproblemer.)\n"
+msgid "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "advarsel: gids forkortet til %u bit.  (Dette kan give sikkerhedsproblemer.)\n"
 
-#: disk-utils/mkfs.cramfs.c:926
+#: 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 ""
-"ADVARSEL: enhedsnumre er afkortet til %u bit.  Det betyder næsten med "
-"sikkerhed\n"
+"ADVARSEL: enhedsnumre er afkortet til %u bit.  Det betyder næsten med sikkerhed\n"
 "at nogle af enhedsfilerne vil være fejlbehæftede.\n"
 
 #: disk-utils/mkfs.minix.c:175
@@ -1120,8 +1105,7 @@
 #: disk-utils/mkswap.c:187
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
-msgstr ""
-"Benytter bruger-bestemt sidestørrelse %d i stedet for systemværdierne %d/%d\n"
+msgstr "Benytter bruger-bestemt sidestørrelse %d i stedet for systemværdierne %d/%d\n"
 
 #: disk-utils/mkswap.c:191
 #, c-format
@@ -1137,8 +1121,8 @@
 msgid "too many bad pages"
 msgstr "for mange ugyldige sider"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1145
+#: text-utils/more.c:2064 text-utils/more.c:2075
 msgid "Out of memory"
 msgstr "Hukommelse opbrugt"
 
@@ -1241,8 +1225,7 @@
 
 #: disk-utils/setfdprm.c:102
 #, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+msgid "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
 msgstr "   %s [ -p ] enh str sekt hoveder spor stræk gab rate spec1 fmt_gab\n"
 
 #: disk-utils/setfdprm.c:105
@@ -1255,11 +1238,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] enh\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Ubrugelig"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Frit område"
 
@@ -1302,8 +1285,7 @@
 
 #: fdisk/cfdisk.c:429
 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"
+msgstr "Genstart systemet for at sikre, at partitionstabellen er opdateret korrekt.\n"
 
 #: fdisk/cfdisk.c:432
 msgid ""
@@ -1374,16 +1356,12 @@
 msgstr "forstørret logisk partitions-overlap"
 
 #: fdisk/cfdisk.c:969
-msgid ""
-"!!!! Internal error creating logical drive with no extended partition !!!!"
-msgstr ""
-"!!!! Intern fejl under oprettelse af logisk drev uden udvidet partition !!!!"
+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
-msgid ""
-"Cannot create logical drive here -- would create two extended partitions"
-msgstr ""
-"Kan ikke oprette logisk drev her -- ville resultere i to udvidede partitioner"
+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
 msgid "Menu item too long. Menu may look odd."
@@ -1393,693 +1371,677 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu uden retning. Vælger standarden horisontal."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Ugyldig tast"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Tryk en tast for at fortsætte"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2497
 msgid "Primary"
 msgstr "Primær"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Opret en ny primær partition"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2497
 msgid "Logical"
 msgstr "Logisk"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Opret en ny logisk partition"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Opret ikke partition"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Intern fejl !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Størrelse (i MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Begyndelse"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Tilføj partition i starten af det frie område"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Slut"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Tilføj partition i slutningen af det frie område"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "Ikke plads til at oprette udvidet partition"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1512
 msgid "No partition table or unknown signature on partition table"
 msgstr "Ingen partitionstabel eller ugyldig signatur på partitionstabellen"
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1514
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Vil du starte med nulstillet tabel [j/N] ?"
 
-#: fdisk/cfdisk.c:1576
+#: fdisk/cfdisk.c:1566
 msgid "You specified more cylinders than fit on disk"
 msgstr "Du angav flere cylindre end der kan være på disken"
 
-#: fdisk/cfdisk.c:1606
+#: fdisk/cfdisk.c:1596
 msgid "Cannot open disk drive"
 msgstr "Kan ikke åbne drev"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1598 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:1629
+#: fdisk/cfdisk.c:1619
 msgid "Cannot get disk size"
 msgstr "Kan ikke få diskstørrelsen"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
 msgstr "Ugyldig primærpartition"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
 msgstr "Ugyldig logisk partition"
 
-#: fdisk/cfdisk.c:1799
+#: 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:1803
+#: 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): "
+msgstr "Er du sikke på, at du vil skrive partitionstabellen til disken? (ja eller nej): "
 
-#: fdisk/cfdisk.c:1809
+#: fdisk/cfdisk.c:1799
 msgid "no"
 msgstr "nej"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
 msgstr "Skrev ikke partitionstabellen til disken"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Skriv venligst 'ja' eller 'nej'"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Skriver partitionstabel til disken..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Skrev partitionstabel til disken"
 
+#: 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:1846
-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:1856
 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."
+msgstr "Ingen primærpartitioner er markeret opstartbar. DOS MBR vil ikke kunne starte op."
 
-#: fdisk/cfdisk.c:1858
-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: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:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: 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:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: 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:1936
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Drev: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Ingen  "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "   Primær"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Logisk "
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
 #: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2005
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Opstart (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2007 fdisk/cfdisk.c:2503
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Ukendt (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2009
 #, c-format
 msgid "None (%02X)"
 msgstr "Ingen (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabel for %s\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2046
 msgid "            First    Last\n"
 msgstr "            Første   Sidste\n"
 
-#: fdisk/cfdisk.c:2057
-msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
-msgstr ""
-" # Type     Sektor   Sektor   Forskyd Længde   Filsystem type (ID)    Flag\n"
+#: fdisk/cfdisk.c:2047
+msgid " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+msgstr " # Type     Sektor   Sektor   Forskyd Længde   Filsystem type (ID)    Flag\n"
 
-#: fdisk/cfdisk.c:2058
-msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
-msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+#: fdisk/cfdisk.c:2048
+msgid "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
+msgstr "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2131
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         --- Start-----      -----Slut-----    Start antal af\n"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2132
 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:2143
+#: fdisk/cfdisk.c:2133
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Rå"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Vis tabellen i råtdata format"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2269
 msgid "Sectors"
 msgstr "Sektorer"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Vis tabellen ordnet efter sektorer"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Vis kun partitionstabellen"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Vis ikke tabellen"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Hjælpeskærm for cfdisk"
 
-#: fdisk/cfdisk.c:2209
+#: 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:2210
+#: 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:2211
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "harddisk."
 
-#: fdisk/cfdisk.c:2213
+#: 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:2215
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Kommando     Betydning"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Skift opstartbar-flaget for partitionen ('bootable')"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
 msgstr "  d          Slet partitionen"
 
-#: fdisk/cfdisk.c:2219
+#: 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:2220
+#: 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:2221
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
 msgstr "             er klar over, hvad de gør."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
 msgstr "  h          Vis denne skærm"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimér partitionens diskforbrug"
 
-#: fdisk/cfdisk.c:2224
+#: 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:2225
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
 msgstr "  n          Opret ny partition i frit område"
 
-#: fdisk/cfdisk.c:2227
+#: 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:2228
+#: fdisk/cfdisk.c:2218
 msgid "             There are several different formats for the partition"
 msgstr "             Der er flere forskellige formater på partitionen,"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2219
 msgid "             that you can choose from:"
 msgstr "             som du kan vælge mellem:"
 
-#: fdisk/cfdisk.c:2230
+#: 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:2231
+#: fdisk/cfdisk.c:2221
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabel ordnet efter sektorer"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2222
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel i rådata format"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2223
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Afslut program uden at skrive partitionstabellen"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2224
 msgid "  t          Change the filesystem type"
 msgstr "  t          Skift filsystem type"
 
-#: fdisk/cfdisk.c:2235
+#: 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:2236
+#: fdisk/cfdisk.c:2226
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Skifter mellem MB, sektorer og cylindre"
 
-#: fdisk/cfdisk.c:2237
+#: 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:2238
+#: 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:2239
+#: 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:2240
+#: fdisk/cfdisk.c:2230
 msgid "             `no'"
 msgstr "             eller 'nej'"
 
-#: fdisk/cfdisk.c:2241
+#: 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:2242
+#: 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:2243
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Gentegner skærmen"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
 msgstr "  ?          Vis denne skærm"
 
-#: fdisk/cfdisk.c:2246
+#: 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:2247
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
 msgstr "bogstaver (undtagen W)."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2597 fdisk/fdisksunlabel.c:322
 #: fdisk/fdisksunlabel.c:324
 msgid "Cylinders"
 msgstr "Cylindre"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2267
 msgid "Change cylinder geometry"
 msgstr "Skift cylindergeometri"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:319
 msgid "Heads"
 msgstr "Hoveder"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2268
 msgid "Change head geometry"
 msgstr "Skift hovedgeometri"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2269
 msgid "Change sector geometry"
 msgstr "Skift sektorgeometri"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2270
 msgid "Done"
 msgstr "Færdig"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2270
 msgid "Done with changing geometry"
 msgstr "Færdig med geometriændring"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2283
 msgid "Enter the number of cylinders: "
 msgstr "Angiv antallet af cylindre: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2865
 msgid "Illegal cylinders value"
 msgstr "Ugyldigt cylinderantal"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
 msgstr "Angiv antallet af hoveder: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2875
 msgid "Illegal heads value"
 msgstr "Ugyldig hovedantal"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
 msgstr "Angiv antallet af sektorer per spor: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2882
 msgid "Illegal sectors value"
 msgstr "Ugyldig sektorantal"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
 msgstr "Angiv filsystemtype: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
 msgstr "Kan ikke ændre filsystemtype til tom"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
 msgstr "Kan ikke ændre filsystemtype til udvidet"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2472 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Opstart"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2474
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ukt(%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2477 fdisk/cfdisk.c:2480
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2485 fdisk/cfdisk.c:2488
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2496
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Drev: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2578
 #, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "Størrelse: %lld byte, %ld Mb"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2581
 #, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "Størrelse: %lld byte, %ld.%ld Gb"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2585
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Hoveder: %d   Sektorer per spor: %d   Cylindre: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2589
 msgid "Name"
 msgstr "Navn"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2590
 msgid "Flags"
 msgstr "Flag"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2591
 msgid "Part Type"
 msgstr "Part-type"
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2592
 msgid "FS Type"
 msgstr "Fs-type"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2593
 msgid "[Label]"
 msgstr "[Mærkat]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2595
 msgid "  Sectors"
 msgstr "  Sektorer"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2599
 msgid "Size (MB)"
 msgstr "Størrelse (MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2601
 msgid "Size (GB)"
 msgstr "Størrelse (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2656
 msgid "Bootable"
 msgstr "Opstartbar"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2656
 msgid "Toggle bootable flag of the current partition"
 msgstr "Skift opstartbar-flaget for partitionen ('bootable')"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2657
 msgid "Delete"
 msgstr "Slet"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2657
 msgid "Delete the current partition"
 msgstr "Slet partitionen"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2658
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2658
 msgid "Change disk geometry (experts only)"
 msgstr "Skift diskgeometri (kun for eksperter)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2659
 msgid "Help"
 msgstr "Hjælp"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2659
 msgid "Print help screen"
 msgstr "Vis hjælpeskærm"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2660
 msgid "Maximize"
 msgstr "Maksimér"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2660
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimér diskforbruget for partitionen (kun for eksperter)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2661
 msgid "New"
 msgstr "Ny"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2661
 msgid "Create new partition from free space"
 msgstr "Opret ny partition i frit område"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2662
 msgid "Print"
 msgstr "Udlæs"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2662
 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:2673
+#: fdisk/cfdisk.c:2663
 msgid "Quit"
 msgstr "Afslut"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2663
 msgid "Quit program without writing partition table"
 msgstr "Afslut program uden at ændre partitionstabellen"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2664
 msgid "Type"
 msgstr "Type"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2664
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Skift filsystemtype (DOS, Linux, OS/2 osv.)"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2665
 msgid "Units"
 msgstr "Enheder"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2665
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Skift enheder for visning af partitionstabellen (MB, sekt, cyl)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2666
 msgid "Write"
 msgstr "Skriv"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2666
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Skriv partitionstabellen til disk (dette kan ødelægge data)"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2712
 msgid "Cannot make this partition bootable"
 msgstr "Kan ikke gøre denne partition opstartbar"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2722
 msgid "Cannot delete an empty partition"
 msgstr "Kan ikke slette en tom partition"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2742 fdisk/cfdisk.c:2744
 msgid "Cannot maximize this partition"
 msgstr "Kan ikke maksimere denne partition"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2752
 msgid "This partition is unusable"
 msgstr "Denne partition er ubrugelig"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2754
 msgid "This partition is already in use"
 msgstr "Denne partition er allerede i brug"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2771
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan ikke ændre en tom partitions type"
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2798 fdisk/cfdisk.c:2804
 msgid "No more partitions"
 msgstr "Ikke flere partitioner"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2811
 msgid "Illegal command"
 msgstr "Ugyldig kommando"
 
-#: fdisk/cfdisk.c:2831
-#, fuzzy
+#: fdisk/cfdisk.c:2821
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-2000 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:2838
+#: fdisk/cfdisk.c:2828
 #, c-format
 msgid ""
 "\n"
@@ -2446,12 +2408,8 @@
 "BSD. Brug 'b'-kommandoen for at gå i BSD-tilstand.\n"
 
 #: fdisk/fdisk.c:927
-msgid ""
-"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
-"disklabel\n"
-msgstr ""
-"Enheden indeholder hverken en gyldig DOS-partitionstabel eller et Sun-, SGI- "
-"eller OSF-diskmærkat.\n"
+msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
+msgstr "Enheden indeholder hverken en gyldig DOS-partitionstabel eller et Sun-, SGI- eller OSF-diskmærkat.\n"
 
 #: fdisk/fdisk.c:944
 msgid "Internal error\n"
@@ -2464,12 +2422,8 @@
 
 #: fdisk/fdisk.c:969
 #, c-format
-msgid ""
-"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
-"(rite)\n"
-msgstr ""
-"Advarsel: ugyldigt flag 0x%04x for partitionstabel %d vil blive rettet med "
-"'w' (skriv)\n"
+msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n"
+msgstr "Advarsel: ugyldigt flag 0x%04x for partitionstabel %d vil blive rettet med 'w' (skriv)\n"
 
 #: fdisk/fdisk.c:991
 msgid ""
@@ -2626,9 +2580,9 @@
 msgstr "burde være (%d, %d, 1)\n"
 
 #: fdisk/fdisk.c:1469
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr "Partition %d slutter ikke på en cylindergrænse.\n"
+msgstr "Partition %i slutter ikke på en cylindergrænse.\n"
 
 #: fdisk/fdisk.c:1473
 #, c-format
@@ -2770,8 +2724,7 @@
 #: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
 #, 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"
+msgstr "Partition %d er allerede defineret. Slet den før du tilføjer den igen.\n"
 
 #: fdisk/fdisk.c:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
 #: fdisk/fdisksunlabel.c:522
@@ -2932,12 +2885,8 @@
 msgstr "Denne kerne finder selv sektorstørrelser - tilvalget -b ignoreres\n"
 
 #: fdisk/fdisk.c:2470
-msgid ""
-"Warning: the -b (set sector size) option should be used with one specified "
-"device\n"
-msgstr ""
-"Advarsel: tilvalget -b (angiv sektorstørrelse) kræver angivelse af disk-"
-"enhed\n"
+msgid "Warning: the -b (set sector size) option should be used with one specified device\n"
+msgstr "Advarsel: tilvalget -b (angiv sektorstørrelse) kræver angivelse af disk-enhed\n"
 
 #. OSF label, and no DOS label
 #: fdisk/fdisk.c:2529
@@ -3353,11 +3302,8 @@
 msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:158
-msgid ""
-"According to MIPS Computer Systems, Inc the Label must not contain more than "
-"512 bytes\n"
-msgstr ""
-"Ifølge MIPS Computer Systems. Inc, må mærkatet ikke fylde mere end 512 byte\n"
+msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
+msgstr "Ifølge MIPS Computer Systems. Inc, må mærkatet ikke fylde mere end 512 byte\n"
 
 #: fdisk/fdisksgilabel.c:177
 msgid "Detected sgi disklabel with wrong checksum.\n"
@@ -4346,27 +4292,18 @@
 
 #: fdisk/sfdisk.c:538
 #, 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"
+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
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
-"lu)\n"
-msgstr ""
-"%s for partition %s har umulig sektor-værdi: %lu (burde være mellem 1-%lu)\n"
+msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
+msgstr "%s for partition %s har umulig sektor-værdi: %lu (burde være mellem 1-%lu)\n"
 
 #: fdisk/sfdisk.c:548
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
-"lu)\n"
-msgstr ""
-"%s for partition %s har umulig cylinder-værdi: %lu (burde være mellem 0-%"
-"lu)\n"
+msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
+msgstr "%s for partition %s har umulig cylinder-værdi: %lu (burde være mellem 0-%lu)\n"
 
 #: fdisk/sfdisk.c:588
 msgid ""
@@ -4454,15 +4391,15 @@
 #: 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 ""
-"Enheder = megabyte á 1048576 byte, blokke á 1024 byte, tæller fra %d\n"
+"Enheder = mebibyte á 1048576 byte, blokke á 1024 byte, tæller fra %d\n"
 "\n"
 
 #: fdisk/sfdisk.c:887
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
-msgstr "   Enhed  Opst Start   End     Mb    #blokke   Id  System\n"
+msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
+msgstr "   Enhed  Opst Start   End     MiB   #blokke   Id  System\n"
 
 #: fdisk/sfdisk.c:1047
 #, c-format
@@ -4544,8 +4481,7 @@
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
-"Advarsel: partitionen %s indeholder en del af partitionstabellen (sektor %"
-"lu),\n"
+"Advarsel: partitionen %s indeholder en del af partitionstabellen (sektor %lu),\n"
 "og vil ødelægge denne, når der skrives til partitionen.\n"
 
 #: fdisk/sfdisk.c:1184
@@ -4582,8 +4518,7 @@
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 "Advarsel: adskillige primærpartitioner er markeret opstartbare (aktive)\n"
-"Dette generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne "
-"disk.\n"
+"Dette generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne disk.\n"
 
 #: fdisk/sfdisk.c:1252
 msgid ""
@@ -4601,18 +4536,23 @@
 "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
+msgid "start"
+msgstr "start"
+
 #: fdisk/sfdisk.c:1275
 #, 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"
+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
+msgid "end"
+msgstr "slut"
 
 #: fdisk/sfdisk.c:1284
 #, 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"
+msgstr "partition %s: end: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1287
 #, c-format
@@ -4730,9 +4670,7 @@
 #: fdisk/sfdisk.c:2044
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr ""
-"Advarsel: den angiven størrelse(%lu) overstiger den maksimalt tilladte (%"
-"lu)\n"
+msgstr "Advarsel: den angiven størrelse(%lu) overstiger den maksimalt tilladte (%lu)\n"
 
 #: fdisk/sfdisk.c:2050
 msgid "Warning: empty partition\n"
@@ -4804,22 +4742,15 @@
 
 #: fdisk/sfdisk.c:2237
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
-msgstr ""
-"    -d [eller --dump]:      det samme, men i et format, der vil passe til "
-"senere inddata"
+msgstr "    -d [eller --dump]:      det samme, men i et format, der vil passe til senere inddata"
 
 #: fdisk/sfdisk.c:2238
 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"
+msgstr "    -i [eller --increment]: antal cylindre osv. fra 1 i stedet for fra 0"
 
 #: fdisk/sfdisk.c:2239
-msgid ""
-"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
-"MB"
-msgstr ""
-"    -uS, -uB, -uC, -uM:     indlæs/vis i enhederne sektorer/blokke/cylindre/"
-"MB"
+msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
+msgstr "    -uS, -uB, -uC, -uM:     indlæs/vis i enhederne sektorer/blokke/cylindre/MB"
 
 #: fdisk/sfdisk.c:2240
 msgid "    -T [or --list-types]:list the known partition types"
@@ -4842,8 +4773,7 @@
 msgstr "    -n :                    undlad at skrive ændringerne til disken"
 
 #: fdisk/sfdisk.c:2245
-msgid ""
-"    -O file :            save the sectors that will be overwritten to file"
+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:2246
@@ -4875,8 +4805,7 @@
 "                                eller forvent beskrivelser af dem i inddata"
 
 #: fdisk/sfdisk.c:2253
-msgid ""
-"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+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:2254
@@ -5034,8 +4963,7 @@
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
-"Denne disk er for øjeblikket i brug - genpartitionering er nok i dårlig "
-"idé.\n"
+"Denne disk er for øjeblikket i brug - genpartitionering er nok i dårlig idé.\n"
 "Afmonter alle filsystemer og 'swapoff' alle swappartitioner på denne disk.\n"
 "Brug flaget --no-reread for at undertrykke dette tjek.\n"
 
@@ -5114,91 +5042,87 @@
 "dd(1) til at nulstille de første 512 byte:\n"
 "'dd if=/dev/zero of=/dev/xxx7 bs=512 count=1'  (se fdisk(8))\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Brug 'getopt --help' for flere detaljer.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "tomt 'long'­tilvalg efter -l eller --long"
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "ukendt skal efter -s eller --shell"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Brug: getopt tilvalgsstreng parametre\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [tilvalg] [--] tilvalgsstreng parametre\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [tilvalg] -o|--options tilvalgsstreng [tilvalg] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "              parametre\n"
 
-#: getopt-1.1.2/getopt.c:328
-msgid ""
-"  -a, --alternative            Allow long options starting with single -\n"
+#: getopt/getopt.c:328
+msgid "  -a, --alternative            Allow long options starting with single -\n"
 msgstr "  -a, --alternative            Tillad lange tilvalg med enkelt -\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Denne lille brugsmanual\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=langtilvalg  Lange tilvalg, der skal genkendes\n"
 
-#: getopt-1.1.2/getopt.c:331
-msgid ""
-"  -n, --name=progname          The name under which errors are reported\n"
-msgstr ""
-"  -n, --name=prognavn          Navnet som fejl skal rapporteres under\n"
+#: getopt/getopt.c:331
+msgid "  -n, --name=progname          The name under which errors are reported\n"
+msgstr "  -n, --name=prognavn          Navnet som fejl skal rapporteres under\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=tilvalgsstreng Korte tilvalg, der skal genkendes\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-msgstr ""
-"  -q, --quiet                  Undertryk fejlrapportering fra getopt(3)\n"
+msgstr "  -q, --quiet                  Undertryk fejlrapportering fra getopt(3)\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Ingen normale uddata\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=skal             Angiv konventioner for anførselstegn\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Tjek getopt(1) version\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -u, --unqote                 Indskyd ikke anførselstegn i uddata\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Vis versionsinformation\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr "mangler tilvalgstreng-parameter"
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
-msgstr "getopt (udvidet) 1.1.2\n"
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (udvidet) 1.1.3\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "intern fejl, kontakt programmøren."
 
@@ -5325,12 +5249,8 @@
 "Udskyder yderligere for at nå til næste hele sekund.\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 ""
-"Maskinurets registre indeholder værdier, der enten er ugyldige (f.eks. 50. "
-"dag i måneden) eller udenfor det område, vi kan håndtere (f.eks. år 2095).\n"
+msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr "Maskinurets registre indeholder værdier, der enten er ugyldige (f.eks. 50. dag i måneden) eller udenfor det område, vi kan håndtere (f.eks. år 2095).\n"
 
 #: hwclock/hwclock.c:555
 #, c-format
@@ -5360,8 +5280,7 @@
 
 #: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr ""
-"Kunne ikke køre 'date'-programmet i /bin/sh skallen. popen() mislykkedes"
+msgstr "Kunne ikke køre 'date'-programmet i /bin/sh skallen. popen() mislykkedes"
 
 #: hwclock/hwclock.c:622
 #, c-format
@@ -5386,15 +5305,13 @@
 #: 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'-kommandoen sendt af %s returnerede noget andet end et heltal, hvor "
-"den konverterede tid forventedes.\n"
+"'date'-kommandoen sendt af %s returnerede noget andet end et heltal, hvor den konverterede tid forventedes.\n"
 "Kommandoen var:\n"
 "  %s\n"
 "Svaret var:\n"
@@ -5406,12 +5323,8 @@
 msgstr "Datoteksten %s svarer til %ld sekunder siden 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 ""
-"Maskinuret indeholder ikke en gyldig tid, så vi kan ikke sætte systemuret "
-"med det.\n"
+msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
+msgstr "Maskinuret indeholder ikke en gyldig tid, så vi kan ikke sætte systemuret med det.\n"
 
 #: hwclock/hwclock.c:701
 msgid "Calling settimeofday:\n"
@@ -5440,12 +5353,8 @@
 msgstr "settimeofday() mislykkedes"
 
 #: hwclock/hwclock.c:749
-msgid ""
-"Not adjusting drift factor because the Hardware Clock previously contained "
-"garbage.\n"
-msgstr ""
-"Justerede ikke hastighedsfaktoren, da maskinuret tidligere havde en ugyldig "
-"værdi.\n"
+msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
+msgstr "Justerede ikke hastighedsfaktoren, da maskinuret tidligere havde en ugyldig værdi.\n"
 
 #: hwclock/hwclock.c:754
 msgid ""
@@ -5457,22 +5366,16 @@
 "kalibreringen forfra.\n"
 
 #: hwclock/hwclock.c:760
-msgid ""
-"Not adjusting drift factor because it has been less than a day since the "
-"last calibration.\n"
-msgstr ""
-"Justerede ikke hastighedsfaktoren, da det er mindre en et døgn siden sidste "
-"kalibrering.\n"
+msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
+msgstr "Justerede ikke hastighedsfaktoren, da det er mindre en et døgn siden sidste kalibrering.\n"
 
 #: hwclock/hwclock.c:808
 #, c-format
 msgid ""
-"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
-"of %f seconds/day.\n"
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"Uret drev %.1f sekunder i løbet af de sidste %d sekunder på trods af en "
-"hastighedsfaktor på %f sekunder/døgn.\n"
+"Uret drev %.1f sekunder i løbet af de sidste %d sekunder på trods af en hastighedsfaktor på %f sekunder/døgn.\n"
 "Justerer hastighedsfaktoren med %f sekunder/døgn\n"
 
 #: hwclock/hwclock.c:859
@@ -5503,15 +5406,12 @@
 msgstr "Hastighedsjusteringen blev ikke opdateret.\n"
 
 #: hwclock/hwclock.c:956
-msgid ""
-"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr ""
-"Maskinuret indeholder ikke en gyldig tid, så vi kan ikke justere det.\n"
+msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr "Maskinuret indeholder ikke en gyldig tid, så vi kan ikke justere det.\n"
 
 #: hwclock/hwclock.c:988
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
-msgstr ""
-"Den krævede justering er mindre end ét sekund, så vi sætter ikke uret.\n"
+msgstr "Den krævede justering er mindre end ét sekund, så vi sætter ikke uret.\n"
 
 #: hwclock/hwclock.c:1014
 #, c-format
@@ -5528,8 +5428,7 @@
 
 #: 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 ""
@@ -5547,12 +5446,8 @@
 msgstr "Kernen går ud fra en epokeværdi på %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 ""
-"For at sætte epokeværdien, skal du bruge tilvalget 'epoch' for at angive "
-"hvilken værdi, den skal sættes til\n"
+msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n"
+msgstr "For at sætte epokeværdien, skal du bruge tilvalget 'epoch' for at angive hvilken værdi, den skal sættes til\n"
 
 #: hwclock/hwclock.c:1159
 #, c-format
@@ -5645,19 +5540,13 @@
 
 #: hwclock/hwclock.c:1410
 #, c-format
-msgid ""
-"%s: The --utc and --localtime options are mutually exclusive.  You specified "
-"both.\n"
-msgstr ""
-"%s: Tilvalgene --utc og --localtime udelukker hinanden. Du angav begge.\n"
+msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
+msgstr "%s: Tilvalgene --utc og --localtime udelukker hinanden. Du angav begge.\n"
 
 #: hwclock/hwclock.c:1417
 #, c-format
-msgid ""
-"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
-"specified both.\n"
-msgstr ""
-"%s: Tilvalgene --adjust og --noadjfile udelukker hinanden. Du angav begge.\n"
+msgid "%s: The --adjust and --noadjfile options are mutually exclusive.  You specified both.\n"
+msgstr "%s: Tilvalgene --adjust og --noadjfile udelukker hinanden. Du angav begge.\n"
 
 #: hwclock/hwclock.c:1424
 #, c-format
@@ -5677,23 +5566,16 @@
 msgstr "Beklager, kun superbrugeren kan ændre systemuret.\n"
 
 #: hwclock/hwclock.c:1464
-msgid ""
-"Sorry, only the superuser can change the Hardware Clock epoch in the "
-"kernel.\n"
-msgstr ""
-"Beklager, kun superbrugeren kan ændre maskinurets epokeværdi i kernen.\n"
+msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
+msgstr "Beklager, kun superbrugeren kan ændre maskinurets epokeværdi i kernen.\n"
 
 #: hwclock/hwclock.c:1484
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Kan ikke tilgå maskinuret med nogen kendt metode.\n"
 
 #: hwclock/hwclock.c:1488
-msgid ""
-"Use the --debug option to see the details of our search for an access "
-"method.\n"
-msgstr ""
-"Benyt tilvalget --debug for at se detaljerne fra vores søgning efter en "
-"tilgangsmetode.\n"
+msgid "Use the --debug option to see the details of our search for an access method.\n"
+msgstr "Benyt tilvalget --debug for at se detaljerne fra vores søgning efter en tilgangsmetode.\n"
 
 #: hwclock/kd.c:43
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
@@ -5703,7 +5585,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK ioctl for at aflæse tiden mislykkedes"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr "Tidsudløb mens der ventedes på tidsændring.\n"
 
@@ -5728,79 +5610,72 @@
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK ioctl mislykkedes"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "open() af %s mislykkedes"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, 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:171
+#: hwclock/rtc.c:170
 #, 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:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s har ingen interrupt-funktioner. "
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, 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:244
+#: hwclock/rtc.c:243
 #, 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:247
+#: hwclock/rtc.c:246
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
-msgstr ""
-"ioctl() til %s for at afbryde opdaterings-interrupts mislykkedes uventet"
+msgstr "ioctl() til %s for at afbryde opdaterings-interrupts mislykkedes uventet"
 
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:305
 #, 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:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) lykkedes.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "Åbning af %s mislykkedes"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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 ""
-"For at manipulere epokeværdien i kernen, skal vi have adgang til Linux' "
-"maskinursenhed via enhedsspecialfilen '%s'. Denne fil eksisterer ikke på "
-"dette system.\n"
+msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s.  This file does not exist on this system.\n"
+msgstr "For at manipulere epokeværdien i kernen, skal vi have adgang til Linux' maskinursenhed via enhedsspecialfilen '%s'. Denne fil eksisterer ikke på dette system.\n"
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr "Kunne ikke åbne %s"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) til %s mislykkedes"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, 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"
@@ -5808,23 +5683,22 @@
 #. 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:397
+#: hwclock/rtc.c:396
 #, 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:415
+#: hwclock/rtc.c:414
 #, 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:420
+#: hwclock/rtc.c:419
 #, c-format
-msgid ""
-"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr "Kernens enheds-driver for %s har ikke en RTC_EPOCH_SET ioctl.\n"
 
-#: hwclock/rtc.c:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) til %s mislykkedes"
@@ -5961,15 +5835,11 @@
 #: 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 ""
-"Brug: %s [-hiLmw] [-l login_program] [-t tidsudløb] [-I initstreng] [-H "
-"login_vært] baud_rate,... linje [termtype]\n"
-"eller\t[-hiLmw] [-l login_program] [-t tidsudløb] [-I initstreng] [-H "
-"login_vært] linje baud_rate,... [termtype]\n"
+"Brug: %s [-hiLmw] [-l login_program] [-t tidsudløb] [-I initstreng] [-H login_vært] baud_rate,... linje [termtype]\n"
+"eller\t[-hiLmw] [-l login_program] [-t tidsudløb] [-I initstreng] [-H login_vært] linje baud_rate,... [termtype]\n"
 
 #: login-utils/checktty.c:104 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
@@ -6024,7 +5894,7 @@
 msgid "Password error."
 msgstr "Fejl i adgangskode."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
+#: 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:249
 #: mount/lomount.c:254
 msgid "Password: "
@@ -6244,29 +6114,29 @@
 "\n"
 "afbrudt %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATALT: kunne ikke genåbne tty: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
 msgstr "FATALT: ugyldig tty"
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h er kun for superbrugeren.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "brug: login [-fp] [brugernavn]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM-fejl, afbryder: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Kunne ikke klargøre PAM: %s"
@@ -6277,16 +6147,16 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "MISLYKKET LOGIN %d FRA %s FOR %s, %s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -6294,17 +6164,17 @@
 "Login ugyldigt\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "FOR MANGE LOGINFORSØG (%d) FRA %s FOR %s, %s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "MISLYKKET LOGINSESSION FRA %s FOR %s, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -6312,7 +6182,7 @@
 "\n"
 "Login ugyldigt\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
@@ -6320,44 +6190,44 @@
 "\n"
 "Problem med sessions-opsætning, afbryder.\n"
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "TOMT brugernavn i %s: %d. Afbryder."
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Ugyldigt brugernavn \"%s\" i %s:%d. Afbryder."
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
 msgstr "login: Hukommelse opbrugt\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Ugyldigt brugernavn"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login afvist på denne terminal.\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s AFVIST FRA %s PÅ TTY %s"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s AFVIST PÅ TTY %s"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Login ugyldigt\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -6365,82 +6235,82 @@
 "For mange brugere er allerede logget på.\n"
 "Prøv igen senere.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
 msgstr "Du har for mange processer kørende.\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "OPRINGNING KLOKKEN %s AF %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN PÅ %s FRA %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN PÅ %s"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN PÅ %s AF %s FRA %s"
 
-#: login-utils/login.c:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN PÅ %s AF %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
 msgstr "Du har ny post.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
 msgstr "Du har post.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: mislykket forgrening: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY mislykkedes: %m"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr "setuid() mislykkedes"
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Intet katalog %s!\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr "Logger ind med hjemmekatalog = \"/\".\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
 msgstr "login: ingen hukommelse for skal-skript.\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, 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:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ingen skal: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6449,62 +6319,62 @@
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "loginnavn alt for langt.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "for langt NAVN"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
 msgstr "loginnavne må ikke starte med '-'.\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "for mange tomme linjeskift,\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "VOLDSOMT MANGE linjeskift"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login udløb efter %d sekunder\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Sidste login: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "fra %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "på %.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGINFEJL FRA %s, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGINFEJL på %s, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGINFEJL fra %s, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGINFEJL PÅ %s, %s"
@@ -6607,8 +6477,7 @@
 
 #: login-utils/passwd.c:343
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Beklager, jeg kan kun ændre lokale adgangskoder. Brug 'yppasswd' i stedet."
+msgstr "Beklager, jeg kan kun ændre lokale adgangskoder. Brug 'yppasswd' i stedet."
 
 #: login-utils/passwd.c:349
 msgid "UID and username does not match, imposter!"
@@ -6831,7 +6700,7 @@
 
 #: login-utils/simpleinit.c:210
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr ""
+msgstr "fejl under sætning af close-on-exec på /dev/initctl"
 
 #: login-utils/simpleinit.c:257
 msgid "error running finalprog\n"
@@ -6866,7 +6735,7 @@
 msgid "fork failed\n"
 msgstr "forgrening mislykkedes\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1708
 msgid "exec failed\n"
 msgstr "programkørsel mislykkedes\n"
 
@@ -6928,8 +6797,7 @@
 #: login-utils/vipw.c:195
 #, 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"
+msgstr "%s: kunne ikke fjerne låsen på %s: %s (dine ændringer er stadig i %s)\n"
 
 #: login-utils/vipw.c:218
 #, c-format
@@ -7067,10 +6935,8 @@
 msgstr "logger: ukendt prioritetsnavn: %s.\n"
 
 #: misc-utils/logger.c:286
-msgid ""
-"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr ""
-"brug: logger [-is] [-f fil] [-p pri] [-t mærke] [-u sokkel] [ besked ... ]\n"
+msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr "brug: logger [-is] [-f fil] [-p pri] [-t mærke] [-u sokkel] [ besked ... ]\n"
 
 #: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
@@ -7166,12 +7032,12 @@
 msgid "Script started, file is %s\n"
 msgstr "Skript påbegyndt, filen er %s\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr "Skript påbegyndt på %s"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
@@ -7180,210 +7046,210 @@
 "\n"
 "Skript kørt på %s"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skript færdigt, filen er %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr "openpty mislykkedes\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr "Løbet tør for pty-er\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:744
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Parameterfejl, brug\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_navn ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -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 "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumpfilnavn ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr "kan ikke ændre strømsparetilstand\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl fejl: %s\n"
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fejl ved læsning af %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr "Fejl ved skrivning af skærmkopi\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "kunne hverken læse %s eller udføre ioctl dump\n"
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM er ikke defineret.\n"
@@ -7439,17 +7305,17 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Besked fra %s@%s på %s klokken %s ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "advarsel: fejl ved læsning af %s: %s"
 
-#: mount/fstab.c:141 mount/fstab.c:164
+#: mount/fstab.c:142 mount/fstab.c:165
 #, c-format
 msgid "warning: can't open %s: %s"
 msgstr "advarsel: kunne ikke åbne %s: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:146
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: kunne ikke åbne %s - bruger %s i stedet\n"
@@ -7458,36 +7324,36 @@
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:413
 #, 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:399
+#: mount/fstab.c:425
 #, 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:411
+#: mount/fstab.c:437
 #, 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:426
+#: mount/fstab.c:452
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Kunne ikke låse låsefilen %s: %s\n"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:465
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "kunne ikke låse låsefilen %s: %s"
 
-#: mount/fstab.c:441
+#: mount/fstab.c:467
 msgid "timed out"
 msgstr "tidsoverløb"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:474
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7496,22 +7362,22 @@
 "Kunne ikke oprette lænken %s\n"
 "Måske er der en efterladt låsefil?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:523 mount/fstab.c:559
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "kunne ikke åbne %s (%s) - mtab ikke opdateret"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:567
 #, c-format
 msgid "error writing %s: %s"
 msgstr "fejl ved skrivning af %s: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:575
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "fejl ved ændring af filmodus for %s: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:593
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "kunne ikke omdøbe %s til %s: %s\n"
@@ -7561,8 +7427,7 @@
 "       maybe /dev/loop# has the wrong major number?"
 msgstr ""
 "mount: Kunne ikke finde nogen loop-enheder. Måske kender denne kerne ikke\n"
-"       til loop-enheder (i så fald genoversæt kernen, eller 'insmod loop."
-"o'),\n"
+"       til loop-enheder (i så fald genoversæt kernen, eller 'insmod loop.o'),\n"
 "       eller har /dev/loop# bare et forkert hovednummer?"
 
 #: mount/lomount.c:195
@@ -7609,8 +7474,7 @@
 
 #: mount/lomount.c:317
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr ""
-"Denne 'mount' er oversat uden loop-understøttelse. Genoversæt venligst.\n"
+msgstr "Denne 'mount' er oversat uden loop-understøttelse. Genoversæt venligst.\n"
 
 #: mount/lomount.c:354
 #, c-format
@@ -7632,15 +7496,12 @@
 
 #: mount/lomount.c:443
 msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr ""
-"Der var ingen loop-understøttelse tilgængelig ved oversættelsen. Genoversæt "
-"venligst.\n"
+msgstr "Der var ingen loop-understøttelse tilgængelig ved oversættelsen. Genoversæt venligst.\n"
 
 #: mount/mntent.c:165
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
-msgstr ""
-"[mntent]: advarsel: intet afsluttende linjeskift ved slutningen af %s\n"
+msgstr "[mntent]: advarsel: intet afsluttende linjeskift ved slutningen af %s\n"
 
 #: mount/mntent.c:216
 #, c-format
@@ -7651,159 +7512,158 @@
 msgid "; rest of file ignored"
 msgstr "; resten af filen blev ignoreret"
 
-#: mount/mount.c:385
+#: mount/mount.c:388
 #, 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:389
+#: mount/mount.c:392
 #, 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:410
+#: mount/mount.c:413
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kunne ikke åbne %s for skrivning: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:428 mount/mount.c:647
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fejl ved skrivning til %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:435
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: fejl ved ændring af filmodus for %s: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:481
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ligner et swap-område - ikke monteret"
 
-#: mount/mount.c:538
+#: mount/mount.c:541
 msgid "mount failed"
 msgstr "montering mislykkedes"
 
-#: mount/mount.c:540
+#: mount/mount.c:543
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: kun root kan montere %s som %s"
 
-#: mount/mount.c:568
+#: mount/mount.c:571
 msgid "mount: loop device specified twice"
 msgstr "mount: loop-enheden angivet to gange"
 
-#: mount/mount.c:573
+#: mount/mount.c:576
 msgid "mount: type specified twice"
 msgstr "mount: type angivet to gange"
 
-#: mount/mount.c:585
+#: mount/mount.c:588
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: dropper opsætning af loop-enhed\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:597
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: skal til at benytte loop-enheden %s\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:601
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: klargøring af loop-enhed mislykkedes\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:605
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: klargøringen af loop-enhed lykkedes\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:642
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kunne ikke åbne %s: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:665
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: kunne ikke åbne %s for at sætte hastigheden"
 
-#: mount/mount.c:665
+#: mount/mount.c:668
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kunne ikke sætte hastigheden: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:722 mount/mount.c:1296
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kunne ikke forgrene: %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:802
 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:845
+#: mount/mount.c:841
 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:856
-msgid ""
-"mount: I could not determine the filesystem type, and none was specified"
+#: mount/mount.c:852
+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:859
+#: mount/mount.c:855
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: du skal angive filsystemtypen"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:858
 msgid "mount: mount failed"
 msgstr "mount: montering mislykkedes"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:864 mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: monteringspunkt %s er ikke et katalog"
 
-#: mount/mount.c:870
+#: mount/mount.c:866
 msgid "mount: permission denied"
 msgstr "mount: adgang nægtet"
 
-#: mount/mount.c:872
+#: mount/mount.c:868
 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:876 mount/mount.c:880
+#: mount/mount.c:872 mount/mount.c:876
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s er optaget"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:878
 msgid "mount: proc already mounted"
 msgstr "mount: proc er allerede monteret"
 
-#: mount/mount.c:884
+#: mount/mount.c:880
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: enten er %s allerede monteret eller %s optaget"
 
-#: mount/mount.c:890
+#: mount/mount.c:886
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: monteringspunkt %s eksisterer ikke"
 
-#: mount/mount.c:892
+#: mount/mount.c:888
 #, 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:895
+#: mount/mount.c:891
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: specialenhed %s eksisterer ikke"
 
-#: mount/mount.c:905
+#: mount/mount.c:901
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7812,12 +7672,12 @@
 "mount: specialenhed %s eksisterer ikke\n"
 "       (en sti er ikke et katalog)\n"
 
-#: mount/mount.c:918
+#: mount/mount.c:914
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ikke allerede monteret, eller forkert tilvalg"
 
-#: mount/mount.c:920
+#: mount/mount.c:916
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7826,47 +7686,46 @@
 "mount: forkert filsystemtype, forkert tilvalg, ugyldig superblok på %s,\n"
 "       eller for mange monterede filsystemer"
 
-#: mount/mount.c:954
+#: mount/mount.c:950
 msgid "mount table full"
 msgstr "monteringstabellen er fuld"
 
-#: mount/mount.c:956
+#: mount/mount.c:952
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kunne ikke læse superblokken"
 
-#: mount/mount.c:960
+#: mount/mount.c:956
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ukendt enhed"
 
-#: mount/mount.c:965
+#: mount/mount.c:961
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: filsystemtype %s understøttes ikke af kernen"
 
-#: mount/mount.c:977
+#: mount/mount.c:973
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: du mente sikkert %s"
 
-#: mount/mount.c:979
+#: mount/mount.c:975
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: du mente måske iso9660 ?"
 
-#: mount/mount.c:982
+#: mount/mount.c:978
 #, 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"
+msgstr "mount: %s har forkert enhedsnummer eller filsystemtypen %s understøttes ikke"
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:984
 #, 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:990
+#: mount/mount.c:986
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7875,98 +7734,96 @@
 "mount: kernen genkender ikke %s som en blokenhed\n"
 "       (måske hjælper 'insmod enheds-driver'?)"
 
-#: mount/mount.c:993
+#: mount/mount.c:989
 #, 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:996
+#: mount/mount.c:992
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s er ikke en blokenhed"
 
-#: mount/mount.c:999
+#: mount/mount.c:995
 #, 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:1002
+#: mount/mount.c:998
 msgid "block device "
 msgstr "blokenhed "
 
-#: mount/mount.c:1004
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kunne ikke montere %s%s skrivebeskyttet"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1004
 #, 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:1024
+#: mount/mount.c:1020
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s er skrivebeskyttet, monterer skrivebeskyttet"
 
-#: mount/mount.c:1111
+#: mount/mount.c:1107
 #, 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:1115
+#: mount/mount.c:1111
 #, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr "umount: %s gentaget - ikke monteret"
 
-#: mount/mount.c:1125
+#: mount/mount.c:1121
 #, c-format
 msgid "mount: going to mount %s by %s\n"
 msgstr "mount: vil montere %s som %s\n"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1122
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1122
 msgid "label"
 msgstr "mærke"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: mount/mount.c:1124 mount/mount.c:1573
 msgid "mount: no such partition found"
 msgstr "mount: fandt ingen sådan partition"
 
-#: mount/mount.c:1136
+#: mount/mount.c:1132
 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:1141
+#: mount/mount.c:1137
 msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
-msgstr ""
-"mount: ingen type blev angivet - Jeg antager smb p.g.a. det "
-"foranstillede //\n"
+msgstr "mount: ingen type blev angivet - Jeg antager smb p.g.a. det foranstillede //\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1153
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: kører \"%s\" i baggrunden\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1164
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: opgiver \"%s\"\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1241
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s er allerede monteret som %s\n"
 
-#: mount/mount.c:1376
+#: mount/mount.c:1373
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8045,42 +7902,39 @@
 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:259
+#: mount/mount_by_label.c:153
 #, c-format
-msgid ""
-"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
-msgstr ""
-"mount: kunne ikke åbne %s, så UUID- og MÆRKE­konvertering kan ikke "
-"gennemføres.\n"
+msgid "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr "mount: kunne ikke åbne %s, så UUID- og MÆRKE­konvertering kan ikke gennemføres.\n"
 
-#: mount/mount_by_label.c:378
+#: mount/mount_by_label.c:272
 msgid "mount: bad UUID"
 msgstr "mount: ugyldig UUID"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:486
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: fejl ved gæt af filsystemtype\n"
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:495
 #, 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:496
+#: mount/mount_guess_fstype.c:498
 #, 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:499
+#: mount/mount_guess_fstype.c:501
 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:501
+#: mount/mount_guess_fstype.c:503
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Jeg vil forsøge type %s\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:591
 #, c-format
 msgid "Trying %s\n"
 msgstr "Forsøger %s\n"
@@ -8313,8 +8167,7 @@
 
 #: mount/umount.c:426
 msgid "umount: cannot find list of filesystems to unmount"
-msgstr ""
-"umount: kunne ikke finde listen over filsystemer, der skulle afmonteres"
+msgstr "umount: kunne ikke finde listen over filsystemer, der skulle afmonteres"
 
 #: mount/umount.c:457
 msgid ""
@@ -8385,12 +8238,10 @@
 #: sys-utils/cytune.c:131
 #, c-format
 msgid ""
-"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
-"in fifo were %d,\n"
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"Filen %s, For grænseværdi %lu og tidsoverløbsværdi %lu, Maksimale antal tegn "
-"i fifo var %d,\n"
+"Filen %s, For grænseværdi %lu og tidsoverløbsværdi %lu, Maksimale antal tegn i fifo var %d,\n"
 "og den maksimale overførselshastighed var %f tegn/sekund\n"
 
 #: sys-utils/cytune.c:195
@@ -8420,12 +8271,8 @@
 
 #: 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 ""
-"Brug: %s [-q [-i interval]] ([-s værdi]|[-S værdi]) ([-t værdi]|[-T værdi]) "
-"[-g|-G] fil [fil...]\n"
+msgid "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) [-g|-G] file [file...]\n"
+msgstr "Brug: %s [-q [-i interval]] ([-s værdi]|[-S værdi]) ([-t værdi]|[-T værdi]) [-g|-G] fil [fil...]\n"
 
 #: sys-utils/cytune.c:256 sys-utils/cytune.c:275 sys-utils/cytune.c:295
 #: sys-utils/cytune.c:345
@@ -8478,10 +8325,8 @@
 
 #: 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 htal, %lu/%lu tegn; fifo: %lu grænse, %lu t-ovl, %lu maks, %lu nu\n"
+msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu htal, %lu/%lu tegn; fifo: %lu grænse, %lu t-ovl, %lu maks, %lu nu\n"
 
 #: sys-utils/cytune.c:430
 #, c-format
@@ -8490,17 +8335,15 @@
 
 #: 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 htal, %lu tegn; fifo: %lu grænse, %lu t-ovl, %lu maks, %lu nu\n"
+msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu htal, %lu tegn; fifo: %lu grænse, %lu t-ovl, %lu maks, %lu nu\n"
 
 #: sys-utils/cytune.c:441
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f tal/sek; %f flt (tegn/sek)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Brug: %s [-c] [-n level] [-s bufstr.]\n"
@@ -8607,8 +8450,7 @@
 
 #: sys-utils/ipcs.c:129
 #, c-format
-msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+msgid "%s provides information on ipc facilities for which you have read access.\n"
 msgstr "%s viser oplysninger om de ipc-faciliteter, du har læseadgang til.\n"
 
 #: sys-utils/ipcs.c:131
@@ -9038,9 +8880,9 @@
 msgstr "modus=%#o\tadgangs_rett=%#o\n"
 
 #: sys-utils/ipcs.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr "byte=%d\tlpid=%d\tcpid=%d\tatilkbl=%ld\n"
+msgstr "byte=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:615
 #, c-format
@@ -9142,14 +8984,11 @@
 
 #: sys-utils/rdev.c:69
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"brug: rdev [ -rv ] [ -o FORSKYDNING ] [ BILLEDE [ VÆRDI [ FORSKYDNING ] ] ]"
+msgstr "brug: rdev [ -rv ] [ -o FORSKYDNING ] [ BILLEDE [ VÆRDI [ FORSKYDNING ] ] ]"
 
 #: sys-utils/rdev.c:70
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (eller rdev /linux, osv.) viser den nuværende rod-enhed"
+msgid "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr "  rdev /dev/fd0  (eller rdev /linux, osv.) viser den nuværende rod-enhed"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
@@ -9157,8 +8996,7 @@
 
 #: sys-utils/rdev.c:72
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              sætter ROOTFLAGS (skrivebeskyttelsesstatus)"
+msgstr "  rdev -R /dev/fd0 1              sætter ROOTFLAGS (skrivebeskyttelsesstatus)"
 
 #: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
@@ -9185,11 +9023,8 @@
 msgstr "  vidmode ...                     samme som rdev -v"
 
 #: sys-utils/rdev.c:79
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Bemærk: skærmtilstande er: -3=Spørg, -2=Udvidet, -1=NormalVGA, 1=nøgle1, "
-"2=nøgle2,..."
+msgid "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr "Bemærk: skærmtilstande er: -3=Spørg, -2=Udvidet, -1=NormalVGA, 1=nøgle1, 2=nøgle2,..."
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
@@ -9199,12 +9034,17 @@
 msgid "missing comma"
 msgstr "manglende komma"
 
-#: sys-utils/readprofile.c:60
+#: sys-utils/readprofile.c:67
+msgid "out of memory"
+msgstr "løbet tør for hukommelse"
+
+#: sys-utils/readprofile.c:113
 #, 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"
@@ -9215,54 +9055,50 @@
 "\t -V            print version and exit\n"
 msgstr ""
 "%s: Brug: \"%s [tilvalg]\n"
-"\t -m <oversigtsfil> (standard = \"%s\")\n"
-"\t -p <pro-fil>      (standard = \"%s\")\n"
+"\t -m <oversigtsfil> (standard: \"%s\" og\n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <pro-fil>      (standard: \"%s\")\n"
 "\t -M <mult>         sæt profileringsmultiplikator til <mult>\n"
 "\t -i                vis kun oplysninger om sample-skridt\n"
 "\t -v                medtag flere detaljer\n"
-"\t -a                vis alle symboler, selvom de ikke bruges\n"
+"\t -a                vis alle symboler, selvom antallet er 0\n"
+"\t -b                vis individuelle histrogram-bin antal\n"
 "\t -r                nulstil alle tællere (kun root)\n"
 "\t -n                deaktivér automatisk bestemmelse af byterækkefølge\n"
 "\t -V                vis version og afslut\n"
 
-#: sys-utils/readprofile.c:84
-msgid "out of memory"
-msgstr "løbet tør for hukommelse"
-
-#: sys-utils/readprofile.c:147
+#: sys-utils/readprofile.c:186
 #, c-format
-msgid "%s Version %s\n"
-msgstr "%s Version %s\n"
+msgid "%s version %s\n"
+msgstr "%s version %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:272
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:293 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): forkert oversigtlinje\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:305
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: kunne ikke finde \"_stext\" i %s\n"
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:331
 #, 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:323
+#: sys-utils/readprofile.c:372
 msgid "total"
 msgstr "total"
 
 #: sys-utils/renice.c:68
-msgid ""
-"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
-msgstr ""
-"brug: renice prioritet [ [ -p ] pids ] [ [ -g ] pgrpr ] [ [ -u ] brugere ]\n"
+msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr "brug: renice prioritet [ [ -p ] pids ] [ [ -g ] pgrpr ] [ [ -u ] brugere ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
@@ -9404,11 +9240,8 @@
 msgstr "hexdump: ugyldig oversprings-værdi.\n"
 
 #: text-utils/hexsyntax.c:131
-msgid ""
-"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-msgstr ""
-"hexdump: [-bcCdovx] [-e fmt] [-f fmt_fil] [-n længde] [-s overspring] "
-"[fil ...]\n"
+msgid "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr "hexdump: [-bcCdovx] [-e fmt] [-f fmt_fil] [-n længde] [-s overspring] [fil ...]\n"
 
 #: text-utils/more.c:263
 #, c-format
@@ -9486,61 +9319,82 @@
 #: text-utils/more.c:1390
 msgid ""
 "\n"
-"Most commands optionally preceded by integer argument k.  Defaults in "
-"brackets.\n"
+"Most commands optionally preceded by integer argument k.  Defaults in brackets.\n"
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
+"\n"
+"De fleste kommandoer kan efterfølges af et heltal k. Standardværdier i klammer.\n"
+"Stjerne (*) betyder at parameteren bliver den nye standardværdi.\n"
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1397
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
+"<mellemrum>             Vis de næste k tekstlinjer [aktuel skærmstørrelse]\n"
+"z                       Vis de næste k tekstlinjer [aktuel skærmstørrelse]*\n"
+"<retur>                 Vis de næste k tekstlinjer [1]*\n"
+"d eller ctrl-D          Rul k linjer[aktuel rullelængde, starter med 11]*\n"
+"q, Q eller <interrupt>  Afslut more\n"
+"s                       Hop k tekstlinjer frem [1]\n"
+"f                       Hop k skærmfulde frem [1]\n"
+"b eller ctrl-B          Hop k skærmfulde tilbage[1]\n"
+"'                       Gå til stedet hvorfra sidste søgning startede\n"
+"=                       Vis aktuelt linjenummer\n"
+"/<regulært udtryk>      Søg efter den k'ne optræden af regulært udtryk [1]\n"
+"n                       Søg efter k'ne optræden af sidste r.u [1]\n"
+"!<kmd> eller :!<kmd>    Udfør <kmd> i en underskal\n"
+"v                       Start /usr/bin/vi på aktuelle linje\n"
+"ctrl-L                  Gentegn skærm\n"
+":n                      Gå til k'ne-næste fil [1]\n"
+":p                      Gå til k'ne-forrige fil [1]\n"
+":f                      Vis aktuelt filnavn og linjenummer\n"
+".                       Gentag forrige kommando\n"
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1444 text-utils/more.c:1449
 msgid "[Press 'h' for instructions.]"
 msgstr "[Tryk 'h' for instruktioner.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1483
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" linje %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1485
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Ikke en fil] linje %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1569
 msgid "  Overflow\n"
 msgstr "  Overløb\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1616
 msgid "...skipping\n"
 msgstr "...overspringer\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1646
 msgid "Regular expression botch"
 msgstr "Forkludret regulært udtryk"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1658
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9548,15 +9402,15 @@
 "\n"
 "Mønster ikke fundet\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1661 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr "Mønster ikke fundet"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1722
 msgid "can't fork\n"
 msgstr "kunne ikke forgrene (fork)\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1761
 msgid ""
 "\n"
 "...Skipping "
@@ -9564,19 +9418,19 @@
 "\n"
 "...Overspringer "
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1766
 msgid "...Skipping to file "
 msgstr "...Springer til filen "
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1768
 msgid "...Skipping back to file "
 msgstr "...Springer tilbage til filen "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2048
 msgid "Line too long"
 msgstr "For lang linje"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2091
 msgid "No previous command to substitute for"
 msgstr "Ingen tidligere kommando at erstatte med"
 
@@ -9626,40 +9480,38 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: ugyldig konverteringstegn %%%s.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
-msgid ""
-"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
-msgstr ""
-"%s: Brug: %s [-tal] [-p streng] [-cefnrs] [+linje] [+/mønster/] [filer]\n"
+msgid "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr "%s: Brug: %s [-tal] [-p streng] [-cefnrs] [+linje] [+/mønster/] [filer]\n"
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: tilvalget kræver et parameter -- %s\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: ugyldigt tilvalg -- %s\n"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 msgid "...skipping forward\n"
 msgstr "...hopper fremad\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 msgid "...skipping backward\n"
 msgstr "...springer bagud\n"
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 msgid "No next file"
 msgstr "Ingen næste fil"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 msgid "No previous file"
 msgstr "Ingen forrige fil"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Læsefejl fra %s-fil\n"
@@ -9667,50 +9519,50 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Uventet filafslutning i %s-fil\n"
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Ukendt fejl i %s-fil\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Kunne ikke oprette midlertidig fil.\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 msgid "RE error: "
 msgstr "RE fejl: "
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr "(Filafslutning)"
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr "Ingen gammel søgestreng"
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 msgid "Cannot open "
 msgstr "Kunne ikke åbne "
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 msgid "saved"
 msgstr "gemte"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !kommando ikke tilladt i rflag-tilstand.\n"
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 msgid "fork() failed, try again later\n"
 msgstr "fork() mislykkedes, prøv senere\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 msgid "(Next file: "
 msgstr "(Næste fil: "
 
diff --git a/po/de.po b/po/de.po
index cc81e20..d9b7f5e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -43,9 +43,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11x\n"
-"POT-Creation-Date: 2002-11-25 00:47+0100\n"
-"PO-Revision-Date: 2002-11-07 10:09:16+0100\n"
+"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"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -189,7 +189,7 @@
 # "mkfs von util-linux-2.10d"
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -262,17 +262,17 @@
 #: disk-utils/fsck.cramfs.c:337
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
-msgstr ""
+msgstr "%s: Nicht-Block (%ld) Bytes\n"
 
 #: disk-utils/fsck.cramfs.c:343
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
-msgstr ""
+msgstr "%s: Nicht-Größe (%ld vs %ld) Bytes\n"
 
 #: disk-utils/fsck.cramfs.c:392
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
-msgstr ""
+msgstr "%s: ungültiges cramfs - ungültige Pfadlänge\n"
 
 #: disk-utils/fsck.cramfs.c:472
 #, c-format
@@ -317,17 +317,19 @@
 #: disk-utils/fsck.cramfs.c:592
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
-msgstr ""
+msgstr "%s: ungültiges cramfs - ungültiger Superblock\n"
 
 #: disk-utils/fsck.cramfs.c:608
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
 msgstr ""
+"%s: ungültiges cramfs - Verzeichnisdatenende (%ld) != Dateidatenanfang (%"
+"ld)\n"
 
 #: disk-utils/fsck.cramfs.c:616
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
-msgstr ""
+msgstr "%s: ungültiges cramfs - ungültiges Dateidatenoffset\n"
 
 #: disk-utils/fsck.minix.c:200
 #, c-format
@@ -341,7 +343,7 @@
 
 #: disk-utils/fsck.minix.c:309
 msgid "Do you really want to continue"
-msgstr "Fortfahren"
+msgstr "Möchten Sie wirklich fortfahren"
 
 #: disk-utils/fsck.minix.c:313
 msgid "check aborted.\n"
@@ -587,36 +589,36 @@
 
 #: disk-utils/fsck.minix.c:1138
 msgid "seek failed in bad_zone"
-msgstr ""
+msgstr "seek in bad_zone fehlgeschlagen"
 
 #: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
 #, c-format
 msgid "Inode %d mode not cleared."
-msgstr ""
+msgstr "Inode %d Modus nicht zurückgesetzt."
 
 #: 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 nicht benutzt, in Bitmap als benutzt markiert."
 
 #: 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 benutzt, in Bitmap als unbenutzt markiert."
 
 #: 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 (Modus = %07o), i_nlinks=%d, gezählt=%d."
 
 #: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
 msgid "Set i_nlinks to count"
-msgstr ""
+msgstr "Setze i_nlinks auf count"
 
 #: 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 "Zone %d: als benutzt markiert, keine Datei benutzt sie."
 
 #: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
 msgid "Unmark"
@@ -625,12 +627,12 @@
 #: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
 #, c-format
 msgid "Zone %d: in use, counted=%d\n"
-msgstr ""
+msgstr "Zone %d: in Benutzung, gezählt=%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 "Zone %d: nicht in Benutzung, gezählt=%d\n"
 
 #: disk-utils/fsck.minix.c:1220
 msgid "Set"
@@ -639,15 +641,15 @@
 #: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
 #: disk-utils/mkfs.minix.c:646
 msgid "bad inode size"
-msgstr ""
+msgstr "ungültige INode-Größe"
 
 #: disk-utils/fsck.minix.c:1299
 msgid "bad v2 inode size"
-msgstr ""
+msgstr "ungültige V2-INode-Größe"
 
 #: disk-utils/fsck.minix.c:1325
 msgid "need terminal for interactive repairs"
-msgstr ""
+msgstr "Brauche Terminal für interaktive Reparaturen."
 
 #: disk-utils/fsck.minix.c:1329
 #, c-format
@@ -675,11 +677,13 @@
 "\n"
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
+"\n"
+"%6ld INodes benutzten (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1384
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
-msgstr ""
+msgstr "%6ld zones benutzten (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1386
 #, c-format
@@ -694,6 +698,15 @@
 "------\n"
 "%6d files\n"
 msgstr ""
+"\n"
+"%6d reguläre Dateien\n"
+"%6d Verzeichnisse\n"
+"%6d zeichenorientierte Geräte\n"
+"%6d blockorientierte Geräte\n"
+"%6d Verknüpfungen\n"
+"%6d symbolische Verknüpfungen\n"
+"------\n"
+"%6d Dateien\n"
 
 #: disk-utils/fsck.minix.c:1399
 msgid ""
@@ -713,7 +726,7 @@
 #: disk-utils/isosize.c:135
 #, c-format
 msgid "%s: seek error on %s\n"
-msgstr ""
+msgstr "%s: Fehler beim Seek auf %s\n"
 
 #: disk-utils/isosize.c:141
 #, c-format
@@ -755,7 +768,7 @@
 #: disk-utils/mkfs.bfs.c:167
 #, c-format
 msgid "cannot stat device %s"
-msgstr ""
+msgstr "kann nicht auf Gerät %s zugreifen"
 
 #: disk-utils/mkfs.bfs.c:171
 #, c-format
@@ -775,7 +788,7 @@
 #: disk-utils/mkfs.bfs.c:192
 #, c-format
 msgid "blocks argument too large, max is %lu"
-msgstr ""
+msgstr "»blocks«-Argument zu groß, max ist %lu"
 
 #: disk-utils/mkfs.bfs.c:207
 msgid "too many inodes - max is 512"
@@ -786,7 +799,7 @@
 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:2166
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
 #, c-format
 msgid "Device: %s\n"
 msgstr "Gerät: %s\n"
@@ -799,12 +812,12 @@
 #: disk-utils/mkfs.bfs.c:230
 #, c-format
 msgid "FSname: <%-6s>\n"
-msgstr ""
+msgstr "DSName: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:231
 #, c-format
 msgid "BlockSize: %d\n"
-msgstr ""
+msgstr "Blockgröße: %d\n"
 
 #: disk-utils/mkfs.bfs.c:233
 #, c-format
@@ -824,7 +837,7 @@
 #: disk-utils/mkfs.bfs.c:239
 #, c-format
 msgid "Inode end: %d, Data end: %d\n"
-msgstr ""
+msgstr "Inode-Ende: %d, Datenende: %d\n"
 
 #: disk-utils/mkfs.bfs.c:244
 msgid "error writing superblock"
@@ -840,7 +853,7 @@
 
 #: disk-utils/mkfs.bfs.c:272
 msgid "seek error"
-msgstr ""
+msgstr "Seek-Fehler"
 
 #: disk-utils/mkfs.bfs.c:278
 msgid "error writing . entry"
@@ -859,8 +872,8 @@
 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-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Speicher ist aufgebraucht!\n"
@@ -870,7 +883,7 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs Version %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
+#: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
 "usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
@@ -887,8 +900,22 @@
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
+"Aufruf: %s [-v] [-b blkgr] [-e edition] [-i datei] [-n name] verzname "
+"ausdatei\n"
+" -h         diese Hilfe ausgeben\n"
+" -v         wortreich sein\n"
+" -E         alle Warnungen zu Fehlern machen (von 0 versch. Exit-Status)\n"
+" -b blkgr   diese Blockgröße verwenden, muss gleich der Seitengröße sein\n"
+" -e edition Edition-Nummber setzen (Teil von fsid)\n"
+" -i datei   ein Dateiabbild in das Dateisystem einfügen (benötigt >= 2.4.0)\n"
+" -n name    name des cramfs-Dateisystems setzen\n"
+" -p         mit %d Bytes für Boot-Code auffüllen\n"
+" -s         Verzeichniseinträge sortieren (alte Option, ignoriert)\n"
+" -z         explizite Löcher machen (benötigt >= 2.3.39)\n"
+" verzname   Wurzel des zu komprimierenden Dateisystems\n"
+" ausdatei   Ausgabedatei\n"
 
-#: disk-utils/mkfs.cramfs.c:328
+#: disk-utils/mkfs.cramfs.c:335
 #, c-format
 msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
@@ -898,11 +925,11 @@
 " Bitte setzen Sie MAX_INPUT_NAMELEN in mkcramfs.c hoch und übersetzen Sie\n"
 " erneut. Breche jetzt ab.\n"
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr "Dateisystem zu groß. Breche jetzt ab.\n"
 
-#: disk-utils/mkfs.cramfs.c:507
+#: disk-utils/mkfs.cramfs.c:514
 msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
@@ -911,93 +938,103 @@
 "übersetzen Sie erneut. Breche jetzt ab.\n"
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
-msgstr ""
+msgstr "AIEEE: Block auf > 2*Blocklänge (%ld) »komprimiert«\n"
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
-msgstr ""
+msgstr "%6.2f%% (%+d Bytes)\t%s\n"
 
-#: disk-utils/mkfs.cramfs.c:812
+#: 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 ""
+"Warnung: Grobschätzung der benötigten Größe (obere Schranke) ist %LdMB, aber "
+"maximale Abbild-Größe ist %uMB. Wir könnten frühzeitig sterben.\n"
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
 msgstr "Einschließlich: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
-msgstr ""
+msgstr "Verzeichnisdaten: %d Bytes\n"
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
-msgstr ""
-
-#: disk-utils/mkfs.cramfs.c:872
-#, c-format
-msgid "Super block: %d bytes\n"
-msgstr ""
+msgstr "Alles: %d Kilobytes\n"
 
 #: disk-utils/mkfs.cramfs.c:879
 #, c-format
-msgid "CRC: %x\n"
-msgstr ""
+msgid "Super block: %d bytes\n"
+msgstr "Superblock: %d Bytes\n"
 
-#: disk-utils/mkfs.cramfs.c:884
+#: 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 ""
+"nicht genug Raum für ROM-Abbild bereitgestellt (%Ld bereitgestellt, %d "
+"benutzt)\n"
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
-msgstr ""
+msgstr "Schreiben des ROM-Abbilds fehlgeschlagen (%d %d)\n"
 
 #. (These warnings used to come at the start, but they scroll off the
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "Warnung: Dateiname auf 255 Bytes abgeschnitten.\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
-msgstr ""
+msgstr "Warnung: Dateien wurden wegen Fehlern übersprungen.\n"
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
-msgstr ""
+msgstr "Warnung: Dateigrößen abgeschnitten auf %luMB (minus 1 Byte).\n"
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
+"Warnung: UIDs abgeschnitten auf %u Bits.  (Dies könnte ein Sicherheitsrisiko "
+"sein.)\n"
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
+"Warnung: GIDs abgeschnitten auf %u Bits.  (Dies könnte ein Sicherheitsrisiko "
+"sein.)\n"
 
-#: disk-utils/mkfs.cramfs.c:926
+#: 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 ""
+"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
 #, c-format
@@ -1141,8 +1178,8 @@
 msgid "too many bad pages"
 msgstr "Zu viele beschädigte »Seiten«"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: 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 "Speicher ist aufgebraucht"
 
@@ -1265,11 +1302,11 @@
 msgstr "   %s [ -c | -y | -n ] Gerät\n"
 
 # "Unbrauchbar"
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
 msgid "Unusable"
 msgstr "Unbenutzbar"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
 msgid "Free Space"
 msgstr "Freier Bereich"
 
@@ -1370,7 +1407,7 @@
 
 #: fdisk/cfdisk.c:910
 msgid "Partition ends in the final partial cylinder"
-msgstr ""
+msgstr "Partition endet im letzten teilweisen Zylinder"
 
 #: fdisk/cfdisk.c:934
 msgid "logical partitions not in disk order"
@@ -1405,155 +1442,155 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menü ohne Richtung, verwende horizontal."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Diese Taste ist hier nicht verwendbar"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Eine Taste drücken, um fortzufahren"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2512
 msgid "Primary"
 msgstr "Primäre"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Erzeuge eine neue primäre Partition"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2512
 msgid "Logical"
 msgstr "Logische"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Erzeuge eine neue logische Partition"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Erzeuge keine neue Partition"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Interner Fehler !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Größe (in MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Anfang"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Erzeuge Partition am Anfang des freien Bereiches"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Ende"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Erzeuge Partition am Ende des freien Bereiches"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "Kein Platz, um die erweiterte Partition anzulegen"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1527
 msgid "No partition table or unknown signature on partition table"
 msgstr ""
 "Keine Partitionstabelle oder unbekannte Signatur in der Partitionstabelle"
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1529
 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:1576
+#: fdisk/cfdisk.c:1581
 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:1606
+#: fdisk/cfdisk.c:1611
 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:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
 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:1629
+#: fdisk/cfdisk.c:1634
 msgid "Cannot get disk size"
 msgstr "Konnte die Größe der Festplatte nicht feststellen"
 
 # "Ungültige primäre Partition"
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1659
 msgid "Bad primary partition"
 msgstr "Beschädigte primäre Partition"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1689
 msgid "Bad logical partition"
 msgstr "Beschädigte logische Partition"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1804
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Warnung!!  Dies kann Daten auf der Festplatte zerstören!"
 
-#: fdisk/cfdisk.c:1803
+#: fdisk/cfdisk.c:1808
 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:1809
+#: fdisk/cfdisk.c:1814
 msgid "no"
 msgstr "nein"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1815
 msgid "Did not write partition table to disk"
 msgstr "Die Partitionstabelle wurde nicht auf die Festplatte geschrieben"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1817
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1820
 msgid "Please enter `yes' or `no'"
 msgstr "Bitte »ja« oder »nein« eingeben"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1824
 msgid "Writing partition table to disk..."
 msgstr "Die Partitionstabelle wird auf die Festplatte geschrieben..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
 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:1846
+#: fdisk/cfdisk.c:1851
 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:1856
+#: fdisk/cfdisk.c:1861
 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:1858
+#: fdisk/cfdisk.c:1863
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
@@ -1562,84 +1599,84 @@
 
 # "Geben sie einen Dateinamen ein oder drücken Sie Return, um es auf dem Bildschirm anzuzeigen: "
 # is too long
-#: fdisk/cfdisk.c:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Dateiname oder Return um es auf dem Bildschirm anzuzeigen: "
 
-#: fdisk/cfdisk.c:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Konnte »%s« nicht öffnen"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1941
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Festplatte: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1943
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1950
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1970
 msgid "   None   "
 msgstr "   Keine  "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1972
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1974
 msgid "   Primary"
 msgstr "   Primäre"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1976
 msgid "   Logical"
 msgstr "  Logische"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2020
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Boot (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Unbekannt (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2024
 #, c-format
 msgid "None (%02X)"
 msgstr "Keine (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabelle von %s\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2061
 msgid "            First    Last\n"
 msgstr "            Erster   Letzter\n"
 
-#: fdisk/cfdisk.c:2057
+#: fdisk/cfdisk.c:2062
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Typ      Sektor   Sektor   Offset  Länge    Dateisystemtyp (ID)    Flags\n"
 
-#: fdisk/cfdisk.c:2058
+#: fdisk/cfdisk.c:2063
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1648,485 +1685,484 @@
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2146
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         ---Anfangs----      -----End------   Start  Anzahl der\n"
 
-#: fdisk/cfdisk.c:2142
+#: 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:2143
+#: fdisk/cfdisk.c:2148
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Raw"
 msgstr "»Roh«"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Print the table using raw data format"
 msgstr "Die »rohen« Daten der Tabelle ausgeben"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
 msgid "Sectors"
 msgstr "Sektoren"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2182
 msgid "Print the table ordered by sectors"
 msgstr "Die Tabelle nach Sektoren sortiert ausgeben"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Table"
 msgstr "Tabelle"
 
 # "Nur die Partitionstabelle ausgeben" (joey)
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Just print the partition table"
 msgstr "Einfach die Tabelle ausgeben"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2184
 msgid "Don't print the table"
 msgstr "Zeige die Tabelle nicht an"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2212
 msgid "Help Screen for cfdisk"
 msgstr "Hilfe für cfdisk"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2214
 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:2210
+#: fdisk/cfdisk.c:2215
 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:2211
+#: fdisk/cfdisk.c:2216
 msgid "disk drive."
 msgstr "und zu verändern."
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2218
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
 # "Befehl"
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2220
 msgid "Command      Meaning"
 msgstr "Befehl     Bedeutung"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2221
 msgid "-------      -------"
 msgstr "--------     ---------"
 
 # "  b          Wechselt zwischen bootfähig und nicht bootfähig."
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2222
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 "  b          (De)Aktivieren des bootfähig-flags der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2223
 msgid "  d          Delete the current partition"
 msgstr "  d          Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2224
 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:2220
+#: fdisk/cfdisk.c:2225
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             WARNUNG: Diese Funktion sollte nur von Leuten benutzt"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2226
 msgid "             know what they are doing."
 msgstr "             werden, die wissen, was sie tun."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2227
 msgid "  h          Print this screen"
 msgstr "  h          Diese Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2228
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximieren der Nutzung der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2229
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Beachten Sie, dass dies die Partition nicht mehr kompatibel"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2230
 msgid "             DOS, OS/2, ..."
 msgstr "             zu DOS, OS/2, ... machen kann"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2231
 msgid "  n          Create new partition from free space"
 msgstr "  n          Aus dem freien Bereich eine neue Partition erzeugen"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2232
 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:2228
+#: fdisk/cfdisk.c:2233
 msgid "             There are several different formats for the partition"
 msgstr "             Es gibt mehrere Formate für die Partitionstabelle, aus"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2234
 msgid "             that you can choose from:"
 msgstr "             denen man wählen kann"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2235
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - »Rohe« Daten (was auf die Festplatte geschrieben würde)"
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2236
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabelle nach Sektoren sortiert"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2237
 msgid "                t - Table in raw format"
 msgstr "                t - Tabelle mit den reinen Daten"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2238
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Das Programm beenden ohne die Partitionstabelle zu schreiben"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2239
 msgid "  t          Change the filesystem type"
 msgstr "  t          Den Dateisystemtyp ändern"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2240
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Einheit für die Größenanzeige ändern"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2241
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Wechselt zwischen MB, Sektoren und Zylindern"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2242
 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:2238
+#: fdisk/cfdisk.c:2243
 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:2239
+#: fdisk/cfdisk.c:2244
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             Sie das Schreiben mit »yes« oder »no« bestätigen oder"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2245
 msgid "             `no'"
 msgstr "             ablehnen"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2246
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pfeil-hoch   Den Cursor zur vorherigen Partition bewegen"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2247
 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:2243
+#: fdisk/cfdisk.c:2248
 msgid "CTRL-L       Redraws the screen"
 msgstr "Strg-L       Zeichnet den Bildschirm erneut"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2249
 msgid "  ?          Print this screen"
 msgstr "  ?          Diese Hilfe anzeigen"
 
 # "Hinweis"
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2251
 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:2247
+#: fdisk/cfdisk.c:2252
 msgid "case letters (except for Writes)."
 msgstr "eingegeben werden (außer W zum Schreiben)."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
-#: fdisk/fdisksunlabel.c:324
+#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr " Zylinder"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2282
 msgid "Change cylinder geometry"
 msgstr "Die Anzahl der Zylinder ändern"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Köpfe"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2283
 msgid "Change head geometry"
 msgstr "Die Anzahl der Köpfe ändern"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2284
 msgid "Change sector geometry"
 msgstr "Die Anzahl der Sektoren pro Spur ändern"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done"
 msgstr "Fertig"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done with changing geometry"
 msgstr "Ändern der Geometrie beenden"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2298
 msgid "Enter the number of cylinders: "
 msgstr "Geben Sie die Anzahl der Zylinder ein: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
 msgid "Illegal cylinders value"
 msgstr "Ungültiger Wert für die Anzahl der Zylinder"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2316
 msgid "Enter the number of heads: "
 msgstr "Geben Sie die Anzahl der Köpfe ein: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
 msgid "Illegal heads value"
 msgstr "Ungültiger Wert für die Anzahl der Köpfe"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2329
 msgid "Enter the number of sectors per track: "
 msgstr "Geben Sie die Anzahl der Sektoren pro Spur ein: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
 msgid "Illegal sectors value"
 msgstr "Ungültiger Wert für die Anzahl der Sektoren"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2439
 msgid "Enter filesystem type: "
 msgstr "Geben Sie den Dateisystemtyp ein: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2457
 msgid "Cannot change FS Type to empty"
 msgstr "Der Dateisystemtyp kann nicht auf »leer« gesetzt werden"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2459
 msgid "Cannot change FS Type to extended"
 msgstr "Der Dateisystemtyp kann nicht auf »erweitert« gesetzt werden"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Boot"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2489
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unb(%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2511
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2587
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Festplatte: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2593
 #, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "Größe: %lld Bytes, %ld MB"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2596
 #, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "Größe: %lld Bytes, %ld,%ld GB"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2600
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Köpfe: %d   Sektoren pro Spur: %d   Zylinder: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2604
 msgid "Name"
 msgstr "Name"
 
 # I currently don't know a better translation
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2605
 msgid "Flags"
 msgstr "Flags"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2606
 msgid "Part Type"
 msgstr "Part. Typ"
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2607
 msgid "FS Type"
 msgstr "Dateisystemtyp"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2608
 msgid "[Label]"
 msgstr "[Bezeichner]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2610
 msgid "  Sectors"
 msgstr " Sektoren"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2614
 msgid "Size (MB)"
 msgstr "Größe (MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2616
 msgid "Size (GB)"
 msgstr "Größe (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Bootable"
 msgstr "Bootbar"
 
 # "Bootfähigkeit der aktuellen Partition ändern" (joey)
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Toggle bootable flag of the current partition"
 msgstr "(De)Aktivieren des bootfähig-flags der aktuellen Partition"
 
 # "Löschen"
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete"
 msgstr "Löschen"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete the current partition"
 msgstr "Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Change disk geometry (experts only)"
 msgstr "Die Festplattengeometrieparameter ändern (nur für Experten)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Help"
 msgstr "Hilfe"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Print help screen"
 msgstr "Die Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize"
 msgstr "Maxim."
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximieren der Nutzung der aktuellen Partition (nur für Experten)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "New"
 msgstr "Neue"
 
 # "Erzeuge aus dem freien Bereich eine neue Partition"
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "Create new partition from free space"
 msgstr "Neue Partition im freiem Bereich anlegen"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print"
 msgstr "Ausgabe"
 
 # "Gib die Partitionstabelle auf dem Bildschirm oder in eine Datei aus"
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print partition table to the screen or to a file"
 msgstr "Partitionstabelle auf dem Bildschirm oder in Datei ausgeben"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit"
 msgstr "Ende"
 
 # "Beende das Programm ohne die Partitionstabelle zu schreiben"
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit program without writing partition table"
 msgstr "Das Programm beenden, ohne die Partitionstabelle zu speichern"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 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:2675
+#: fdisk/cfdisk.c:2680
 msgid "Units"
 msgstr "Einheit."
 
 # "Ändert die Einheiten der Größenanzeige ("
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 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:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write"
 msgstr "Schreib."
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Die Partitionstabelle schreiben (dies kann Daten zerstören)"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2727
 msgid "Cannot make this partition bootable"
 msgstr "Diese Partition kann nicht als bootfähig markiert werden"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2737
 msgid "Cannot delete an empty partition"
 msgstr "Eine leere Partition kann nicht gelöscht werden"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
 msgid "Cannot maximize this partition"
 msgstr "Die Nutzung dieser Partition kann nicht maximiert werden"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2767
 msgid "This partition is unusable"
 msgstr "Diese Partition ist unbenutzbar"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2769
 msgid "This partition is already in use"
 msgstr "Diese Partition ist bereits in Benutzung"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2786
 msgid "Cannot change the type of an empty partition"
 msgstr "Der Dateisystemtyp einer leeren Partition kann nicht geändert werden"
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
 msgid "No more partitions"
 msgstr "Keine weiteren Partitionen"
 
 # "Ungültige Taste"
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2826
 msgid "Illegal command"
 msgstr "Unzulässiger Befehl"
 
-#: fdisk/cfdisk.c:2831
-#, fuzzy
+#: fdisk/cfdisk.c:2836
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-2000 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:2838
+#: fdisk/cfdisk.c:2843
 #, c-format
 msgid ""
 "\n"
@@ -2410,11 +2446,11 @@
 msgid "heads"
 msgstr "Köpfe"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "Sektoren"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470
+#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "Zylinder"
@@ -2541,73 +2577,73 @@
 msgstr "Hex code (L um eine Liste anzuzeigen): "
 
 #: fdisk/fdisk.c:1069
-#, c-format
-msgid "%s (%d-%d, default %d): "
+#, fuzzy, c-format
+msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, Vorgabe: %d): "
 
-#: fdisk/fdisk.c:1134
-#, c-format
-msgid "Using default value %d\n"
+#: fdisk/fdisk.c:1136
+#, fuzzy, c-format
+msgid "Using default value %u\n"
 msgstr "Benutze den Standardwert %d\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1140
 msgid "Value out of range.\n"
 msgstr "Wert außerhalb des Bereichs.\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1150
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1161
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Warnung: Partition %d hat leeren Typ\n"
 
-#: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207
+#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition %d ausgewählt\n"
 
-#: fdisk/fdisk.c:1184
+#: fdisk/fdisk.c:1186
 msgid "No partition is defined yet!\n"
 msgstr "Noch keine Partition definiert!\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1212
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle primären Partitionen sind schon definiert worden!\n"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "cylinder"
 msgstr "Zylinder"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "sector"
 msgstr "Sektor"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1231
 #, 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:1240
+#: fdisk/fdisk.c:1242
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "WARNUNG: Partition %d ist eine erweiterte Partition\n"
 
-#: fdisk/fdisk.c:1251
+#: fdisk/fdisk.c:1253
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-Kompatibilitätsflag ist gesetzt\n"
 
-#: fdisk/fdisk.c:1255
+#: fdisk/fdisk.c:1257
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-Kompatibilitätsflag ist nicht gesetzt\n"
 
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1357
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d existiert noch nicht!\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1362
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2619,7 +2655,7 @@
 "ist wahrscheinlich unklug. Sie können eine Partition\n"
 "mit dem »d«-Kommando löschen.\n"
 
-#: fdisk/fdisk.c:1361
+#: fdisk/fdisk.c:1371
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2627,7 +2663,7 @@
 "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:1370
+#: fdisk/fdisk.c:1380
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2637,7 +2673,7 @@
 "zu lassen, wie es SunOS/Solaris erwartet und sogar Linux es mag.\n"
 "\n"
 
-#: fdisk/fdisk.c:1376
+#: fdisk/fdisk.c:1386
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2648,52 +2684,52 @@
 "als gesamte Platte zu lassen, wie es IRIX erwartet.\n"
 "\n"
 
-#: fdisk/fdisk.c:1389
+#: fdisk/fdisk.c:1399
 #, 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:1443
+#: fdisk/fdisk.c:1453
 #, 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:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisch=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1451
+#: fdisk/fdisk.c:1461
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d hat unterschiedliche phys./log. Enden:\n"
 
-#: fdisk/fdisk.c:1460
+#: fdisk/fdisk.c:1470
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i beginnt nicht an einer Zylindergrenze:\n"
 
-#: fdisk/fdisk.c:1463
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "sollte sein (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1469
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1479
+#, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr "Partition %d endet nicht an einer Zylindergrenze.\n"
+msgstr "Partition %i endet nicht an einer Zylindergrenze.\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "sollte sein (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1485
+#: fdisk/fdisk.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -2702,7 +2738,7 @@
 "\n"
 "Platte %s: %ld MByte, %lld Byte\n"
 
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid ""
 "\n"
@@ -2711,17 +2747,17 @@
 "\n"
 "Platte %s: %ld.%ld GByte, %lld Byte\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d Köpfe, %d Sektoren/Spuren, %d Zylinder"
 
-#: fdisk/fdisk.c:1493
+#: fdisk/fdisk.c:1503
 #, c-format
 msgid ", total %lu sectors"
 msgstr ", zusammen %lu Sektoren"
 
-#: fdisk/fdisk.c:1496
+#: fdisk/fdisk.c:1506
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2730,7 +2766,7 @@
 "Einheiten = %s von %d * %d = %d Bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1604
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2742,16 +2778,16 @@
 # "   Device"
 # "    Gerät"
 # 2002-05-10 12:15:13 CEST -ke-
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1678
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr " %*s boot.  Anfang      Ende    Blöcke   Id  Dateisystemtyp\n"
 
-#: fdisk/fdisk.c:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
 msgid "Device"
 msgstr "Gerät"
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1716
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2759,7 +2795,7 @@
 "\n"
 "Partitionstabelleneinträge sind nicht in Platten-Reihenfolge\n"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
@@ -2772,109 +2808,113 @@
 
 # Ist "Kp" eine gute Abkürzung für "Kopf" ?
 # Kf ist besser (2001-11-24 21:30:51 CET -ke-)
-#: fdisk/fdisk.c:1718
+#: 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:1762
+#: fdisk/fdisk.c:1772
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Warnung: Partition %d enthält Sektor 0\n"
 
-#: fdisk/fdisk.c:1765
+#: fdisk/fdisk.c:1775
 #, 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:1768
+#: fdisk/fdisk.c:1778
 #, 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:1771
+#: fdisk/fdisk.c:1781
 #, 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:1775
+#: fdisk/fdisk.c:1785
 #, 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:1807
+#: fdisk/fdisk.c:1817
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
-msgstr ""
+msgstr "Warnung: ungültiger Anfang-der-Daten in Partition %d\n"
 
-#: fdisk/fdisk.c:1815
+#: fdisk/fdisk.c:1825
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Warnung: Partition %d überlappt mit Partition %d.\n"
 
-#: fdisk/fdisk.c:1835
+#: fdisk/fdisk.c:1845
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Warnung: Partition %d ist leer\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1850
 #, 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:1846
+#: fdisk/fdisk.c:1856
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
-msgstr ""
+msgstr "Gesamtanzahl belegter Sektoren %d größer als Maximum %d\n"
 
-#: fdisk/fdisk.c:1849
+#: fdisk/fdisk.c:1859
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d unbenutzte Sektoren\n"
 
-#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
+#: fdisk/fdisk.c:1872 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:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
-#: fdisk/fdisksunlabel.c:522
+#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Erster %s"
 
-#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
+#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d wird bereits benutzt\n"
 
-#: fdisk/fdisk.c:1937
+#: fdisk/fdisk.c:1947
 msgid "No free sectors available\n"
 msgstr "Es sind keine freien Sektoren verfügbar\n"
 
-#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
+#: fdisk/fdisk.c:1956 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:2011
+#: fdisk/fdisk.c:2021
 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 ""
+"\tTut mir leid, dieses fdisk kann nicht mit AIX-Disklabels umgehen.\n"
+"\tWenn Sie Partitionen vom Typ DOS hinzufügen wollen, erstellen Sie\n"
+"\tzuerst eine neue, leere DOS-Partitionstabelle (mit o).\n"
+"\tWARNUNG: Das zerstört den momentanen Inhalt Ihrer Platte.\n"
 
-#: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2033 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:2031
+#: fdisk/fdisk.c:2041
 msgid "You must delete some partition and add an extended partition first\n"
-msgstr ""
+msgstr "Sie müssen erst eine Partion löschen und eine erweiterte anlegen.\n"
 
-#: fdisk/fdisk.c:2036
+#: fdisk/fdisk.c:2046
 #, c-format
 msgid ""
 "Command action\n"
@@ -2885,20 +2925,20 @@
 "   %s\n"
 "   p      Primäre Partition (1-4)\n"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "l   logical (5 or over)"
 msgstr "l      Logische Partition (5 oder größer)"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "e   extended"
 msgstr "e      Erweiterte"
 
-#: fdisk/fdisk.c:2057
+#: fdisk/fdisk.c:2067
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ungültige Partitionsnummer für den Typ »%c«\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2103
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2906,11 +2946,11 @@
 "Die Partitionstabelle wurde verändert!\n"
 "\n"
 
-#: fdisk/fdisk.c:2102
+#: fdisk/fdisk.c:2112
 msgid "Calling ioctl() to re-read partition table.\n"
-msgstr ""
+msgstr "Rufe ioctl() um Partitionstabelle neu einzulesen.\n"
 
-#: fdisk/fdisk.c:2118
+#: fdisk/fdisk.c:2128
 #, c-format
 msgid ""
 "\n"
@@ -2918,8 +2958,12 @@
 "The kernel still uses the old table.\n"
 "The new table will be used at the next reboot.\n"
 msgstr ""
+"\n"
+"WARNUNG: Neueinlesen der Partitionstabelle führte zu Fehler %d: %s.\n"
+"Der Kernel benutzt noch die alte Tabelle.\n"
+"Die neue Tabelle wird beim nächsten Neustart verwendet.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2138
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2931,96 +2975,100 @@
 "oder verändert haben, dann schauen Sie bitte in die\n"
 "fdisk-manual-Seite nach weiteren Informationen\n"
 
-#: fdisk/fdisk.c:2135
+#: fdisk/fdisk.c:2145
 msgid "Syncing disks.\n"
-msgstr ""
+msgstr "Synchronisiere Platten.\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d hat keinen Datenbereich\n"
 
-#: fdisk/fdisk.c:2187
+#: fdisk/fdisk.c:2197
 msgid "New beginning of data"
-msgstr ""
+msgstr "Neuer Datenanfang"
 
 # That sounds pretty ummm...
-#: fdisk/fdisk.c:2203
+#: fdisk/fdisk.c:2213
 msgid "Expert command (m for help): "
 msgstr "Expertenkommando (m für Hilfe): "
 
-#: fdisk/fdisk.c:2216
+#: fdisk/fdisk.c:2226
 msgid "Number of cylinders"
 msgstr "Anzahl der Zylinder"
 
-#: fdisk/fdisk.c:2243
+#: fdisk/fdisk.c:2253
 msgid "Number of heads"
 msgstr "Anzahl der Köpfe"
 
-#: fdisk/fdisk.c:2268
+#: fdisk/fdisk.c:2278
 msgid "Number of sectors"
 msgstr "Anzahl der Sektoren"
 
-#: fdisk/fdisk.c:2271
+#: fdisk/fdisk.c:2281
 msgid "Warning: setting sector offset for DOS compatiblity\n"
-msgstr ""
+msgstr "Warnung: setze Sektoren-Offset für DOS-Kompatibilität\n"
 
-#: fdisk/fdisk.c:2346
+#: fdisk/fdisk.c:2356
 #, 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:2360
+#: fdisk/fdisk.c:2370
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2408
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: Unbekannter Befehl\n"
 
-#: fdisk/fdisk.c:2466
+#: fdisk/fdisk.c:2476
 msgid "This kernel finds the sector size itself - -b option ignored\n"
-msgstr ""
+msgstr "Dieser Kernel stellt Sektorengröße selbst fest - Option -b ignoriert\n"
 
-#: fdisk/fdisk.c:2470
+#: fdisk/fdisk.c:2480
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
+"Warnung: Option -b (Sektorengröße setzen) sollte nur mit einem\n"
+"angegebenen Gerät benutzt werden\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2529
+#: fdisk/fdisk.c:2539
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2549
 msgid "Command (m for help): "
 msgstr "Befehl (m für Hilfe): "
 
-#: fdisk/fdisk.c:2555
+#: fdisk/fdisk.c:2565
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
+"\n"
+"Momentane Bootdatei ist: %s\n"
 
-#: fdisk/fdisk.c:2557
+#: fdisk/fdisk.c:2567
 msgid "Please enter the name of the new boot file: "
-msgstr ""
+msgstr "Bitte geben Sie den Namen der neuen Boot-Datei an: "
 
-#: fdisk/fdisk.c:2559
+#: fdisk/fdisk.c:2569
 msgid "Boot file unchanged\n"
-msgstr ""
+msgstr "Boot-Datei unverändert\n"
 
-#: fdisk/fdisk.c:2624
+#: fdisk/fdisk.c:2642
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3078,7 +3126,7 @@
 
 #: fdisk/fdiskbsdlabel.c:139
 msgid "   s   show complete disklabel"
-msgstr ""
+msgstr "   s   komplettes Disklabel zeigen"
 
 #: fdisk/fdiskbsdlabel.c:140
 msgid "   t   change a partition's filesystem id"
@@ -3086,11 +3134,11 @@
 
 #: fdisk/fdiskbsdlabel.c:141
 msgid "   u   change units (cylinders/sectors)"
-msgstr ""
+msgstr "   u   Einheiten ändern (Zylinder/Sektoren)"
 
 #: fdisk/fdiskbsdlabel.c:142
 msgid "   w   write disklabel to disk"
-msgstr ""
+msgstr "   w   Disklabel auf Platte schreiben"
 
 #: fdisk/fdiskbsdlabel.c:144
 msgid "   x   link BSD partition to non-BSD partition"
@@ -3224,7 +3272,7 @@
 
 #: fdisk/fdiskbsdlabel.c:356
 msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr ""
+msgstr "#       Anfang      Ende     Größe    Typ      [fsize bsize   cpg]\n"
 
 #: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
@@ -3258,7 +3306,7 @@
 
 #: fdisk/fdiskbsdlabel.c:481
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
-msgstr ""
+msgstr "Muss <= Sektoren/Spur * Spuren/Zylinder sein (Voreinstellung).\n"
 
 #: fdisk/fdiskbsdlabel.c:483
 msgid "rpm"
@@ -3317,87 +3365,91 @@
 "\n"
 "Syncing disks.\n"
 msgstr ""
+"\n"
+"Synchronisiere Platten.\n"
 
-#: fdisk/fdisksgilabel.c:78
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
 msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI xfslog"
 msgstr "SGI xfslog"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:92
 msgid "SGI xlv"
 msgstr "SGI xlv"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:93
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux Swap"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:95
+#: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:163
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
 msgstr ""
+"Laut MIPS Computer Systems, Inc darf das Label höchstens 512 Bytes "
+"enthalten\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr ""
 
@@ -3450,12 +3502,13 @@
 "----- Directory Entries -----\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:250
+#: fdisk/fdisksgilabel.c:248
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:304
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3467,7 +3520,7 @@
 "\tDie Bootdatei muss ein absoluter, nichtleerer Pfadname sein,\n"
 "\tz. B. »/unix« oder »/unix.save«.\n"
 
-#: fdisk/fdisksgilabel.c:311
+#: fdisk/fdisksgilabel.c:308
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3475,7 +3528,7 @@
 "\n"
 "\tName der Bootdatei zu lang: höchstens 16 Bytes.\n"
 
-#: fdisk/fdisksgilabel.c:316
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3483,7 +3536,7 @@
 "\n"
 "\tBootdatei muss einen voll qualifizierten Pfadnamen haben.\n"
 
-#: fdisk/fdisksgilabel.c:321
+#: fdisk/fdisksgilabel.c:320
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3493,7 +3546,7 @@
 "\tVorsicht, die Existenz der Bootdatei wird nicht geprüft.\n"
 "\tSGIs Voreinstellung ist »/unix« und als Sicherung »/unix.save«.\n"
 
-#: fdisk/fdisksgilabel.c:349
+#: fdisk/fdisksgilabel.c:346
 #, c-format
 msgid ""
 "\n"
@@ -3502,19 +3555,19 @@
 "\n"
 "\tBootdatei geändert auf »%s«.\n"
 
-#: fdisk/fdisksgilabel.c:447
+#: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
 msgstr "Keine Partitionen definiert\n"
 
-#: fdisk/fdisksgilabel.c:462
+#: fdisk/fdisksgilabel.c:449
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "IRIX mag es, wenn Partition 11 die ganze Platte umfasst.\n"
 
-#: fdisk/fdisksgilabel.c:464
+#: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3523,7 +3576,7 @@
 "Die Partition für die ganze Platte sollte bei Block 0 beginnen,\n"
 "nicht bei Plattenblock %d.\n"
 
-#: fdisk/fdisksgilabel.c:468
+#: fdisk/fdisksgilabel.c:457
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3532,57 +3585,58 @@
 "Die Partition für die ganze Platte ist nur %d Blöcke groß,\n"
 "die Platte allerdings umfasst %d Blöcke.\n"
 
-#: fdisk/fdisksgilabel.c:475
+#: fdisk/fdisksgilabel.c:463
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "Eine Partition (#11) sollte die ganze Platte umfassen.\n"
 
-#: fdisk/fdisksgilabel.c:487
+#: fdisk/fdisksgilabel.c:473
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "Partition %d beginnt nicht an einer Zylindergrenze.\n"
 
-#: fdisk/fdisksgilabel.c:494
+#: fdisk/fdisksgilabel.c:479
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "Partition %d endet nicht an einer Zylindergrenze.\n"
 
-#: fdisk/fdisksgilabel.c:502
+#: fdisk/fdisksgilabel.c:486
 #, c-format
 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:511 fdisk/fdisksgilabel.c:531
-#, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
-msgstr ""
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, fuzzy, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
+msgstr "Unbenutzter Bereich - Sektor %d-%d\n"
 
-#: fdisk/fdisksgilabel.c:544
+#: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:548
+#: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:553
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:557
+#: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:568
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:575
+#: 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"
@@ -3599,28 +3653,28 @@
 "Geben Sie JAWOHL ein, wenn Sie sicher sind, diese\n"
 "Partition von anderem Typ sein lassen zu wollen.\n"
 
-#: fdisk/fdisksgilabel.c:580 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
 msgid "YES\n"
 msgstr "JAWOHL\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:606
+#: fdisk/fdisksgilabel.c:577
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:668
+#: fdisk/fdisksgilabel.c:637
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:675
+#: fdisk/fdisksgilabel.c:642
 msgid "The entire disk is already covered with partitions.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:680
+#: fdisk/fdisksgilabel.c:646
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
+#: 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"
@@ -3628,16 +3682,16 @@
 "Es ist höchst empfehlenswert, die elfte Partition die ganze\n"
 "Platte überdecken und sie vom Typ »SGI volume« sein zu lassen.\n"
 
-#: fdisk/fdisksgilabel.c:705
+#: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:710
+#: fdisk/fdisksgilabel.c:676
 #, c-format
 msgid " Last %s"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:732
+#: 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"
@@ -3651,12 +3705,20 @@
 "vorherige Inhalt unrettbar verloren.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:758
+#: 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 ""
+
+#: fdisk/fdisksgilabel.c:738
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:760
+#: fdisk/fdisksgilabel.c:740
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tANFANG=%d\tLÄNGE=%d\n"
@@ -3740,69 +3802,69 @@
 msgid "Autoconfigure failed.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Sektoren/Spur"
 
-#: fdisk/fdisksunlabel.c:327
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:330
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
 msgid "Extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:352
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "3,5″-Diskette"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:446
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partition %d endet nicht an einer Zylindergrenze\n"
 
-#: fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:462
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:488
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Unbenutzter Bereich - Sektor 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Unbenutzter Bereich - Sektor %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:593
+#: fdisk/fdisksunlabel.c:589
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3810,14 +3872,14 @@
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:613
+#: fdisk/fdisksunlabel.c:609
 #, 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:626
+#: fdisk/fdisksunlabel.c:622
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3826,7 +3888,7 @@
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:657
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid ""
 "\n"
@@ -3838,7 +3900,7 @@
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:671
+#: fdisk/fdisksunlabel.c:667
 #, c-format
 msgid ""
 "\n"
@@ -3851,16 +3913,16 @@
 "Einheiten: %s mit %d * 512 Bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:676
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:701
+#: fdisk/fdisksunlabel.c:697
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:734
+#: fdisk/fdisksunlabel.c:730
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -4119,7 +4181,7 @@
 
 #: fdisk/i386_sys_types.c:70
 msgid "Darwin UFS"
-msgstr ""
+msgstr "Darwin UFS"
 
 #: fdisk/i386_sys_types.c:71
 msgid "NetBSD"
@@ -4127,7 +4189,7 @@
 
 #: fdisk/i386_sys_types.c:72
 msgid "Darwin boot"
-msgstr ""
+msgstr "Darwin boot"
 
 #: fdisk/i386_sys_types.c:73
 msgid "BSDI fs"
@@ -4139,11 +4201,11 @@
 
 #: fdisk/i386_sys_types.c:75
 msgid "Boot Wizard hidden"
-msgstr ""
+msgstr "Boot Wizard versteckt"
 
 #: fdisk/i386_sys_types.c:76
 msgid "Solaris boot"
-msgstr ""
+msgstr "Solaris boot"
 
 #: fdisk/i386_sys_types.c:77
 msgid "DRDOS/sec (FAT-12)"
@@ -4163,7 +4225,7 @@
 
 #: fdisk/i386_sys_types.c:81
 msgid "Non-FS data"
-msgstr ""
+msgstr "Nicht-DS-Daten"
 
 #: fdisk/i386_sys_types.c:82
 msgid "CP/M / CTOS / ..."
@@ -4173,7 +4235,7 @@
 #. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:84
 msgid "Dell Utility"
-msgstr ""
+msgstr "Dell Utility"
 
 #. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:85
@@ -4204,17 +4266,17 @@
 #. Intel EFI GUID Partition Table
 #: 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:94
 msgid "Linux/PA-RISC boot"
-msgstr ""
+msgstr "Linux/PA-RISC boot"
 
 #. SpeedStor large partition
 #: fdisk/i386_sys_types.c:97
 msgid "DOS secondary"
-msgstr "DOS secondary"
+msgstr "DOS sekundär"
 
 #. New (2.2.x) raid partition with
 #. autodetect using persistent
@@ -4456,16 +4518,16 @@
 #: 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 ""
-"Einheit = Megabytes von 1048576 Bytes, Blöcke von 1024 Bytes, Zählung "
+"Einheit = Mebibytes von 1048576 Bytes, Blöcke von 1024 Bytes, Zählung "
 "beginnt bei %d\n"
 "\n"
 
 #: fdisk/sfdisk.c:887
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
-msgstr "   Gerät  boot. Anfang Ende    MB    #Blöcke   Id  System\n"
+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
 #, c-format
@@ -4598,21 +4660,31 @@
 "         Dies spielt bei LILO keine Rolle, aber der DOS-MBR wird auf\n"
 "         dieser Festplatte nicht booten.\n"
 
+#: fdisk/sfdisk.c:1272
+msgid "start"
+msgstr "Anfang"
+
 #: fdisk/sfdisk.c:1275
 #, 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
+msgid "end"
+msgstr "Ende"
 
 #: fdisk/sfdisk.c:1284
 #, 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
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
-msgstr ""
+msgstr "Partition %s endet am Zylinder %ld, hinter dem Ende der Platte\n"
 
 #: fdisk/sfdisk.c:1312
 #, c-format
@@ -4632,11 +4704,11 @@
 #: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
-msgstr ""
+msgstr "Zu viele Partitionen - ignoriere alle hinter Nr. (%d)\n"
 
 #: fdisk/sfdisk.c:1351
 msgid "tree of partitions?\n"
-msgstr ""
+msgstr "Partitionsbaum?\n"
 
 #: fdisk/sfdisk.c:1472
 msgid "detected Disk Manager - unable to handle that\n"
@@ -4663,307 +4735,307 @@
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Die Option »-n« wurde verwendet: Es wurde nichts verändert\n"
 
-#: fdisk/sfdisk.c:1577
+#: fdisk/sfdisk.c:1579
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Speichern der alten Sektoren fehlgeschlagen - Abbruch\n"
 
-#: fdisk/sfdisk.c:1582
+#: fdisk/sfdisk.c:1584
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1661
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1695
+#: fdisk/sfdisk.c:1697
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1702
+#: fdisk/sfdisk.c:1704
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1708
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
 msgstr "Zahl zu groß\n"
 
-#: fdisk/sfdisk.c:1754
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1875
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1908
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1959
+#: fdisk/sfdisk.c:1961
 msgid "too many input fields\n"
 msgstr ""
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1993
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
 msgstr "Für mehr kein Platz\n"
 
-#: fdisk/sfdisk.c:2012
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2044
+#: fdisk/sfdisk.c:2046
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2050
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2066
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2077
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
 msgstr "ungültige Eingabe\n"
 
-#: fdisk/sfdisk.c:2172
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
 msgstr "Zu viele Partitionen\n"
 
-#: fdisk/sfdisk.c:2205
+#: 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 ""
 
-#: fdisk/sfdisk.c:2225
+#: fdisk/sfdisk.c:2227
 msgid "version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2236
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2237
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2238
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2239
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2240
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2241
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2242
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2243
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2244
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2247
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2252
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2255
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2254
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2258
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2259
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2260
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2262
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2266
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: fdisk/sfdisk.c:2267
+#: fdisk/sfdisk.c:2269
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2270
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2271
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2421
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2539
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2576
+#: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2580
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2582
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2587
+#: fdisk/sfdisk.c:2589
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2613
+#: fdisk/sfdisk.c:2615
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "Konnte %s nicht zum Lesen/Schreiben öffnen\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2617
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "Konnte %s nicht zum Lesen öffnen\n"
 
-#: fdisk/sfdisk.c:2640
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
 # And again one for show_geometry()...
-#: fdisk/sfdisk.c:2657
+#: fdisk/sfdisk.c:2659
 #, 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:2674
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2754
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
@@ -4971,7 +5043,7 @@
 "Fertig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2777
+#: fdisk/sfdisk.c:2781
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -4980,36 +5052,36 @@
 "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:2791
+#: fdisk/sfdisk.c:2795
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2848
+#: fdisk/sfdisk.c:2852
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2863
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
 msgstr "Diese Platte ist momentan in Benutzung.\n"
 
 # This is a stat()
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2887
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2889
+#: fdisk/sfdisk.c:2893
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2891
+#: fdisk/sfdisk.c:2895
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5017,60 +5089,60 @@
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2899
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2903
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2908
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
 msgstr "Alte Aufteilung:\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2916
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2920
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
 msgstr "Neue Aufteilung:\n"
 
-#: fdisk/sfdisk.c:2925
+#: 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 ""
 
-#: fdisk/sfdisk.c:2928
+#: fdisk/sfdisk.c:2932
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2933
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2942
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2948
+#: fdisk/sfdisk.c:2952
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2956
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5078,96 +5150,101 @@
 "Die neue Partitionstabelle wurde erfolgreich geschrieben\n"
 "\n"
 
-#: fdisk/sfdisk.c:2962
+#: 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 ""
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "»getopt --help« gibt weitere Informationen.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
-msgstr ""
+msgstr "leere lange Option nach -l oder --long"
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "Unbekannte Shell als Argument von -s oder --shell"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Aufruf: getopt Optionszeichenkette Parameter\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
-msgstr "       getopt [Optionen] [--] Optionszeichenkette Parameter\n"
+msgstr "        getopt [Optionen] [--] Optionszeichenkette Parameter\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
+"        getopt [Optionen] -o|--options Optionszeichenkette [Optionen] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
-msgstr ""
+msgstr "               Parameter\n"
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
+"  -a, --alternative          lange Optionen dürfen auch mit einfachem - "
+"beginnen\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
-msgstr ""
+msgstr "  -h, --help                 dieser kleine Hilfe\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-msgstr ""
+msgstr "  -l, --longoptions=lopt     zu erkennende lange Optionen\n"
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
+"  -n, --name=progname        der Name, der in Fehlermeldungen benutzt wird\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
-msgstr ""
+msgstr "  -o, --options=OptZKette    zu erkennende kurze Optionen\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
+"  -q, --quiet                Fehlermeldungen von getopt(3) unterdrücken\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
-msgstr ""
+msgstr "  -Q, --quiet-output         keine normale Ausgabe\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-msgstr ""
+msgstr "  -s, --shell=Shell          Konventionen für Shell-Quoting setzen\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
-msgstr ""
+msgstr "  -T, --test                 auf getopt(1)-Version testen\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr ""
+msgstr "  -u, --unquote              die Ausgabe nicht quoten\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
-msgstr ""
+msgstr "  -V, --version              Versionsinformation ausgeben\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
-msgstr ""
+msgstr "fehlendes Optionszeichenkettenargument"
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
-msgstr "getopt (enhanced) 1.1.2\n"
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (enhanced) 1.1.3\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "Interner Fehler, kontaktieren Sie den Autor."
 
@@ -5177,7 +5254,7 @@
 
 #: hwclock/cmos.c:181
 msgid "Ruffian BCD clock\n"
-msgstr "Ruffian BCD Uhr\n"
+msgstr "Bösartige BCD-Uhr\n"
 
 # Egger
 #: hwclock/cmos.c:197
@@ -5338,7 +5415,7 @@
 
 #: hwclock/hwclock.c:595
 msgid "--date argument too long\n"
-msgstr ""
+msgstr "--date-Argument zu lang\n"
 
 # The english version is already a little misleading.
 #: hwclock/hwclock.c:602
@@ -5661,13 +5738,15 @@
 #: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
-msgstr ""
+msgstr "%s nimmt keine Nicht-Options-Argumente. Sie gaben %d.\n"
 
 #: hwclock/hwclock.c:1403
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
+"Sie haben mehrere Funktionen angefordert.\n"
+"Sie können immer nur eine Funktion gleichzeitig ausführen.\n"
 
 #: hwclock/hwclock.c:1410
 #, c-format
@@ -5675,6 +5754,8 @@
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
+"%s: Die Optionen --utc und --localtime schließen sich aus. Sie gaben beide "
+"an.\n"
 
 #: hwclock/hwclock.c:1417
 #, c-format
@@ -5682,15 +5763,18 @@
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
+"%s: Die Optionen --adjust und --noadjfile schließen sich aus. Sie gaben "
+"beide an.\n"
 
 #: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
+"%s: Ohne --noadjfile müssen Sie entweder --utc oder --localtime angeben.\n"
 
 #: hwclock/hwclock.c:1438
 msgid "No usable set-to time.  Cannot set clock.\n"
-msgstr ""
+msgstr "Keine brauchbare Zeitangabe. Kann Uhr nicht stellen.\n"
 
 #: hwclock/hwclock.c:1454
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
@@ -5723,23 +5807,19 @@
 # debug
 #: hwclock/kd.c:43
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
-msgstr ""
+msgstr "Warte in Schleife auf Änderung der Zeit von KDGHWCLK\n"
 
 #: hwclock/kd.c:46
 msgid "KDGHWCLK ioctl to read time failed"
-msgstr ""
-"KDGHWCLK ioctl scheiterte beim Versuch die Zeit aus der Hardwareuhr "
-"auszulesen."
+msgstr "KDGHWCLK-Ioctl scheiterte beim Auslesen der Zeit."
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
-msgstr ""
+msgstr "Zeitüberschreitung beim Warten auf Zeitänderung.\n"
 
 #: hwclock/kd.c:71
 msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr ""
-"KDGHWCLK ioctl scheiterte beim Versuch die Zeit aus der Hardwareuhr "
-"auszulesen."
+msgstr "KDGHWCLK-Ioctl scheiterte in Schleife beim Auslesen der Zeit."
 
 #: hwclock/kd.c:93
 #, c-format
@@ -5748,7 +5828,7 @@
 
 #: hwclock/kd.c:129
 msgid "ioctl KDSHWCLK failed"
-msgstr ""
+msgstr "Ioctl KDSHWCLK fehlgeschlagen"
 
 #: hwclock/kd.c:166
 msgid "Can't open /dev/tty1 or /dev/vc/1"
@@ -5756,102 +5836,106 @@
 
 #: hwclock/kd.c:171
 msgid "KDGHWCLK ioctl failed"
-msgstr ""
+msgstr "KDGHWCLK-Ioctl fehlgeschlagen"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "Konnte %s nicht öffnen"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
-msgstr ""
+msgstr "ioctl() auf %s, um die Zeit zu lesen, fehlgeschlagen.\n"
 
-#: hwclock/rtc.c:171
+#: hwclock/rtc.c:170
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
-msgstr ""
+msgstr "Warte in Schleife auf Änderung der Zeit aus %s\n"
 
-#: hwclock/rtc.c:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
-msgstr ""
+msgstr "%s hat keine Interrupt-Funktionen."
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
-msgstr ""
+msgstr "ioctl() auf %s, um auf Zeittick zu warten, fehlgeschlagen."
 
-#: hwclock/rtc.c:244
+#: hwclock/rtc.c:243
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
 
-#: hwclock/rtc.c:247
+#: hwclock/rtc.c:246
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:305
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
-msgstr ""
+msgstr "ioctl() auf %s, um die Zeit zu setzen, fehlgeschlagen.\n"
 
 # debug
-#: hwclock/rtc.c:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "»ioctl(%s)« war erfolgreich.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "Konnte %s nicht öffnen"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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 ""
+"Zum Manipulieren des Epoch-Wertes im Kernel müssen wir den Linux-"
+"Gerätetreiber ‚rtc‘ mittels der Gerätedatei %s ansprechen. Diese Datei "
+"existiert auf diesem System nicht.\n"
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr "Konnte %s nicht öffnen"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr ""
+msgstr "ioctl(RTC_EPOCH_READ) auf %s fehlgeschlagen"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr ""
+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:397
+#: hwclock/rtc.c:396
 #, 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:415
+#: hwclock/rtc.c:414
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
-msgstr ""
+msgstr "Setze Epoche auf %ld mit RTC_EPOCH_SET-Ioctl auf %s.\n"
 
-#: hwclock/rtc.c:420
+#: hwclock/rtc.c:419
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr ""
 
-#: hwclock/rtc.c:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr ""
@@ -5994,10 +6078,14 @@
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
+"Aufruf: %s [-hiLmw] [-l login_programm] [-t zeitlimit] [-I initstring] [-H "
+"login_host] baud_rate,... zeile [termtype]\n"
+" oder:   [-hiLmw] [-l login_programm] [-t zeitlimit] [-I initstring] [-H "
+"login_host] zeile baud_rate,... [termtype]\n"
 
 #: login-utils/checktty.c:104 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
-msgstr ""
+msgstr "login: wenig Speicher, Einloggen könnte fehlschlagen\n"
 
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
 #: login-utils/checktty.c:105
@@ -6050,9 +6138,8 @@
 msgid "Password error."
 msgstr ""
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249
-#: mount/lomount.c:254
+#: 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
 msgid "Password: "
 msgstr "Passwort: "
 
@@ -6068,44 +6155,48 @@
 #: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr ""
+msgstr "Aufruf: %s [ -f ganzer_Name ] [ -o Bureau ] "
 
 #: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
+"[ -p Bureau-Telefon ]\n"
+"\t[ -h Heim-Telefon ] "
 
 #: 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"
+"Abgebrochen.\n"
 
 #: login-utils/chfn.c:398
 msgid "field is too long.\n"
-msgstr ""
+msgstr "Feld ist zu lang.\n"
 
 #: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr ""
+msgstr "»%c« ist nicht erlaubt.\n"
 
 #: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
-msgstr ""
+msgstr "Steuerzeichen sind nicht erlaubt.\n"
 
 #: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
-msgstr ""
+msgstr "Finger-Information *NICHT* geändert. Später erneut versuchen.\n"
 
 #: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
-msgstr ""
+msgstr "Finger-Information geändert.\n"
 
 #: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
 msgid "malloc failed"
@@ -6149,7 +6240,7 @@
 #: login-utils/chsh.c:303
 #, c-format
 msgid "%s: shell must be a full path name.\n"
-msgstr ""
+msgstr "%s: Shell muss ein voller Pfadname sein.\n"
 
 #: login-utils/chsh.c:307
 #, c-format
@@ -6185,7 +6276,7 @@
 #: login-utils/chsh.c:333
 #, c-format
 msgid "%s: use -l option to see list\n"
-msgstr ""
+msgstr "%s: Benutzen Sie die Option -l für eine Liste\n"
 
 #: login-utils/chsh.c:339
 #, c-format
@@ -6207,7 +6298,7 @@
 
 #: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
-msgstr ""
+msgstr "konnte keine zufälligen Daten aus /dev/urandom lesen"
 
 #: login-utils/cryptocard.c:96
 #, c-format
@@ -6232,7 +6323,7 @@
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
-msgstr ""
+msgstr "Kann %s nicht lesen, beende."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
@@ -6253,7 +6344,7 @@
 
 #: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
 msgid "last: malloc failure.\n"
-msgstr ""
+msgstr "last: malloc-Fehlschlag.\n"
 
 #: login-utils/last.c:441
 msgid "last: gethostname"
@@ -6265,33 +6356,35 @@
 "\n"
 "interrupted %10.10s %5.5s \n"
 msgstr ""
+"\n"
+"unterbrochen %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATAL: kann TTY nicht erneut öffnen: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
-msgstr ""
+msgstr "FATAL: ungültiges TTY"
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h nur für den Superuser.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "Aufruf: login [-fp] [Benutzername]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
-msgstr ""
+msgstr "login: PAM-Fehlschlag, breche ab: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
-msgstr ""
+msgstr "Konnte PAM nicht initialisieren: %s"
 
 # unten nochmal mit NL
 #.
@@ -6300,17 +6393,18 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "Anmeldung: "
 
-#: login-utils/login.c:603
+# Das geht ins Syslog - ich übersetze es nicht. (MPi)
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr ""
+msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
 # unten noch zwei mal mit anderen NL
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -6319,17 +6413,17 @@
 "\n"
 
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -6337,133 +6431,137 @@
 "\n"
 "Login inkorrekt\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
+"\n"
+"Problem beim Aufsetzen der Sitzung, Abbruch.\n"
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
-msgstr ""
+msgstr "Leerer Benutzername in %s:%d. Abbruch."
 
-#: login-utils/login.c:654
+#: 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."
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
 msgstr "login: Speicher ist alle!\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Ungültiger Nutzername"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
-msgstr ""
+msgstr "%s Login auf diesem Terminal verweigert.\n"
 
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s REFUSED FROM %s ON TTY %s"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s REFUSED ON TTY %s"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Login inkorrekt\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
 msgstr ""
+"Bereits zu viele Nutzer eingeloggt.\n"
+"Versuchen Sie es später wieder.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
-msgstr ""
+msgstr "Sie haben zu viele Prozesse am Laufen.\n"
 
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP AT %s BY %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN ON %s FROM %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN ON %s"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN ON %s BY %s FROM %s"
 
-#: login-utils/login.c:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN ON %s BY %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
 msgstr "Sie haben neue E-Mail.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
 msgstr "Sie haben E-Mail.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: Kann keinen neuen Prozess erzeugen: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
-msgstr ""
+msgstr "TIOCSCTTY fehlgeschlagen: %m"
+
+#: login-utils/login.c:1155
+msgid "setuid() failed"
+msgstr "setuid() fehlgeschlagen"
 
 #: login-utils/login.c:1161
-msgid "setuid() failed"
-msgstr ""
-
-#: login-utils/login.c:1167
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Konnte nicht in das Verzeichnis %s wechseln!\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr "Logge ein mit Heimatverzeichnis = »/«.\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
-msgstr ""
+msgstr "login: kein Speicher für Shellskipt.\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
-msgstr ""
+msgstr "login: konnte Shellskipt nicht ausführen: %s.\n"
 
-#: login-utils/login.c:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: keine Shell: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6472,66 +6570,66 @@
 "\n"
 "%s Anmeldung: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "Login-Name viel zu lang.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "NAME zu lang"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
 msgstr "Benutzernamen dürfen nicht mit einem »-« anfangen.\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "zu viele nackte Zeilenvorschübe\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "EXZESSIV viele Zeilenvorschübe"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login nach %d Sekunden abgebrochen\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Letzte Anmeldung: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "von %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "auf %.*s\n"
 
 # Das geht ins Syslog - ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, 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:1384
+#: login-utils/login.c:1378
 #, 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:1388
+#: login-utils/login.c:1382
 #, 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:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -6550,15 +6648,15 @@
 
 #: login-utils/newgrp.c:68
 msgid "newgrp: Who are you?"
-msgstr ""
+msgstr "newgrp: Wer sind Sie?"
 
 #: 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: Keine solche Gruppe."
 
 # libc.po: "Keine Berechtigung"
 #: login-utils/newgrp.c:90
@@ -6567,7 +6665,7 @@
 
 #: login-utils/newgrp.c:97
 msgid "newgrp: setuid"
-msgstr ""
+msgstr "newgrp: setuid"
 
 #: login-utils/newgrp.c:103
 msgid "No shell"
@@ -6575,7 +6673,7 @@
 
 #: login-utils/passwd.c:161
 msgid "The password must have at least 6 characters, try again.\n"
-msgstr ""
+msgstr "Das Passwort muss mindesten 6 Zeichen haben, nochmal bitte.\n"
 
 #: login-utils/passwd.c:174
 msgid ""
@@ -6583,136 +6681,141 @@
 "classes:  upper and lower case letters, digits and non alphanumeric\n"
 "characters. See passwd(1) for more information.\n"
 msgstr ""
+"Das Passwort muss Zeichen aus zwei der folgenden Klassen enthalten:\n"
+"Groß- und Kleinbuchstaben, Ziffern und nicht-alphanumerische Zeichen.\n"
+"Siehe auch passwd(1) für weitere Informationen.\n"
 
 #: login-utils/passwd.c:183
 msgid "You cannot reuse the old password.\n"
-msgstr ""
+msgstr "Sie können das alte Passwort nicht wiederbenutzen.\n"
 
 #: login-utils/passwd.c:188
 msgid "Please don't use something like your username as password!\n"
-msgstr ""
+msgstr "Benutzen Sie bitte nicht etwas wie Ihren Nutzernamen als Passwort!\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 "Benutzen Sie bitte nicht etwas wie Ihren echten Namen als Passwort!\n"
 
 #: login-utils/passwd.c:224
 msgid "Usage: passwd [username [password]]\n"
-msgstr ""
+msgstr "Aufruf: passwd [nutzername [passwort]]\n"
 
 #: login-utils/passwd.c:225
 msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
+msgstr "Nur root kann die ein- und zweiargumentigen Formen benutzen.\n"
 
 #: login-utils/passwd.c:280
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr ""
+msgstr "Aufruf: passwd [-foqsvV] [nutzer [passwort]]\n"
 
 #: login-utils/passwd.c:301
 #, c-format
 msgid "Can't exec %s: %s\n"
-msgstr ""
+msgstr "Kann %s nicht ausführen: %s\n"
 
 #: login-utils/passwd.c:312
 msgid "Cannot find login name"
-msgstr ""
+msgstr "Kann Login-namen nicht finden"
 
 #: login-utils/passwd.c:319 login-utils/passwd.c:326
 msgid "Only root can change the password for others.\n"
-msgstr ""
+msgstr "Nur root kann das Passwort für andere ändern.\n"
 
 #: login-utils/passwd.c:334
 msgid "Too many arguments.\n"
-msgstr ""
+msgstr "Zu viele Argumente.\n"
 
 #: login-utils/passwd.c:339
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
+msgstr "Kann Nutzernamen nirgends finden. Ist »%s« wirklich ein Nutzer?"
 
 #: login-utils/passwd.c:343
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 msgstr ""
+"Tut mir leid, ich kann nur lokale Passwörter ändern. Bitte yppasswd benutzen."
 
 #: login-utils/passwd.c:349
 msgid "UID and username does not match, imposter!"
-msgstr ""
+msgstr "UID und Nutzername stimmen nicht überein, Hochstapler!"
 
 #: login-utils/passwd.c:354
 #, c-format
 msgid "Changing password for %s\n"
-msgstr ""
+msgstr "Ändere Passwort für %s\n"
 
 #: login-utils/passwd.c:358
 msgid "Enter old password: "
-msgstr ""
+msgstr "Altes Passwort: "
 
 #: login-utils/passwd.c:360
 msgid "Illegal password, imposter."
-msgstr ""
+msgstr "Illegales Passwort, Hochstapler."
 
 #: login-utils/passwd.c:372
 msgid "Enter new password: "
-msgstr ""
+msgstr "Neues Passwort: "
 
 #: login-utils/passwd.c:374
 msgid "Password not changed."
-msgstr ""
+msgstr "Passwort nicht geändert."
 
 #: login-utils/passwd.c:383
 msgid "Re-type new password: "
-msgstr ""
+msgstr "Neues Passwort wiederholen: "
 
 #: login-utils/passwd.c:386
 msgid "You misspelled it. Password not changed."
-msgstr ""
+msgstr "Sie haben sich vertippt. Passwort nicht geändert."
 
 #: login-utils/passwd.c:401
 #, c-format
 msgid "password changed, user %s"
-msgstr ""
+msgstr "Passwort geändert, Nutzer %s"
 
 #: login-utils/passwd.c:404
 msgid "ROOT PASSWORD CHANGED"
-msgstr ""
+msgstr "ROOT-PASSWORT GEÄNDERT"
 
 #: login-utils/passwd.c:406
 #, c-format
 msgid "password changed by root, user %s"
-msgstr ""
+msgstr "Passwort durch root geändert, Nutzer %s"
 
 #: login-utils/passwd.c:413
 msgid "calling setpwnam to set password.\n"
-msgstr ""
+msgstr "rufe setpwnam, um Passwort zu setzen.\n"
 
 #: login-utils/passwd.c:417
 msgid "Password *NOT* changed.  Try again later.\n"
-msgstr ""
+msgstr "Passwort *NICHT* geändert. Später erneut versuchen.\n"
 
 #: login-utils/passwd.c:423
 msgid "Password changed.\n"
-msgstr ""
+msgstr "Passwort geändert.\n"
 
 #: login-utils/shutdown.c:113
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr ""
+msgstr "Aufruf: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
-msgstr ""
+msgstr "Shutdown-Prozess abgebrochen"
 
 #: login-utils/shutdown.c:162
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr ""
+msgstr "%s: Nur root kann ein System herunterfahren.\n"
 
 #: login-utils/shutdown.c:256
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr ""
+msgstr "Das muss morgen sein, können Sie nicht bis dann warten?\n"
 
+# What the f... (MPi)
 #: login-utils/shutdown.c:307
 msgid "for maintenance; bounce, bounce"
-msgstr ""
+msgstr "zur Systempflege; bounce, bounce"
 
 # debug
 #: login-utils/shutdown.c:311
@@ -6722,21 +6825,21 @@
 
 #: login-utils/shutdown.c:336
 msgid "The system is being shut down within 5 minutes"
-msgstr ""
+msgstr "Das System wird innerhalb der nächsten 5 Minuten heruntergefahren"
 
 #: login-utils/shutdown.c:340
 msgid "Login is therefore prohibited."
-msgstr ""
+msgstr "Das Einloggen ist daher untersagt."
 
 #: login-utils/shutdown.c:362
 #, c-format
 msgid "rebooted by %s: %s"
-msgstr ""
+msgstr "neu gestartet durch %s: %s"
 
 #: login-utils/shutdown.c:365
 #, c-format
 msgid "halted by %s: %s"
-msgstr ""
+msgstr "angehalten durch %s: %s"
 
 #. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
@@ -6744,21 +6847,25 @@
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
+"\n"
+"Warum bin ich nach dem Neustart noch am Leben?"
 
 #: login-utils/shutdown.c:431
 msgid ""
 "\n"
 "Now you can turn off the power..."
 msgstr ""
+"\n"
+"Sie können den Rechner jetzt abschalten..."
 
 #: login-utils/shutdown.c:447
 msgid "Calling kernel power-off facility...\n"
-msgstr ""
+msgstr "Rufe die Abschaltfunktion des Kernels...\n"
 
 #: login-utils/shutdown.c:450
 #, c-format
 msgid "Error powering off\t%s\n"
-msgstr ""
+msgstr "Fehler beim Abschalten\t%s\n"
 
 #: login-utils/shutdown.c:458
 #, c-format
@@ -6768,7 +6875,7 @@
 #: login-utils/shutdown.c:461
 #, c-format
 msgid "Error executing\t%s\n"
-msgstr ""
+msgstr "Fehler beim Ausführen\t%s\n"
 
 # XXX - Have to look at other OSs translation for Broadcast
 # Message
@@ -6781,25 +6888,25 @@
 #: login-utils/shutdown.c:494
 #, c-format
 msgid "System going down in %d hours %d minutes"
-msgstr ""
+msgstr "System fährt in %d Stunden und %d Minuten herunter"
 
 #: login-utils/shutdown.c:497
 #, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr ""
+msgstr "System fährt in einer Stunde und %d Minuten herunter"
 
 #: login-utils/shutdown.c:500
 #, c-format
 msgid "System going down in %d minutes\n"
-msgstr ""
+msgstr "System fährt in %d Minuten herunter\n"
 
 #: login-utils/shutdown.c:503
 msgid "System going down in 1 minute\n"
-msgstr ""
+msgstr "System fährt in einer Minute herunter\n"
 
 #: login-utils/shutdown.c:505
 msgid "System going down IMMEDIATELY!\n"
-msgstr ""
+msgstr "System fährt SOFORT herunter!\n"
 
 #: login-utils/shutdown.c:510
 #, c-format
@@ -6890,7 +6997,7 @@
 msgid "fork failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
 msgstr "»exec()« schlug fehl\n"
 
@@ -7050,10 +7157,11 @@
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Aufruf: %s [+Format] [Tag Monat Jahr]\n"
 
+# The rest is untranslated, leave it (MPi)
 #. handle St. Tib's Day
 #: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
-msgstr "St.-Tibs-Tag"
+msgstr "St. Tib's Day"
 
 #: misc-utils/kill.c:206
 #, c-format
@@ -7201,13 +7309,13 @@
 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:255
+#: misc-utils/script.c:264
 #, 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:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
@@ -7216,210 +7324,210 @@
 "\n"
 "Script beendet: %s"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script wurde beendet, die Datei ist %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr "»openpty« ist fehlgeschlagen\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr "Keine ptys mehr.\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:744
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Fehler bei den Argumenten; Aufruf:\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term Terminalname ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ Attribut ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -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 "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabN = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-Anzahl_Konsolen] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-Anzahl_Konsolen] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file Dumpdateiname ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq Freqnummer ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "»klogctl« Fehler: %s\n"
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fehler beim Lesen von %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr "Fehler beim Schreiben des Bildschirmdumps\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: Die Umgebungsvariable TERM ist nicht gesetzt.\n"
@@ -7475,17 +7583,17 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr ""
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "Warnung: Fehler beim Lesen von %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 "Warnung: Konnte %s nicht öffnen: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: Konnte %s nicht öffnen - benutze %s stattdessen\n"
@@ -7494,21 +7602,21 @@
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:415
 #, 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:399
+#: mount/fstab.c:427
 #, 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:411
+#: mount/fstab.c:439
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
@@ -7517,22 +7625,22 @@
 
 # This one should be merged with the next one by using
 # error() instead of printf()
-#: mount/fstab.c:426
+#: mount/fstab.c:454
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Konnte die Lock-Datei %s nicht »locken«: %s\n"
 
 # sperren
-#: mount/fstab.c:439
+#: mount/fstab.c:467
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Konnte die Lock-Datei %s nicht »locken«: %s"
 
-#: mount/fstab.c:441
+#: mount/fstab.c:469
 msgid "timed out"
 msgstr "Zeitüberschreitung"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:476
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7541,47 +7649,47 @@
 "Konnte Verknüpfung %s nicht anlegen\n"
 "Vielleicht gibt es noch eine abgelaufene Lock-Datei?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:525 mount/fstab.c:561
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "Konnte %s nicht öffnen (%s) - mtab nicht aktualisiert"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:569
 #, c-format
 msgid "error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:577
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:595
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "Konnte %s nicht in %s umbenennen: %s\n"
 
-#: mount/lomount.c:80
+#: mount/lomount.c:173
 #, 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:86
+#: mount/lomount.c:179
 #, 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"
 
-#: mount/lomount.c:91
+#: mount/lomount.c:184
 #, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
 msgstr ""
 
 # XXX - pretty dumb
-#: mount/lomount.c:177
+#: mount/lomount.c:245
 msgid "mount: could not find any device /dev/loop#"
 msgstr "mount: Konnte kein Gerät /dev/loop# finden"
 
-#: mount/lomount.c:181
+#: mount/lomount.c:249
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -7589,7 +7697,7 @@
 "mount: Konnte kein »loop«-Gerät finden.\n"
 "       Vielleicht hat /dev/loop# eine falsche Major-Nummer?"
 
-#: mount/lomount.c:185
+#: mount/lomount.c:253
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -7601,7 +7709,7 @@
 "       ist, dann sollten Sie das Kernel neu kompilieren oder\n"
 "       »insmod loop.o« ausführen.)"
 
-#: mount/lomount.c:191
+#: 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"
@@ -7613,273 +7721,311 @@
 "       »insmod loop.o« ausführen) Oder vieleicht hat /dev/loop#\n"
 "       eine falsche Major-Nummer?"
 
-#: mount/lomount.c:195
+#: mount/lomount.c:263
 msgid "mount: could not find any free loop device"
 msgstr "mount: Konnte kein freies »loop«-Gerät finden"
 
-# Verschlüsselungstyp
-#: mount/lomount.c:225
-#, c-format
-msgid "Unsupported encryption type %s\n"
-msgstr "Die Verschlüsselungsmethode %s wird nicht unterstützt\n"
+#: 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:239
+#: 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"
+msgstr ""
+
+#: mount/lomount.c:463
+#, 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 ""
+
+#: mount/lomount.c:611
+#, 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:258
+#: mount/lomount.c:654
 msgid "Init (up to 16 hex digits): "
 msgstr "Initialisierung (bis zu 16 Hexadezimalziffern): "
 
 # "Ziffer" ?
-#: mount/lomount.c:265
+#: mount/lomount.c:661
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Das Zeichen »%c« ist keine hexadezimale Ziffer.\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:764
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr ""
 
-#: mount/lomount.c:288
+#: mount/lomount.c:802
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr "set_loop(%s, %s, %d): Erfolg\n"
 
-# this is actually an open()...
-#: mount/lomount.c:299
-#, c-format
-msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: Konnte das Gerät %s nicht löschen: %s\n"
-
-#: mount/lomount.c:309
-#, c-format
-msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s): Erfolg\n"
-
-#: mount/lomount.c:317
-msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr ""
-"Dieses mount wurde ohne Loop-Unterstützung übersetzt. Bitte neu übersetzen.\n"
-
-# Setup
-#: mount/lomount.c:354
+#: mount/lomount.c:831
 #, 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"
+"  %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 ""
-"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:372 mount/sundries.c:30 mount/sundries.c:45
-#: mount/sundries.c:244
+#: 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 "Nicht genügend Speicher"
 
-#: mount/lomount.c:443
-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/lomount.c:945
+#, fuzzy
+msgid "Error: unable to open /etc/fstab for reading\n"
+msgstr "Konnte %s nicht zum Lesen öffnen\n"
 
-#: mount/mntent.c:165
+#: 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/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
 "[mntent]: Warnung: Am Ende der Datei %s fehlt ein abschließender "
 "Zeilenvorschub.\n"
 
-#: mount/mntent.c:216
+#: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: Zeile %d in %s ist fehlerhaft%s\n"
 
-#: mount/mntent.c:219
+#: mount/mntent.c:222
 msgid "; rest of file ignored"
 msgstr "; der Rest der Datei wurde ignoriert"
 
-#: mount/mount.c:385
+#: mount/mount.c:396
 #, 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:389
+#: mount/mount.c:400
 #, 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:410
+#: mount/mount.c:421
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: Konnte %s nicht zum Schreiben öffnen: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:436 mount/mount.c:660
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: Fehler beim Schreiben von %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:443
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: Fehler beim Ändern der Zugriffsrechte von %s: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:494
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s sieht wie ein Swap-Bereich aus - nicht eingehängt"
 
-#: mount/mount.c:538
+#: mount/mount.c:554
 msgid "mount failed"
 msgstr "mount ist fehlgeschlagen"
 
-#: mount/mount.c:540
+#: mount/mount.c:556
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: Nur »root« kann %s auf %s einhängen"
 
-#: mount/mount.c:568
+#: mount/mount.c:584
 msgid "mount: loop device specified twice"
 msgstr "mount: Das »loop«-Gerät wurde zweimal angegeben"
 
-#: mount/mount.c:573
+#: mount/mount.c:589
 msgid "mount: type specified twice"
 msgstr "mount: Der Typ wurde doppelt angegeben"
 
-#: mount/mount.c:585
+#: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:594
+#: 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"
 
-#: mount/mount.c:598
+#: mount/mount.c:614
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:602
+#: mount/mount.c:618
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:639
+#: mount/mount.c:655
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: Konnte %s nicht öffnen: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:678
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: Kann %s nicht zum Setzen der Geschwindigkeit öffnen"
 
-#: mount/mount.c:665
+#: mount/mount.c:681
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:735 mount/mount.c:1309
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: Kann keinen neuen Prozess erzeugen: %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:815
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr ""
 "mount: Diese Version wurde ohne Unterstützung für den Typ »nfs« kompiliert"
 
-#: mount/mount.c:845
+#: mount/mount.c:854
 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:856
+#: mount/mount.c:865
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: Der Dateisystemtyp konnte nicht festgestellt werden\n"
 "       und es wurde keiner angegeben"
 
-#: mount/mount.c:859
+#: mount/mount.c:868
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: Sie müssen den Dateisystemtyp angeben"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:871
 msgid "mount: mount failed"
 msgstr "mount: mount ist fehlgeschlagen"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:877 mount/mount.c:912
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: Mountpunkt %s ist kein Verzeichnis"
 
 # libc.po: "Keine Berechtigung"
-#: mount/mount.c:870
+#: mount/mount.c:879
 msgid "mount: permission denied"
 msgstr "mount: Zugriff verweigert"
 
-#: mount/mount.c:872
+#: mount/mount.c:881
 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:876 mount/mount.c:880
+#: mount/mount.c:885 mount/mount.c:889
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s wird gerade benutzt"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:891
 msgid "mount: proc already mounted"
 msgstr "mount: proc ist bereits eingehängt"
 
-#: mount/mount.c:884
+#: mount/mount.c:893
 #, 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:890
+#: mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: Einhängepunkt %s existiert nicht"
 
-#: mount/mount.c:892
+#: mount/mount.c:901
 #, 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"
 
-#: mount/mount.c:895
+#: mount/mount.c:904
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: Gerätedatei %s existiert nicht"
 
-#: mount/mount.c:905
+#: mount/mount.c:914
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:918
+#: mount/mount.c:927
 #, 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:920
+#: mount/mount.c:929
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7889,35 +8035,35 @@
 "       »Superblock« von %s ist beschädigt oder es sind\n"
 "       zu viele Dateisysteme eingehängt"
 
-#: mount/mount.c:954
+#: mount/mount.c:963
 msgid "mount table full"
 msgstr "Einhängetabelle ist voll"
 
-#: mount/mount.c:956
+#: mount/mount.c:965
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: Konnte den Superblock nicht lesen"
 
-#: mount/mount.c:960
+#: mount/mount.c:969
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: unbekanntes Gerät"
 
-#: mount/mount.c:965
+#: mount/mount.c:974
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: Der Dateisystemtyp »%s« wird nicht vom Kernel unterstützt"
 
-#: mount/mount.c:977
+#: mount/mount.c:986
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: Wahrscheinlich meinten sie »%s«"
 
-#: mount/mount.c:979
+#: mount/mount.c:988
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: Vielleicht meinten Sie »iso9660«?"
 
-#: mount/mount.c:982
+#: mount/mount.c:991
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -7925,12 +8071,12 @@
 "       Dateisystemtyp %s wird nicht unterstützt"
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:997
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s ist kein blockorientiertes Gerät und »stat« schlägt fehl?"
 
-#: mount/mount.c:990
+#: mount/mount.c:999
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7940,104 +8086,105 @@
 "       Gerät (Vielleicht hilft »insmod Treiber«?)"
 
 # "versuchen"
-#: mount/mount.c:993
+#: mount/mount.c:1002
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s ist kein blockorientiertes Gerät\n"
 "       (Vielleicht probieren Sie »-o loop«?)"
 
-#: mount/mount.c:996
+#: mount/mount.c:1005
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ist kein blockorientiertes Gerät"
 
-#: mount/mount.c:999
+#: mount/mount.c:1008
 #, 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:1002
+#: mount/mount.c:1011
 msgid "block device "
 msgstr "blockorientiertes Gerät "
 
-#: mount/mount.c:1004
+#: mount/mount.c:1013
 #, 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:1008
+#: mount/mount.c:1017
 #, 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"
 
 # That sounds somehow dumb.
-#: mount/mount.c:1024
+#: mount/mount.c:1033
 #, 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:1111
+#: mount/mount.c:1120
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s\n"
 msgstr ""
 
-#: mount/mount.c:1115
+#: mount/mount.c:1124
 #, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr "mount: %s doppelt - nicht eingehängt"
 
-#: mount/mount.c:1125
+#: 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:1126
+#: mount/mount.c:1135
 msgid "UUID"
 msgstr "UUID"
 
 # dito
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "label"
 msgstr "label"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: mount/mount.c:1137 mount/mount.c:1587
 msgid "mount: no such partition found"
 msgstr "mount: Keine passende Partition gefunden"
 
-#: mount/mount.c:1136
+#: mount/mount.c:1145
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: Kein Typ angegeben - aufgrund des Doppelpunkts wird NFS angenommen\n"
 
-#: mount/mount.c:1141
-msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+#: mount/mount.c:1150
+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 smb angenommen\n"
+"mount: Kein Typ angegeben - aufgrund des //-Präfixes wird smbfs angenommen\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1166
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: »%s« wird im Hintergrund fortgesetzt\n"
 
 # Not really nice
-#: mount/mount.c:1168
+#: mount/mount.c:1177
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: »%s« schlug fehl\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1254
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ist bereits auf %s eingehängt\n"
 
-#: mount/mount.c:1376
+#: mount/mount.c:1386
+#, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8058,7 +8205,7 @@
 "       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 fd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Aufruf: mount -V                 : Version ausgeben\n"
@@ -8084,40 +8231,40 @@
 "Weitere Optionen: [-nfFrsvw] [-o optionen].\n"
 "Für viele weitere Details: man 8 mount.\n"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1563
 msgid "mount: only root can do that"
 msgstr "mount: Nur »root« kann dies tun"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1568
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nicht gefunden - Erzeuge sie...\n"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1582
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
 msgstr ""
 
-#: mount/mount.c:1575
+#: mount/mount.c:1589
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: Hänge %s ein\n"
 
-#: mount/mount.c:1584
+#: mount/mount.c:1598
 msgid "nothing was mounted"
 msgstr "nichts wurde eingehängt"
 
-#: mount/mount.c:1599
+#: mount/mount.c:1613
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: Konnte %s nicht in %s finden"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1628
 #, 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:259
+#: mount/mount_by_label.c:189
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8125,15 +8272,15 @@
 "mount: konnte %s nicht öffnen, also können UUID- und LABEL-Konvertierung\n"
 "       nicht durchgeführt werden.\n"
 
-#: mount/mount_by_label.c:378
+#: mount/mount_by_label.c:309
 msgid "mount: bad UUID"
 msgstr "mount: ungültige UUID"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:483
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: Fehler beim Erraten des Dateisystemtyps\n"
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:492
 #, 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"
@@ -8141,25 +8288,25 @@
 # Maybe:
 # "       Es werden alle Dateisystemtypen ausprobiert, die\n"
 # "       in %s oder %s aufgelistet sind\n"
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:495
 #, 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:499
+#: mount/mount_guess_fstype.c:498
 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:501
+#: mount/mount_guess_fstype.c:500
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Werde den Typ %s versuchen\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:588
 #, c-format
 msgid "Trying %s\n"
 msgstr "Versuche %s\n"
@@ -8254,7 +8401,7 @@
 msgid "bug in xstrndup call"
 msgstr "Fehler im Aufruf von xstrndup"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8267,7 +8414,7 @@
 "        %s [-v] [-p Priorität] Spezialdatei ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:84
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8278,35 +8425,103 @@
 "        %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:178 mount/swapon.c:242
+#: mount/swapon.c:201 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s für %s\n"
 
 # stat
-#: mount/swapon.c:182
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: Konnte »stat« nicht auf %s anwenden: %s\n"
 
-#: mount/swapon.c:193
+#: mount/swapon.c:216
 #, 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:205
+#: mount/swapon.c:228
 #, 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:248
+#: mount/swapon.c:271
 msgid "Not superuser.\n"
 msgstr "Nicht Superuser.\n"
 
-#: mount/swapon.c:312 mount/swapon.c:401
+#: 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
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: Konnte %s nicht öffnen: %s\n"
@@ -8393,7 +8608,7 @@
 #: mount/umount.c:329
 #, c-format
 msgid "umount: could not remount %s read-only\n"
-msgstr "umount: konnte %s nicht im Nur-Lese-Modus wiedereinhängen\n"
+msgstr "umount: konnte %s nicht im Nur-Lese-Modus wieder einhängen\n"
 
 #: mount/umount.c:338
 #, c-format
@@ -8411,7 +8626,7 @@
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Aufruf: umount [-hV]\n"
-"        umoumt -a [-f] [-r] [-n] [-v] [-t VFS-Typen] [-O optionen]\n"
+"        umount -a [-f] [-r] [-n] [-v] [-t VFS-Typen] [-O optionen]\n"
 "        umount [-f] [-r] [-n] [-v] Spezialdatei | Verzeichnis ...\n"
 
 #: mount/umount.c:539
@@ -8439,17 +8654,17 @@
 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:564
+#: mount/umount.c:566
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount und fstab stimmen nicht überein"
 
-#: mount/umount.c:598
+#: mount/umount.c:602
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: Nur »root« kann %s von %s aushängen"
 
-#: mount/umount.c:669
+#: mount/umount.c:671
 msgid "umount: only root can do that"
 msgstr "umount: Nur »root« kann dies tun"
 
@@ -8479,27 +8694,27 @@
 #: sys-utils/cytune.c:195
 #, c-format
 msgid "Invalid interval value: %s\n"
-msgstr ""
+msgstr "Ungültiger interner Wert: %s\n"
 
 #: sys-utils/cytune.c:203
 #, c-format
 msgid "Invalid set value: %s\n"
-msgstr ""
+msgstr "Ungültiger Wert zu setzen: %s\n"
 
 #: sys-utils/cytune.c:211
 #, c-format
 msgid "Invalid default value: %s\n"
-msgstr ""
+msgstr "Ungültiger voreingestellter Wert: %s\n"
 
 #: sys-utils/cytune.c:219
 #, c-format
 msgid "Invalid set time value: %s\n"
-msgstr ""
+msgstr "Ungültiger Zeit-Wert zu setzen: %s\n"
 
 #: sys-utils/cytune.c:227
 #, c-format
 msgid "Invalid default time value: %s\n"
-msgstr ""
+msgstr "Ungültiger voreingestellter Zeit-Wert: %s\n"
 
 #: sys-utils/cytune.c:244
 #, c-format
@@ -8507,6 +8722,8 @@
 "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
 "[-g|-G] file [file...]\n"
 msgstr ""
+"Aufruf: %s [-q [-i Intervall]] ([-s Wert]|[-S Wert]) ([-t Wert]|[-T Wert]) [-"
+"g|-G] Datei [Datei...]\n"
 
 #: sys-utils/cytune.c:256 sys-utils/cytune.c:275 sys-utils/cytune.c:295
 #: sys-utils/cytune.c:345
@@ -8580,7 +8797,7 @@
 msgstr ""
 
 # "Level"
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Aufruf: %s [-c] [-n Level] [-s Puffergröße]\n"
@@ -8588,7 +8805,7 @@
 #: sys-utils/ipcrm.c:66
 #, c-format
 msgid "invalid id: %s\n"
-msgstr ""
+msgstr "ungültige ID: %s\n"
 
 #: sys-utils/ipcrm.c:84
 #, c-format
@@ -8711,7 +8928,7 @@
 "\t-a : all (default)\n"
 msgstr ""
 "\t-s : Semaphoren\n"
-"\t-a : alles (Voreinstellung)\n"
+"\r-a : alles (Voreinstellung)\n"
 
 #: sys-utils/ipcs.c:133
 msgid ""
@@ -9004,7 +9221,7 @@
 
 #: sys-utils/ipcs.c:496
 msgid "kernel not configured for message queues\n"
-msgstr ""
+msgstr "Kernel nicht für Nachrichtenschlangen konfiguriert\n"
 
 #: sys-utils/ipcs.c:504
 msgid "------ Messages: Limits --------\n"
@@ -9123,9 +9340,9 @@
 msgstr ""
 
 #: sys-utils/ipcs.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:615
 #, c-format
@@ -9148,16 +9365,18 @@
 "\n"
 "Message Queue msqid=%d\n"
 msgstr ""
+"\n"
+"Nachrichtenwarteschlange msqid=%d\n"
 
 #: 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\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:637
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
-msgstr ""
+msgstr "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 
 #: sys-utils/ipcs.c:646
 #, c-format
@@ -9175,6 +9394,8 @@
 "\n"
 "Semaphore Array semid=%d\n"
 msgstr ""
+"\n"
+"Semaphorenfeld semid=%d\n"
 
 #: sys-utils/ipcs.c:669
 #, c-format
@@ -9203,7 +9424,7 @@
 
 #: sys-utils/ipcs.c:679
 msgid "semnum"
-msgstr ""
+msgstr "Semnum"
 
 #: sys-utils/ipcs.c:679
 msgid "value"
@@ -9211,11 +9432,11 @@
 
 #: sys-utils/ipcs.c:679
 msgid "ncount"
-msgstr ""
+msgstr "ncount"
 
 #: sys-utils/ipcs.c:679
 msgid "zcount"
-msgstr ""
+msgstr "zcount"
 
 #: sys-utils/ipcs.c:679
 msgid "pid"
@@ -9281,12 +9502,13 @@
 msgid "missing comma"
 msgstr "fehlendes Komma"
 
-#: sys-utils/readprofile.c:60
+#: 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"
@@ -9297,7 +9519,8 @@
 "\t -V            print version and exit\n"
 msgstr ""
 "%s: Aufruf: %s [optionen]\n"
-"\t -m <mapfile>  (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"
@@ -9308,38 +9531,34 @@
 "\t -n            Byte-Anordnungs-Erkennung abschalten\n"
 "\t -V            Versionsinformation ausgeben und beenden\n"
 
-#: sys-utils/readprofile.c:84
-msgid "out of memory"
-msgstr "Speicher ist alle"
-
-#: sys-utils/readprofile.c:147
+#: sys-utils/readprofile.c:188
 #, c-format
-msgid "%s Version %s\n"
+msgid "%s version %s\n"
 msgstr "%s Version %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
-msgstr ""
+msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:308
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: Konnte »_stext« nicht in %s finden\n"
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:334
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
-msgstr ""
+msgstr "%s: Profil-Adresse außerhalb des Bereichs. Falsche Map-Datei?\n"
 
-#: sys-utils/readprofile.c:323
+#: sys-utils/readprofile.c:375
 msgid "total"
-msgstr "total"
+msgstr "gesamt"
 
 #: sys-utils/renice.c:68
 msgid ""
@@ -9550,16 +9769,16 @@
 msgid "...back 1 page"
 msgstr "... eine Seite zurück"
 
-#: text-utils/more.c:1313
+#: text-utils/more.c:1314
 msgid "...skipping one line"
 msgstr "...überspringe eine Zeile"
 
-#: text-utils/more.c:1315
+#: text-utils/more.c:1316
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...überspringe %d Zeilen"
 
-#: text-utils/more.c:1352
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
@@ -9569,7 +9788,7 @@
 "***Zurück***\n"
 "\n"
 
-#: text-utils/more.c:1390
+#: text-utils/more.c:1391
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9577,80 +9796,83 @@
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 "\n"
-"Vor den meisten Befehlen kann wahlweise ein ganzzahliger Wert k eingeben "
-"werden\n"
-"[Voreinstellungen stehen in Klammern]. Bei '*' wird k neue Voreinstellung.\n"
+"Den meisten Befehlen kann optional ein Ganzzahlargument k vorausgehen; die\n"
+"Voreinstellung in Klammern. Sternchen (*) bedeutet, dass das Argument die "
+"neue\n"
+"Voreinstellung wird.\n"
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1398
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
-"<Leertaste>\t\tdie nächsten k Zeilen anzeigen [Anz. Bildschirmzeilen]\n"
-"z\t\t\tdie nächsten k Zeilen anzeigen [Anz. Bildschirmzeilen]*\n"
-"<Eingabe>\t\tdie nächsten k Zeilen anzeigen [1]*\n"
-"d oder Strg-D\t\tum k Zeilen weiterrollen [anfangs 11]*\n"
-"q, Q oder <interrupt>\tmore beenden\n"
-"s\t\t\tk Textzeilen überspringen [1]\n"
-"f\t\t\tk Bildschirmseiten vorwärts überspringen [1]\n"
-"b oder Strg-B\t\tk Bildschirmseiten rückwärts überspringen [1]\n"
-"'\t\t\tzurück zum Ausgangspunkt der letzen Suche gehen\n"
-"=\t\t\tdie aktuelle Zeilennummer anzeigen\n"
-"/<regulärer Ausdruck>\tdas k-te Muster mit dem regulären Ausdruck suchen "
+"<Leertaste>             die nächsten k Zeilen Text zeigen [Bildschirmgröße]\n"
+"z                       die nächsten k Zeilen Text zeigen [Bildschirmgröße]"
+"*\n"
+"<Eingabe>               die nächsten k Zeilen Text zeigen [1]*\n"
+"d oder Strg-D           k Zeilen rollen [momentane Rollgröße, anfangs 11]*\n"
+"q oder Q oder <Untbr>   more beenden\n"
+"s                       k Zeilen Text vorwärtsspringen [1]\n"
+"f                       k Bildschirme Text vorwärtsspringen [1]\n"
+"b oder Strg-B           k Bildschirme Text rückwärtsspringen [1]\n"
+"'                       zum Anfang der letzten Suche gehen\n"
+"=                       momentane Zeilennummer zeigen\n"
+"/<regulärer Ausdruck>   nach ktem Auftreten des regulären Ausdrucks suchen "
 "[1]\n"
-"n\t\t\tnächstes k-te Muster mit dem letzten reg. A. suchen [1]\n"
-"!<bef> oder :!<bef>\t<bef> in einer Subshell ausführen\n"
-"v\t\t\tDatei mit /usr/bin/vi bei der aktuellen Zeile öffnen\n"
-"Strg-L\t\t\tBildschirm neu zeichnen\n"
-":n\t\t\tk Dateien weiterspringen [1]\n"
-":p\t\t\tk Dateien zurückspringen [1]\n"
-":f\t\t\tden aktuellen Dateinamen und die Zeilennummer anzeigen\n"
-".\t\t\tvorherigen Befehl wiederholen\n"
+"n                       nach ktem Auftreten des letzten reg. Ausdr. suchen "
+"[1]\n"
+"!<bef> oder :!<bef>     <bef> in einer Untershell ausführen\n"
+"v                       /usr/bin/vi an momentaner Zeile starten\n"
+"Strg-L                  Schirm neuzeichnen\n"
+":n                      zur kten nächsten Datei gehen [1]\n"
+":p                      zur kten vorigen Datei gehen [1]\n"
+":f                      momentanen Dateinamen und Zeilennummer zeigen\n"
+".                       letzten Befehl wiederholen\n"
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
 msgstr "[Drücken Sie ›h‹ für Hilfe.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "»%s« Zeile %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Keine Datei] Zeile %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
 msgstr "  Überlauf\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1642
 msgid "...skipping\n"
 msgstr "...Überspringe\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
 msgstr "Fehler beim Ausführen von »re_exec()«"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9658,15 +9880,15 @@
 "\n"
 "Muster wurde nicht gefunden\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr "Muster wurde nicht gefunden"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1748
 msgid "can't fork\n"
 msgstr "Kann keinen neuen Prozess erzeugen\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
@@ -9674,19 +9896,19 @@
 "\n"
 "...Überspringe "
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1792
 msgid "...Skipping to file "
 msgstr "...Springe zu Datei"
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1794
 msgid "...Skipping back to file "
 msgstr "...Springe zurück zu Datei "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2074
 msgid "Line too long"
 msgstr "Zeile ist zu lang"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
 msgstr "Kein vorheriger Befehl, der eingefügt werden könnte"
 
@@ -9719,12 +9941,12 @@
 #: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
-msgstr ""
+msgstr "hexdump: ungültiger Bytezähler für Umwandlungszeichen %s.\n"
 
 #: text-utils/parse.c:490
 #, c-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
-msgstr ""
+msgstr "hexdump: %%s benötigt einen Präzisions- oder Bytezähler.\n"
 
 #: text-utils/parse.c:496
 #, c-format
@@ -9736,7 +9958,7 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: ungültiges Umwandlungszeichen %%%s.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -9744,33 +9966,33 @@
 "%s: Aufruf: %s [-zahl] [-p zkette] [-cefnrs] [+zeile] [+/muster/] [dateien]\n"
 
 # libc: "Die Option »%s« erfordert ein Argument\n"
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: Option erfordert ein Argument -- %s\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: unzulässige Option -- %s\n"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 msgid "...skipping forward\n"
 msgstr "...springe vorwärts\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 msgid "...skipping backward\n"
 msgstr "...springe rückwärts\n"
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 msgid "No next file"
 msgstr "Keine nächste Datei"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 msgid "No previous file"
 msgstr "Kein vorhergehende Datei"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Fehler beim Lesen aus %s-Datei\n"
@@ -9778,50 +10000,50 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: unerwartetes Dateiende in %s-Datei\n"
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: unbekannter Fehler in %s-Datei\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Konnte keine temporäre Datei anlegen.\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 msgid "RE error: "
 msgstr "Fehler in regulärem Ausdruck: "
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr "(Dateiende)"
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr "Kein gemerkter Suchtext"
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 msgid "Cannot open "
 msgstr "Kann nicht öffnen "
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 msgid "saved"
 msgstr "gespeichert"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !befehl im rflag-Modus nicht erlaubt.\n"
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 msgid "fork() failed, try again later\n"
 msgstr "fork() fehlgeschlagen, später versuchen\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 msgid "(Next file: "
 msgstr "(Nächste Datei: "
 
@@ -9859,9 +10081,44 @@
 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 "del_loop(%s): success\n"
+#~ msgstr "del_loop(%s): Erfolg\n"
+
+#~ msgid "This mount was compiled without loop support. Please recompile.\n"
+#~ msgstr ""
+#~ "Dieses mount wurde ohne Loop-Unterstützung übersetzt. Bitte neu "
+#~ "übersetzen.\n"
+
+# 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"
+#~ 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"
+#~ msgstr ""
+#~ "Zur Übersetzungszeit war keine Loop-Unterstützung verfügbar. Bitte neu "
+#~ "übersetzen.\n"
+
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Partition %i endet nicht an einer Zylindergrenze:\n"
 
+#~ msgid "Can't open help file"
+#~ 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"
 
diff --git a/po/es.po b/po/es.po
index 3ccd895..30421c2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2000 Beth Powell <bpowell@turbolinux.com>.
 # Copyright (C) 2001, 2002 Santiago Vila Doncel <sanvila@unex.es>.
 # Beth Powell <bpowell@turbolinux.com>, 2000.
-# Santiago Vila Doncel <sanvila@unex.es>, 2001, 2002.
+# Santiago Vila Doncel <sanvila@unex.es>, 2001, 2002, 2003.
 #
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided that this
@@ -11,9 +11,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11x\n"
-"POT-Creation-Date: 2002-11-25 00:47+0100\n"
-"PO-Revision-Date: 2002-11-07 18:46+0100\n"
+"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"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -153,7 +153,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -773,7 +773,7 @@
 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:2166
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -847,8 +847,8 @@
 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-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: ¡No queda memoria!\n"
@@ -858,7 +858,7 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versión %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
+#: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
 "usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
@@ -892,7 +892,7 @@
 " nombredir  raíz del sistema de ficheros que se va a comprimir\n"
 " fsalida    fichero de salida\n"
 
-#: disk-utils/mkfs.cramfs.c:328
+#: disk-utils/mkfs.cramfs.c:335
 #, c-format
 msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
@@ -902,11 +902,11 @@
 " Por favor incremente MAX_INPUT_NAMELEN en mkcramfs.c y recompile. "
 "Saliendo.\n"
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr "sistema de ficheros demasiado grande. Saliendo.\n"
 
-#: disk-utils/mkfs.cramfs.c:507
+#: disk-utils/mkfs.cramfs.c:514
 msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
@@ -915,17 +915,17 @@
 "Saliendo.\n"
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr "YEPA: bloque \"comprimido\" a > 2*longituddelbloque (%ld)\n"
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr "%6.2f%% (%+d bytes)\t%s\n"
 
-#: disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.cramfs.c:819
 #, c-format
 msgid ""
 "warning: guestimate of required size (upper bound) is %LdMB, but maximum "
@@ -934,38 +934,38 @@
 "atención: la estimación del tamaño requerido (cota superior) es %LdMB, pero\n"
 "el tamaño máximo de la imagen es %uMB. Podría abortarse prematuramente.\n"
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
 msgstr "Incluyendo: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr "Datos de directorios: %d bytes\n"
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr "Todo: %d kilobytes\n"
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, c-format
 msgid "Super block: %d bytes\n"
 msgstr "Superbloque: %d bytes\n"
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr "CRC: %x\n"
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
 "no hay suficiente espacio para la imagen ROM (asignado %Ld, usado %d)\n"
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr "falló la escritura de la imagen ROM (%d %d)\n"
@@ -974,21 +974,21 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "atención: los nombres de ficheros se truncan a 255 bytes.\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr "atención: se saltaron ficheros debido a errores.\n"
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr ""
 "atención: los tamaños de los ficheros se truncan a %luMB (menos 1 byte).\n"
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
@@ -996,7 +996,7 @@
 "atención: los uids se truncan a %u bites.  (Esto podría ser un problema\n"
 "de seguridad.)\n"
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
@@ -1004,7 +1004,7 @@
 "atención: los gids se truncan a %u bits. (Esto podría ser un problema\n"
 "de seguridad).\n"
 
-#: disk-utils/mkfs.cramfs.c:926
+#: disk-utils/mkfs.cramfs.c:933
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -1160,8 +1160,8 @@
 msgid "too many bad pages"
 msgstr "Hay demasiadas páginas incorrectas"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: 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 "No queda memoria"
 
@@ -1283,11 +1283,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] dispositivo\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
 msgid "Unusable"
 msgstr "Inutilizable"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
 msgid "Free Space"
 msgstr "Espacio libre"
 
@@ -1424,236 +1424,236 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menú sin dirección; la opción predeterminada es horizontal."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Tecla no permitida"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Pulse una tecla para continuar"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2512
 msgid "Primary"
 msgstr "Primaria"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Crea una nueva partición primaria"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2512
 msgid "Logical"
 msgstr "Lógica"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Crea una nueva partición lógica"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "No crea ninguna partición"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "¡¡¡¡ Error interno !!!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Tamaño (en MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Principio"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Añade la partición al principio del espacio libre"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Final"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Añade la partición al final del espacio libre"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "No hay espacio para crear la partición extendida"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1527
 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:1524
+#: fdisk/cfdisk.c:1529
 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:1576
+#: fdisk/cfdisk.c:1581
 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:1606
+#: fdisk/cfdisk.c:1611
 msgid "Cannot open disk drive"
 msgstr "No se puede abrir la unidad de disco"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
 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:1629
+#: fdisk/cfdisk.c:1634
 msgid "Cannot get disk size"
 msgstr "No se puede obtener el tamaño del disco"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1659
 msgid "Bad primary partition"
 msgstr "Partición primaria incorrecta"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1689
 msgid "Bad logical partition"
 msgstr "Partición lógica incorrecta"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1804
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "¡Atención!: esta operación puede destruir datos del disco"
 
-#: fdisk/cfdisk.c:1803
+#: fdisk/cfdisk.c:1808
 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:1809
+#: fdisk/cfdisk.c:1814
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1815
 msgid "Did not write partition table to disk"
 msgstr "No se ha escrito la tabla de particiones en el disco"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1817
 msgid "yes"
 msgstr "sí"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1820
 msgid "Please enter `yes' or `no'"
 msgstr "Por favor escriba `sí' (con acento) o `no'"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1824
 msgid "Writing partition table to disk..."
 msgstr "Se está escribiendo la tabla de particiones en el disco..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
 msgid "Wrote partition table to disk"
 msgstr "Se ha escrito la tabla de particiones en el disco"
 
-#: fdisk/cfdisk.c:1846
+#: fdisk/cfdisk.c:1851
 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:1856
+#: fdisk/cfdisk.c:1861
 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:1858
+#: fdisk/cfdisk.c:1863
 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:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
 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:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "No se puede abrir el fichero '%s'"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1941
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unidad de disco: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1943
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1950
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1970
 msgid "   None   "
 msgstr "   Ninguna"
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1972
 msgid "   Pri/Log"
 msgstr "   Pri/Lóg"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1974
 msgid "   Primary"
 msgstr "   Primaria"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1976
 msgid "   Logical"
 msgstr "   Lógica"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2020
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Inicio (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconocido (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2024
 #, c-format
 msgid "None (%02X)"
 msgstr "Ninguno (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabla de particiones para %s\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2061
 msgid "            First    Last\n"
 msgstr "            Primer   Último\n"
 
-#: fdisk/cfdisk.c:2057
+#: fdisk/cfdisk.c:2062
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 "Nº Tipo     Sector   Sector   Despl.  Longitud  Tipo sist. fich. (ID) "
 "Indicad.\n"
 
-#: fdisk/cfdisk.c:2058
+#: fdisk/cfdisk.c:2063
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1662,470 +1662,469 @@
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2146
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         ----Inicio----      -----Final----   Sector Número de\n"
 
-#: fdisk/cfdisk.c:2142
+#: 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:2143
+#: fdisk/cfdisk.c:2148
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Raw"
 msgstr "En bruto (raw)"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Print the table using raw data format"
 msgstr "Imprime la tabla utilizando el formato de datos en bruto"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
 msgid "Sectors"
 msgstr "Sectores"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2182
 msgid "Print the table ordered by sectors"
 msgstr "Imprime la tabla ordenada por sectores"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Table"
 msgstr "Tabla"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Just print the partition table"
 msgstr "Sólo imprime la tabla de particiones"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2184
 msgid "Don't print the table"
 msgstr "No imprime la tabla"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2212
 msgid "Help Screen for cfdisk"
 msgstr "Pantalla de ayuda para cfdisk"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2214
 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:2210
+#: fdisk/cfdisk.c:2215
 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:2211
+#: fdisk/cfdisk.c:2216
 msgid "disk drive."
 msgstr "de disco duro."
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2218
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2220
 msgid "Command      Meaning"
 msgstr "Orden        Significado"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2221
 msgid "-------      -------"
 msgstr "-----        -----------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2222
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Conmuta el indicador de iniciable de la partición actual"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2223
 msgid "  d          Delete the current partition"
 msgstr "  d          Suprime la partición actual"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2224
 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:2220
+#: fdisk/cfdisk.c:2225
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ATENCIÓN: Se recomienda utilizar esta opción únicamente"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2226
 msgid "             know what they are doing."
 msgstr "             si se conoce el funcionamiento de la misma."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2227
 msgid "  h          Print this screen"
 msgstr "  h          Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2228
 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:2224
+#: fdisk/cfdisk.c:2229
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Esta opción puede hacer que la partición sea"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2230
 msgid "             DOS, OS/2, ..."
 msgstr "             incompatible con DOS, OS/2,..."
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2231
 msgid "  n          Create new partition from free space"
 msgstr "  n          Crea una nueva partición a partir del espacio libre"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2232
 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:2228
+#: fdisk/cfdisk.c:2233
 msgid "             There are several different formats for the partition"
 msgstr "             Hay varios formatos distintos para la partición"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2234
 msgid "             that you can choose from:"
 msgstr "             entre los que puede elegir:"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2235
 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:2231
+#: fdisk/cfdisk.c:2236
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabla ordenada por sectores"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2237
 msgid "                t - Table in raw format"
 msgstr "                t - Tabla con formato en bruto"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2238
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Sale del programa sin escribir la tabla de particiones"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2239
 msgid "  t          Change the filesystem type"
 msgstr "  t          Cambia el tipo de sistema de ficheros"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2240
 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:2236
+#: fdisk/cfdisk.c:2241
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, sectores y cilindros"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2242
 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:2238
+#: fdisk/cfdisk.c:2243
 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:2239
+#: fdisk/cfdisk.c:2244
 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:2240
+#: fdisk/cfdisk.c:2245
 msgid "             `no'"
 msgstr "             escribiendo `sí' o `no'"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2246
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Flecha arriba  Desplaza el cursor a la partición anterior"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2247
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Flecha abajo   Desplaza el cursor a la partición siguiente"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2248
 msgid "CTRL-L       Redraws the screen"
 msgstr "Ctrl-L       Vuelve a dibujar la pantalla"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2249
 msgid "  ?          Print this screen"
 msgstr "  ?          Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2251
 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:2247
+#: fdisk/cfdisk.c:2252
 msgid "case letters (except for Writes)."
 msgstr "(salvo W para operaciones de escritura)."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
-#: fdisk/fdisksunlabel.c:324
+#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2282
 msgid "Change cylinder geometry"
 msgstr "Cambia la geometría de cilindros"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Cabezas"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2283
 msgid "Change head geometry"
 msgstr "Cambiar geometría de cabezas"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2284
 msgid "Change sector geometry"
 msgstr "Cambiar geometría de sectores"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done"
 msgstr "Fin"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done with changing geometry"
 msgstr "Ha finalizado la operación de cambio de geometría"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2298
 msgid "Enter the number of cylinders: "
 msgstr "Escriba el número de cilindros: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
 msgid "Illegal cylinders value"
 msgstr "Valor de cilindros no permitido"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2316
 msgid "Enter the number of heads: "
 msgstr "Escriba el número de cabezas: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
 msgid "Illegal heads value"
 msgstr "Valor de cabezas no permitido"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2329
 msgid "Enter the number of sectors per track: "
 msgstr "Escriba el número de sectores por pista: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
 msgid "Illegal sectors value"
 msgstr "Valor de sectores no permitido"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2439
 msgid "Enter filesystem type: "
 msgstr "Escriba el tipo de sistema de ficheros: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2457
 msgid "Cannot change FS Type to empty"
 msgstr "No se puede cambiar el tipo de sistema de ficheros a vacío"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2459
 msgid "Cannot change FS Type to extended"
 msgstr "No se puede cambiar el tipo de sistema de ficheros a extendido"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Inicio"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2489
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc.(%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2511
 msgid "Pri/Log"
 msgstr "Pri/Lóg"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2587
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unidad de disco: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2593
 #, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "Tamaño: %lld bytes, %ld MB"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2596
 #, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "Tamaño: %lld bytes, %ld.%ld GB"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2600
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Cabezas: %d   Sectores por pista: %d   Cilindros: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2604
 msgid "Name"
 msgstr "Nombre"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2605
 msgid "Flags"
 msgstr "Indicadores"
 
 # Este espacio inicial es para que no se pegue con la s de Indicadores
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2606
 msgid "Part Type"
 msgstr " Tipo"
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2607
 msgid "FS Type"
 msgstr "Tipo de S.F."
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2608
 msgid "[Label]"
 msgstr "[Etiqueta]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2610
 msgid "  Sectors"
 msgstr "  Sectores"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2614
 msgid "Size (MB)"
 msgstr "Tamaño(MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2616
 msgid "Size (GB)"
 msgstr "Tamaño (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Bootable"
 msgstr "Iniciable"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Toggle bootable flag of the current partition"
 msgstr "Conmuta el indicador de iniciable de la partición actual"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete"
 msgstr "Suprimir"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete the current partition"
 msgstr "Suprime la partición actual"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Geometry"
 msgstr "Geometría"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Change disk geometry (experts only)"
 msgstr "Cambia la geometría del disco (sólo para usuarios avanzados)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Help"
 msgstr "Ayuda"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Print help screen"
 msgstr "Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 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:2671
+#: fdisk/cfdisk.c:2676
 msgid "New"
 msgstr "Nueva"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "Create new partition from free space"
 msgstr "Crea una nueva partición a partir del espacio libre"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print"
 msgstr "Imprimir"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 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:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit"
 msgstr "Salir"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit program without writing partition table"
 msgstr "Sale del programa sin escribir la tabla de particiones"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 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:2675
+#: fdisk/cfdisk.c:2680
 msgid "Units"
 msgstr "Unidades"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 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:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write"
 msgstr "Escribir"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 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:2722
+#: fdisk/cfdisk.c:2727
 msgid "Cannot make this partition bootable"
 msgstr "No se puede convertir esta partición en una partición iniciable"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2737
 msgid "Cannot delete an empty partition"
 msgstr "No se puede suprimir una partición vacía"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
 msgid "Cannot maximize this partition"
 msgstr "No se puede maximizar esta partición"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2767
 msgid "This partition is unusable"
 msgstr "Esta partición se encuentra en estado inutilizable"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2769
 msgid "This partition is already in use"
 msgstr "Esta partición ya está en uso"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2786
 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:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
 msgid "No more partitions"
 msgstr "No hay más particiones"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2826
 msgid "Illegal command"
 msgstr "Orden ilegal"
 
-#: fdisk/cfdisk.c:2831
-#, fuzzy
+#: fdisk/cfdisk.c:2836
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-2001 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:2838
+#: fdisk/cfdisk.c:2843
 #, c-format
 msgid ""
 "\n"
@@ -2403,11 +2402,11 @@
 msgid "heads"
 msgstr "cabezas"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "sectores"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470
+#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cilindros"
@@ -2533,73 +2532,73 @@
 msgstr "Código hexadecimal (escriba L para ver los códigos): "
 
 #: fdisk/fdisk.c:1069
-#, c-format
-msgid "%s (%d-%d, default %d): "
+#, fuzzy, c-format
+msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, valor predeterminado %d): "
 
-#: fdisk/fdisk.c:1134
-#, c-format
-msgid "Using default value %d\n"
+#: fdisk/fdisk.c:1136
+#, fuzzy, c-format
+msgid "Using default value %u\n"
 msgstr "Se está utilizando el valor predeterminado %d\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1140
 msgid "Value out of range.\n"
 msgstr "El valor está fuera del rango.\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1150
 msgid "Partition number"
 msgstr "Número de partición"
 
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1161
 #, 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:1181 fdisk/fdisk.c:1207
+#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Se ha seleccionado la partición %d\n"
 
-#: fdisk/fdisk.c:1184
+#: fdisk/fdisk.c:1186
 msgid "No partition is defined yet!\n"
 msgstr "¡No hay ninguna partición definida!\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1212
 msgid "All primary partitions have been defined already!\n"
 msgstr "¡Ya se han definido todas las particiones primarias!\n"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1231
 #, 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:1240
+#: fdisk/fdisk.c:1242
 #, 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:1251
+#: fdisk/fdisk.c:1253
 msgid "DOS Compatibility flag is set\n"
 msgstr "El indicador de compatibilidad con DOS está establecido\n"
 
-#: fdisk/fdisk.c:1255
+#: fdisk/fdisk.c:1257
 msgid "DOS Compatibility flag is not set\n"
 msgstr "El indicador de compatibilidad con DOS no está establecido\n"
 
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1357
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partición %d todavía no existe\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1362
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2611,7 +2610,7 @@
 "tener particiones de tipo 0. Puede suprimir una\n"
 "partición con la orden `d'.\n"
 
-#: fdisk/fdisk.c:1361
+#: fdisk/fdisk.c:1371
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2619,7 +2618,7 @@
 "No puede convertir una partición en extendida ni viceversa.\n"
 "Primero debe suprimirla.\n"
 
-#: fdisk/fdisk.c:1370
+#: fdisk/fdisk.c:1380
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2629,7 +2628,7 @@
 "ya que así lo prevé SunOS/Solaris e incluso es adecuado para Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1376
+#: fdisk/fdisk.c:1386
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2639,53 +2638,53 @@
 "y la partición 11 como volumen completo (6) ya que IRIX así lo espera.\n"
 "\n"
 
-#: fdisk/fdisk.c:1389
+#: fdisk/fdisk.c:1399
 #, 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:1443
+#: fdisk/fdisk.c:1453
 #, 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:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " físicos=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lógicos=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1451
+#: fdisk/fdisk.c:1461
 #, 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:1460
+#: fdisk/fdisk.c:1470
 #, 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:1463
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "debe ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1469
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1479
+#, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr "La partición %d no termina en un límite de cilindro.\n"
+msgstr "La partición %i no termina en un límite de cilindro.\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "debe ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1485
+#: fdisk/fdisk.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -2694,7 +2693,7 @@
 "\n"
 "Disco %s: %ld MB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid ""
 "\n"
@@ -2703,17 +2702,17 @@
 "\n"
 "Disco %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d cabezas, %d sectores/pista, %d cilindros"
 
-#: fdisk/fdisk.c:1493
+#: fdisk/fdisk.c:1503
 #, c-format
 msgid ", total %lu sectors"
 msgstr ", %lu sectores en total"
 
-#: fdisk/fdisk.c:1496
+#: fdisk/fdisk.c:1506
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2722,7 +2721,7 @@
 "Unidades = %s de %d * %d = %d bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1604
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2730,17 +2729,17 @@
 "No hay nada que hacer. El orden ya es correcto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1678
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Inicio  Principio   Fin    Bloques  Id  Sistema\n"
 
 # Nota: si se pone Dispositivo no queda bien el resto de la línea.
-#: fdisk/fdisk.c:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
 msgid "Device"
 msgstr "Disposit."
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1716
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2748,7 +2747,7 @@
 "\n"
 "Las entradas de la tabla de particiones no están en el orden del disco\n"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
@@ -2759,92 +2758,92 @@
 "Disco %s: %d cabezas, %d sectores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: 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:1762
+#: fdisk/fdisk.c:1772
 #, 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:1765
+#: fdisk/fdisk.c:1775
 #, 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:1768
+#: fdisk/fdisk.c:1778
 #, 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:1771
+#: fdisk/fdisk.c:1781
 #, 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:1775
+#: fdisk/fdisk.c:1785
 #, 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:1807
+#: fdisk/fdisk.c:1817
 #, 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:1815
+#: fdisk/fdisk.c:1825
 #, 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:1835
+#: fdisk/fdisk.c:1845
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Atención: la partición %d está vacía\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1850
 #, 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:1846
+#: fdisk/fdisk.c:1856
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "El total de sectores asignados %d supera el máximo %d\n"
 
-#: fdisk/fdisk.c:1849
+#: fdisk/fdisk.c:1859
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d sectores no asignados\n"
 
-#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
+#: fdisk/fdisk.c:1872 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:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
-#: fdisk/fdisksunlabel.c:522
+#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Primer %s"
 
-#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
+#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ya está asignado\n"
 
-#: fdisk/fdisk.c:1937
+#: fdisk/fdisk.c:1947
 msgid "No free sectors available\n"
 msgstr "No hay disponible ningún sector libre\n"
 
-#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
+#: fdisk/fdisk.c:1956 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:2011
+#: fdisk/fdisk.c:2021
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2856,16 +2855,16 @@
 "        tabla de particiones DOS vacía primero. (Use o.)\n"
 "        ATENCIÓN: Esto destruirá el contenido de este disco.\n"
 
-#: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2033 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:2031
+#: fdisk/fdisk.c:2041
 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:2036
+#: fdisk/fdisk.c:2046
 #, c-format
 msgid ""
 "Command action\n"
@@ -2876,20 +2875,20 @@
 "%s\n"
 "   p   Partición primaria (1-4)\n"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "l   logical (5 or over)"
 msgstr "l   Partición lógica (5 o superior)"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "e   extended"
 msgstr "e   Partición extendida"
 
-#: fdisk/fdisk.c:2057
+#: fdisk/fdisk.c:2067
 #, 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:2093
+#: fdisk/fdisk.c:2103
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2897,11 +2896,11 @@
 "¡Se ha modificado la tabla de particiones!\n"
 "\n"
 
-#: fdisk/fdisk.c:2102
+#: fdisk/fdisk.c:2112
 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:2118
+#: fdisk/fdisk.c:2128
 #, c-format
 msgid ""
 "\n"
@@ -2915,7 +2914,7 @@
 "El núcleo todavía usa la tabla antigua.\n"
 "La nueva tabla se usará en el próximo reinicio.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2138
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2927,68 +2926,68 @@
 "particiones DOS 6.x, consulte la página man de fdisk\n"
 "para ver información adicional.\n"
 
-#: fdisk/fdisk.c:2135
+#: fdisk/fdisk.c:2145
 msgid "Syncing disks.\n"
 msgstr "Se están sincronizando los discos.\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2192
 #, 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:2187
+#: fdisk/fdisk.c:2197
 msgid "New beginning of data"
 msgstr "Nuevo principio de datos"
 
-#: fdisk/fdisk.c:2203
+#: fdisk/fdisk.c:2213
 msgid "Expert command (m for help): "
 msgstr "Orden avanzada (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:2216
+#: fdisk/fdisk.c:2226
 msgid "Number of cylinders"
 msgstr "Número de cilindros"
 
-#: fdisk/fdisk.c:2243
+#: fdisk/fdisk.c:2253
 msgid "Number of heads"
 msgstr "Número de cabezas"
 
-#: fdisk/fdisk.c:2268
+#: fdisk/fdisk.c:2278
 msgid "Number of sectors"
 msgstr "Número de sectores"
 
-#: fdisk/fdisk.c:2271
+#: fdisk/fdisk.c:2281
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Atención: estableciendo desplazamiento de sector para compatibilidad con "
 "DOS\n"
 
-#: fdisk/fdisk.c:2346
+#: fdisk/fdisk.c:2356
 #, 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:2360
+#: fdisk/fdisk.c:2370
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2408
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: orden desconocida\n"
 
-#: fdisk/fdisk.c:2466
+#: fdisk/fdisk.c:2476
 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:2470
+#: fdisk/fdisk.c:2480
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2997,18 +2996,18 @@
 "dispositivo especificado\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2529
+#: fdisk/fdisk.c:2539
 #, 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:2539
+#: fdisk/fdisk.c:2549
 msgid "Command (m for help): "
 msgstr "Orden (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:2555
+#: fdisk/fdisk.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -3017,15 +3016,15 @@
 "\n"
 "El fichero de inicio actual es: %s\n"
 
-#: fdisk/fdisk.c:2557
+#: fdisk/fdisk.c:2567
 msgid "Please enter the name of the new boot file: "
 msgstr "Escriba el nombre del nuevo fichero de inicio: "
 
-#: fdisk/fdisk.c:2559
+#: fdisk/fdisk.c:2569
 msgid "Boot file unchanged\n"
 msgstr "No se ha modificado el fichero de inicio\n"
 
-#: fdisk/fdisk.c:2624
+#: fdisk/fdisk.c:2642
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3340,80 +3339,80 @@
 "\n"
 "Se están sincronizando los discos.\n"
 
-#: fdisk/fdisksgilabel.c:78
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
 msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI xfslog"
 msgstr "SGI xfslog"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:92
 msgid "SGI xlv"
 msgstr "SGI xlv"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:93
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:95
+#: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:163
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3421,7 +3420,7 @@
 "Según MIPS Computer Systems, Inc. la etiqueta puede contener como máximo 512 "
 "bytes\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr ""
 "Se ha detectado una etiqueta de disco sgi con suma de comprobación "
@@ -3479,12 +3478,13 @@
 "Fichero de inicio: %s\n"
 "----- Entradas de directorio -----\n"
 
-#: fdisk/fdisksgilabel.c:250
+#: fdisk/fdisksgilabel.c:248
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sector%5u tamaño%8u\n"
 
-#: fdisk/fdisksgilabel.c:304
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3496,7 +3496,7 @@
 "\tEl fichero de inicio debe ser un nombre de ruta absoluto\n"
 "\tdistinto de cero, como por ejemplo \"/unix\" o \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:311
+#: fdisk/fdisksgilabel.c:308
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3504,7 +3504,7 @@
 "\n"
 "\tNombre del fichero de inicio demasiado largo: 16 bytes como máximo.\n"
 
-#: fdisk/fdisksgilabel.c:316
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3512,7 +3512,7 @@
 "\n"
 "\tEl fichero de inicio debe tener un nombre de ruta totalmente calificado.\n"
 
-#: fdisk/fdisksgilabel.c:321
+#: fdisk/fdisksgilabel.c:320
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3523,7 +3523,7 @@
 "\tEl valor predeterminado de SGI es \"/unix\" y para la copia de seguridad "
 "\"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:349
+#: fdisk/fdisksgilabel.c:346
 #, c-format
 msgid ""
 "\n"
@@ -3532,20 +3532,20 @@
 "\n"
 "\tEl fichero de inicio se cambia a \"%s\".\n"
 
-#: fdisk/fdisksgilabel.c:447
+#: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
 msgstr "Existe más de una entrada de disco completo.\n"
 
-#: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
 msgstr "No hay ninguna partición definida\n"
 
-#: fdisk/fdisksgilabel.c:462
+#: fdisk/fdisksgilabel.c:449
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr ""
 "Para IRIX se recomienda que la partición 11 abarque el disco completo.\n"
 
-#: fdisk/fdisksgilabel.c:464
+#: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3554,7 +3554,7 @@
 "La partición de disco completo debe empezar en el bloque 0,\n"
 "no en el bloque de disco %d.\n"
 
-#: fdisk/fdisksgilabel.c:468
+#: fdisk/fdisksgilabel.c:457
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3563,31 +3563,31 @@
 "La partición de disco completo sólo tiene un tamaño de %d bloques de disco,\n"
 "mientras que el disco tiene una longitud de %d bloques de disco.\n"
 
-#: fdisk/fdisksgilabel.c:475
+#: fdisk/fdisksgilabel.c:463
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "Una partición (11) debe abarcar el disco completo.\n"
 
-#: fdisk/fdisksgilabel.c:487
+#: fdisk/fdisksgilabel.c:473
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "La partición %d no empieza en un límite de cilindro.\n"
 
-#: fdisk/fdisksgilabel.c:494
+#: fdisk/fdisksgilabel.c:479
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "La partición %d no termina en un límite de cilindro.\n"
 
-#: fdisk/fdisksgilabel.c:502
+#: fdisk/fdisksgilabel.c:486
 #, c-format
 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:511 fdisk/fdisksgilabel.c:531
-#, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, fuzzy, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
 msgstr "Espacio no utilizado de %8d sectores - sectores %8d-%d\n"
 
-#: fdisk/fdisksgilabel.c:544
+#: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
@@ -3595,7 +3595,7 @@
 "\n"
 "La partición de inicio no existe.\n"
 
-#: fdisk/fdisksgilabel.c:548
+#: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
@@ -3603,7 +3603,7 @@
 "\n"
 "La partición de intercambio no existe.\n"
 
-#: fdisk/fdisksgilabel.c:553
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
@@ -3611,15 +3611,16 @@
 "\n"
 "La partición de intercambio no tiene un tipo de intercambio.\n"
 
-#: fdisk/fdisksgilabel.c:557
+#: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tHa elegido un nombre de fichero de inicio no habitual.\n"
 
-#: fdisk/fdisksgilabel.c:568
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr "Sólo puede cambiar la etiqueta de las particiones no vacías.\n"
 
-#: fdisk/fdisksgilabel.c:575
+#: 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"
@@ -3635,31 +3636,31 @@
 "Escriba SÍ si está seguro de querer dar una etiqueta distinta a esta "
 "partición.\n"
 
-#: fdisk/fdisksgilabel.c:580 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
 msgid "YES\n"
 msgstr "SÍ\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:606
+#: fdisk/fdisksgilabel.c:577
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "Se ha producido un solapamiento de partición en el disco.\n"
 
-#: fdisk/fdisksgilabel.c:668
+#: fdisk/fdisksgilabel.c:637
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr ""
 "Se está intentando generar una entrada de disco completo automáticamente.\n"
 
-#: fdisk/fdisksgilabel.c:675
+#: fdisk/fdisksgilabel.c:642
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "Ya existen particiones que abarcan el disco completo.\n"
 
-#: fdisk/fdisksgilabel.c:680
+#: fdisk/fdisksgilabel.c:646
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Se ha producido un solapamiento de particiones en el disco. Corríjalo antes "
 "de continuar.\n"
 
-#: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
+#: 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"
@@ -3667,18 +3668,18 @@
 "Se recomienda que la partición 11\n"
 "abarque el disco completo y sea del tipo `SGI volume'\n"
 
-#: fdisk/fdisksgilabel.c:705
+#: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Se producirá un solapamiento de particiones en el disco. Corríjalo antes de "
 "continuar.\n"
 
-#: fdisk/fdisksgilabel.c:710
+#: fdisk/fdisksgilabel.c:676
 #, c-format
 msgid " Last %s"
 msgstr " Último %s"
 
-#: fdisk/fdisksgilabel.c:732
+#: 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"
@@ -3690,12 +3691,20 @@
 "operación, el contenido anterior se habrá perdido de forma irrecuperable.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:758
+#: 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 ""
+
+#: fdisk/fdisksgilabel.c:738
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Intentando conservar los parámetros de la partición %d.\n"
 
-#: fdisk/fdisksgilabel.c:760
+#: fdisk/fdisksgilabel.c:740
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tPRINCIPIO=%d\tLONGITUD=%d\n"
@@ -3785,63 +3794,63 @@
 msgid "Autoconfigure failed.\n"
 msgstr "Error de configuración automática.\n"
 
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Sectores/pista"
 
-#: fdisk/fdisksunlabel.c:327
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:330
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Cilindros físicos"
 
-#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
 msgid "Rotation speed (rpm)"
 msgstr "Velocidad de rotación (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
 msgid "Interleave factor"
 msgstr "Factor de interleave"
 
-#: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
 msgid "Extra sectors per cylinder"
 msgstr "Sectores adicionales por cilindro"
 
-#: fdisk/fdisksunlabel.c:352
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "Puede cambiar todos los parámetros de disco desde el menú x"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "Disquete 3,5 pulg."
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "Linux personalizado"
 
-#: fdisk/fdisksunlabel.c:446
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partición %d no termina en un límite de cilindro\n"
 
-#: fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:462
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "La partición %d se solapa con otras en los sectores %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:488
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Espacio no utilizado - sectores 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Espacio no utilizado - sectores %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3849,7 +3858,7 @@
 "Ya hay otras particiones que abarcan el disco completo.\n"
 "Suprima algunas o reduzca su tamaño antes de volver a intentarlo.\n"
 
-#: fdisk/fdisksunlabel.c:593
+#: fdisk/fdisksunlabel.c:589
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3860,7 +3869,7 @@
 "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:613
+#: fdisk/fdisksunlabel.c:609
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3869,7 +3878,7 @@
 "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:626
+#: fdisk/fdisksunlabel.c:622
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3883,7 +3892,7 @@
 "Escriba SÍ si está seguro de que desea que la partición\n"
 "esté marcada con 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:657
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid ""
 "\n"
@@ -3902,7 +3911,7 @@
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:671
+#: fdisk/fdisksunlabel.c:667
 #, c-format
 msgid ""
 "\n"
@@ -3915,16 +3924,16 @@
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:676
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Indic.  Principio   Fin    Bloques  Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:701
+#: fdisk/fdisksunlabel.c:697
 msgid "Number of alternate cylinders"
 msgstr "Número de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:734
+#: fdisk/fdisksunlabel.c:730
 msgid "Number of physical cylinders"
 msgstr "Número de cilindros físicos"
 
@@ -4528,18 +4537,20 @@
 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
 #, 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 ""
-"Unidades = MB de 1048576 bytes, bloques de 1024 bytes, contando desde %d\n"
+"Unidades = megabytes de 1048576 bytes, bloques de 1024 bytes, contando desde "
+"%d\n"
 "\n"
 
 #: fdisk/sfdisk.c:887
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
-msgstr "   Disp.  Inic Princ.  Fin     MB    Nºbloques Id  Sistema\n"
+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
 #, c-format
@@ -4685,6 +4696,10 @@
 "Esto no es problema para LILO, pero el MBR de DOS no iniciará con este "
 "disco.\n"
 
+#: fdisk/sfdisk.c:1272
+msgid "start"
+msgstr "comienzo"
+
 #: fdisk/sfdisk.c:1275
 #, c-format
 msgid ""
@@ -4693,6 +4708,10 @@
 "Partición %s: principio: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado "
 "(%ld,%ld,%ld)\n"
 
+#: fdisk/sfdisk.c:1281
+msgid "end"
+msgstr "final"
+
 #: fdisk/sfdisk.c:1284
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4758,99 +4777,99 @@
 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:1577
+#: fdisk/sfdisk.c:1579
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Error al guardar los sectores antiguos; anulando la operación\n"
 
-#: fdisk/sfdisk.c:1582
+#: fdisk/sfdisk.c:1584
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Error al escribir la partición en %s\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1661
 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:1695
+#: fdisk/sfdisk.c:1697
 #, 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:1702
+#: fdisk/sfdisk.c:1704
 #, 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:1708
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "Entrada no reconocida: %s\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
 msgstr "Número demasiado elevado\n"
 
-#: fdisk/sfdisk.c:1754
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
 msgstr "Datos extraños tras el número\n"
 
-#: fdisk/sfdisk.c:1875
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
 msgstr "No hay espacio para descriptor de partición\n"
 
-#: fdisk/sfdisk.c:1908
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
 msgstr "No se puede crear partición extendida adyacente\n"
 
-#: fdisk/sfdisk.c:1959
+#: fdisk/sfdisk.c:1961
 msgid "too many input fields\n"
 msgstr "Demasiados campos de entrada\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1993
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
 msgstr "No queda más espacio\n"
 
-#: fdisk/sfdisk.c:2012
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
 msgstr "Tipo no permitido\n"
 
-#: fdisk/sfdisk.c:2044
+#: fdisk/sfdisk.c:2046
 #, 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:2050
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
 msgstr "Atención: partición vacía\n"
 
-#: fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2066
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Atención: principio de partición incorrecto (antes %lu)\n"
 
-#: fdisk/sfdisk.c:2077
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "Indicador de iniciable no reconocido; elija - o *\n"
 
-#: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
 msgstr "¿Especificación parcial de cil,cab,sect?\n"
 
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
 msgstr "Partición extendida en ubicación no esperada\n"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
 msgstr "Entrada incorrecta\n"
 
-#: fdisk/sfdisk.c:2172
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
 msgstr "Hay demasiadas particiones\n"
 
-#: fdisk/sfdisk.c:2205
+#: 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"
@@ -4862,48 +4881,48 @@
 "<cil,cab,sec>\n"
 "Normalmente sólo debe especificar <principio> y <tamaño> (y quizás <tipo>).\n"
 
-#: fdisk/sfdisk.c:2225
+#: fdisk/sfdisk.c:2227
 msgid "version"
 msgstr "versión"
 
-#: fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: similar a /dev/hda or /dev/sda"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
 msgstr "opciones útiles:"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2236
 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:2235
+#: fdisk/sfdisk.c:2237
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [o --id]:         Imprime o cambia el identificador de partición"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2238
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:       Muestra las particiones de cada dispositivo"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2239
 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:2238
+#: fdisk/sfdisk.c:2240
 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:2239
+#: fdisk/sfdisk.c:2241
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4911,60 +4930,60 @@
 "    -uS, -uB, -uC, -uM:  Acepta/muestra en unidades de\n"
 "                         sectores/bloques/cilindros/MB"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2242
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]: Muestra los tipos de particiones conocidos"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2243
 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:2242
+#: fdisk/sfdisk.c:2244
 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:2243
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 "    -N# :                Cambia únicamente la partición con el número #"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 No escribe realmente en el disco"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2247
 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:2246
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fichero:          Restaura estos sectores de nuevo"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:    Imprime la versión"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:       Imprime este mensaje"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
 msgstr "opciones peligrosas:"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2252
 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:2251
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4972,7 +4991,7 @@
 "    -x [o --show-extended]:  Muestra también las particiones extendidas en\n"
 "                             salida o espera sus descriptores en entrada"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2255
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
@@ -4980,114 +4999,114 @@
 "para\n"
 "                           Linux"
 
-#: fdisk/sfdisk.c:2254
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:       Suprime mensajes de aviso"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
 msgstr "    Puede modificar la geometría detectada utilizando:"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2258
 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:2257
+#: fdisk/sfdisk.c:2259
 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:2258
+#: fdisk/sfdisk.c:2260
 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:2259
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
 msgstr "Puede desactivar toda comprobación de coherencia con:"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2262
 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:2266
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2267
+#: fdisk/sfdisk.c:2269
 #, 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:2268
+#: fdisk/sfdisk.c:2270
 #, 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:2269
+#: fdisk/sfdisk.c:2271
 #, 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:2421
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
 msgstr "¿ninguna orden?\n"
 
-#: fdisk/sfdisk.c:2539
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "total: %d bloques\n"
 
-#: fdisk/sfdisk.c:2576
+#: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "uso: sfdisk --print-id dispositivo número-partición\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2580
 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:2580
+#: fdisk/sfdisk.c:2582
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "uso: sfdisk --id dispositivo número-partición [Id]\n"
 
-#: fdisk/sfdisk.c:2587
+#: fdisk/sfdisk.c:2589
 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:2613
+#: fdisk/sfdisk.c:2615
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "No se puede abrir %s para lectura-escritura\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2617
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "No se puede abrir %s para lectura\n"
 
-#: fdisk/sfdisk.c:2640
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcto\n"
 
-#: fdisk/sfdisk.c:2657
+#: fdisk/sfdisk.c:2659
 #, 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:2674
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "Error de ioctl BLKGETSIZE para %s\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2754
 #, 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:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
@@ -5095,7 +5114,7 @@
 "Fin\n"
 "\n"
 
-#: fdisk/sfdisk.c:2777
+#: fdisk/sfdisk.c:2781
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5104,35 +5123,35 @@
 "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:2791
+#: fdisk/sfdisk.c:2795
 #, 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:2848
+#: fdisk/sfdisk.c:2852
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificador %lx incorrecto\n"
 
-#: fdisk/sfdisk.c:2863
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
 msgstr "Actualmente este disco está en uso.\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Error muy grave: no se puede encontrar %s\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2887
 #, 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:2889
+#: fdisk/sfdisk.c:2893
 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:2891
+#: fdisk/sfdisk.c:2895
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5147,28 +5166,28 @@
 "esta\n"
 "comprobación.\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2899
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilice el indicador --force para eludir todas las comprobaciones.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2903
 msgid "OK\n"
 msgstr "Correcto\n"
 
-#: fdisk/sfdisk.c:2908
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
 msgstr "Situación anterior:\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2916
 #, 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:2920
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
 msgstr "Situación nueva:\n"
 
-#: fdisk/sfdisk.c:2925
+#: fdisk/sfdisk.c:2929
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5177,21 +5196,21 @@
 "nada.\n"
 "(Si realmente desea realizar esta operación, use la opción --force.)\n"
 
-#: fdisk/sfdisk.c:2928
+#: fdisk/sfdisk.c:2932
 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:2933
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
 msgstr "¿Está satisfecho con esta operación? [ynq] "
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "¿Desea escribir esta información en el disco? [ynq] "
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5199,15 +5218,15 @@
 "\n"
 "sfdisk: final de entrada antes de lo previsto\n"
 
-#: fdisk/sfdisk.c:2942
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
 msgstr "Se está saliendo; no se ha cambiado nada\n"
 
-#: fdisk/sfdisk.c:2948
+#: fdisk/sfdisk.c:2952
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda con una de las entradas siguientes: y,n,q\n"
 
-#: fdisk/sfdisk.c:2956
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5215,7 +5234,7 @@
 "La nueva tabla de particiones se ha escrito correctamente\n"
 "\n"
 
-#: fdisk/sfdisk.c:2962
+#: 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"
@@ -5226,97 +5245,98 @@
 "bs=512 count=1\n"
 "(Véase fdisk(8).)\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Escriba `getopt --help' para obtener más información.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "Opción larga vacía tras argumento -l o --long"
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "Shell desconocido tras argumento -s o --shell"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Uso: getopt cadenaopciones parámetros\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [opciones] [--] cadenaopciones parámetros\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [opciones] -o|--options cadenaopciones [opciones] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "              parámetros\n"
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Permite opciones largas con un solo - "
 "inicial\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Esta pequeña guía de uso\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=opclargas  Opciones largas para reconocer\n"
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 "  -n, --name=nombreprograma    El nombre con el que se informa de los "
 "errores\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=cadenaopciones Opciones cortas que se reconocen\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 "  -q, --quiet                  Desactiva información de errores mediante\n"
 "                               getopt(3)\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           No hay salida normal\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
 "  -s, --shell=intérpr.órdenes  Define las convenciones de cita del "
 "intérprete\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Prueba para la versión de getopt(1)\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -u, --unquote                No entrecomilla el resultado\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Muestra información de versión\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr "Falta el argumento cadenaopciones"
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
-msgstr "getopt (mejorado) 1.1.2\n"
+# FIXME: ¿Qué hace un número de versión en una cadena para ser traducida?
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (mejorado) 1.1.3\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "Error interno; contacte con el desarrollador."
 
@@ -5848,7 +5868,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "Error de ioctl KDGHWCLK al leer la hora"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr "Se ha excedido el tiempo de espera del cambio de hora.\n"
 
@@ -5873,58 +5893,58 @@
 msgid "KDGHWCLK ioctl failed"
 msgstr "Error de ioctl KDGHWCLK"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "Error de open() de %s"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, 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:171
+#: hwclock/rtc.c:170
 #, 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:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s no tiene funciones de interrupción. "
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, 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:244
+#: hwclock/rtc.c:243
 #, 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:247
+#: hwclock/rtc.c:246
 #, 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:306
+#: hwclock/rtc.c:305
 #, 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:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) ha finalizado correctamente.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "Error al abrir %s"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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' "
@@ -5936,17 +5956,17 @@
 "dispositivo 'rtc' de Linux mediante el fichero especial de dispositivo %s.\n"
 "Este fichero no existe en este sistema.\n"
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr "No se puede abrir %s"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "Error de ioctl(RTC_EPOCH_READ) con %s"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, 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"
@@ -5954,17 +5974,17 @@
 #. 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:397
+#: hwclock/rtc.c:396
 #, 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:415
+#: hwclock/rtc.c:414
 #, 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:420
+#: hwclock/rtc.c:419
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
@@ -5972,7 +5992,7 @@
 "El controlador de dispositivo del núcleo para %s no tiene la ioctl "
 "RTC_EPOCH_SET.\n"
 
-#: hwclock/rtc.c:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "Error de ioctl(RTC_EPOCH_SET) de %s"
@@ -6175,9 +6195,8 @@
 msgid "Password error."
 msgstr "Error de contraseña."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249
-#: mount/lomount.c:254
+#: 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
 msgid "Password: "
 msgstr "Contraseña: "
 
@@ -6401,29 +6420,29 @@
 "\n"
 "interrumpido %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Error fatal: no se puede reabrir la terminal: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
 msgstr "ERROR FATAL: Terminal errónea"
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h sólo para superusuario.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "uso: login [-fp] [nombreusuario]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: error de PAM; anulando: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "No se ha podido inicializar PAM: %s"
@@ -6434,16 +6453,16 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "Inicio de sesión: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "Error de inicio de sesión %d desde %s para %s, %s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -6451,17 +6470,17 @@
 "Inicio de sesión incorrecto\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "Demasiados intentos de inicio de sesión (%d) desde %s para %s, %s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "Error de sesión de inicio de sesión desde %s para %s, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -6469,7 +6488,7 @@
 "\n"
 "Inicio de sesión incorrecto\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
@@ -6477,44 +6496,44 @@
 "\n"
 "Problema al iniciar la sesión, abortado.\n"
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "nombre de usuario NULO en %s:%d. Abortado."
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Nombre de usuario inválido \"%s\" en %s:%d. Abortado."
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
 msgstr "login: No queda memoria\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Nombre de usuario no permitido"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "Inicio de sesión %s rechazado en este terminal.\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "Inicio de sesión %s rechazado desde %s en tty %s"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "Inicio de sesión %s rechazado en tty %s"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Inicio de sesión incorrecto\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -6522,83 +6541,83 @@
 "Ya hay demasiados usuarios con una sesión iniciada.\n"
 "Inténtelo de nuevo más adelante.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
 msgstr "Tiene demasiados procesos en ejecución.\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "Conexión telefónica en %s por %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "Inicio de sesión con root en %s desde %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "Inicio de sesión con root en %s"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, 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:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "Inicio de sesión en %s por %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
 msgstr "Tiene correo nuevo.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
 msgstr "Tiene correo.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: error en fork: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "Fallo en TIOCSCTTY: %m"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr "setuid() ha fallado"
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr "No hay ningún directorio %s\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr "Iniciando la sesión con directorio de inicio = \"/\".\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 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:1206
+#: login-utils/login.c:1200
 #, 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:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: no hay intérprete de órdenes: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6607,62 +6626,62 @@
 "\n"
 "Inicio de sesión de %s: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "Nombre de inicio de sesión demasiado largo.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "Nombre demasiado largo"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 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:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "Demasiados avances de línea solos.\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "Excesivos avances de línea"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, 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:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Último inicio de sesión: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "desde %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "en %.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "Error de inicio de sesión desde %s, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "Error de inicio de sesión en %s, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d errores de inicio de sesión desde %s, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d errores de inicio de sesión en %s, %s"
@@ -7000,7 +7019,7 @@
 
 #: login-utils/simpleinit.c:210
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr ""
+msgstr "error al establecer close-on-exec sobre /dev/initctl"
 
 #: login-utils/simpleinit.c:257
 msgid "error running finalprog\n"
@@ -7035,7 +7054,7 @@
 msgid "fork failed\n"
 msgstr "La bifurcación (fork) ha fallado\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
 msgstr "La ejecución (exec) ha fallado\n"
 
@@ -7338,12 +7357,12 @@
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado; el fichero es %s\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado (%s)"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
@@ -7352,210 +7371,210 @@
 "\n"
 "Script terminado (%s)"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script terminado; el fichero es %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr "openpty ha fallado\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr "No quedan pty\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:744
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: error de argumento, uso\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nombre_terminal ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -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 "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NUM_CONSOLAS] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLAS] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file nombreficherovuelco ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq númerofrecuencia ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr "No se puede (des)activar el modo de ahorro de alimentación\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "Error de klogctl: %s\n"
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Error al leer %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr "Error al escribir vuelco de pantalla\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "No se ha podido leer %s y no se puede efectuar vuelco de ioctl\n"
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM no está definido.\n"
@@ -7612,17 +7631,17 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Mensaje de %s@%s el %s a las %s ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "atención: error al leer %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 "atención: no se puede abrir %s: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: no se ha podido abrir %s; en su lugar se utiliza %s\n"
@@ -7631,42 +7650,42 @@
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:415
 #, 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:399
+#: mount/fstab.c:427
 #, 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:411
+#: mount/fstab.c:439
 #, 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:426
+#: mount/fstab.c:454
 #, 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:439
+#: mount/fstab.c:467
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "No se puede bloquear el fichero de bloqueo %s: %s"
 
-#: mount/fstab.c:441
+#: mount/fstab.c:469
 msgid "timed out"
 msgstr "Tiempo de espera excedido"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:476
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7675,46 +7694,46 @@
 "No se puede crear enlace %s\n"
 "Puede que haya un fichero de bloqueo obsoleto.\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:525 mount/fstab.c:561
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "No se puede abrir %s (%s) - mtab no actualizado"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:569
 #, c-format
 msgid "error writing %s: %s"
 msgstr "Error al escribir %s: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:577
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "Error al cambiar el modo de %s: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:595
 #, 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:80
+#: mount/lomount.c:173
 #, 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:86
+#: mount/lomount.c:179
 #, 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:91
-#, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#: 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:177
+#: 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:181
+#: mount/lomount.c:249
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -7722,7 +7741,7 @@
 "mount: No se puede encontrar ningún dispositivo de bucle.\n"
 "       Puede que /dev/loop# tenga un número principal incorrecto."
 
-#: mount/lomount.c:185
+#: mount/lomount.c:253
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -7733,7 +7752,7 @@
 "       este núcleo no conoce el dispositivo de bucle.\n"
 "       (En este caso, vuelva a realizar la compilación o `insmod loop.o'.)"
 
-#: mount/lomount.c:191
+#: 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"
@@ -7745,248 +7764,293 @@
 "o')\n"
 "       o tal vez /dev/loop# tenga el número principal incorrecto."
 
-#: mount/lomount.c:195
+#: mount/lomount.c:263
 msgid "mount: could not find any free loop device"
 msgstr "mount: no se ha encontrado ningún dispositivo de bucle libre"
 
-#: mount/lomount.c:225
-#, c-format
-msgid "Unsupported encryption type %s\n"
-msgstr "Tipo de cifrado no soportado %s\n"
+#: 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:239
+#: 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
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "No se pudo bloquear en memoria, saliendo.\n"
 
-#: mount/lomount.c:258
+#: mount/lomount.c:654
 msgid "Init (up to 16 hex digits): "
 msgstr "Inicialización (hasta 16 dígitos hexadecimales): "
 
-#: mount/lomount.c:265
+#: mount/lomount.c:661
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Dígito no hexadecimal '%c'.\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:764
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr "No se sabe cómo obtener la clave para el sistema de cifrado %d\n"
 
-#: mount/lomount.c:288
+#: 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:299
-#, c-format
-msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: no se puede suprimir el dispositivo %s: %s\n"
-
-#: mount/lomount.c:309
-#, c-format
-msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s): ejecución correcta\n"
-
-#: mount/lomount.c:317
-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:354
+#: mount/lomount.c:831
 #, 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"
+"  %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 ""
-"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:372 mount/sundries.c:30 mount/sundries.c:45
-#: mount/sundries.c:244
+#: 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:443
-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/lomount.c:945
+#, fuzzy
+msgid "Error: unable to open /etc/fstab for reading\n"
+msgstr "No se puede abrir %s para lectura\n"
 
-#: mount/mntent.c:165
+#: 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/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: atención: no hay ninguna nueva línea final al final de %s\n"
 
-#: mount/mntent.c:216
+#: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: la línea %d de %s es incorrecta%s\n"
 
-#: mount/mntent.c:219
+#: mount/mntent.c:222
 msgid "; rest of file ignored"
 msgstr "; el resto del fichero no se tiene en cuenta"
 
-#: mount/mount.c:385
+#: mount/mount.c:396
 #, 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:389
+#: mount/mount.c:400
 #, 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:410
+#: mount/mount.c:421
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: no se puede abrir %s para escritura: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:436 mount/mount.c:660
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: error al escribir %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:443
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: error al cambiar el modo de %s: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:494
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s parece espacio de intercambio - no montado"
 
-#: mount/mount.c:538
+#: mount/mount.c:554
 msgid "mount failed"
 msgstr "montaje erróneo"
 
-#: mount/mount.c:540
+#: mount/mount.c:556
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: sólo el usuario root puede montar %s en %s"
 
-#: mount/mount.c:568
+#: mount/mount.c:584
 msgid "mount: loop device specified twice"
 msgstr "mount: dispositivo de bucle especificado dos veces"
 
-#: mount/mount.c:573
+#: mount/mount.c:589
 msgid "mount: type specified twice"
 msgstr "mount: tipo especificado dos veces"
 
-#: mount/mount.c:585
+#: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: omitiendo la configuración de un dispositivo de bucle\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: se va a utilizar el dispositivo de bucle %s\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:614
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: error al configurar dispositivo de bucle\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:618
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configuración correcta de dispositivo de bucle\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:655
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: no se puede abrir %s: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:678
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: no se puede abrir %s para establecer la velocidad"
 
-#: mount/mount.c:665
+#: mount/mount.c:681
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:735 mount/mount.c:1309
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: no se puede bifurcar (fork): %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:815
 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:845
+#: mount/mount.c:854
 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:856
+#: mount/mount.c:865
 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:859
+#: mount/mount.c:868
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: debe especificar el tipo de sistema de ficheros"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:871
 msgid "mount: mount failed"
 msgstr "mount: montaje erróneo"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:877 mount/mount.c:912
 #, 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:870
+#: mount/mount.c:879
 msgid "mount: permission denied"
 msgstr "mount: permiso denegado"
 
-#: mount/mount.c:872
+#: mount/mount.c:881
 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:876 mount/mount.c:880
+#: mount/mount.c:885 mount/mount.c:889
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s está ocupado"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:891
 msgid "mount: proc already mounted"
 msgstr "mount: proc ya está montado"
 
-#: mount/mount.c:884
+#: mount/mount.c:893
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ya está montado o %s está ocupado"
 
-#: mount/mount.c:890
+#: mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: el punto de montaje %s no existe"
 
-#: mount/mount.c:892
+#: mount/mount.c:901
 #, 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:895
+#: mount/mount.c:904
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: el dispositivo especial %s no existe"
 
-#: mount/mount.c:905
+#: mount/mount.c:914
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7995,12 +8059,12 @@
 "mount: el dispositivo especial %s no existe\n"
 "       (un prefijo de ruta no es un directorio)\n"
 
-#: mount/mount.c:918
+#: mount/mount.c:927
 #, 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:920
+#: mount/mount.c:929
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -8010,36 +8074,36 @@
 "superbloque incorrecto en %s,\n"
 "       o número de sistemas de ficheros montados excesivo"
 
-#: mount/mount.c:954
+#: mount/mount.c:963
 msgid "mount table full"
 msgstr "tabla de dispositivos montados completa"
 
-#: mount/mount.c:956
+#: mount/mount.c:965
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: no se puede leer el superbloque"
 
-#: mount/mount.c:960
+#: mount/mount.c:969
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: dispositivo desconocido"
 
-#: mount/mount.c:965
+#: mount/mount.c:974
 #, 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:977
+#: mount/mount.c:986
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablemente quería referirse a %s"
 
-#: mount/mount.c:979
+#: mount/mount.c:988
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: ¿tal vez quería referirse a iso9660?"
 
-#: mount/mount.c:982
+#: mount/mount.c:991
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -8047,12 +8111,12 @@
 "%s no soportado"
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:997
 #, 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:990
+#: mount/mount.c:999
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -8061,102 +8125,103 @@
 "mount: el núcleo no reconoce %s como dispositivo de bloques\n"
 "       (¿tal vez `insmod driver'?)"
 
-#: mount/mount.c:993
+#: mount/mount.c:1002
 #, 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:996
+#: mount/mount.c:1005
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s no es un dispositivo de bloques"
 
-#: mount/mount.c:999
+#: mount/mount.c:1008
 #, 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:1002
+#: mount/mount.c:1011
 msgid "block device "
 msgstr "dispositivo de bloques "
 
-#: mount/mount.c:1004
+#: mount/mount.c:1013
 #, 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:1008
+#: mount/mount.c:1017
 #, 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:1024
+#: mount/mount.c:1033
 #, 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:1111
+#: 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:1115
+#: mount/mount.c:1124
 #, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr "mount: %s duplicado - no se monta"
 
-#: mount/mount.c:1125
+#: 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:1126
+#: mount/mount.c:1135
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "label"
 msgstr "etiqueta"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: 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:1136
+#: mount/mount.c:1145
 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:1141
-msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+#: mount/mount.c:1150
+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 smb por el "
+"mount: no se ha especificado ningún tipo; se presupone smbfs por el "
 "prefijo //\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1166
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: ejecutando en segundo plano \"%s\"\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1177
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: se abandona \"%s\"\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1254
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ya está montado en %s\n"
 
-#: mount/mount.c:1376
+#: mount/mount.c:1386
+#, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8177,7 +8242,7 @@
 "       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 fd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Uso: mount -V                 : muestra la versión\n"
@@ -8204,40 +8269,40 @@
 "Otras opciones: [-nfFrsvw] [-o opciones].\n"
 "Escriba man 8 mount para saber mucho más.\n"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1563
 msgid "mount: only root can do that"
 msgstr "mount: sólo el usuario root puede efectuar esta acción"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1568
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: no se ha encontrado %s; se está creando...\n"
 
-#: mount/mount.c:1568
+#: 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:1575
+#: mount/mount.c:1589
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: montando %s\n"
 
-#: mount/mount.c:1584
+#: mount/mount.c:1598
 msgid "nothing was mounted"
 msgstr "no se ha montado nada"
 
-#: mount/mount.c:1599
+#: mount/mount.c:1613
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: no se puede encontrar %s en %s"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1628
 #, 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:259
+#: mount/mount_by_label.c:189
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8245,34 +8310,34 @@
 "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:378
+#: mount/mount_by_label.c:309
 msgid "mount: bad UUID"
 msgstr "mount: UUID incorrecto"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:483
 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:493
+#: mount/mount_guess_fstype.c:492
 #, 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:496
+#: mount/mount_guess_fstype.c:495
 #, 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:499
+#: mount/mount_guess_fstype.c:498
 msgid "       and it looks like this is swapspace\n"
 msgstr "       y parece que sea un espacio de intercambio\n"
 
-#: mount/mount_guess_fstype.c:501
+#: mount/mount_guess_fstype.c:500
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Se probará con el tipo %s\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:588
 #, c-format
 msgid "Trying %s\n"
 msgstr "Probando con %s\n"
@@ -8366,7 +8431,7 @@
 msgid "bug in xstrndup call"
 msgstr "Error en la llamada xstrndup"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8379,7 +8444,7 @@
 "       %s [-v] [-p prioridad] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:84
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8390,33 +8455,100 @@
 "       %s -a [-v]\n"
 "       %s [-v] especial ...\n"
 
-#: mount/swapon.c:178 mount/swapon.c:242
+#: 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
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s en %s\n"
 
-#: mount/swapon.c:182
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: no se puede ejecutar stat para %s: %s\n"
 
-#: mount/swapon.c:193
+#: mount/swapon.c:216
 #, 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:205
+#: mount/swapon.c:228
 #, 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:248
+#: mount/swapon.c:271
 msgid "Not superuser.\n"
 msgstr "No es el superusuario.\n"
 
-#: mount/swapon.c:312 mount/swapon.c:401
+#: 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
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: no se puede abrir %s: %s\n"
@@ -8546,17 +8678,17 @@
 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:564
+#: mount/umount.c:566
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montaje de %s no concuerda con fstab"
 
-#: mount/umount.c:598
+#: mount/umount.c:602
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: sólo el usuario root puede desmontar %s desde %s"
 
-#: mount/umount.c:669
+#: mount/umount.c:671
 msgid "umount: only root can do that"
 msgstr "umount: sólo el usuario root puede efectuar esta acción"
 
@@ -8698,7 +8830,7 @@
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f enteros/seg.; %f recepción (caracteres/seg.)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Uso: %s [-c] [-n nivel] [-s tamañobúfer]\n"
@@ -9243,9 +9375,9 @@
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:615
 #, c-format
@@ -9408,12 +9540,13 @@
 msgid "missing comma"
 msgstr "falta una coma"
 
-#: sys-utils/readprofile.c:60
+#: 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"
@@ -9424,8 +9557,9 @@
 "\t -V            print version and exit\n"
 msgstr ""
 "%s: Uso: \"%s [opciones]\n"
-"         -m <archmapa> (Valor predeterminado = \"%s\")\n"
-"         -p <fichero>  (Valor predeterminado = \"%s\")\n"
+"         -m <archmapa> (Valores predeterminados: \"%s\" y\n"
+"                                  \"%s\")\n"
+"         -p <fichero>  (Valor predeterminado: \"%s\")\n"
 "         -M <mult>     Establece el multiplicador de perfil en <mult>\n"
 "         -i            Muestra sólo información sobre paso de muestreo\n"
 "         -v            Muestra datos detallados\n"
@@ -9437,36 +9571,32 @@
 "bytes\n"
 "         -V            Muestra la versión y sale\n"
 
-#: sys-utils/readprofile.c:84
-msgid "out of memory"
-msgstr "no queda memoria"
-
-#: sys-utils/readprofile.c:147
+#: sys-utils/readprofile.c:188
 #, c-format
-msgid "%s Version %s\n"
-msgstr "%s Versión %s\n"
+msgid "%s version %s\n"
+msgstr "%s versión %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Paso de sondeo: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): línea de mapa incorrecta\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:308
 #, 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:282
+#: sys-utils/readprofile.c:334
 #, 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:323
+#: sys-utils/readprofile.c:375
 msgid "total"
 msgstr "total"
 
@@ -9676,16 +9806,16 @@
 msgid "...back 1 page"
 msgstr "...retroceder 1 página"
 
-#: text-utils/more.c:1313
+#: text-utils/more.c:1314
 msgid "...skipping one line"
 msgstr "...omitiendo una línea"
 
-#: text-utils/more.c:1315
+#: text-utils/more.c:1316
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...omitiendo %d líneas"
 
-#: text-utils/more.c:1352
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
@@ -9695,64 +9825,93 @@
 "***Atrás***\n"
 "\n"
 
-#: text-utils/more.c:1390
+#: 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"
+"La mayoría de las órdenes pueden estar precedidas por un argumento entero "
+"k.\n"
+"Los valores predeterminados están entre corchetes.\n"
+"Un asterisco (*) indica que el argumento será el nuevo valor "
+"predeterminado.\n"
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1398
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
+"<espacio>               Muestra las siguientes k líneas de texto\n"
+"                        [por omisión, el tamaño actual de la ventana]\n"
+"z                       Muestra las siguientes k líneas de texto\n"
+"                        [por omisión, el tamaño actual de la ventana]*\n"
+"<intro>                 Muestra las siguientes k líneas de texto [1]*\n"
+"d o ctrl-D              Desplaza k líneas [tamaño de desplazo actual,\n"
+"                          inicialmente 11]*\n"
+"q o Q o <interr>        Sale de more\n"
+"s                       Salta hacia adelante k líneas de texto [1]\n"
+"f                       Salta hacia adelante k pantallas de texto [1]\n"
+"b o ctrl-B              Salta hacia atrás k pantallas de texto [1]\n"
+"'                       Va al sitio donde comenzó la búsqueda anterior\n"
+"=                       Muestra el número de la línea actual\n"
+"/<expresión regular>    Busca la k-ésima aparición de la expresión regular "
+"[1]\n"
+"n                       Busca la k-ésima aparición de la última e.r. [1]\n"
+"!<orden> o :!<orden>    Ejecuta <orden> en un subshell\n"
+"v                       Inicia /usr/bin/vi en la línea actual\n"
+"ctrl-L                  Redibuja la pantalla\n"
+":n                      Va al k-ésimo fichero siguiente [1]\n"
+":p                      Va al k-ésimo fichero anterior [1]\n"
+":f                      Muestra el fichero actual y el número de línea\n"
+".                       Repite la orden anterior\n"
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
 msgstr "[Pulse 'h' para consultar las instrucciones.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" línea %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[No es un fichero] línea %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
 msgstr "  Desbordamiento\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1642
 msgid "...skipping\n"
 msgstr "...omitiendo\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
 msgstr "Error en expresión regular"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9760,15 +9919,15 @@
 "\n"
 "Patrón no encontrado\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr "Patrón no encontrado"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1748
 msgid "can't fork\n"
 msgstr "no se puede bifurcar\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
@@ -9776,19 +9935,19 @@
 "\n"
 "...Saltando "
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1792
 msgid "...Skipping to file "
 msgstr "...Saltando al fichero "
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1794
 msgid "...Skipping back to file "
 msgstr "...Retrocediendo al fichero "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2074
 msgid "Line too long"
 msgstr "Línea demasiado larga"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
 msgstr "No hay ningún comando anterior para sustituir"
 
@@ -9840,40 +9999,40 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: carácter de conversión %%%s incorrecto.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 "%s: Uso: %s [-número] [-p cadena] [-cefrns] [+línea] [+/patrón/] [ficheros]\n"
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: la opción necesita un argumento -- %s\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: opción ilegal -- %s\n"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 msgid "...skipping forward\n"
 msgstr "...saltando hacia adelante\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 msgid "...skipping backward\n"
 msgstr "...saltando hacia atrás\n"
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 msgid "No next file"
 msgstr "No hay ningún fichero siguiente"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 msgid "No previous file"
 msgstr "No hay ningún fichero anterior"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Error de lectura en el fichero %s\n"
@@ -9881,51 +10040,51 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: EOF inesperado en el fichero %s\n"
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Error desconocido en el fichero %s\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: No se puede crear un fichero temporal.\n"
 
 # ¿Qué significa?
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 msgid "RE error: "
 msgstr "RE error:"
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr "No se recuerda ninguna cadena de búsqueda"
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 msgid "Cannot open "
 msgstr "No se puede abrir "
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 msgid "saved"
 msgstr "guardado"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": no se permite !orden en el modo rflag.\n"
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 msgid "fork() failed, try again later\n"
 msgstr "falló la llamada al sistema fork(), inténtelo de nuevo más adelante\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 msgid "(Next file: "
 msgstr "(Siguiente fichero: "
 
@@ -9963,6 +10122,33 @@
 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 "del_loop(%s): success\n"
+#~ msgstr "del_loop(%s): ejecución correcta\n"
+
+#~ 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"
+
+#~ 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 ""
+#~ "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"
+
+#~ 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"
+
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "La partición %i no termina en el límite del cilindro:\n"
 
diff --git a/po/et.po b/po/et.po
index 9bd2fd2..bd1eac8 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: 2002-11-25 00:47+0100\n"
+"POT-Creation-Date: 2003-06-13 00:50+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"
@@ -151,7 +151,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -752,7 +752,7 @@
 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:2166
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
 #, c-format
 msgid "Device: %s\n"
 msgstr "Seade: %s\n"
@@ -825,8 +825,8 @@
 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-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Mälu sai otsa\n"
@@ -836,7 +836,7 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versioon %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
+#: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
 "usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
@@ -854,72 +854,72 @@
 " outfile    output file\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:328
+#: 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 ""
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:507
+#: disk-utils/mkfs.cramfs.c:514
 msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
 msgstr ""
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:812
+#: 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 ""
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, fuzzy, c-format
 msgid "Including: %s\n"
 msgstr "Vigane arv: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, c-format
 msgid "Super block: %d bytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
@@ -928,33 +928,33 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 #, fuzzy
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "Hoiatus: i-kirjete arv on liiga suur\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:926
+#: disk-utils/mkfs.cramfs.c:933
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -1104,8 +1104,8 @@
 msgid "too many bad pages"
 msgstr "liiga palju vigaseid lehekülgi"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: 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 "Mälu sai otsa"
 
@@ -1223,11 +1223,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "%s [ -c | -y | -n ] seade\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
 msgid "Unusable"
 msgstr "Kasutamatu"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
 msgid "Free Space"
 msgstr "Vaba ruum"
 
@@ -1360,229 +1360,229 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menüü ilma suunata, eeldan horisontaalset"
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Vale klahv"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Vajuta mõnda klahvi jätkamiseks"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2512
 msgid "Primary"
 msgstr "Primaarne"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Loo uus primaarne partitsioon"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2512
 msgid "Logical"
 msgstr "Loogiline"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Loo uus loogiline partitsioon"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
 msgid "Cancel"
 msgstr "Tühista"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Ära loo partitsiooni"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Sisemine viga !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Suurus (MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Beginning"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Lisada partitsioon vaba ruumi algusse"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "End"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Lisada partitsioon vaba ruumi lõppu"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "Pole ruumi extended-partitsiooni tegemiseks"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1527
 msgid "No partition table or unknown signature on partition table"
 msgstr "Puuduv partitsioonitabel või vale signatuur partitsioonitabelis"
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1529
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Kas soovite alustada tühja tabeliga [y/N] ?"
 
-#: fdisk/cfdisk.c:1576
+#: fdisk/cfdisk.c:1581
 msgid "You specified more cylinders than fit on disk"
 msgstr "Te andiste suurema silindrite arvu kui kettale mahub"
 
-#: fdisk/cfdisk.c:1606
+#: fdisk/cfdisk.c:1611
 msgid "Cannot open disk drive"
 msgstr "Ei suuda avada kettaseadet"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Avasin ketta ainult lugemiseks - kirjutamiseks pole õigust"
 
-#: fdisk/cfdisk.c:1629
+#: fdisk/cfdisk.c:1634
 msgid "Cannot get disk size"
 msgstr "Ei suuda kindlaks teha ketta mahtu"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1659
 msgid "Bad primary partition"
 msgstr "Vigane primaarne partitsioon"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1689
 msgid "Bad logical partition"
 msgstr "Vigane loogiline partitsioon"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1804
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Hoiatus!!  See võib Teie kettal andmeid hävitada!"
 
-#: fdisk/cfdisk.c:1803
+#: fdisk/cfdisk.c:1808
 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:1809
+#: fdisk/cfdisk.c:1814
 msgid "no"
 msgstr "ei"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1815
 msgid "Did not write partition table to disk"
 msgstr "Ei kirjutanud partitsioonitabelit kettale"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1817
 msgid "yes"
 msgstr "jah"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1820
 msgid "Please enter `yes' or `no'"
 msgstr "Palun sisestage `jah' või `ei'"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1824
 msgid "Writing partition table to disk..."
 msgstr "Kirjutan partitsioonitabelit kettale..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
 msgid "Wrote partition table to disk"
 msgstr "Kirjutasin partitsioonitabeli kettale"
 
-#: fdisk/cfdisk.c:1846
+#: fdisk/cfdisk.c:1851
 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:1856
+#: fdisk/cfdisk.c:1861
 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:1858
+#: fdisk/cfdisk.c:1863
 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:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Siseta failinimi või vajuta RETURN ekraanil näitamiseks: "
 
-#: fdisk/cfdisk.c:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ei suuda avada faili `%s'"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1941
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Kettaseade: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1943
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1950
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1970
 msgid "   None   "
 msgstr "   Vaba   "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1972
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1974
 msgid "   Primary"
 msgstr " Primaarne"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1976
 msgid "   Logical"
 msgstr " Loogiline"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2020
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Buutiv (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2024
 #, c-format
 msgid "None (%02X)"
 msgstr "Pole (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitsioonitabel kettal %s\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2061
 msgid "            First    Last\n"
 msgstr "            Esimene  Viimane\n"
 
-#: fdisk/cfdisk.c:2057
+#: fdisk/cfdisk.c:2062
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Tüüp     Sektor   Sektor   Offset  Pikkus   Failisüst. tüüp (ID)   Lipud\n"
 
-#: fdisk/cfdisk.c:2058
+#: fdisk/cfdisk.c:2063
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1591,461 +1591,461 @@
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2146
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         ----Algus-----      -----Lõpp-----  Esimene Sektorite\n"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2147
 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:2143
+#: fdisk/cfdisk.c:2148
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Raw"
 msgstr "tooRes"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Print the table using raw data format"
 msgstr "Trükkida tabel toores formaadis (baithaaval)"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
 msgid "Sectors"
 msgstr "Sektorid"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2182
 msgid "Print the table ordered by sectors"
 msgstr "Trükkida tabel järjestatuna sektorite järgi"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Just print the partition table"
 msgstr "Trükkida lihtsalt tabel"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2184
 msgid "Don't print the table"
 msgstr "Ei trüki midagi"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2212
 msgid "Help Screen for cfdisk"
 msgstr "cfdiski abiinfo ekraan"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2214
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "See on cfdisk, curses'il baseeruv ketta partitsioneerimise"
 
-#: fdisk/cfdisk.c:2210
+#: fdisk/cfdisk.c:2215
 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:2211
+#: fdisk/cfdisk.c:2216
 msgid "disk drive."
 msgstr "arvuti kõvakettal."
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2218
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2220
 msgid "Command      Meaning"
 msgstr "Käsk        Tähendus"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2221
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2222
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Vahetada buuditavuse lippu jooksval partitsioonil"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2223
 msgid "  d          Delete the current partition"
 msgstr "  d          Kustutada jooksev partitsioon"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2224
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Muuta silindrite, peade ja rajal olevate sektorite arvu"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2225
 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:2221
+#: fdisk/cfdisk.c:2226
 msgid "             know what they are doing."
 msgstr "             nad teevad."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2227
 msgid "  h          Print this screen"
 msgstr "  h          Näidata sedasama ekraani"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2228
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimiseerida jooksva partitsiooni kettakasutus"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2229
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Märkus: see võib teha ketta mitteühilduvaks DOSi,"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2230
 msgid "             DOS, OS/2, ..."
 msgstr "             OS/2 ja muude operatsioonisüteemidega."
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2231
 msgid "  n          Create new partition from free space"
 msgstr "  n          Luua uus partitsioon vaba ruumi sisse"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2232
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Väljastada partitsioonitabel ekraanile või faili"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2233
 msgid "             There are several different formats for the partition"
 msgstr "             Väljastamisel võite valida mitme formaadi vahel:"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2234
 msgid "             that you can choose from:"
 msgstr " "
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2235
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - tooRes - see baidijada, mis kettale kirjutataks"
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2236
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Sektorite järgi järjestatud tabel"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2237
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel teksti kujul (umbes nagu peaekraanil)"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2238
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Väljuda programmist ilam muutusi salvestamata"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2239
 msgid "  t          Change the filesystem type"
 msgstr "  t          Muuta jooksva partitsiooni failisüsteemi tüüpi"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2240
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Muuta partitsioonide suuruse ja asukoha ühikuid"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2241
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Variandid on MB, sektorid ja silindrid"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2242
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Kirjutada partitsioonitabel kettale (jah, suurtäht)"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2243
 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:2239
+#: fdisk/cfdisk.c:2244
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             enne kirjutamist kinnitust. Vastata tuleb eestikeelse"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2245
 msgid "             `no'"
 msgstr "             täissõnaga (`jah' või `ei')."
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2246
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nool üles    Viia kursor eelmisele reale"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2247
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nool alla    Viia kursor järgmisele reale"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2248
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Joonistada ekraan üle"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2249
 msgid "  ?          Print this screen"
 msgstr "  ?          Näidata sedasama ekraani"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2251
 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:2247
+#: fdisk/cfdisk.c:2252
 msgid "case letters (except for Writes)."
 msgstr "välja arvatud suur W."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
-#: fdisk/fdisksunlabel.c:324
+#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "silindrid (C)"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2282
 msgid "Change cylinder geometry"
 msgstr "Muuta silindrite arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "pead (H)"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2283
 msgid "Change head geometry"
 msgstr "Muuta peade arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2284
 msgid "Change sector geometry"
 msgstr "Muuta sektorite arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done"
 msgstr "valmis (D)"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done with changing geometry"
 msgstr "Muutused geomeetrias on tehtud"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2298
 msgid "Enter the number of cylinders: "
 msgstr "Sisestage silindrite arv: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
 msgid "Illegal cylinders value"
 msgstr "Vigane silindrite arv"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2316
 msgid "Enter the number of heads: "
 msgstr "Sisetage peade arv: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
 msgid "Illegal heads value"
 msgstr "Vigane peade arv"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2329
 msgid "Enter the number of sectors per track: "
 msgstr "Sisestage sektorite arv rajal: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
 msgid "Illegal sectors value"
 msgstr "Vigane sektorite arv"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2439
 msgid "Enter filesystem type: "
 msgstr "Sisestage failisüsteemi tüübi number: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2457
 msgid "Cannot change FS Type to empty"
 msgstr "Failisüsteemi tüüpi ei saa muuta tühjaks"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2459
 msgid "Cannot change FS Type to extended"
 msgstr "Failisüsteemi tüüpi ei saa muuta extended'iks"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Buutiv"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2489
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2511
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2587
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Kettaseade: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2593
 #, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "Maht: %lld baiti, %ld MB"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2596
 #, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "Maht: %lld baiti, %ld.%ld GB"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2600
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Päid: %d    Sektoreid rajal: %d    Silindreid: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2604
 msgid "Name"
 msgstr "Nimi"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2605
 msgid "Flags"
 msgstr "Lipud"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2606
 msgid "Part Type"
 msgstr "Tüüp"
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2607
 msgid "FS Type"
 msgstr "FS tüüp"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2608
 msgid "[Label]"
 msgstr "[Label]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2610
 msgid "  Sectors"
 msgstr "Sektoreid"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2614
 msgid "Size (MB)"
 msgstr "Maht (MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2616
 msgid "Size (GB)"
 msgstr "Maht (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Bootable"
 msgstr "Buutiv"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Toggle bootable flag of the current partition"
 msgstr "Vahetada buuditavuse lippu jooksval partitsioonil"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete"
 msgstr "kustutaDa"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete the current partition"
 msgstr "Kustutada jooksev partitsioon"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Geometry"
 msgstr "Geomeetria"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Change disk geometry (experts only)"
 msgstr "Muuta ketta geomeetriat (ainult ekspertidele)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Help"
 msgstr "Help"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Print help screen"
 msgstr "Näidata abiinfot"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize"
 msgstr "Maksimiseerida"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimiseerida jooksva partitsiooni kettakasutus (ainult ekspertidele)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "New"
 msgstr "uus (N)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "Create new partition from free space"
 msgstr "Luua uus partitsioon vaba ruumi sisse"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print"
 msgstr "Prindi"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print partition table to the screen or to a file"
 msgstr "Väljastada partitsioonitabel ekraanile või faili"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit"
 msgstr "Välja"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit program without writing partition table"
 msgstr "Väljuda programmist ilam muutusi salvestamata"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Type"
 msgstr "Tüüp"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 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:2675
+#: fdisk/cfdisk.c:2680
 msgid "Units"
 msgstr "Uhikud"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Muuta partitsioonide suuruse näitamise ühikuid (MB, sektorid, silindrid)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write"
 msgstr "salvesta (W)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Kirjutada partitsioonitabel kettale (võib hävitada andmed)"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2727
 msgid "Cannot make this partition bootable"
 msgstr "Seda partitsiooni ei saa buutivaks teha"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2737
 msgid "Cannot delete an empty partition"
 msgstr "Tühja partitsiooni ei saa kustutada"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
 msgid "Cannot maximize this partition"
 msgstr "Seda partitsiooni ei saa maksimiseerida"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2767
 msgid "This partition is unusable"
 msgstr "See partitsioon pole kasutatav"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2769
 msgid "This partition is already in use"
 msgstr "See partitsioon on juba olemas"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2786
 msgid "Cannot change the type of an empty partition"
 msgstr "Tühja partitsiooni tüüpi ei saa muuta"
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
 msgid "No more partitions"
 msgstr "Rohkem partitsioone ei ole"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2826
 msgid "Illegal command"
 msgstr "Vigane käsk"
 
-#: fdisk/cfdisk.c:2831
+#: fdisk/cfdisk.c:2836
 #, 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:2838
+#: fdisk/cfdisk.c:2843
 #, c-format
 msgid ""
 "\n"
@@ -2325,11 +2325,11 @@
 msgid "heads"
 msgstr "pead"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "sektorit"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470
+#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "silindrit"
@@ -2448,74 +2448,74 @@
 msgstr "Kuueteistkümnendsüsteemis kood (L näitab koodide nimekirja): "
 
 #: fdisk/fdisk.c:1069
-#, c-format
-msgid "%s (%d-%d, default %d): "
+#, fuzzy, c-format
+msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, vaikimisi %d): "
 
-#: fdisk/fdisk.c:1134
-#, c-format
-msgid "Using default value %d\n"
+#: fdisk/fdisk.c:1136
+#, fuzzy, c-format
+msgid "Using default value %u\n"
 msgstr "Kasutan vaikimisi väärtust %d\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1140
 msgid "Value out of range.\n"
 msgstr "Väärtus on piiridest väljas\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1150
 msgid "Partition number"
 msgstr "Partitsiooni number"
 
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1161
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Hoiatus: partitsioonil %d on tühi tüüp\n"
 
-#: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207
+#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Ignoreerin lisa-extended partistsiooni %d\n"
 
-#: fdisk/fdisk.c:1184
+#: fdisk/fdisk.c:1186
 #, fuzzy
 msgid "No partition is defined yet!\n"
 msgstr "Ühtegi partitsiooni pole defineeritud\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1212
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "cylinder"
 msgstr "silinder"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1231
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Sisestamisel ja näitamisel on nüüd ühikuteks %s\n"
 
-#: fdisk/fdisk.c:1240
+#: fdisk/fdisk.c:1242
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "Hoiatus: partitsioon %d on extended-partitsioon\n"
 
-#: fdisk/fdisk.c:1251
+#: fdisk/fdisk.c:1253
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOSiga ühilduvuse lipp on püsti\n"
 
-#: fdisk/fdisk.c:1255
+#: fdisk/fdisk.c:1257
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOSiga ühilduvuse lipp pole püsti\n"
 
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1357
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partitsiooni %d pole veel olemas!\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1362
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2527,7 +2527,7 @@
 "tekitada tüüpi 0 partitsioone. Te saate partitsiooni\n"
 "kustutada käsuga 'd'.\n"
 
-#: fdisk/fdisk.c:1361
+#: fdisk/fdisk.c:1371
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2535,7 +2535,7 @@
 "Partitsiooni ei saa muuta extended'iks ega extendedist harilikuks.\n"
 "Selle asemel tuleb partitsioon kustutada ja uus luua.\n"
 
-#: fdisk/fdisk.c:1370
+#: fdisk/fdisk.c:1380
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2544,7 +2544,7 @@
 "Soovitav on jätta partitsioon 3 terveks kettaks (5),\n"
 "sest SunOs/Solaris eeldab seda ja see meeldib isegi Linuxile.\n"
 
-#: fdisk/fdisk.c:1376
+#: fdisk/fdisk.c:1386
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2553,61 +2553,61 @@
 "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:1389
+#: fdisk/fdisk.c:1399
 #, 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:1443
+#: fdisk/fdisk.c:1453
 #, 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:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     füüs=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "loogiline=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1451
+#: fdisk/fdisk.c:1461
 #, 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:1460
+#: fdisk/fdisk.c:1470
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partitsioon %i ei alga silindri piirilt:\n"
 
-#: fdisk/fdisk.c:1463
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "peaks olema (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1469
+#: fdisk/fdisk.c:1479
 #, 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:1473
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "peaks olema (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1485
+#: fdisk/fdisk.c:1495
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1498
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2617,7 +2617,7 @@
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1500
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -2625,19 +2625,19 @@
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1493
+#: fdisk/fdisk.c:1503
 #, c-format
 msgid ", total %lu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1496
+#: fdisk/fdisk.c:1506
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1604
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2645,16 +2645,16 @@
 "Midagi pole vaja teha, järjestus on juba õige\n"
 "\n"
 
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1678
 #, 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:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
 msgid "Device"
 msgstr "Seade"
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1716
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2662,7 +2662,7 @@
 "\n"
 "Partitsioonitabeli kirjed on füüsilisest erinevas järjekorras\n"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
@@ -2673,91 +2673,91 @@
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1728
 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:1762
+#: fdisk/fdisk.c:1772
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Hoiatus: partitsioon %d sisaldab sektorit 0\n"
 
-#: fdisk/fdisk.c:1765
+#: fdisk/fdisk.c:1775
 #, 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:1768
+#: fdisk/fdisk.c:1778
 #, 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:1771
+#: fdisk/fdisk.c:1781
 #, 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:1775
+#: fdisk/fdisk.c:1785
 #, 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:1807
+#: fdisk/fdisk.c:1817
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Hoiatus: partitsioonis %d on andmete algus vigane\n"
 
-#: fdisk/fdisk.c:1815
+#: fdisk/fdisk.c:1825
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Hoiatus: partitsioon %d kattub partitsiooniga %d\n"
 
-#: fdisk/fdisk.c:1835
+#: fdisk/fdisk.c:1845
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Hoiatus: partitsioon %d on tühi\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1850
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Loogiline partitsioon %d pole üleni partitsioonis %d\n"
 
-#: fdisk/fdisk.c:1846
+#: fdisk/fdisk.c:1856
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "Kogu kasutataud sektorite arv %d on suurem kui sektorite koguarv %d\n"
 
-#: fdisk/fdisk.c:1849
+#: fdisk/fdisk.c:1859
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d vaba sektorit\n"
 
-#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
+#: fdisk/fdisk.c:1872 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:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
-#: fdisk/fdisksunlabel.c:522
+#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Esimene %s"
 
-#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
+#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: fdisk/fdisk.c:1937
+#: fdisk/fdisk.c:1947
 msgid "No free sectors available\n"
 msgstr "Vabad sektorid on otsas\n"
 
-#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
+#: fdisk/fdisk.c:1956 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:2011
+#: fdisk/fdisk.c:2021
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2770,17 +2770,17 @@
 "\t(käsuga o).\n"
 "\tHOIATUS: see hävitab ketta praeguse sisu!\n"
 
-#: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2033 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:2031
+#: fdisk/fdisk.c:2041
 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:2036
+#: fdisk/fdisk.c:2046
 #, c-format
 msgid ""
 "Command action\n"
@@ -2791,20 +2791,20 @@
 "   %s\n"
 "   p   primaarse partitsiooni (1-4) loomine\n"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "l   logical (5 or over)"
 msgstr "l   loogilise partitsiooni (5-...) loomine"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "e   extended"
 msgstr "e   extended partitsiooni loomine"
 
-#: fdisk/fdisk.c:2057
+#: fdisk/fdisk.c:2067
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Vigane partitsiooni number tüübile `%c'\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2103
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2812,11 +2812,11 @@
 "Partitsioonitabelit on muudetud!\n"
 "\n"
 
-#: fdisk/fdisk.c:2102
+#: fdisk/fdisk.c:2112
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kasutan ioctl() partitsioonitabeli uuesti lugemiseks\n"
 
-#: fdisk/fdisk.c:2118
+#: fdisk/fdisk.c:2128
 #, c-format
 msgid ""
 "\n"
@@ -2830,7 +2830,7 @@
 "Tuum kasutab endiselt vana tabelit,\n"
 "uus tabel hakkab kehtima järgmisest buudist alates.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2138
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2842,64 +2842,64 @@
 "partitsioone, lugege palun fdisk'i manuali\n"
 "lisainformatsiooni jaoks.\n"
 
-#: fdisk/fdisk.c:2135
+#: fdisk/fdisk.c:2145
 msgid "Syncing disks.\n"
 msgstr "Kirjutan puhvreid kettale\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitsioonil %d pole andmetele ruumi eraldatud\n"
 
-#: fdisk/fdisk.c:2187
+#: fdisk/fdisk.c:2197
 msgid "New beginning of data"
 msgstr "Andmete uus algus"
 
-#: fdisk/fdisk.c:2203
+#: fdisk/fdisk.c:2213
 msgid "Expert command (m for help): "
 msgstr "Eksperdi käsk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:2216
+#: fdisk/fdisk.c:2226
 msgid "Number of cylinders"
 msgstr "Sisestage silindrite arv"
 
-#: fdisk/fdisk.c:2243
+#: fdisk/fdisk.c:2253
 msgid "Number of heads"
 msgstr "Sisetage peade arv"
 
-#: fdisk/fdisk.c:2268
+#: fdisk/fdisk.c:2278
 msgid "Number of sectors"
 msgstr "Sisetage sektorite arv"
 
-#: fdisk/fdisk.c:2271
+#: fdisk/fdisk.c:2281
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Hoiatus: sean sektorite offseti DOSiga ühilduvuse jaoks\n"
 
-#: fdisk/fdisk.c:2346
+#: fdisk/fdisk.c:2356
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Seade %s ei sisalda äratuntavat partitsioonitabelit\n"
 
-#: fdisk/fdisk.c:2360
+#: fdisk/fdisk.c:2370
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Ei suuda avada faili %s\n"
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2408
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tundmatu käsk\n"
 
-#: fdisk/fdisk.c:2466
+#: fdisk/fdisk.c:2476
 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:2470
+#: fdisk/fdisk.c:2480
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2908,18 +2908,18 @@
 "täpselt määratud seadmega\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2529
+#: fdisk/fdisk.c:2539
 #, 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:2539
+#: fdisk/fdisk.c:2549
 msgid "Command (m for help): "
 msgstr "Käsk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:2555
+#: fdisk/fdisk.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -2928,15 +2928,15 @@
 "\n"
 "Aktiivne buutfail on %s\n"
 
-#: fdisk/fdisk.c:2557
+#: fdisk/fdisk.c:2567
 msgid "Please enter the name of the new boot file: "
 msgstr "Palun sisestage uue buutfaili nimi: "
 
-#: fdisk/fdisk.c:2559
+#: fdisk/fdisk.c:2569
 msgid "Boot file unchanged\n"
 msgstr "Buutfail jäi samaks\n"
 
-#: fdisk/fdisk.c:2624
+#: fdisk/fdisk.c:2642
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3252,80 +3252,80 @@
 "\n"
 "Kirjutan puhvreid kettale\n"
 
-#: fdisk/fdisksgilabel.c:78
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
 msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
 msgstr "SGI rvol"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI xfslog"
 msgstr "SGI xfslog"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:92
 msgid "SGI xlv"
 msgstr "SGI xlv"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:93
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linuxi swap"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
 msgstr "Linuxi andmed"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:95
+#: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:163
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3333,7 +3333,7 @@
 "Vastavalt MIPS Computer Systems, Inc spetsifikatsioonidele ei tohi\n"
 "partitsioonitabel olla suurem kui 512 baiti\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Leidsin vale kontrollsummaga SGI partitsioonitabeli\n"
 
@@ -3389,12 +3389,13 @@
 "Buutfail: %s\n"
 "----- Kataloogikirjed -----\n"
 
-#: fdisk/fdisksgilabel.c:250
+#: fdisk/fdisksgilabel.c:248
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor %5u pikkus %8u\n"
 
-#: fdisk/fdisksgilabel.c:304
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3406,7 +3407,7 @@
 "\tBuutfail peab olema absoluutse teega mittetühi string,\n"
 "\tnäiteks \"/unix\" või \"/unix.save\"\n"
 
-#: fdisk/fdisksgilabel.c:311
+#: fdisk/fdisksgilabel.c:308
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3414,7 +3415,7 @@
 "\n"
 "\tBuutfaili nimi on liiga pikk: 16 baiti on maksimum\n"
 
-#: fdisk/fdisksgilabel.c:316
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3422,7 +3423,7 @@
 "\n"
 "\tBuutfail tuleb anda täisteega\n"
 
-#: fdisk/fdisksgilabel.c:321
+#: fdisk/fdisksgilabel.c:320
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3432,7 +3433,7 @@
 "\tEttevaatust, buutfaili olemasolu ei kontrollita.\n"
 "\tSGI vaikeväärtus on \"/unix\" ja varuväärtus \"/unix.save\"\n"
 
-#: fdisk/fdisksgilabel.c:349
+#: fdisk/fdisksgilabel.c:346
 #, c-format
 msgid ""
 "\n"
@@ -3441,19 +3442,19 @@
 "\n"
 "\tUueks buutfailiks on \"%s\"\n"
 
-#: fdisk/fdisksgilabel.c:447
+#: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
 msgstr "Tabelis on rohekm kui üks terve ketta kirje\n"
 
-#: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
 msgstr "Ühtegi partitsiooni pole defineeritud\n"
 
-#: fdisk/fdisksgilabel.c:462
+#: fdisk/fdisksgilabel.c:449
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "IRIXile meeldib, et partitsioon 11 katab kogu ketta\n"
 
-#: fdisk/fdisksgilabel.c:464
+#: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3461,7 +3462,7 @@
 msgstr ""
 "Tervet ketast kattev partitsioon peab algama kettaplokist 0, mitte %d\n"
 
-#: fdisk/fdisksgilabel.c:468
+#: fdisk/fdisksgilabel.c:457
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3470,31 +3471,31 @@
 "Tervet ketast kattev partitsioon on ainult %d plokki pikk,\n"
 "aga ketas ise on %d plokki pikk\n"
 
-#: fdisk/fdisksgilabel.c:475
+#: fdisk/fdisksgilabel.c:463
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "Mingi partitsioon (soovitavalt number 11) peab katma kogu ketta\n"
 
-#: fdisk/fdisksgilabel.c:487
+#: fdisk/fdisksgilabel.c:473
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "Partitsioon %d ei alga silindri piirilt\n"
 
-#: fdisk/fdisksgilabel.c:494
+#: fdisk/fdisksgilabel.c:479
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "Partitsioon %d ei lõppe silindri piiril\n"
 
-#: fdisk/fdisksgilabel.c:502
+#: fdisk/fdisksgilabel.c:486
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Partitsioonid %d ja %d kattuvad %d sektori ulatuses\n"
 
-#: fdisk/fdisksgilabel.c:511 fdisk/fdisksgilabel.c:531
-#, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, fuzzy, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
 msgstr "Kasutamata auk %8d sektorist - sektorid %8d-%d\n"
 
-#: fdisk/fdisksgilabel.c:544
+#: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
@@ -3502,7 +3503,7 @@
 "\n"
 "Buutpartitsiooni ei eksisteeri\n"
 
-#: fdisk/fdisksgilabel.c:548
+#: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
@@ -3510,7 +3511,7 @@
 "\n"
 "Saalimispartitsiooni ei eksisteeri\n"
 
-#: fdisk/fdisksgilabel.c:553
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
@@ -3518,15 +3519,16 @@
 "\n"
 "Saalimispartitsioonil pole saalimispartitsiooni tüüp\n"
 
-#: fdisk/fdisksgilabel.c:557
+#: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tTe olete valinud ebahariliku buutfaili nime\n"
 
-#: fdisk/fdisksgilabel.c:568
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr "Tüüpi saab muuta ainult mittetühjadel partitsioonidel\n"
 
-#: fdisk/fdisksgilabel.c:575
+#: 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"
@@ -3540,28 +3542,28 @@
 "terve ketta kirje tohib seda reeglit rikkuda.\n"
 "Kui olete kindel, et soovite seda tüüpi muuta, kirjutage YES\n"
 
-#: fdisk/fdisksgilabel.c:580 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
 msgid "YES\n"
 msgstr "YES\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:606
+#: fdisk/fdisksgilabel.c:577
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "Kas teate, et mõned partitsioonid kattuvad omavahel?\n"
 
-#: fdisk/fdisksgilabel.c:668
+#: fdisk/fdisksgilabel.c:637
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "Üritan genereerida terve ketta kirjet automaatselt\n"
 
-#: fdisk/fdisksgilabel.c:675
+#: fdisk/fdisksgilabel.c:642
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "Terve ketas on juba partitsioonidega kaetud\n"
 
-#: fdisk/fdisksgilabel.c:680
+#: fdisk/fdisksgilabel.c:646
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr "Kettal on partitsioonide kattumine. Parandage see kõigepealt!\n"
 
-#: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
+#: 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"
@@ -3569,16 +3571,16 @@
 "On ülimalt soovitav, et 11. partitsioon kataks kogu ketta\n"
 "ja oleks tüüpi \"SGI volume\"\n"
 
-#: fdisk/fdisksgilabel.c:705
+#: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr "Te ajaksite partitsioonid kattuma! Parandage see kõigepealt ära\n"
 
-#: fdisk/fdisksgilabel.c:710
+#: fdisk/fdisksgilabel.c:676
 #, c-format
 msgid " Last %s"
 msgstr "Viimane %s"
 
-#: fdisk/fdisksgilabel.c:732
+#: 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"
@@ -3589,12 +3591,20 @@
 "kuni Te ise otsustate need kettale kirjutada. Pärast seda pole vana sisu\n"
 "loomulikult enam taastatav.\n"
 
-#: fdisk/fdisksgilabel.c:758
+#: 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 ""
+
+#: fdisk/fdisksgilabel.c:738
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Üritan säilitada partitsiooni %d parameetrid\n"
 
-#: fdisk/fdisksgilabel.c:760
+#: fdisk/fdisksgilabel.c:740
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tSTART=%d\tLENGTH=%d\n"
@@ -3682,63 +3692,63 @@
 msgid "Autoconfigure failed.\n"
 msgstr "Automaatne konfigureerimine ei õnnestunud\n"
 
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Sektoreid rajal"
 
-#: fdisk/fdisksunlabel.c:327
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Alternatiivseid silindreid"
 
-#: fdisk/fdisksunlabel.c:330
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Füüsilisi silindreid"
 
-#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
 msgid "Rotation speed (rpm)"
 msgstr "Pöörlemiskiirus (rpm)"
 
-#: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
 msgid "Interleave factor"
 msgstr "Vahelejätu tegur"
 
-#: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
 msgid "Extra sectors per cylinder"
 msgstr "Lisasektoreid silindril"
 
-#: fdisk/fdisksunlabel.c:352
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "Kõiki kettaseadme parameetreid saab muuta x menüüst"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "3,5\" floppi"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "Linuxi oma"
 
-#: fdisk/fdisksunlabel.c:446
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partitsioon %d ei lõppe silindri piiril\n"
 
-#: fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:462
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partitsioon %d kattub teistega sektorites %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:488
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Kasutamata vahemik - sektorid 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Kasutamata vahemik - sektorid %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3746,7 +3756,7 @@
 "Teised partitsioonid katavad juba kogu ketta.\n"
 "Kustutage või vähendage neist mõnda ja proovige uuesti\n"
 
-#: fdisk/fdisksunlabel.c:593
+#: fdisk/fdisksunlabel.c:589
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3756,7 +3766,7 @@
 "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:613
+#: fdisk/fdisksunlabel.c:609
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3765,7 +3775,7 @@
 "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:626
+#: fdisk/fdisksunlabel.c:622
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3779,7 +3789,7 @@
 "sisestage YES, kui olete tõdesti kindlad, et tahate partitsiooni tüübiks\n"
 "panna 82 (Linuxi saalimisala):"
 
-#: fdisk/fdisksunlabel.c:657
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid ""
 "\n"
@@ -3798,7 +3808,7 @@
 "Ühikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:671
+#: fdisk/fdisksunlabel.c:667
 #, c-format
 msgid ""
 "\n"
@@ -3811,16 +3821,16 @@
 "Ühikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:676
+#: fdisk/fdisksunlabel.c:672
 #, 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:701
+#: fdisk/fdisksunlabel.c:697
 msgid "Number of alternate cylinders"
 msgstr "Alternatiivsete silindrite arv"
 
-#: fdisk/fdisksunlabel.c:734
+#: fdisk/fdisksunlabel.c:730
 msgid "Number of physical cylinders"
 msgstr "Füüsiliste silindrite arv"
 
@@ -4423,16 +4433,17 @@
 msgstr "   Seade  Buut   Algus      Lõpp    #plokke   ID  Süsteem\n"
 
 #: fdisk/sfdisk.c:885
-#, c-format
+#, fuzzy, 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 ""
 "Ühikud = megabaidid (1048576 baiti), plokid (1024 baiti), loendan alates %d\n"
 "\n"
 
 #: fdisk/sfdisk.c:887
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
+#, 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
@@ -4572,12 +4583,21 @@
 "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
+msgid "start"
+msgstr ""
+
 #: fdisk/sfdisk.c:1275
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
+#: fdisk/sfdisk.c:1281
+#, fuzzy
+msgid "end"
+msgstr "End"
+
 #: fdisk/sfdisk.c:1284
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4637,306 +4657,306 @@
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1577
+#: fdisk/sfdisk.c:1579
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1582
+#: fdisk/sfdisk.c:1584
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1661
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1695
+#: fdisk/sfdisk.c:1697
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1702
+#: fdisk/sfdisk.c:1704
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1708
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1754
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1875
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1908
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1959
+#: fdisk/sfdisk.c:1961
 msgid "too many input fields\n"
 msgstr ""
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1993
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2012
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2044
+#: fdisk/sfdisk.c:2046
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2050
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
 msgstr "Hoiatus: tühi partitsioon\n"
 
-#: fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2066
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2077
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2172
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
 msgstr "Liiga palju partitsioone\n"
 
-#: fdisk/sfdisk.c:2205
+#: 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 ""
 
-#: fdisk/sfdisk.c:2225
+#: fdisk/sfdisk.c:2227
 msgid "version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Kasutamine: %s [ võtmed ] seade ...\n"
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2236
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2237
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2238
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2239
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2240
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2241
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2242
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2243
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2244
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2247
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2252
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2255
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2254
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2258
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2259
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2260
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2262
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2266
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
 msgstr "kasutamine:"
 
-#: fdisk/sfdisk.c:2267
+#: fdisk/sfdisk.c:2269
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2270
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2271
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2421
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2539
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "kokku: %d plokki\n"
 
-#: fdisk/sfdisk.c:2576
+#: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2580
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2582
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2587
+#: fdisk/sfdisk.c:2589
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2613
+#: fdisk/sfdisk.c:2615
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ei suuda avada seadet %s lugemiseks ja kirjutamiseks\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2617
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ei suuda avada seadet %s lugemiseks\n"
 
-#: fdisk/sfdisk.c:2640
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2657
+#: fdisk/sfdisk.c:2659
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2674
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2754
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
@@ -4944,42 +4964,42 @@
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:2777
+#: 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 ""
 
-#: fdisk/sfdisk.c:2791
+#: fdisk/sfdisk.c:2795
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2848
+#: fdisk/sfdisk.c:2852
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2863
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fataalne viga: ei suuda leida %s\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2887
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Hoiatus: %s pole plokkseade\n"
 
-#: fdisk/sfdisk.c:2889
+#: fdisk/sfdisk.c:2893
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2891
+#: fdisk/sfdisk.c:2895
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -4987,155 +5007,155 @@
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2899
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2903
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2908
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2916
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2920
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2925
+#: 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 ""
 
-#: fdisk/sfdisk.c:2928
+#: fdisk/sfdisk.c:2932
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2933
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2942
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2948
+#: fdisk/sfdisk.c:2952
 msgid "Please answer one of y,n,q\n"
 msgstr "Palun sisestage y, n või q\n"
 
-#: fdisk/sfdisk.c:2956
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2962
+#: 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 ""
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr ""
 
@@ -5643,7 +5663,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK ioctl kella lugemiseks ei õnnestunud"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr "Taimaut oodates kellaaja muutumist\n"
 
@@ -5668,57 +5688,57 @@
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK ioctl ei õnnestunud"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "%s avamine ei õnnestunud"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, 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:171
+#: hwclock/rtc.c:170
 #, 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:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s ei paku katkestusfunktsioone. "
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "%s lugemine kella tiksu ootamisel ei õnnestunud"
 
-#: hwclock/rtc.c:244
+#: hwclock/rtc.c:243
 #, 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:247
+#: hwclock/rtc.c:246
 #, 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:306
+#: hwclock/rtc.c:305
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "ioctl() %s kaudu kella seadmiseks ei õnnestunud\n"
 
-#: hwclock/rtc.c:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) õnnestus\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "%s avamine ei õnnestunud"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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' "
@@ -5728,17 +5748,17 @@
 "Epohhi väärtuse manipuleerimiseks tuleb kasutada 'rtc' draiverit seadmefaili "
 "%s kaudu. Antud süsteemis seda faili ei leidu\n"
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr "Ei suuda avada seadet %s"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "%s ioctl(RTC_EPOCH_READ) ei õnnestunud"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, 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"
@@ -5746,23 +5766,23 @@
 #. 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:397
+#: hwclock/rtc.c:396
 #, 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:415
+#: hwclock/rtc.c:414
 #, 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:420
+#: hwclock/rtc.c:419
 #, 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:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "%s ioctl(RTC_EPOCH_SET) ei õnnestunud"
@@ -5964,9 +5984,8 @@
 msgid "Password error."
 msgstr "Miski ei klapi"
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249
-#: mount/lomount.c:254
+#: 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
 msgid "Password: "
 msgstr "Parool: "
 
@@ -6184,29 +6203,29 @@
 "\n"
 "katkestatud %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Saatuslik viga: ei suuda taasavada terminali: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h on ainult superkasutajale\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "Kasutamine: login [-fp] [kasutajanimi]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM viga, katkestan: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Ei suutnud initsialiseerida PAM'i: %s"
@@ -6217,16 +6236,16 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -6234,17 +6253,17 @@
 "Login incorrect\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -6252,50 +6271,50 @@
 "\n"
 "Login incorrect\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
 msgstr "login: Mälu sai otsa\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Vigane kasutajanimi"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "Kasutaja %s ei tohi sellelt terminaliltsisse logida\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s REFUSED FROM %s ON TTY %s"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s REFUSED ON TTY %s"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Login incorrect\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -6303,82 +6322,82 @@
 "Liiga palju kasutajaid on juba sisse loginud.\n"
 "Proovige hiljem uuesti.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
 msgstr "Teil on liiga palju protsesse töötamas\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP AT %s BY %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN ON %s FROM %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN ON %s"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN ON %s BY %s FROM %s"
 
-#: login-utils/login.c:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN ON %s BY %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
 msgstr "Teile on uusi kirju\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
 msgstr "Teile on kirju\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: Viga fork'imisel: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ei õnnestunud: %m"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr "setuid() ei õnnestunud"
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Kataloogi %s pole!\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr "Login sisse kodukataloogiga \"/\"\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
 msgstr "login: Ei jätku mälu shell-skriptile\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, 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:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: shelli pole: %s\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6387,62 +6406,62 @@
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "Kasutajanimi on liiga pikk\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "Nimi on liiga pikk"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
 msgstr "Kasutajanimed ei tohi alata miinusega\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "Liiga palju tühje ridu\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "TOHUTULT reavahetusi"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login timed out after %d seconds\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Viimati loginud: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "masinast %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "terminalil %.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN FAILURE FROM %s, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN FAILURE ON %s, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN FAILURES FROM %s, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -6804,7 +6823,7 @@
 msgid "fork failed\n"
 msgstr "fork ei õnnestunud\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
 msgstr "exec ei õnnestunud\n"
 
@@ -7103,222 +7122,222 @@
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr ""
 
 #. 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 ""
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr ""
 
-#: 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 ""
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: 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 ""
 
-#: misc-utils/setterm.c:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:782
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:783
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:791
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
@@ -7376,17 +7395,17 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Teade kasutajalt %s@%s terminalil %s kell %s..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr ""
 
-#: 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 ""
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
@@ -7395,88 +7414,88 @@
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:415
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:399
+#: mount/fstab.c:427
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:411
+#: mount/fstab.c:439
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:426
+#: mount/fstab.c:454
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:439
+#: mount/fstab.c:467
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr ""
 
-#: mount/fstab.c:441
+#: mount/fstab.c:469
 msgid "timed out"
 msgstr ""
 
-#: mount/fstab.c:448
+#: mount/fstab.c:476
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:525 mount/fstab.c:561
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr ""
 
-#: mount/fstab.c:541
+#: mount/fstab.c:569
 #, c-format
 msgid "error writing %s: %s"
 msgstr ""
 
-#: mount/fstab.c:549
+#: mount/fstab.c:577
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:567
+#: mount/fstab.c:595
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:80
+#: mount/lomount.c:173
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:86
+#: mount/lomount.c:179
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:91
+#: mount/lomount.c:184
 #, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+msgid "%s: [%04llx]:%llu (%s) offset %llu, %s encryption\n"
 msgstr ""
 
-#: mount/lomount.c:177
+#: mount/lomount.c:245
 msgid "mount: could not find any device /dev/loop#"
 msgstr ""
 
-#: mount/lomount.c:181
+#: mount/lomount.c:249
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
 msgstr ""
 
-#: mount/lomount.c:185
+#: mount/lomount.c:253
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -7484,398 +7503,450 @@
 "       (If so, then recompile or `insmod loop.o'.)"
 msgstr ""
 
-#: mount/lomount.c:191
+#: 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/lomount.c:195
+#: mount/lomount.c:263
 msgid "mount: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:225
-#, c-format
-msgid "Unsupported encryption type %s\n"
+#: 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"
 msgstr ""
 
-#: mount/lomount.c:239
+#: 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
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:258
+#: mount/lomount.c:654
 msgid "Init (up to 16 hex digits): "
 msgstr ""
 
-#: mount/lomount.c:265
+#: mount/lomount.c:661
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr ""
 
-#: mount/lomount.c:272
+#: mount/lomount.c:764
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr ""
 
-#: mount/lomount.c:288
+#: mount/lomount.c:802
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr ""
 
-#: mount/lomount.c:299
-#, c-format
-msgid "loop: can't delete device %s: %s\n"
-msgstr ""
-
-#: mount/lomount.c:309
-#, c-format
-msgid "del_loop(%s): success\n"
-msgstr ""
-
-#: mount/lomount.c:317
-msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr ""
-
-#: mount/lomount.c:354
+#: mount/lomount.c:831
 #, 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"
+"  %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:372 mount/sundries.c:30 mount/sundries.c:45
-#: mount/sundries.c:244
+#: 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:443
-msgid "No loop support was available at compile time. Please recompile.\n"
+#: 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/mntent.c:165
+#: 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/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
 
-#: mount/mntent.c:216
+#: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr ""
 
-#: mount/mntent.c:219
+#: mount/mntent.c:222
 msgid "; rest of file ignored"
 msgstr ""
 
-#: mount/mount.c:385
+#: mount/mount.c:396
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr ""
 
-#: mount/mount.c:389
+#: mount/mount.c:400
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr ""
 
-#: mount/mount.c:410
+#: mount/mount.c:421
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:436 mount/mount.c:660
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
 
-#: mount/mount.c:432
+#: mount/mount.c:443
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr ""
 
-#: mount/mount.c:478
+#: mount/mount.c:494
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:538
+#: mount/mount.c:554
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:540
+#: mount/mount.c:556
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:568
+#: mount/mount.c:584
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:573
+#: mount/mount.c:589
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:585
+#: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:594
+#: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:598
+#: mount/mount.c:614
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:602
+#: mount/mount.c:618
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:639
+#: mount/mount.c:655
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:662
+#: mount/mount.c:678
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: ei suuda avada seadet %s kiiruse seadmiseks"
 
-#: mount/mount.c:665
+#: mount/mount.c:681
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:735 mount/mount.c:1309
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:806
+#: mount/mount.c:815
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr ""
 
-#: mount/mount.c:845
+#: mount/mount.c:854
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:856
+#: mount/mount.c:865
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:859
+#: mount/mount.c:868
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:871
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:877 mount/mount.c:912
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:870
+#: mount/mount.c:879
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:872
+#: mount/mount.c:881
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:876 mount/mount.c:880
+#: mount/mount.c:885 mount/mount.c:889
 #, c-format
 msgid "mount: %s is busy"
 msgstr ""
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:891
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:884
+#: mount/mount.c:893
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:890
+#: mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:892
+#: mount/mount.c:901
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:895
+#: mount/mount.c:904
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:914
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:918
+#: mount/mount.c:927
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:920
+#: mount/mount.c:929
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
 
-#: mount/mount.c:954
+#: mount/mount.c:963
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:956
-#, c-format
-msgid "mount: %s: can't read superblock"
-msgstr ""
-
-#: mount/mount.c:960
-#, c-format
-msgid "mount: %s: unknown device"
-msgstr ""
-
 #: mount/mount.c:965
 #, c-format
+msgid "mount: %s: can't read superblock"
+msgstr ""
+
+#: mount/mount.c:969
+#, c-format
+msgid "mount: %s: unknown device"
+msgstr ""
+
+#: mount/mount.c:974
+#, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr ""
 
-#: mount/mount.c:977
+#: mount/mount.c:986
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:979
+#: mount/mount.c:988
 msgid "mount: maybe you meant iso9660 ?"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:991
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:997
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:990
+#: mount/mount.c:999
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:993
+#: mount/mount.c:1002
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:996
+#: mount/mount.c:1005
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:1008
 #, 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:1002
+#: mount/mount.c:1011
 msgid "block device "
 msgstr ""
 
-#: mount/mount.c:1004
+#: mount/mount.c:1013
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr ""
 
-#: mount/mount.c:1008
+#: mount/mount.c:1017
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1024
+#: mount/mount.c:1033
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1111
+#: mount/mount.c:1120
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s\n"
 msgstr ""
 
-#: mount/mount.c:1115
+#: mount/mount.c:1124
 #, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr ""
 
-#: mount/mount.c:1125
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: going to mount %s by %s\n"
 msgstr ""
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "UUID"
 msgstr ""
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "label"
 msgstr ""
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: mount/mount.c:1137 mount/mount.c:1587
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:1136
+#: mount/mount.c:1145
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1141
-msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+#: mount/mount.c:1150
+msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1166
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1168
+#: mount/mount.c:1177
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1245
+#: mount/mount.c:1254
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1376
+#: mount/mount.c:1386
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -7896,77 +7967,77 @@
 "       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 fd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:1549
+#: mount/mount.c:1563
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:1554
-#, c-format
-msgid "mount: no %s found - creating it..\n"
-msgstr ""
-
 #: mount/mount.c:1568
 #, 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"
 msgstr ""
 
-#: mount/mount.c:1575
+#: mount/mount.c:1589
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr ""
 
-#: mount/mount.c:1584
+#: mount/mount.c:1598
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1599
+#: mount/mount.c:1613
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr ""
 
-#: mount/mount.c:1614
+#: mount/mount.c:1628
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
 
-#: mount/mount_by_label.c:259
+#: mount/mount_by_label.c:189
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
 
-#: mount/mount_by_label.c:378
+#: mount/mount_by_label.c:309
 msgid "mount: bad UUID"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:483
 msgid "mount: error while guessing filesystem type\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:492
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:495
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:498
 msgid "       and it looks like this is swapspace\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:501
+#: mount/mount_guess_fstype.c:500
 #, c-format
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:588
 #, c-format
 msgid "Trying %s\n"
 msgstr ""
@@ -8060,7 +8131,7 @@
 msgid "bug in xstrndup call"
 msgstr ""
 
-#: mount/swapon.c:64
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8069,7 +8140,7 @@
 "       %s [-s]\n"
 msgstr ""
 
-#: mount/swapon.c:74
+#: mount/swapon.c:84
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8077,31 +8148,96 @@
 "       %s [-v] special ...\n"
 msgstr ""
 
-#: mount/swapon.c:178 mount/swapon.c:242
+#: 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
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:182
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr ""
 
-#: mount/swapon.c:193
+#: mount/swapon.c:216
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 
-#: mount/swapon.c:205
+#: mount/swapon.c:228
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr ""
 
-#: mount/swapon.c:248
+#: mount/swapon.c:271
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:312 mount/swapon.c:401
+#: 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
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr ""
@@ -8226,17 +8362,17 @@
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:564
+#: mount/umount.c:566
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:598
+#: mount/umount.c:602
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:669
+#: mount/umount.c:671
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8366,7 +8502,7 @@
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr ""
@@ -9041,12 +9177,13 @@
 msgid "missing comma"
 msgstr ""
 
-#: sys-utils/readprofile.c:60
+#: 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"
@@ -9057,36 +9194,32 @@
 "\t -V            print version and exit\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:84
-msgid "out of memory"
-msgstr "Mälu sai otsa"
+#: sys-utils/readprofile.c:188
+#, fuzzy, c-format
+msgid "%s version %s\n"
+msgstr "mkfs versioon %s (%s)\n"
 
-#: sys-utils/readprofile.c:147
-#, c-format
-msgid "%s Version %s\n"
-msgstr ""
-
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:308
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:334
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:323
+#: sys-utils/readprofile.c:375
 msgid "total"
 msgstr ""
 
@@ -9284,23 +9417,23 @@
 msgid "...back 1 page"
 msgstr ""
 
-#: text-utils/more.c:1313
+#: text-utils/more.c:1314
 msgid "...skipping one line"
 msgstr ""
 
-#: text-utils/more.c:1315
+#: text-utils/more.c:1316
 #, c-format
 msgid "...skipping %d lines"
 msgstr ""
 
-#: text-utils/more.c:1352
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
 "\n"
 msgstr ""
 
-#: text-utils/more.c:1390
+#: text-utils/more.c:1391
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9308,88 +9441,88 @@
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1398
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
 msgstr ""
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
 msgstr ""
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
 msgstr ""
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
 msgstr ""
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1642
 msgid "...skipping\n"
 msgstr ""
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
 msgstr ""
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr ""
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1748
 msgid "can't fork\n"
 msgstr ""
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1792
 msgid "...Skipping to file "
 msgstr ""
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1794
 msgid "...Skipping back to file "
 msgstr ""
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2074
 msgid "Line too long"
 msgstr ""
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
 msgstr ""
 
@@ -9439,40 +9572,40 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr ""
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "võti `%s' vajab argumenti\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: vigane võti (%s)\n"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 msgid "No next file"
 msgstr ""
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 #, fuzzy
 msgid "No previous file"
 msgstr "Ühtegi partitsiooni pole defineeritud\n"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: lugemise viga failis %s\n"
@@ -9480,53 +9613,53 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: seekimise viga failis %s\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: ei suuda lugeda ajutist faili\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 #, fuzzy
 msgid "RE error: "
 msgstr "positsioneerimise viga"
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 #, fuzzy
 msgid "Cannot open "
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 msgid "saved"
 msgstr ""
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "Parooli EI muudetud - proovige hiljem uuesti\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 msgid "(Next file: "
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 889548b..cdf5db1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 # Finnish messages for util-linux
-# Copyright © 2002 Lauri Nurmi <lanurmi@iki.fi>
-# Lauri Nurmi <lanurmi@iki.fi>, 2002.
+# Copyright © 2002, 2003 Lauri Nurmi <lanurmi@iki.fi>
+# Lauri Nurmi <lanurmi@iki.fi>, 2002, 2003.
 #
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided, that this
@@ -13,9 +13,9 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11w\n"
-"POT-Creation-Date: 2002-11-25 00:47+0100\n"
-"PO-Revision-Date: 2002-11-06 22:01+0200\n"
+"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"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@
 
 #: disk-utils/blockdev.c:61
 msgid "set read-write"
-msgstr "aseta luku-kirjoitus -tilaan"
+msgstr "aseta luku-kirjoitus-tilaan"
 
 #: disk-utils/blockdev.c:64
 msgid "get read-only"
@@ -102,7 +102,7 @@
 #: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: cannot open %s\n"
-msgstr "%s: ei voi avata tiedostoa %s\n"
+msgstr "%s: tiedostoa %s ei voi avata\n"
 
 #: disk-utils/blockdev.c:338
 #, c-format
@@ -119,7 +119,7 @@
 
 #: disk-utils/fdformat.c:31
 msgid "Formatting ... "
-msgstr "Alustetaan ... "
+msgstr "Alustetaan... "
 
 #: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
 msgid "done\n"
@@ -127,7 +127,7 @@
 
 #: disk-utils/fdformat.c:60
 msgid "Verifying ... "
-msgstr "Varmistetaan ... "
+msgstr "Varmistetaan... "
 
 #: disk-utils/fdformat.c:71
 msgid "Read: "
@@ -145,7 +145,7 @@
 "Continuing ... "
 msgstr ""
 "viallista dataa sylinterissä %d\n"
-"Jatketaan ... "
+"Jatketaan... "
 
 #: disk-utils/fdformat.c:94
 #, c-format
@@ -154,7 +154,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -169,12 +169,12 @@
 
 #: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
-msgstr "Ei voinut selvittää nykyistä alustustyyppiä"
+msgstr "Nykyistä alustustyyppiä ei voi määrittää"
 
 #: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
-msgstr "%spuoleinen, %d uraa, %d sektoria/ura. Kokonaistila %d kB.\n"
+msgstr "%spuoleinen, %d uraa, %d sektoria/ura. Kokonaistila %d kt.\n"
 
 #: disk-utils/fdformat.c:142
 msgid "Double"
@@ -247,7 +247,7 @@
 #: disk-utils/fsck.cramfs.c:498
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
-msgstr "%s: varoitus--tiedostojärjestelmän kokoa ei voida selvittää\n"
+msgstr "%s: varoitus--tiedostojärjestelmän kokoa ei voi määrittää \n"
 
 #: disk-utils/fsck.cramfs.c:508
 #, c-format
@@ -365,7 +365,7 @@
 
 #: disk-utils/fsck.minix.c:544
 msgid "Unable to write inode map"
-msgstr "Ei voi kirjoittaa i-solmukartaa"
+msgstr "I-solmukarttaa ei voi kirjoittaa"
 
 #: disk-utils/fsck.minix.c:546
 msgid "Unable to write zone map"
@@ -373,7 +373,7 @@
 
 #: disk-utils/fsck.minix.c:548
 msgid "Unable to write inodes"
-msgstr "Ei voi kirjoittaa i-solmuja"
+msgstr "I-solmuja ei voi kirjoittaa"
 
 #: disk-utils/fsck.minix.c:577
 msgid "seek failed"
@@ -381,7 +381,7 @@
 
 #: disk-utils/fsck.minix.c:579
 msgid "unable to read super block"
-msgstr "ei voi lukea superlohkoa"
+msgstr "superlohkoa ei voi lukea"
 
 #: disk-utils/fsck.minix.c:599
 msgid "bad magic number in super-block"
@@ -401,31 +401,31 @@
 
 #: disk-utils/fsck.minix.c:612
 msgid "Unable to allocate buffer for inode map"
-msgstr "Ei voi varata puskuria i-solmukartalle"
+msgstr "I-solmukartalle ei voi varata puskuria"
 
 #: disk-utils/fsck.minix.c:620
 msgid "Unable to allocate buffer for inodes"
-msgstr "Ei voi varata puskuria i-solmuille"
+msgstr "I-solmuille ei voi varata puskuria"
 
 #: disk-utils/fsck.minix.c:623
 msgid "Unable to allocate buffer for inode count"
-msgstr "Ei voi varata puskuria i-solmujen laskemiseen"
+msgstr "I-solmujen laskemiseen ei voi varata puskuria"
 
 #: disk-utils/fsck.minix.c:626
 msgid "Unable to allocate buffer for zone count"
-msgstr "Ei voi varata puskuria vyöhykkeen laskemiseen"
+msgstr "Vyöhykkeen laskemiseen ei voi varata puskuria"
 
 #: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
-msgstr "Ei voi lukea i-solmukarttaa"
+msgstr "I-solmukarttaa ei voi lukea"
 
 #: disk-utils/fsck.minix.c:630
 msgid "Unable to read zone map"
-msgstr "Ei voi lukea vyöhykekarttaa"
+msgstr "Vyöhykekarttaa ei voi lukea"
 
 #: disk-utils/fsck.minix.c:632
 msgid "Unable to read inodes"
-msgstr "Ei voi lukea i-solmuja"
+msgstr "I-solmuja ei voi lukea"
 
 #: disk-utils/fsck.minix.c:634
 msgid "Warning: Firstzone != Norm_firstzone\n"
@@ -618,7 +618,7 @@
 #: disk-utils/fsck.minix.c:1329
 #, c-format
 msgid "unable to open '%s'"
-msgstr "ei voi avata \"%s\""
+msgstr "laitetta \"%s\" ei voi avata"
 
 #: disk-utils/fsck.minix.c:1344
 #, c-format
@@ -690,12 +690,12 @@
 #: disk-utils/isosize.c:135
 #, c-format
 msgid "%s: seek error on %s\n"
-msgstr "%s: virhe siirrytäessä %s\n"
+msgstr "%s: virhe siirrytäessä tiedostossa %s\n"
 
 #: disk-utils/isosize.c:141
 #, c-format
 msgid "%s: read error on %s\n"
-msgstr "%s: virhe luettaessa %s\n"
+msgstr "%s: virhe luettaessa tiedostoa %s\n"
 
 #: disk-utils/isosize.c:150
 #, c-format
@@ -710,7 +710,7 @@
 #: disk-utils/isosize.c:206
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr "Käyttö: %s [-x] [-d <num>] iso9660-kuva\n"
+msgstr "Käyttö: %s [-x] [-d <nro>] iso9660-kuva\n"
 
 #: disk-utils/mkfs.bfs.c:88
 #, c-format
@@ -732,7 +732,7 @@
 #: disk-utils/mkfs.bfs.c:167
 #, c-format
 msgid "cannot stat device %s"
-msgstr "ei voi lukea laitteen %s tilaa"
+msgstr "laitteen %s tilaa ei voi lukea"
 
 #: disk-utils/mkfs.bfs.c:171
 #, c-format
@@ -742,12 +742,12 @@
 #: disk-utils/mkfs.bfs.c:176
 #, c-format
 msgid "cannot open %s"
-msgstr "ei voi avata %s"
+msgstr "laitetta %s ei voi avata"
 
 #: disk-utils/mkfs.bfs.c:187
 #, c-format
 msgid "cannot get size of %s"
-msgstr "ei voi hakea laitteen %s kokoa"
+msgstr "laitteen %s kokoa ei voi hakea"
 
 #: disk-utils/mkfs.bfs.c:192
 #, c-format
@@ -761,9 +761,9 @@
 #: disk-utils/mkfs.bfs.c:216
 #, c-format
 msgid "not enough space, need at least %lu blocks"
-msgstr "ei riittävästi tilaa, vaaditaan vähintään %lu lohkoa"
+msgstr "tila ei riitä, vaaditaan vähintään %lu lohkoa"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2166
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
 #, c-format
 msgid "Device: %s\n"
 msgstr "Laite: %s\n"
@@ -830,7 +830,7 @@
 #: disk-utils/mkfs.bfs.c:286
 #, c-format
 msgid "error closing %s"
-msgstr "virhe suljettaessa %s"
+msgstr "virhe suljettaessa laitetta %s"
 
 #: disk-utils/mkfs.c:76
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
@@ -838,8 +838,8 @@
 "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-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Muisti lopussa!\n"
@@ -847,10 +847,10 @@
 #: disk-utils/mkfs.c:99
 #, c-format
 msgid "mkfs version %s (%s)\n"
-msgstr "mkfs versio %s (%s)\n"
+msgstr "mkfs-versio %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
-#, fuzzy, c-format
+#: 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"
@@ -866,20 +866,22 @@
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"käyttö: %s [-h] [-v] [-e edition] [-i tiedosto] [-n nimi] haknimi tulostied\n"
+"käyttö: %s [-v] [-b lkoko] [-e laitos] [-i tied] [-n nimi] haknimi "
+"tulostied\n"
 " -h          näytä tämä ohje\n"
 " -v          monisanaisuus\n"
 " -E          käsittele varoitukset virheinä (nollasta poikkeava paluuarvo)\n"
+" -b lkoko    käytä tätä lohkokokoa, on oltava sama kuin sivukoko\n"
 " -e laitos   aseta laitosnumero (osa tied.järj-id:tä)\n"
-" -i tiedosto sisällytä tiedostokuva tiedostojärjestelmään (vaatii >= 2.4.0)\n"
+" -i tied     sisällytä tiedostokuva tiedostojärjestelmään (vaatii >= 2.4.0)\n"
 " -n nimi     aseta cramfs-tiedostojärjestelmän nimi\n"
 " -p          tasaa %d tavulla käynnistyskoodia varten\n"
 " -s          lajittele hakemistomerkinnät (vanha valitsin, ei huomioida)\n"
-" -z          make explicit holes (requires >= 2.3.39)\n"
+" -z          tee reikiä (vaatii >= 2.3.39)\n"
 " haknimi     pakattavan tiedostojärjestelmän juuri\n"
 " tulostied   tulostiedosto\n"
 
-#: disk-utils/mkfs.cramfs.c:328
+#: disk-utils/mkfs.cramfs.c:335
 #, c-format
 msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
@@ -887,72 +889,72 @@
 msgstr ""
 "Löytyi hyvin pitkä tiedostonimi \"%2$s\" (%1$u tavua).\n"
 " Kasvata vakiota MAX_INPUT_NAMELEN tiedostossa mkcramfs.c ja käännä "
-"uudelleen.  Poistutaan.\n"
+"uudelleen. Poistutaan.\n"
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
-msgstr "tiedostojärjestelmä on liian suuri.  Poistutaan.\n"
+msgstr "tiedostojärjestelmä on liian suuri. Poistutaan.\n"
 
-#: disk-utils/mkfs.cramfs.c:507
+#: disk-utils/mkfs.cramfs.c:514
 msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
 msgstr ""
-"MAXENTRIES ylitetty.  Kasvata tätä arvoa tiedostossa mkcramfs.c ja käännä "
-"uudelleen.  Poistutaan.\n"
+"MAXENTRIES ylitetty. Kasvata tätä arvoa tiedostossa mkcramfs.c ja käännä "
+"uudelleen. Poistutaan.\n"
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr "AIEEE: \"pakatun\" lohkon koko > 2*lohkokoko (%ld)\n"
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr "%6.2f%% (%+d tavua)\t%s\n"
 
-#: disk-utils/mkfs.cramfs.c:812
+#: 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 ""
-"varoitus: arvio koko (yläraja) on %Ld MB, mutta suurin kuvakoko on %u MB.  "
+"varoitus: arviokoko (yläraja) on %Ld Mt, mutta suurin kuvakoko on %u Mt. "
 "Prosessi saattaa päättyä ennenaikaisesti.\n"
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
 msgstr "Sisällytetään: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr "Hakemistodata: %d tavua\n"
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr "Kaikki: %d kilotavua\n"
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, c-format
 msgid "Super block: %d bytes\n"
 msgstr "Superlohko: %d tavua\n"
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr "CRC: %x\n"
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
 "ROM-kuvalle ei ole varattu riittävästi tilaa (%Ld varattu, %d käytetty)\n"
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr "ROM-kuvan kirjoitus epäonnistui (%d %d)\n"
@@ -961,33 +963,33 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "varoitus: tiedostonimet typistetään 255 tavuun.\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr "varoitus: tiedostoja ohitettiin virheiden takia.\n"
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr ""
 "varoitus: tiedostojen koot typistetty %lu megatavuun (miinus 1 tavu).\n"
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr "varoitus: uid:t typistetty %u bittiin. (Tämä voi olla turvaongelma.)\n"
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr "varoitus: gid:t typistetty %u bittiin. (Tämä voi olla turvaongelma.)\n"
 
-#: disk-utils/mkfs.cramfs.c:926
+#: disk-utils/mkfs.cramfs.c:933
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -1008,7 +1010,7 @@
 
 #: disk-utils/mkfs.minix.c:260
 msgid "seek to boot block failed in write_tables"
-msgstr "siirtymien käynnistyslohkoon epäonnistui funktiossa write_tables"
+msgstr "siirtyminen käynnistyslohkoon epäonnistui funktiossa write_tables"
 
 #: disk-utils/mkfs.minix.c:262
 msgid "unable to clear boot sector"
@@ -1020,15 +1022,15 @@
 
 #: disk-utils/mkfs.minix.c:268
 msgid "unable to write inode map"
-msgstr "ei voi kirjoittaa i-solmukarttaa"
+msgstr "i-solmukarttaa ei voi kirjoittaa"
 
 #: disk-utils/mkfs.minix.c:270
 msgid "unable to write zone map"
-msgstr "ei voi kirjoittaa vyöhykekarttaa"
+msgstr "vyöhykekarttaa ei voi kirjoittaa"
 
 #: disk-utils/mkfs.minix.c:272
 msgid "unable to write inodes"
-msgstr "ei voi kirjoittaa i-solmuja"
+msgstr "i-solmuja ei voi kirjoittaa"
 
 #: disk-utils/mkfs.minix.c:281
 msgid "write failed in write_block"
@@ -1046,11 +1048,11 @@
 
 #: disk-utils/mkfs.minix.c:509
 msgid "unable to allocate buffers for maps"
-msgstr "ei voi varata puskureita kartoille"
+msgstr "kartoille ei voi varata puskureita"
 
 #: disk-utils/mkfs.minix.c:518
 msgid "unable to allocate buffer for inodes"
-msgstr "ei voi varata puskureita i-solmuille"
+msgstr "i-solmuille ei voi varata puskureita"
 
 #: disk-utils/mkfs.minix.c:524
 #, c-format
@@ -1077,7 +1079,7 @@
 #: disk-utils/mkfs.minix.c:586
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
-"virheellisiä lohkoja ennen data-aluetta: ei voi luoda tiedostojärjestelmää"
+"virheellisiä lohkoja ennen data-aluetta: tiedostojärjestelmää ei voi luoda"
 
 #: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
 #, c-format
@@ -1090,7 +1092,7 @@
 
 #: disk-utils/mkfs.minix.c:604
 msgid "can't open file of bad blocks"
-msgstr "ei voi avata viallisten lohkojen tiedostoa"
+msgstr "vialliset lohkot sisältävää tiedostoa ei voi avata"
 
 #: disk-utils/mkfs.minix.c:674
 #, c-format
@@ -1099,27 +1101,27 @@
 
 #: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
-msgstr "strtol-virhe: lohkojen määrää ei ole määritetty"
+msgstr "strtol-virhe: lohkojen määrää ei ole annettu"
 
 #: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
-msgstr "ei voi avata %s"
+msgstr "laitetta %s ei voi avata"
 
 #: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
-msgstr "ei voi lukea tiedoston %s tilaa"
+msgstr "tiedoston %s tilaa ei voi lukea"
 
 #: disk-utils/mkfs.minix.c:731
 #, c-format
 msgid "will not try to make filesystem on '%s'"
-msgstr "ei yritetä tehdä tiedostojärjestelmää kohteeseen \"%s\""
+msgstr "ei yritetä luoda tiedostojärjestelmää kohteeseen \"%s\""
 
 #: disk-utils/mkswap.c:178
 #, c-format
 msgid "Bad user-specified page size %d\n"
-msgstr "Virheellinen käyttäjän antama sivukoko %d\n"
+msgstr "Käyttäjän antama sivukoko %d on virheellinen\n"
 
 #: disk-utils/mkswap.c:187
 #, c-format
@@ -1141,8 +1143,8 @@
 msgid "too many bad pages"
 msgstr "liian monta viallista sivua"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: 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 "Muisti lopussa"
 
@@ -1173,12 +1175,12 @@
 #: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
-msgstr "%s: virhe: sivutusalueen on oltava vähintään %ld kB:n kokoinen\n"
+msgstr "%s: virhe: sivutusalueen on oltava vähintään %ld kt:n kokoinen\n"
 
 #: disk-utils/mkswap.c:562
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
-msgstr "%s: varoitus: typistetään sivutusalue kokoon %ld kB\n"
+msgstr "%s: varoitus: typistetään sivutusalue kokoon %ld kt\n"
 
 #: disk-utils/mkswap.c:576
 #, c-format
@@ -1204,20 +1206,20 @@
 
 #: disk-utils/mkswap.c:615
 msgid "Unable to set up swap-space: unreadable"
-msgstr "Ei voi asettaa sivutustilaa: lukukelvoton"
+msgstr "Sivutustilaa ei voi luoda: ei luettavissa"
 
 #: disk-utils/mkswap.c:616
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
-msgstr "Asetetaan sivutustila, versio %d, koko = %llu kB\n"
+msgstr "Asetetaan sivutustila, versio %d, koko = %llu kt\n"
 
 #: disk-utils/mkswap.c:622
 msgid "unable to rewind swap-device"
-msgstr "ei voi siirtyä taaksepäin sivutuslaitteella"
+msgstr "sivutuslaitteella ei voi siirtyä taaksepäin"
 
 #: disk-utils/mkswap.c:625
 msgid "unable to write signature page"
-msgstr "ei voi kirjoittaa allekirjoitssivua"
+msgstr "allekirjoitussivua ei voi kirjoittaa"
 
 #: disk-utils/mkswap.c:633
 msgid "fsync failed"
@@ -1260,11 +1262,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] laite\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
 msgid "Unusable"
 msgstr "Ei käytettävissä"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
 msgid "Free Space"
 msgstr "Vapaa tila"
 
@@ -1332,15 +1334,15 @@
 
 #: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
 msgid "Cannot seek on disk drive"
-msgstr "Ei voi siirtyä levyasemalla"
+msgstr "Levyasemalla ei voi siirtyä"
 
 #: fdisk/cfdisk.c:577
 msgid "Cannot read disk drive"
-msgstr "Ei voi lukea levyasemaa"
+msgstr "Levyasemaa ei voi lukea"
 
 #: fdisk/cfdisk.c:585
 msgid "Cannot write disk drive"
-msgstr "Ei voi kirjoittaa levyasemalle"
+msgstr "Levyasemalle ei voi kirjoittaa"
 
 #: fdisk/cfdisk.c:885
 msgid "Too many partitions"
@@ -1364,7 +1366,7 @@
 
 #: fdisk/cfdisk.c:910
 msgid "Partition ends in the final partial cylinder"
-msgstr ""
+msgstr "Osion loppu on viimeisellä osittaisella sylinterillä"
 
 #: fdisk/cfdisk.c:934
 msgid "logical partitions not in disk order"
@@ -1382,7 +1384,7 @@
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
-"!!!! Sisäinen virhe luotaessa loogista asemaa ilman laajennettua osioita !!!!"
+"!!!! Sisäinen virhe luotaessa loogista asemaa ilman laajennettua osiota !!!!"
 
 #: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992
 msgid ""
@@ -1398,231 +1400,231 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Valikko ilman suuntaa. Käytetään oletuksena vaakasuuntaa."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Väärä näppäin"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Paina näppäintä jatkaaksesi"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2512
 msgid "Primary"
 msgstr "Ensiö"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Luo uusi ensiöosio"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2512
 msgid "Logical"
 msgstr "Looginen"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Luo uusi looginen osio"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Älä luo osiota"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Sisäinen virhe !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
-msgstr "Koko (MB): "
+msgstr "Koko (Mt): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Alku"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Lisää osio tyhjän tilan alkuun"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Loppu"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Lisää osio tyhjän tilan loppuun"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "Laajennetun osion luomiseen ei ole tilaa"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1527
 msgid "No partition table or unknown signature on partition table"
 msgstr "Ei osiotaulua tai tuntematon allekirjoitus osiotaulussa"
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1529
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Haluatko aloittaa tyhjällä osiotaululla [y/N]?"
 
-#: fdisk/cfdisk.c:1576
+#: fdisk/cfdisk.c:1581
 msgid "You specified more cylinders than fit on disk"
-msgstr "Määritit suuremman sylinterimäärän kuin levylle mahtuu"
+msgstr "Annoit suuremman sylinterimäärän kuin levylle mahtuu"
 
-#: fdisk/cfdisk.c:1606
+#: fdisk/cfdisk.c:1611
 msgid "Cannot open disk drive"
-msgstr "Ei voi avata levyasemaa"
+msgstr "Levyasemaa ei voi avata"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Levy avattiin vain luku -tilassa - sinulla ei ole kirjoitusoikeutta"
 
-#: fdisk/cfdisk.c:1629
+#: fdisk/cfdisk.c:1634
 msgid "Cannot get disk size"
-msgstr "Ei voi hakea levyn kokoa"
+msgstr "Levyn kokoa ei voi hakea"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1659
 msgid "Bad primary partition"
 msgstr "Viallinen ensiöosio"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1689
 msgid "Bad logical partition"
 msgstr "Viallinen looginen osio"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1804
 msgid "Warning!!  This may destroy data on your disk!"
-msgstr "Varoitus!!  Tämä voi tuhota dataa levyltä!"
+msgstr "Varoitus!! Tämä voi tuhota dataa levyltä!"
 
-#: fdisk/cfdisk.c:1803
+#: fdisk/cfdisk.c:1808
 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:1809
+#: fdisk/cfdisk.c:1814
 msgid "no"
 msgstr "ei"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1815
 msgid "Did not write partition table to disk"
 msgstr "Osiotaulua ei kirjoitettu levylle"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1817
 msgid "yes"
 msgstr "kyllä"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1820
 msgid "Please enter `yes' or `no'"
 msgstr "Kirjoita \"kyllä\" tai \"ei\""
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1824
 msgid "Writing partition table to disk..."
 msgstr "Kirjoitetaan osiotaulua levylle..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
 msgid "Wrote partition table to disk"
 msgstr "Osiotaulu kirjoitettiin levylle"
 
-#: fdisk/cfdisk.c:1846
+#: fdisk/cfdisk.c:1851
 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:1856
+#: fdisk/cfdisk.c:1861
 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:1858
+#: fdisk/cfdisk.c:1863
 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:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Syötä tiedostonimi tai paina RETURN saadaksesi näytölle: "
 
-#: fdisk/cfdisk.c:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
 #, c-format
 msgid "Cannot open file '%s'"
-msgstr "Ei voi avata tiedostoa \"%s\""
+msgstr "Tiedostoa \"%s\" ei voi avata"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1941
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Levyasema: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1943
 msgid "Sector 0:\n"
 msgstr "Sektori 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1950
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektori %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1970
 msgid "   None   "
 msgstr "   Ei mitään"
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1972
 msgid "   Pri/Log"
 msgstr "   Ens/Loog"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1974
 msgid "   Primary"
 msgstr "   Ensiö"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1976
 msgid "   Logical"
 msgstr "   Looginen"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2020
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Käynnistettävä (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Tuntematon (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2024
 #, c-format
 msgid "None (%02X)"
 msgstr "Ei mitään (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Laitteen %s osiotaulu\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2061
 msgid "            First    Last\n"
 msgstr "           Alku-    Loppu-\n"
 
-#: fdisk/cfdisk.c:2057
+#: fdisk/cfdisk.c:2062
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Tyyppi  sektori  sektori   Siirt.  Pituus   Tied.järj. tyyppi (ID) Liput\n"
 
-#: fdisk/cfdisk.c:2058
+#: fdisk/cfdisk.c:2063
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1631,462 +1633,461 @@
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2146
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         ----Alku----         ----Loppu----    Alku- Sektorien\n"
 
-#: fdisk/cfdisk.c:2142
+#: 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:2143
+#: fdisk/cfdisk.c:2148
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ----------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Raw"
 msgstr "Raaka"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Print the table using raw data format"
 msgstr "Näytä taulu raa'assa datamuodossa"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
 msgid "Sectors"
 msgstr "Sektorit"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2182
 msgid "Print the table ordered by sectors"
 msgstr "Näytä taulu järjestettynä sektoreiden mukaan"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Table"
 msgstr "Taulu"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Just print the partition table"
 msgstr "Näytä osiotaulu"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2184
 msgid "Don't print the table"
 msgstr "Älä näytä taulua"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2212
 msgid "Help Screen for cfdisk"
 msgstr "Cfdiskin ohjeruutu"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2214
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Tämä on cfdisk, curses-pohjainen levynosiointiohjelma, "
 
-#: fdisk/cfdisk.c:2210
+#: fdisk/cfdisk.c:2215
 msgid "allows you to create, delete and modify partitions on your hard"
-msgstr "jolla voi luoda, poistaa ja muuttaa kovalevyllä "
+msgstr "jolla voi luoda, poistaa ja muuttaa kiintolevyllä "
 
-#: fdisk/cfdisk.c:2211
+#: fdisk/cfdisk.c:2216
 msgid "disk drive."
 msgstr "olevia osioita."
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2218
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright © 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2220
 msgid "Command      Meaning"
 msgstr "Komento      Merkitys"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2221
 msgid "-------      -------"
 msgstr "-------      --------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2222
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2223
 msgid "  d          Delete the current partition"
 msgstr "  d          Poista nykyinen osio"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2224
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Muuta sylinteri-, pää- ja sektoriparametreja"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2225
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             VAROITUS: Tätä valitsinta tulee käyttää vain niiden,"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2226
 msgid "             know what they are doing."
 msgstr "             jotka tietävät mitä ovat tekemässä."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2227
 msgid "  h          Print this screen"
 msgstr "  h          Näytä tämä ohjeruutu"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2228
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimoi nykyisen osion levynkäyttö"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2229
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Huom: Tämä saattaa tehdä osiosta epäyhteensopivan"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2230
 msgid "             DOS, OS/2, ..."
 msgstr "             mm. DOSin ja OS/2:n kanssa."
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2231
 msgid "  n          Create new partition from free space"
 msgstr "  n          Luo uusi osio tyhjästä tilasta"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2232
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Tulosta osiotaulu ruudulle tai tiedostoon"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2233
 msgid "             There are several different formats for the partition"
 msgstr "             Osioille on useita erilaisia muotoja,"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2234
 msgid "             that you can choose from:"
 msgstr "             joista voit valita:"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2235
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - Raaka data (tasan se, mitä levylle kirjoitettaisiin)"
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2236
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Sektoreittain järjestetty taulu"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2237
 msgid "                t - Table in raw format"
 msgstr "                t - Taulu raa'assa muodossa"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2238
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Lopeta ohjelma kirjoittamatta osiotaulua"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2239
 msgid "  t          Change the filesystem type"
 msgstr "  t          Muuta tiedostojärjestelmän tyyppiä"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2240
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Muuta osiokokonäkymän yksiköitä"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2241
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Vaihtaa megatavujen, sektoreiden ja sylinterien välillä"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2242
 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:2238
+#: fdisk/cfdisk.c:2243
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Koska tämä saattaa tuhota levyllä olevaa dataa, kirjoitus"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2244
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             on joko varmistettava tai peruttava kirjoittamalla \"kyllä\" tai"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2245
 msgid "             `no'"
 msgstr "             \"ei\""
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2246
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nuoli ylös   Siirrä osoitin edelliseen osioon"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2247
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nuoli alas   Siirrä osoitin seuraavaan osioon"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2248
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Piirtää ruudun uudelleen"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2249
 msgid "  ?          Print this screen"
-msgstr "  ?          Näytä tämä ohje ruutu"
+msgstr "  ?          Näytä tämä ohjeruutu"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2251
 msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "Huom: Kaikki komennot voidaan antaa joko isoilla tai pienillä"
+msgstr "Huom: Kaikki komennot voi antaa joko isoilla tai pienillä"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2252
 msgid "case letters (except for Writes)."
 msgstr "kirjaimilla (paitsi taulun kirjoitus (W) )."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
-#: fdisk/fdisksunlabel.c:324
+#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Sylinterit"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2282
 msgid "Change cylinder geometry"
 msgstr "Muuta sylinterigeometriaa"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Päät"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2283
 msgid "Change head geometry"
 msgstr "Vaihda päägeometriaa"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2284
 msgid "Change sector geometry"
 msgstr "Vaihda sektorigeometriaa"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done"
 msgstr "Valmis"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done with changing geometry"
 msgstr "Geometrian muutos valmis"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2298
 msgid "Enter the number of cylinders: "
 msgstr "Anna sylinterien määrä: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
 msgid "Illegal cylinders value"
 msgstr "Virheellinen sylinteriarvo"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2316
 msgid "Enter the number of heads: "
 msgstr "Anna päiden määrä: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
 msgid "Illegal heads value"
 msgstr "Virheellinen pääarvo"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2329
 msgid "Enter the number of sectors per track: "
 msgstr "Anna sektorien määrä uraa kohden: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
 msgid "Illegal sectors value"
 msgstr "Virheellinen sektorimäärä"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2439
 msgid "Enter filesystem type: "
 msgstr "Anna tiedostojärjestelmän tyyppi: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2457
 msgid "Cannot change FS Type to empty"
-msgstr "Ei voi muuttaa tiedostojärjestelmän tyyppiä tyhjäksi"
+msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa tyhjäksi"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2459
 msgid "Cannot change FS Type to extended"
-msgstr "Ei voi muuttaa tiedostojärjestelmän tyyppiä laajennetuksi"
+msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa laajennetuksi"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Käynnistettävä"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2489
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Tunt(%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2511
 msgid "Pri/Log"
 msgstr "Ens/Loog"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2587
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Levyasema: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2593
 #, c-format
 msgid "Size: %lld bytes, %ld MB"
-msgstr "Koko: %lld tavua, %ld MB"
+msgstr "Koko: %lld tavua, %ld Mt"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2596
 #, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
-msgstr "Koko: %lld tavua, %ld.%ld GB"
+msgstr "Koko: %lld tavua, %ld.%ld Gt"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2600
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Päät: %d   Sektorit/ura: %d   Sylinterit: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2604
 msgid "Name"
 msgstr "Nimi"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2605
 msgid "Flags"
 msgstr "Liput"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2606
 msgid "Part Type"
 msgstr "Osiotyyppi"
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2607
 msgid "FS Type"
 msgstr "Tied.järj.tyyppi"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2608
 msgid "[Label]"
 msgstr "[Nimiö]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2610
 msgid "  Sectors"
 msgstr "  Sektorit"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2614
 msgid "Size (MB)"
-msgstr "Koko (MB)"
+msgstr "Koko (Mt)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2616
 msgid "Size (GB)"
-msgstr "Koko (GB)"
+msgstr "Koko (Gt)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Bootable"
 msgstr "Käynnistettävä"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Toggle bootable flag of the current partition"
 msgstr "Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete"
 msgstr "Poista"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete the current partition"
 msgstr "Poista nykyinen osio"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Change disk geometry (experts only)"
-msgstr "Vaihda levyn geometriaa (vain asiantuntijoille)"
+msgstr "Muuta levyn geometriaa (vain asiantuntijoille)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Help"
 msgstr "Ohje"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Print help screen"
 msgstr "Näytä ohjeruutu"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize"
 msgstr "Maksimoi"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimoi nykyisen osion tilankäyttö (vain asiantuntijoille)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "New"
 msgstr "Uusi"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "Create new partition from free space"
 msgstr "Luo uusi osio tyhjästä tilasta"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print"
 msgstr "Näytä"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print partition table to the screen or to a file"
 msgstr "Tulosta osiotaulu ruudulle tai tiedostoon"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit"
 msgstr "Lopeta"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit program without writing partition table"
 msgstr "Lopeta ohjelma kirjoittamatta osiotaulua"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Type"
 msgstr "Tyyppi"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 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:2675
+#: fdisk/cfdisk.c:2680
 msgid "Units"
 msgstr "Yksiköt"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "Vaihda osiokokonäytön yksiköt (MB, sect, cyl)"
+msgstr "Vaihda osiokokonäytön yksiköt (Mt, sekt, syl)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write"
 msgstr "Kirjoita"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Kirjoita osiotaulu levylle (tämä saattaa tuhota dataa)"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2727
 msgid "Cannot make this partition bootable"
-msgstr "Ei voi tehdä tästä osioista käynnistettävää"
+msgstr "Tästä osiosta ei voi tehdä käynnistettävää"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2737
 msgid "Cannot delete an empty partition"
-msgstr "Ei voi poistaa tyhjää osioita"
+msgstr "Tyhjää osiota ei voi poistaa"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
 msgid "Cannot maximize this partition"
-msgstr "Ei voi maksimoida tätä osioita"
+msgstr "Tätä osiota ei voi maksimoida"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2767
 msgid "This partition is unusable"
-msgstr "Tämä osio on käyttökelvoton"
+msgstr "Tämä osio on ei ole käytettävissä"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2769
 msgid "This partition is already in use"
 msgstr "Tämä osio on jo käytössä"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2786
 msgid "Cannot change the type of an empty partition"
-msgstr "Ei voi vaihtaa tyhjän osion tyyppiä"
+msgstr "Tyhjän osion tyyppiä ei voi vaihtaa"
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
 msgid "No more partitions"
 msgstr "Ei enempää osioita"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2826
 msgid "Illegal command"
 msgstr "Virheellinen komento"
 
-#: fdisk/cfdisk.c:2831
-#, fuzzy
+#: fdisk/cfdisk.c:2836
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright © 1994-2000 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:2838
+#: fdisk/cfdisk.c:2843
 #, c-format
 msgid ""
 "\n"
@@ -2118,7 +2119,7 @@
 "-a: Käytä nuolta korostuksen asemesta;\n"
 "-z: Aloita tyhjällä osiotaululla, osiotaulua ei lueta levyltä;\n"
 "-c C -h H -s S: Ohita ytimen mielipide sylinterien ja päiden määrästä,\n"
-"                sekä sektoreita/ura -määrästä.\n"
+"                sekä sektoreita/ura-määrästä.\n"
 "\n"
 
 #: fdisk/fdisk.c:197
@@ -2160,22 +2161,22 @@
 #: fdisk/fdisk.c:218
 #, c-format
 msgid "Unable to open %s\n"
-msgstr "Ei voi avata laitetta %s\n"
+msgstr "Laitetta %s ei voi avata\n"
 
 #: fdisk/fdisk.c:222
 #, c-format
 msgid "Unable to read %s\n"
-msgstr "Ei voi lukea laitetta %s\n"
+msgstr "Laitetta %s ei voi lukea\n"
 
 #: fdisk/fdisk.c:226
 #, c-format
 msgid "Unable to seek on %s\n"
-msgstr "Ei voi siirtyä laitteella %s\n"
+msgstr "Laitteella %s ei voi siirtyä\n"
 
 #: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to write %s\n"
-msgstr "Ei voi kirjoittaa laitteelle %s\n"
+msgstr "Laitteelle %s ei voi kirjoittaa\n"
 
 #: fdisk/fdisk.c:234
 #, c-format
@@ -2184,7 +2185,7 @@
 
 #: fdisk/fdisk.c:238
 msgid "Unable to allocate any more memory\n"
-msgstr "Ei voi varata enempää muistia\n"
+msgstr "Muistia ei voi varata enempää\n"
 
 #: fdisk/fdisk.c:241
 msgid "Fatal error\n"
@@ -2194,7 +2195,7 @@
 #: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
-msgstr "Komento  toiminto"
+msgstr "Komento  merkitys"
 
 #: fdisk/fdisk.c:326
 msgid "   a   toggle a read only flag"
@@ -2363,11 +2364,11 @@
 msgid "heads"
 msgstr "päät"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "sektorit"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470
+#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "sylinterit"
@@ -2431,8 +2432,8 @@
 "\n"
 msgstr ""
 "Muodostetaan uusi DOS-levynimiö. Muutokset tehdään vain käyttömuistiin,\n"
-"kunnes päätät kirjoittaa ne. Sen jälkeen edellistä sisältöä ei tietenkään\n"
-"voida enää palauttaa.\n"
+"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellistä sisältöä ei\n"
+"tietenkään voida enää palauttaa.\n"
 
 #: fdisk/fdisk.c:755
 #, c-format
@@ -2449,7 +2450,7 @@
 "Give the 'b' command to go to BSD mode.\n"
 msgstr ""
 "Tällä levyllä on sekä DOS-, että BSD-taikatavut.\n"
-"Siirry BSD-tilaan 'b'-komennolla.\n"
+"Siirry BSD-tilaan \"b\"-komennolla.\n"
 
 #: fdisk/fdisk.c:927
 msgid ""
@@ -2488,74 +2489,74 @@
 msgstr "Heksakoodi (L listaa koodit): "
 
 #: fdisk/fdisk.c:1069
-#, c-format
-msgid "%s (%d-%d, default %d): "
+#, fuzzy, c-format
+msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, oletus %d): "
 
-#: fdisk/fdisk.c:1134
-#, c-format
-msgid "Using default value %d\n"
+#: fdisk/fdisk.c:1136
+#, fuzzy, c-format
+msgid "Using default value %u\n"
 msgstr "Käytetään oletusarvoa %d\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1140
 msgid "Value out of range.\n"
 msgstr "Arvo sallitun välin ulkopuolella.\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1150
 msgid "Partition number"
 msgstr "Osionumero"
 
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1161
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Varoitus: osiolla %d on tyhjä tyyppi\n"
 
-#: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207
+#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Valittiin osio %d\n"
 
 #
-#: fdisk/fdisk.c:1184
+#: fdisk/fdisk.c:1186
 msgid "No partition is defined yet!\n"
-msgstr "Ei osioita määritetty vielä!\n"
+msgstr "Osioita ei ole vielä määritelty!\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1212
 msgid "All primary partitions have been defined already!\n"
-msgstr "Kaikki ensiöosiot on jo määritetty!\n"
+msgstr "Kaikki ensiöosiot on jo määritelty!\n"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "cylinder"
 msgstr "sylinteri"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "sector"
 msgstr "sektori"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1231
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Vaihdetaan näkymä/syöteyksiköiksi %s\n"
 
-#: fdisk/fdisk.c:1240
+#: fdisk/fdisk.c:1242
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VAROITUS: Osio %d on laajennettu osio\n"
 
-#: fdisk/fdisk.c:1251
+#: fdisk/fdisk.c:1253
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-yhteensopivuuslippu on asetettu\n"
 
-#: fdisk/fdisk.c:1255
+#: fdisk/fdisk.c:1257
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-yhteensopivuuslippua ei ole asetettu\n"
 
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1357
 #, c-format
 msgid "Partition %d does not exist yet!\n"
-msgstr "Osioita %d ei ole vielä olemassa!\n"
+msgstr "Osiota %d ei ole vielä olemassa!\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1362
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2567,15 +2568,15 @@
 "pitäminen ei todennäköisesti ole viisasta. Osion voi\n"
 "poistaa käyttämällä \"d\"-komentoa.\n"
 
-#: fdisk/fdisk.c:1361
+#: fdisk/fdisk.c:1371
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
-"Osiota ei voi muuttaa laajennetuksi, eikä päinvastoin.\n"
+"Osiota ei voi muuttaa laajennetuksi osioksi, eikä päinvastoin.\n"
 "Se on poistettava ensin.\n"
 
-#: fdisk/fdisk.c:1370
+#: fdisk/fdisk.c:1380
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2584,7 +2585,7 @@
 "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:1376
+#: fdisk/fdisk.c:1386
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2593,87 +2594,87 @@
 "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:1389
+#: fdisk/fdisk.c:1399
 #, 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:1443
+#: fdisk/fdisk.c:1453
 #, 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:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyysinen=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "looginen=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1451
+#: fdisk/fdisk.c:1461
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
-msgstr "Osiolla %d on erilaiset fyysiset/loogiset loppukohdat:\n"
+msgstr "Osiolla %d on eri fyysiset/loogiset loppukohdat:\n"
 
-#: fdisk/fdisk.c:1460
+#: fdisk/fdisk.c:1470
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Osion %i alku ei ole sylinterin rajalla:\n"
 
-#: fdisk/fdisk.c:1463
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "pitää olla (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1469
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1479
+#, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr "Osion %d loppu ei ole sylinterin rajalla.\n"
+msgstr "Osion %i loppu ei ole sylinterin rajalla.\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "pitää olla (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1485
+#: fdisk/fdisk.c:1495
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 "\n"
-"Levy %s: %ld MB, %lld tavua\n"
+"Levy %s: %ld Mt, %lld tavua\n"
 
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 "\n"
-"Levy %s: %ld.%ld GB, %lld tavua\n"
+"Levy %s: %ld.%ld Gt, %lld tavua\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d päätä, %d sektoria/ura, %d sylinteriä"
 
-#: fdisk/fdisk.c:1493
+#: fdisk/fdisk.c:1503
 #, c-format
 msgid ", total %lu sectors"
 msgstr ", yhteensä %lu sektoria"
 
-#: fdisk/fdisk.c:1496
+#: fdisk/fdisk.c:1506
 #, 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:1604
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2681,16 +2682,16 @@
 "Ei mitään tehtävää. Järjestys on jo oikea.\n"
 "\n"
 
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1678
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Käynn    Alku       Loppu  Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisk.c:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
 msgid "Device"
 msgstr "Laite"
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1716
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2698,7 +2699,7 @@
 "\n"
 "Osiotaulumerkinnät eivät ole levyjärjestyksessä\n"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
@@ -2709,92 +2710,92 @@
 "Levy %s: %d päätä, %d sektoria, %d sylinteriä\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: 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:1762
+#: fdisk/fdisk.c:1772
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varoitus: osio %d sisältää sektorin 0\n"
 
-#: fdisk/fdisk.c:1765
+#: fdisk/fdisk.c:1775
 #, 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:1768
+#: fdisk/fdisk.c:1778
 #, 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:1771
+#: fdisk/fdisk.c:1781
 #, 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:1775
+#: fdisk/fdisk.c:1785
 #, 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:1807
+#: fdisk/fdisk.c:1817
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varoitus: virheellinen datan alkukohta osiossa %d\n"
 
-#: fdisk/fdisk.c:1815
+#: fdisk/fdisk.c:1825
 #, 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:1835
+#: fdisk/fdisk.c:1845
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varoitus: osio %d on tyhjä\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1850
 #, 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:1846
+#: fdisk/fdisk.c:1856
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "Varattujen sektoreiden kokonaismäärä %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:1849
+#: fdisk/fdisk.c:1859
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d varaamatonta sektoria\n"
 
-#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
+#: fdisk/fdisk.c:1872 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ääritetty. Poista se ennen uudelleen lisäämistä.\n"
+msgstr "Osio %d on jo määritelty. Poista se ennen uudelleen lisäämistä.\n"
 
-#: fdisk/fdisk.c:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
-#: fdisk/fdisksunlabel.c:522
+#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Ensimmäinen %s"
 
-#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
+#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektori %d on jo varattu\n"
 
-#: fdisk/fdisk.c:1937
+#: fdisk/fdisk.c:1947
 msgid "No free sectors available\n"
 msgstr "Ei vapaita sektoreita käytettävissä\n"
 
-#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
+#: fdisk/fdisk.c:1956 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:2011
+#: fdisk/fdisk.c:2021
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2806,15 +2807,15 @@
 "\tuusi DOS-osiotaulu. (Komento o.)\n"
 "\tVAROITUS: Uuden osiotaulun luominen tuhoaa levyn nykyisen sisällön.\n"
 
-#: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "Maksimimäärä osioita on luotu\n"
 
-#: fdisk/fdisk.c:2031
+#: fdisk/fdisk.c:2041
 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:2036
+#: fdisk/fdisk.c:2046
 #, c-format
 msgid ""
 "Command action\n"
@@ -2825,20 +2826,20 @@
 "   %s\n"
 "   p    ensiöosio (1-4)\n"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "l   logical (5 or over)"
 msgstr "l    looginen (5 tai yli)"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "e   extended"
 msgstr "e    laajennettu"
 
-#: fdisk/fdisk.c:2057
+#: fdisk/fdisk.c:2067
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Virheellinen osionumero tyypille \"%c\"\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2103
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2846,11 +2847,11 @@
 "Osiotaulua on muutettu!\n"
 "\n"
 
-#: fdisk/fdisk.c:2102
+#: fdisk/fdisk.c:2112
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kutsutaan osiotaulun uudelleen lukeva ioctl().\n"
 
-#: fdisk/fdisk.c:2118
+#: fdisk/fdisk.c:2128
 #, c-format
 msgid ""
 "\n"
@@ -2863,7 +2864,7 @@
 "Ydin käyttää edelleen vanhaa taulua.\n"
 "Uutta taulua käytetään seuraavasta käynnistyksestä alkaen.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2138
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2874,100 +2875,100 @@
 "VAROITUS: Jos DOS 6.x -osioita luotiin tai muutettiin,\n"
 "katso lisätietoja fdiskin manuaalisivulta.\n"
 
-#: fdisk/fdisk.c:2135
+#: fdisk/fdisk.c:2145
 msgid "Syncing disks.\n"
 msgstr "Synkronoidaan levyt.\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Osiolla %d ei ole data-aluetta\n"
 
-#: fdisk/fdisk.c:2187
+#: fdisk/fdisk.c:2197
 msgid "New beginning of data"
 msgstr "Uusi datan alku"
 
-#: fdisk/fdisk.c:2203
+#: fdisk/fdisk.c:2213
 msgid "Expert command (m for help): "
 msgstr "Asiantuntijakomento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:2216
+#: fdisk/fdisk.c:2226
 msgid "Number of cylinders"
 msgstr "Sylinterien määrä"
 
-#: fdisk/fdisk.c:2243
+#: fdisk/fdisk.c:2253
 msgid "Number of heads"
 msgstr "Päiden määrä"
 
-#: fdisk/fdisk.c:2268
+#: fdisk/fdisk.c:2278
 msgid "Number of sectors"
 msgstr "Sektorien määrä"
 
-#: fdisk/fdisk.c:2271
+#: fdisk/fdisk.c:2281
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varoitus: asetetaan sektorisiirtymä DOS-yhteensopivuutta varten\n"
 
-#: fdisk/fdisk.c:2346
+#: fdisk/fdisk.c:2356
 #, 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:2360
+#: fdisk/fdisk.c:2370
 #, c-format
 msgid "Cannot open %s\n"
-msgstr "Ei voi avata %s\n"
+msgstr "Laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
-msgstr "ei voi avata %s\n"
+msgstr "laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2408
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tuntematon komento\n"
 
-#: fdisk/fdisk.c:2466
+#: fdisk/fdisk.c:2476
 msgid "This kernel finds the sector size itself - -b option ignored\n"
-msgstr "Tämä ydin löytää sektorin koon itse - -b-valitsinta ei huomioida\n"
+msgstr "Tämä ydin löytää sektorin koon itse -- -b-valitsinta ei huomioida\n"
 
-#: fdisk/fdisk.c:2470
+#: fdisk/fdisk.c:2480
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
-"Varoitus: valitsinta -b (sektorikoon asetus) tulee käyttää yhden määritetyn "
+"Varoitus: valitsinta -b (sektorikoon asetus) tulee käyttää yhden annetun "
 "laitteen kanssa\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2529
+#: fdisk/fdisk.c:2539
 #, 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:2539
+#: fdisk/fdisk.c:2549
 msgid "Command (m for help): "
 msgstr "Komento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:2555
+#: fdisk/fdisk.c:2565
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 "\n"
-"Nykyinen käynnistystiedoto on: %s\n"
+"Nykyinen käynnistystiedosto on: %s\n"
 
-#: fdisk/fdisk.c:2557
+#: fdisk/fdisk.c:2567
 msgid "Please enter the name of the new boot file: "
 msgstr "Anna uuden käynnistystiedoston nimi: "
 
-#: fdisk/fdisk.c:2559
+#: fdisk/fdisk.c:2569
 msgid "Boot file unchanged\n"
 msgstr "Käynnistystiedosto muuttumaton\n"
 
-#: fdisk/fdisk.c:2624
+#: fdisk/fdisk.c:2642
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2995,7 +2996,7 @@
 "\n"
 "\tTällä levyllä on kelvollinen AIX-nimiö.\n"
 "\tValitettavasti Linux ei toistaiseksi osaa \n"
-"\tkäsitellä tällaisia levyjä.  Siitä huolimatta\n"
+"\tkäsitellä tällaisia levyjä. Siitä huolimatta\n"
 "\tjoitakin neuvoja:\n"
 "\t1. fdisk tuhoaa levyn tiedot kirjoitettaessa.\n"
 "\t2. Varmista, että tämä levy EI ole enää elintärkeä\n"
@@ -3071,7 +3072,7 @@
 #: fdisk/fdiskbsdlabel.c:190
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
-msgstr "Laitteella %s ei ole *BSD-osioita.\n"
+msgstr "Laitteella %s ei ole *BSD-osiota.\n"
 
 #: fdisk/fdiskbsdlabel.c:204
 msgid "BSD disklabel command (m for help): "
@@ -3128,7 +3129,7 @@
 #: fdisk/fdiskbsdlabel.c:335
 #, c-format
 msgid "tracks/cylinder: %ld\n"
-msgstr "raitoja/sylinteri: %ld\n"
+msgstr "uria/sylinteri: %ld\n"
 
 #: fdisk/fdiskbsdlabel.c:336
 #, c-format
@@ -3163,7 +3164,7 @@
 #: fdisk/fdiskbsdlabel.c:342
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr "päänvaihto: %ld\t\t#millisekuntia\n"
+msgstr "päänvaihto: %ld\t\t# millisekuntia\n"
 
 #: fdisk/fdiskbsdlabel.c:344
 #, c-format
@@ -3281,87 +3282,88 @@
 "\n"
 "Synkronoidaan levyt.\n"
 
-#: fdisk/fdisksgilabel.c:78
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
 msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI xfslog"
 msgstr "SGI xfslog"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:92
 msgid "SGI xlv"
 msgstr "SGI xlv"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:93
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux-sivutus"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
 msgstr "Linuxmainen"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:95
+#: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: fdisk/fdisksgilabel.c:158
+#: 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:in mukaan nimiössä saa olla koreintaan 512 tavua\n"
+"MIPS Computer Systems, Inc:in mukaan nimiössä saa olla korkeintaan 512 "
+"tavua\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Havaittiin sgi-levynimiö, jolla on väärä tarkistussumma.\n"
 
@@ -3417,12 +3419,13 @@
 "Käynnistystiedosto: %s\n"
 "----- Hakemistomerkinnät -----\n"
 
-#: fdisk/fdisksgilabel.c:250
+#: fdisk/fdisksgilabel.c:248
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektori%5u koko%8u\n"
 
-#: fdisk/fdisksgilabel.c:304
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3434,7 +3437,7 @@
 "\tKäynnistystiedoston on oltava absoluuttinen, ei-tyhjä polku,\n"
 "\tesim. \"/unix\" tai \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:311
+#: fdisk/fdisksgilabel.c:308
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3442,7 +3445,7 @@
 "\n"
 "\tKäynnistystiedoston nimi on liian pitkä: maksimi 16 tavua.\n"
 
-#: fdisk/fdisksgilabel.c:316
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3450,7 +3453,7 @@
 "\n"
 "\tKäynnistystiedoston polun on oltava täydellinen.\n"
 
-#: fdisk/fdisksgilabel.c:321
+#: fdisk/fdisksgilabel.c:320
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3460,7 +3463,7 @@
 "\tHuomaa, että käynnistystiedoston olemassaoloa ei tarkisteta.\n"
 "\tSGI:n oletus on \"/unix\", ja varmuuskopiolle \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:349
+#: fdisk/fdisksgilabel.c:346
 #, c-format
 msgid ""
 "\n"
@@ -3469,19 +3472,19 @@
 "\n"
 "\tKäynnistystiedostoksi muutettiin \"%s\".\n"
 
-#: fdisk/fdisksgilabel.c:447
+#: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
-msgstr "On useampi kuin yksi koko levyn merkintä.\n"
+msgstr "Levyllä on useampi kuin yksi kokolevymerkintä.\n"
 
-#: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
-msgstr "Ei osioita määritetty\n"
+msgstr "Ei määriteltyjä osioita\n"
 
-#: fdisk/fdisksgilabel.c:462
+#: fdisk/fdisksgilabel.c:449
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "IRIX pitää siitä, että Osio 11 täyttää koko levyn.\n"
 
-#: fdisk/fdisksgilabel.c:464
+#: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3490,7 +3493,7 @@
 "Koko levyn osion tulee alkaa lohkosta 0,\n"
 "ei levylohkosta %d.\n"
 
-#: fdisk/fdisksgilabel.c:468
+#: fdisk/fdisksgilabel.c:457
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3499,31 +3502,31 @@
 "Koko levyn osio on vain %d levylohkon kokoinen,\n"
 "mutta levy on %d levylohkon kokoinen.\n"
 
-#: fdisk/fdisksgilabel.c:475
+#: fdisk/fdisksgilabel.c:463
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "Yhden osion (#11) tulee täyttää koko levy.\n"
 
-#: fdisk/fdisksgilabel.c:487
+#: fdisk/fdisksgilabel.c:473
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "Osion %d alku ei ole sylinterin rajalla.\n"
 
-#: fdisk/fdisksgilabel.c:494
+#: fdisk/fdisksgilabel.c:479
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "Osion %d loppu ei ole sylinterin rajalla.\n"
 
-#: fdisk/fdisksgilabel.c:502
+#: fdisk/fdisksgilabel.c:486
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Osiot %d ja %d ovat päällekkäiset %d sektorin verran.\n"
 
-#: fdisk/fdisksgilabel.c:511 fdisk/fdisksgilabel.c:531
-#, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, fuzzy, 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"
 
-#: fdisk/fdisksgilabel.c:544
+#: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
@@ -3531,7 +3534,7 @@
 "\n"
 "Käynnistysosiota ei ole olemassa.\n"
 
-#: fdisk/fdisksgilabel.c:548
+#: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
@@ -3539,7 +3542,7 @@
 "\n"
 "Sivutusosiota ei ole olemassa.\n"
 
-#: fdisk/fdisksgilabel.c:553
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
@@ -3547,15 +3550,16 @@
 "\n"
 "Sivutusosiolla ei ole sivutustyyppiä.\n"
 
-#: fdisk/fdisksgilabel.c:557
+#: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tValittu käynnistystiedoston nimi on epätavallinen.\n"
 
-#: fdisk/fdisksgilabel.c:568
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr "Valitan, vain ei-tyhjien osioiden lippua voi muuttaa.\n"
 
-#: fdisk/fdisksgilabel.c:575
+#: 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"
@@ -3569,46 +3573,46 @@
 "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:580 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
 msgid "YES\n"
 msgstr "KYLLÄ\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:606
+#: fdisk/fdisksgilabel.c:577
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "Tiedätkö, että levyllä on päällekkäisiä osioita?\n"
 
-#: fdisk/fdisksgilabel.c:668
+#: fdisk/fdisksgilabel.c:637
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "Yritetään luoda kokolevymerkintä automaattisesti.\n"
 
-#: fdisk/fdisksgilabel.c:675
+#: fdisk/fdisksgilabel.c:642
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "Koko levy on jo osioiden käytössä.\n"
 
-#: fdisk/fdisksgilabel.c:680
+#: fdisk/fdisksgilabel.c:646
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr "Levyllä on päällekkäisiä osioita. Tämä on korjattava ensin!\n"
 
-#: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
+#: 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 ""
-"On erittäin suositeltavaan, että yhdestoista osio\n"
-"kattaa koko levyn, ja on tyyppiä \"SGI volume\"\n"
+"On erittäin suositeltavaa, että yhdestoista osio\n"
+"kattaa koko levyn ja on tyyppiä \"SGI volume\"\n"
 
-#: fdisk/fdisksgilabel.c:705
+#: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
-"Levyllä tulee olemaan päällekkäisiä osioita. Tämä on korjattava esin!\n"
+"Levyllä tulee olemaan päällekkäisiä osioita. Tämä on korjattava ensin!\n"
 
-#: fdisk/fdisksgilabel.c:710
+#: fdisk/fdisksgilabel.c:676
 #, c-format
 msgid " Last %s"
 msgstr " Viimeinen %s"
 
-#: fdisk/fdisksgilabel.c:732
+#: 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"
@@ -3616,16 +3620,24 @@
 "\n"
 msgstr ""
 "Muodostetaan uusi SGI-levynimiö. Muutokset tehdään vain käyttömuistiin,\n"
-"kunnes päätät kirjoittaa ne. Sen jälkeen edellistä sisältöä ei tietenkään\n"
-"voida palauttaa.\n"
+"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellistä sisältöä ei\n"
+"tietenkään voida palauttaa.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:758
+#: 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 ""
+
+#: fdisk/fdisksgilabel.c:738
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Yritetään säilyttää osion %d parametrit.\n"
 
-#: fdisk/fdisksgilabel.c:760
+#: fdisk/fdisksgilabel.c:740
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tALKU=%d\tPITUUS=%d\n"
@@ -3692,9 +3704,9 @@
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Rakennetaan uutta Sun-levynimiötä. Muutokset pysyvät pelkästään muistissa\n"
-"kunnes päätät kirjoittaa ne. Sen jälkeen edellinen sisältö ei tietenkään\n"
-"ole palautettavissa.\n"
+"Luodaan uutta Sun-levynimiötä. Muutokset tehdään vain käyttömuistiin,\n"
+"kunnes päätät kirjoittaa ne levylle. Sen jälkeen edellinen sisältö ei\n"
+"tietenkään ole palautettavissa.\n"
 "\n"
 
 #: fdisk/fdisksunlabel.c:270
@@ -3715,63 +3727,63 @@
 msgid "Autoconfigure failed.\n"
 msgstr "Automaattinen konfigurointi epäonnistui.\n"
 
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Sektoreita/ura"
 
-#: fdisk/fdisksunlabel.c:327
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Vaihtoehtoiset sylinterit"
 
-#: fdisk/fdisksunlabel.c:330
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Fyysiset sylinterit"
 
-#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
 msgid "Rotation speed (rpm)"
 msgstr "Pyörimisnopeus (rpm)"
 
-#: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
 msgid "Interleave factor"
 msgstr "Lomituskerroin"
 
-#: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
 msgid "Extra sectors per cylinder"
 msgstr "Ylimääräisiä sektoreita sylinterillä"
 
-#: fdisk/fdisksunlabel.c:352
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "Voit säätää kaikkia levyn parametreja x-valikosta"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "3,5\" levyke"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "mukautettu Linux"
 
-#: fdisk/fdisksunlabel.c:446
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Osion %d loppu ei ole sylinterin rajalla\n"
 
-#: fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:462
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Osio %d on päällekkäinen muiden kanssa sektoreilla %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:488
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
-msgstr "Käyttämtätöntä tilaa - sektorit 0-%d\n"
+msgstr "Käyttämätöntä tilaa - sektorit 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Käyttämätöntä tilaa - sektorit %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3779,7 +3791,7 @@
 "Muut osiot käyttävät jo koko levyn.\n"
 "Poista/kutista joitakin ennen uutta yritystä.\n"
 
-#: fdisk/fdisksunlabel.c:593
+#: fdisk/fdisksunlabel.c:589
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3789,16 +3801,16 @@
 "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:613
+#: fdisk/fdisksunlabel.c:609
 #, 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-yhteensopivuuden säilyttämiseksi tämän osion tyyppinä\n"
+"Jos halutaan säilyttää SunOS/Solaris-yhteensopivuus, tämän osion tyyppinä\n"
 "on syytä säilyttää Koko levy (5), alkaen kohdasta 0, %u sektoria\n"
 
-#: fdisk/fdisksunlabel.c:626
+#: fdisk/fdisksunlabel.c:622
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3812,7 +3824,7 @@
 "Kirjoita KYLLÄ, jos olet erittäin varma, että haluat osion tyypiksi\n"
 "merkittävän 82 (Linux-sivutus): "
 
-#: fdisk/fdisksunlabel.c:657
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid ""
 "\n"
@@ -3824,15 +3836,15 @@
 "\n"
 msgstr ""
 "\n"
-"Levy %1$s (Sun-levynimiö): %2$d päätä, %3$d sektoria, %4$d kierrosta "
-"minuutissa\n"
-"%5$d sylinteriä, %6$d vaihtoehtoista sylinteriä, %7$d fyysistä sylinteriä\n"
-"%8$d ylimääräistä sekt/syl, lomitus %9$d:1\n"
+"Levy %1$s (Sun-levynimiö): %2$d päätä, %3$d sektoria,\n"
+"%4$d kierrosta minuutissa, %5$d sylinteriä, %6$d vaihtoehtoista\n"
+"sylinteriä, %7$d fyysistä sylinteriä, %8$d ylimääräistä sekt/syl,\n"
+"lomitus %9$d:1\n"
 "%10$s\n"
 "Yksiköt = %12$d * 512 -tavuiset %11$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:671
+#: fdisk/fdisksunlabel.c:667
 #, c-format
 msgid ""
 "\n"
@@ -3845,16 +3857,16 @@
 "Yksiköt = %6$d * 512 -tavuiset %5$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:676
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Lippu   Alku        Loppu  Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisksunlabel.c:701
+#: fdisk/fdisksunlabel.c:697
 msgid "Number of alternate cylinders"
 msgstr "Vaihtoehtoisten sylinterien määrä"
 
-#: fdisk/fdisksunlabel.c:734
+#: fdisk/fdisksunlabel.c:730
 msgid "Number of physical cylinders"
 msgstr "Fyysisten sylinterien määrä"
 
@@ -4132,7 +4144,7 @@
 
 #: fdisk/i386_sys_types.c:75
 msgid "Boot Wizard hidden"
-msgstr "kätketty Boot Wizard"
+msgstr "Kätketty Boot Wizard"
 
 #: fdisk/i386_sys_types.c:76
 msgid "Solaris boot"
@@ -4224,7 +4236,7 @@
 #: fdisk/sfdisk.c:151
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
-msgstr "siirtymis virhe laitteella %s - ei voi siirtyä kohtaan %lu\n"
+msgstr "siirtymisvirhe laitteella %s - kohtaan %lu ei voi siirtyä\n"
 
 #: fdisk/sfdisk.c:156
 #, c-format
@@ -4238,7 +4250,7 @@
 #: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
-msgstr "virhe luettaessa %s - ei voi lukea sektoria %lu\n"
+msgstr "virhe luettaessa laitetta %s - sektoria %lu ei voi lukea\n"
 
 #: fdisk/sfdisk.c:225
 #, c-format
@@ -4248,12 +4260,12 @@
 #: fdisk/sfdisk.c:240
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
-msgstr "virhe kirjoitettaessa %s - ei voi kirjoittaa sektoria %lu\n"
+msgstr "virhe kirjoitettaessa laitteelle %s - sektoria %lu ei voi kirjoittaa\n"
 
 #: fdisk/sfdisk.c:278
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
-msgstr "ei voi avata osion sektoreiden tallennustiedostoa (%s)\n"
+msgstr "osion sektoreiden tallennustiedostoa (%s) ei voi avata\n"
 
 #: fdisk/sfdisk.c:296
 #, c-format
@@ -4263,7 +4275,7 @@
 #: fdisk/sfdisk.c:314
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
-msgstr "ei voi lukea osionpalautustiedoston (%s) tilaa\n"
+msgstr "osionpalautustiedoston %s tilaa ei voi lukea\n"
 
 #: fdisk/sfdisk.c:319
 msgid "partition restore file has wrong size - not restoring\n"
@@ -4276,17 +4288,17 @@
 #: fdisk/sfdisk.c:329
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
-msgstr "ei voi avata osionpalautustiedostoa (%s)\n"
+msgstr "osionpalautustiedostoa (%s) ei voi avata\n"
 
 #: fdisk/sfdisk.c:335
 #, c-format
 msgid "error reading %s\n"
-msgstr "virhe luettaessa %s\n"
+msgstr "virhe luettaessa tiedostoa %s\n"
 
 #: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open device %s for writing\n"
-msgstr "ei voi avata laitetta %s kirjoitusta varten\n"
+msgstr "laitetta %s ei voi avata kirjoitusta varten\n"
 
 #: fdisk/sfdisk.c:354
 #, c-format
@@ -4296,12 +4308,12 @@
 #: fdisk/sfdisk.c:405
 #, c-format
 msgid "Disk %s: cannot get size\n"
-msgstr "Levy %s: ei voi hakea kokoa\n"
+msgstr "Levy %s: kokoa ei voi hakea\n"
 
 #: fdisk/sfdisk.c:410
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
-msgstr "Levy %s: ei voi hakea geometriaa\n"
+msgstr "Levy %s: geometriaa ei voi hakea\n"
 
 #: fdisk/sfdisk.c:434
 #, c-format
@@ -4335,7 +4347,7 @@
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
-"Varoitus: epätodennäköinen sektorimäärä (%lu) - yleensä korkeintaa 63\n"
+"Varoitus: epätodennäköinen sektorimäärä (%lu) - yleensä korkeintaan 63\n"
 "Tästä aiheutuu ongelmia kaikkien C/H/S-osoitusta käyttävien ohjelmien "
 "kanssa.\n"
 
@@ -4348,14 +4360,13 @@
 "\n"
 "Levy %s: %lu sylinteriä, %lu päätä, %lu sektoria/ura\n"
 
-# ensimmäinen %s on "start" tai "end", joita ei voi suomentaa BUGI
-# bugiraportti ylläpitäjälle täytyy lähettää
+# ensimmäinen %s on "start" tai "end", joita ei voi suomentaa
+# bugiraportti täytyy lähettää joskus
 #: fdisk/sfdisk.c:538
 #, 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\":n pääarvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
+msgstr "Osion %2$s %1$s pääarvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
 
 #: fdisk/sfdisk.c:543
 #, c-format
@@ -4383,7 +4394,7 @@
 
 #: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
-msgstr "Luetaan osiotaulu uudelleen ...\n"
+msgstr "Luetaan osiotaulu uudelleen...\n"
 
 #: fdisk/sfdisk.c:747
 msgid ""
@@ -4460,7 +4471,7 @@
 #: 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 ""
 "Yksiköt = 1048576-tavuiset megatavut, 1024-tavuiset lohkot, alkaen kohdasta %"
@@ -4468,8 +4479,8 @@
 "\n"
 
 #: fdisk/sfdisk.c:887
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
-msgstr "   Laite Käynn Alku    Loppu   MB    #lohkot   Id  Järjestelmä\n"
+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
 #, c-format
@@ -4508,7 +4519,7 @@
 #: fdisk/sfdisk.c:1122
 #, c-format
 msgid "strange, only %d partitions defined.\n"
-msgstr "outoa, vain %d osiota määritetty.\n"
+msgstr "outoa, vain %d osiota määritelty.\n"
 
 #: fdisk/sfdisk.c:1131
 #, c-format
@@ -4608,18 +4619,25 @@
 "(aktiiviseksi). Se ei haittaa LILOa, mutta DOS MBR ei käynnistä tältä "
 "levyltä.\n"
 
+#: fdisk/sfdisk.c:1272
+msgid "start"
+msgstr "alun"
+
 #: fdisk/sfdisk.c:1275
 #, 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) odotusJES (%ld,%ld,%ld) löydettiin (%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
+msgid "end"
+msgstr "lopun"
 
 #: fdisk/sfdisk.c:1284
 #, 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) odotus (%ld,%ld,%ld) löydettiin (%ld,%ld,%ld)\n"
+"osio %s: loppu: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1287
 #, c-format
@@ -4633,7 +4651,7 @@
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 "Varoitus: laajennetun osion alkua siirretty kohdasta %ld kohtaan %ld\n"
-"(Vain listaustarkoituksiin. Älä muuta sen sisältö.)\n"
+"(Vain listaustarkoituksiin. Älä muuta sen sisältöä.)\n"
 
 #: fdisk/sfdisk.c:1318
 msgid ""
@@ -4676,100 +4694,100 @@
 
 #: fdisk/sfdisk.c:1563
 msgid "-n flag was given: Nothing changed\n"
-msgstr "-n -valitsin oli annettu: Mitään ei muutettu\n"
+msgstr "valitsin -n oli annettu: Mitään ei muutettu\n"
 
-#: fdisk/sfdisk.c:1577
+#: fdisk/sfdisk.c:1579
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Vanhojen sektoreiden tallennus epäonnistui - keskeytetään\n"
 
-#: fdisk/sfdisk.c:1582
+#: fdisk/sfdisk.c:1584
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1661
 msgid "long or incomplete input line - quitting\n"
 msgstr "liian pitkä tai epätäydellinen syöterivi - lopetetaan\n"
 
-#: fdisk/sfdisk.c:1695
+#: fdisk/sfdisk.c:1697
 #, 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:1702
+#: fdisk/sfdisk.c:1704
 #, 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:1708
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "tunnistamaton syöte: %s\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
 msgstr "liian suuri luku\n"
 
-#: fdisk/sfdisk.c:1754
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
 msgstr "roskaa numeron perässä\n"
 
-#: fdisk/sfdisk.c:1875
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
 msgstr "ei tilaa osiokahvalle\n"
 
-#: fdisk/sfdisk.c:1908
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
-msgstr "ei voi rakentaa ympäröivää laajennettua osiota\n"
+msgstr "ympäröivää laajennettua osiota ei voi rakentaa\n"
 
-#: fdisk/sfdisk.c:1959
+#: fdisk/sfdisk.c:1961
 msgid "too many input fields\n"
 msgstr "liian monta syötekenttää\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1993
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
 msgstr "Ei enempää tilaa\n"
 
-#: fdisk/sfdisk.c:2012
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
 msgstr "Virheellinen tyyppi\n"
 
-#: fdisk/sfdisk.c:2044
+#: fdisk/sfdisk.c:2046
 #, 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:2050
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
 msgstr "Varoitus: tyhjä osio\n"
 
-#: fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2066
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varoitus: virheellinen osion alku (aikaisintaan %lu)\n"
 
-#: fdisk/sfdisk.c:2077
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "tunnistamaton \"käynnistettävä\"-lippu - valitse - tai *\n"
 
-#: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
 msgstr "osittainen c,h,s-määritys?\n"
 
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
 msgstr "Laajennettu osio ei ole odotetussa paikassa\n"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
 msgstr "virheellinen syöte\n"
 
-#: fdisk/sfdisk.c:2172
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
 msgstr "liian monta osiota\n"
 
-#: fdisk/sfdisk.c:2205
+#: 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"
@@ -4779,98 +4797,98 @@
 "<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:2225
+#: fdisk/sfdisk.c:2227
 msgid "version"
 msgstr "versio"
 
-#: fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "laite: esimerkiksi /dev/hda tai /dev/sda"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
-msgstr "käyttökelpoiset valitsimet:"
+msgstr "hyödylliset valitsimet:"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2236
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [tai --show-size]: näytä osion koko"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2237
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [tai --id:        näytä tai muuta osio-id"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2238
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [tai --list]:     listaa kaikkien laitteiden osiot"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2239
 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:2238
+#: fdisk/sfdisk.c:2240
 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:2239
+#: fdisk/sfdisk.c:2241
 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ä/MB"
+"    -uS, -uB, -uC, -uM:  käytä yksikköinä sektoreita/lohkoja/sylintereitä/Mt"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2242
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [tai --list-types]:listaa tunnetut osiotyypit"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2243
 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:2242
+#: fdisk/sfdisk.c:2244
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [tai --re-read]:  käske ytimen lukea osiotaulu uudelleen"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                muuta vain osiota numero #"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 älä kirjoita levylle oikeasti"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2247
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O tiedosto :        tallenna ylikirjoitettavat sektori tiedostoon"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I tiedosto :        palauta nämä sektorit"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [tai --version]:  näytä versio"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [tai --help]:     näytä tämä viesti"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
 msgstr "vaaralliset valitsimet:"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2252
 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:2251
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4878,115 +4896,115 @@
 "    -x [tai --show-extended]: listaa myös laajennetut osiot tulosteessa\n"
 "                             tai odota syötteestä niiden kahvoja"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2255
 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:2254
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [tai --quiet]:     vaienna varoitusviestit"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
 msgstr "    Voit ohittaa tunnistetun geometrian käyttämällä:"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2258
 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:2257
+#: fdisk/sfdisk.c:2259
 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:2258
+#: fdisk/sfdisk.c:2260
 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:2259
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
 msgstr "Kaikki tarkistukset voi ohittaa valitsimella:"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2262
 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:2266
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: fdisk/sfdisk.c:2267
+#: fdisk/sfdisk.c:2269
 #, 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:2268
+#: fdisk/sfdisk.c:2270
 #, 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:2269
+#: fdisk/sfdisk.c:2271
 #, 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:2421
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
 msgstr "ei komentoa?\n"
 
-#: fdisk/sfdisk.c:2539
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "yhteensä: %d lohkoa\n"
 
-#: fdisk/sfdisk.c:2576
+#: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "käyttö: sfdisk --print-id laite osionumero\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2580
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "käyttö: sfdisk --change-id laite osionumero Id\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2582
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "käyttö: sfdisk --id laite osionumero [Id]\n"
 
-#: fdisk/sfdisk.c:2587
+#: fdisk/sfdisk.c:2589
 msgid "can specify only one device (except with -l or -s)\n"
-msgstr "vain yhden laitteen voi määrittää (paitsi optiolla -l tai -s)\n"
-
-#: fdisk/sfdisk.c:2613
-#, c-format
-msgid "cannot open %s read-write\n"
-msgstr "ei voi avata %s lukua-kirjoitusta varten\n"
+msgstr "vain yhden laitteen voi antaa (paitsi valitsimella -l tai -s)\n"
 
 #: fdisk/sfdisk.c:2615
 #, c-format
-msgid "cannot open %s for reading\n"
-msgstr "ei voi avata %s lukua varten\n"
+msgid "cannot open %s read-write\n"
+msgstr "laitetta %s ei voi avata lukua-kirjoitusta varten\n"
 
-#: fdisk/sfdisk.c:2640
+#: fdisk/sfdisk.c:2617
+#, c-format
+msgid "cannot open %s for reading\n"
+msgstr "laitetta %s ei voi avata lukua varten\n"
+
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2657
+#: fdisk/sfdisk.c:2659
 #, 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:2674
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE-ioctl epäonnistui laitteelle %s\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2754
 #, 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:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
@@ -4994,44 +5012,44 @@
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:2777
+#: 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 ""
-"Aktiivisia ensiöosioita on %d. Tämä ei haittaa LILOa, mutta\n"
+"Aktiivisia ensiöosioita on %d kappaletta. Tämä ei haittaa LILOa, mutta\n"
 "DOS MBR käynnistää vain levyltä, jolla on tasan yksi aktiivinen osio.\n"
 
-#: fdisk/sfdisk.c:2791
+#: fdisk/sfdisk.c:2795
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
-msgstr "osiolla %s on id %x, eikä se ole kätketty\n"
+msgstr "osiolla %s id on %x eikä osiota ole kätketty\n"
 
-#: fdisk/sfdisk.c:2848
+#: fdisk/sfdisk.c:2852
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Virheellinen Id %lx\n"
 
-#: fdisk/sfdisk.c:2863
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
-msgstr "Tämä levy on tällä hetkellä käytössä.\n"
+msgstr "Levy on tällä hetkellä käytössä.\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
-msgstr "Vakava virhe: %s ei löydy\n"
+msgstr "Vakava virhe: laitetta %s ei löydy\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2887
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varoitus: %s ei ole lohkolaite\n"
 
-#: fdisk/sfdisk.c:2889
+#: fdisk/sfdisk.c:2893
 msgid "Checking that no-one is using this disk right now ...\n"
-msgstr "Tarkistetaan, että kukaan ei käytä levyä juuri nyt ...\n"
+msgstr "Tarkistetaan, että kukaan ei käytä levyä juuri nyt...\n"
 
-#: fdisk/sfdisk.c:2891
+#: fdisk/sfdisk.c:2895
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5040,52 +5058,52 @@
 msgstr ""
 "\n"
 "Tämä levy on tällä hetkellä käytössä - sen uudelleenosiointi on\n"
-"todennäköisesti huono ajatus. Irroita kaikki levyn tiedostojärjestelmät\n"
+"todennäköisesti huono ajatus. Irrota kaikki levyn tiedostojärjestelmät\n"
 "(komento umount) ja kaikki levyllä olevat sivutusosiot (komento swapoff).\n"
 "Käytä valitsinta --no-reread tämän testin ohittamiseen.\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2899
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Käytä --force -valitsinta ohittaaksesi kaikki tarkistukset.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2903
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2908
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
 msgstr "Vanha tilanne:\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2916
 #, 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:2920
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
 msgstr "Uusi tilanne:\n"
 
-#: fdisk/sfdisk.c:2925
+#: 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 ""
 "En pidä näistä osioista - mitään ei muutettu.\n"
-"(Jos todella haluat tätä, käytä optiota --force.)\n"
+"(Jos todella haluat tätä, käytä valitsinta --force.)\n"
 
-#: fdisk/sfdisk.c:2928
+#: fdisk/sfdisk.c:2932
 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:2933
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Oletko tyytyväinen tähän? [ynq] "
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Haluatko kirjoittaa tämän levylle? [ynq] "
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5093,15 +5111,15 @@
 "\n"
 "sfdisk: ennenaikainen syötteen loppu\n"
 
-#: fdisk/sfdisk.c:2942
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
 msgstr "Lopetetaan - mitään ei muutettu\n"
 
-#: fdisk/sfdisk.c:2948
+#: fdisk/sfdisk.c:2952
 msgid "Please answer one of y,n,q\n"
 msgstr "Vastaa joko y, n tai q\n"
 
-#: fdisk/sfdisk.c:2956
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5109,7 +5127,7 @@
 "Uusi osiotaulu kirjoitettiin onnistuneesti\n"
 "\n"
 
-#: fdisk/sfdisk.c:2962
+#: 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"
@@ -5120,94 +5138,94 @@
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Katso fdisk(8).)\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Komento \"getopt --help\" antaa lisää tietoa.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "tyhjä pitkä valitsin argumentin -l tai --long jälkeen"
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "tuntematon kuori argumentin -s tai --shell jälkeen"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Käyttö: getopt valitsinmerkkijono parametrit\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [valitsimet] [--] valitsinmerkkijono parametrit\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
 "       getopt [valitsimet] -o|--options valitsinmerkkijono [valitsimet] "
 "[--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "              parametrit\n"
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Salli pitkien valitsimien alkaminen yhdellä -:"
 "lla\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Tämä pieni käyttöopas\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=valitsimet Pitkät tunnistettavat valitsimet\n"
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 "  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden yhteydessä\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=valitsimet     Lyhyet tunnistettavat valitsimet\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr "  -q, --quiet                  Vaienna getopt(3):n virheilmoitukset\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Ei normaalia tulostetta\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=kuori            Aseta kuoren lainauskäytännöt\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                  Testaa getopt(1):n versio\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -u, --unquote                Ei lainausmerkkejä tulosteeseen\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Näytä versiotiedot\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr "puuttuva valitsinmerkkijonon argumentti"
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
-msgstr "getopt (parannettu) 1.1.2)\n"
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (parannettu) 1.1.3)\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "sisäinen virhe, ota yhteyttä tekijään."
 
@@ -5236,7 +5254,7 @@
 #: hwclock/cmos.c:587
 #, c-format
 msgid "Cannot open /dev/port: %s"
-msgstr "Ei voi avata /dev/port: %s"
+msgstr "Ei voi avata laitetta /dev/port: %s"
 
 #: hwclock/cmos.c:594
 msgid "I failed to get permission because I didn't try.\n"
@@ -5271,7 +5289,7 @@
 
 #: hwclock/hwclock.c:305
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
-msgstr "(Odotetaan: \"UTC\" tai \"LOCAL\" tai ei mitään.)\n"
+msgstr "(Odotetaan: \"UTC\", \"LOCAL\" tai ei mitään.)\n"
 
 #: hwclock/hwclock.c:312
 #, c-format
@@ -5290,7 +5308,7 @@
 
 #: hwclock/hwclock.c:318
 msgid "unknown"
-msgstr "tuntemattomassa"
+msgstr "tuntemattomassa "
 
 #: hwclock/hwclock.c:342
 msgid "Waiting for clock tick...\n"
@@ -5356,7 +5374,7 @@
 
 #: hwclock/hwclock.c:589
 msgid "No --date option specified.\n"
-msgstr "Valitsinta --date ei ole määritetty.\n"
+msgstr "Valitsinta --date ei ole annettu.\n"
 
 #: hwclock/hwclock.c:595
 msgid "--date argument too long\n"
@@ -5377,7 +5395,7 @@
 
 #: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr "Ei voitu ajaa \"date\"-komentoa /bin/sh-kuoressa. popen() epäonnistui"
+msgstr "Komentoa \"date\" ei voitu ajaa /bin/sh-kuoressa. popen() epäonnistui"
 
 #: hwclock/hwclock.c:622
 #, c-format
@@ -5530,7 +5548,7 @@
 #: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
-msgstr "Käytetään %s.\n"
+msgstr "Käytetään rajapintaa %s.\n"
 
 #: hwclock/hwclock.c:1016
 msgid "No usable clock interface found.\n"
@@ -5549,7 +5567,7 @@
 msgstr ""
 "Ydin säilyttää laitteistokellon epoch-arvoa vain Alpha-koneilla.\n"
 "Tämä hwclock on käännetty muulle koneelle kuin Alphalle\n"
-"(ja todennäköisesti sitä ei ajeta Alphassa nyt).  Toimintoa ei suoritettu.\n"
+"(ja todennäköisesti sitä ei ajeta Alphassa nyt). Toimintoa ei suoritettu.\n"
 
 #: hwclock/hwclock.c:1151
 msgid "Unable to get the epoch value from the kernel.\n"
@@ -5573,7 +5591,7 @@
 
 #: hwclock/hwclock.c:1162
 msgid "Unable to set the epoch value in the kernel.\n"
-msgstr "Ei voi asettaa ytimen epoch-arvoa.\n"
+msgstr "Ytimen epoch-arvoa ei voi asettaa.\n"
 
 #: hwclock/hwclock.c:1196
 #, c-format
@@ -5627,10 +5645,10 @@
 "Valitsimet: \n"
 "  --utc         laitteistokello on kansainvälisessä ajassa (UTC)\n"
 "  --localtime   laitteistokello on paikallisesssa ajassa\n"
-"  --directisa   access the ISA bus directly instead of %s\n"
+"  --directisa   käytä ISA-väylää suoraan, ei laitteen %s kautta\n"
 "  --badyear     ei huomioida laitteistokellon vuotta, koska BIOS on rikki\n"
-"  --date        määrittää ajan, johon laitteistokello asetetaan\n"
-"  --epoch=year  määrittää vuoden, joka on laitteistokellon\n"
+"  --date        aika, johon laitteistokello asetetaan\n"
+"  --epoch=year  vuosi, joka on laitteistokellon\n"
 "                epoch-arvon nollakohta\n"
 "  --noadjfile   ei käytetä tiedostoa /etc/adjtime. Vaatii joko valitsimen\n"
 "                --utc tai --localtime käyttämistä\n"
@@ -5641,19 +5659,19 @@
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
-"                kertoo hwclockille alphan tyypin (katso hwclock(8))\n"
+"                kertoo hwclockille Alphan tyypin (katso hwclock(8))\n"
 
 #: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
-msgstr "%s ottaa vain valitsimia argumentteina.  %d muuta annettu.\n"
+msgstr "%s ottaa vain valitsimia argumentteina. Annoit %d muuta.\n"
 
 #: hwclock/hwclock.c:1403
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
-"Monta toimintoa määritetty.\n"
+"Monta toimintoa määritelty.\n"
 "Vain yksi toiminto voidaan suorittaa kerrallaan.\n"
 
 #: hwclock/hwclock.c:1410
@@ -5683,7 +5701,7 @@
 
 #: hwclock/hwclock.c:1438
 msgid "No usable set-to time.  Cannot set clock.\n"
-msgstr "Ei käyttökelpoista aikaa asetettavaksi.  Kelloa ei voida asettaa.\n"
+msgstr "Ei käyttökelpoista aikaa asetettavaksi. Kelloa ei voida asettaa.\n"
 
 #: hwclock/hwclock.c:1454
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
@@ -5719,7 +5737,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "ajan lukeva KDGHWCLK-ioctl epäonnistui"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr "Aikakatkaisu odotettaessa ajan muutosta.\n"
 
@@ -5738,65 +5756,65 @@
 
 #: hwclock/kd.c:166
 msgid "Can't open /dev/tty1 or /dev/vc/1"
-msgstr "Ei voi avata /dev/tty1 tai /dev/vc/1"
+msgstr "Laitetta /dev/tty1 tai /dev/vc/1 ei voi avata"
 
 #: hwclock/kd.c:171
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK-ioctl epäonnistui"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "tiedoston %s avaaminen epäonnistui"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "aikaa lukeva ioctl() laitteelle %s epäonnistui.\n"
 
-#: hwclock/rtc.c:171
+#: hwclock/rtc.c:170
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "Odotetaan silmukassa laitteen %s ajan muuttumista\n"
 
-#: hwclock/rtc.c:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "laitteella %s ei ole keskeytysfunktioita. "
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "kellon tikitystä odottava luku laitteelle %s epäonnistui"
 
-#: hwclock/rtc.c:244
+#: hwclock/rtc.c:243
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "päivityskeskeytykset lopettava ioctl() laitteelle %s epäonnistui"
 
-#: hwclock/rtc.c:247
+#: hwclock/rtc.c:246
 #, 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:306
+#: hwclock/rtc.c:305
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "ajan asettava ioctl() laitteelle %s epäonnistui.\n"
 
-#: hwclock/rtc.c:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) onnistui.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "Tiedoston %s avaaminen epäonnistui"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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' "
@@ -5804,43 +5822,43 @@
 "this system.\n"
 msgstr ""
 "Ytimen epoch-arvon muuttamiseksi on käytettävä Linuxin \"rtc\"-laiteajuria "
-"laitetiedoston %s kautta.  Tässä järjestelmässä ei ole kyseistä tiedostoa.\n"
+"laitetiedoston %s kautta. Tässä järjestelmässä ei ole kyseistä tiedostoa.\n"
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
-msgstr "Ei voi avata %s"
+msgstr "Laitetta %s ei voi avata"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) laitteelle %s epäonnistui"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr "luimme epoch-arvon %ld laitteelta %s RTC_EPOCH_READ-ioctl:llä.\n"
+msgstr "luimme epoch-arvon %ld laitteelta %s ioctl:llä RTC_EPOCH_READ.\n"
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:397
+#: hwclock/rtc.c:396
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr "Epoch-arvo ei voi olla pienempi kuin 1900.  Pyyntö oli %ld\n"
+msgstr "Epoch-arvo ei voi olla pienempi kuin 1900. Pyyntö oli %ld\n"
 
-#: hwclock/rtc.c:415
+#: hwclock/rtc.c:414
 #, 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:420
+#: hwclock/rtc.c:419
 #, 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:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) laitteelle %s epäonnistui"
@@ -5880,11 +5898,11 @@
 #: login-utils/agetty.c:386
 #, c-format
 msgid "%s: can't exec %s: %m"
-msgstr "%s: ei voi käynnistää %s: %m"
+msgstr "%s: ohjelmaa %s ei voi käynnistää: %m"
 
 #: login-utils/agetty.c:406
 msgid "can't malloc initstring"
-msgstr "ei voi varata muistia alustuskomennoille"
+msgstr "alustuskomennoille ei voi varata muistia"
 
 #: login-utils/agetty.c:471
 #, c-format
@@ -5914,7 +5932,7 @@
 
 #: login-utils/agetty.c:549
 msgid "exiting parsespeeds\n"
-msgstr "poistutaan parsespeeds:istä\n"
+msgstr "poistutaan kohdasta parsespeeds\n"
 
 #: login-utils/agetty.c:649
 #, c-format
@@ -5993,11 +6011,11 @@
 
 #: login-utils/checktty.c:105
 msgid "can't malloc for ttyclass"
-msgstr "ei voi varata muistia kohteelle ttyclass"
+msgstr "kohteelle ttyclass ei voi varata muistia"
 
 #: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
-msgstr "ei voi varata muistia kohteelle grplist"
+msgstr "kohteelle grplist ei voi varata muistia"
 
 #. there was a default rule, but user didn't match, reject!
 #: login-utils/checktty.c:422
@@ -6042,9 +6060,8 @@
 msgid "Password error."
 msgstr "Salasanavirhe."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249
-#: mount/lomount.c:254
+#: 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
 msgid "Password: "
 msgstr "Salasana: "
 
@@ -6066,7 +6083,7 @@
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
-"[ -p toimiston_puhelin ]\n"
+"[ -p toimistopuhelin ]\n"
 "\t[ -h kotipuhelin ]"
 
 #: login-utils/chfn.c:294
@@ -6088,7 +6105,7 @@
 #: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr "merkkiä '%c' ei sallita.\n"
+msgstr "merkki \"%c\" ei ole sallittu.\n"
 
 #: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
@@ -6126,7 +6143,7 @@
 
 #: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr "Kuorta *EI* vaihdettu.  Yritä myöhemmin uudelleen.\n"
+msgstr "Kuorta *EI* vaihdettu. Yritä myöhemmin uudelleen.\n"
 
 #: login-utils/chsh.c:195
 msgid "Shell changed.\n"
@@ -6159,7 +6176,7 @@
 #: login-utils/chsh.c:318
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr "%s: merkkiä '%c' ei sallita.\n"
+msgstr "%s: merkkiä \"%c\" ei sallita.\n"
 
 #: login-utils/chsh.c:322
 #, c-format
@@ -6197,21 +6214,21 @@
 
 #: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
-msgstr "ei voinut avata /dev/urandom"
+msgstr "laitetta /dev/urandom ei voitu avata"
 
 #: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
-msgstr "ei voinut lukea satunnaisdataa tiedostosta /dev/urandom"
+msgstr "tiedostosta /dev/urandom ei voitu lukea satunnaisdataa"
 
 #: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
-msgstr "ei voi avata tiedostoa %s lukua varten"
+msgstr "tiedostoa %s ei voi avata lukua varten"
 
 #: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
-msgstr "ei voi lukea tiedoston (%s) tilaa"
+msgstr "tiedoston %s tilaa ei voi lukea"
 
 #: login-utils/cryptocard.c:106
 #, c-format
@@ -6221,12 +6238,12 @@
 #: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
-msgstr "ei voi lukea dataa tiedostosta %s"
+msgstr "tiedostosta %s ei voi lukea dataa"
 
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
-msgstr "Ei voi lukea %s, poistutaan."
+msgstr "Tiedostoa %s ei voi lukea, poistutaan."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
@@ -6263,29 +6280,29 @@
 "\n"
 "keskeytetty %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
-msgstr "VAKAVAA: ei voi avata uudelleen päätettä: %s"
+msgstr "VAKAVAA: päätettä ei voi avata uudelleen: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
 msgstr "VAKAVAA: virheellinen pääte"
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h on vain pääkäyttäjälle.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "käyttö: login [-fp] [käyttäjänimi]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM-virhe, keskeytetään: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAMia ei voitu alustaa: %s"
@@ -6296,16 +6313,16 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "tunnus: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "EPÄONNISTUNUT KÄYTTÄJÄN %3$s KIRJAUTUMINEN %1$d OSOITTEESTA %2$s, %4$s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -6313,18 +6330,18 @@
 "Kirjautuminen epäonnistui\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
 "LIIAN MONTA (%1$d) KÄYTTÄJÄN %3$s KIRJAUTUMISYRITYSTÄ OSOITTEESTA %2$s, %4$s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "EPÄONNISTUNUT KÄYTTÄJÄN %2$s ISTUNTO OSOITTEESTA %1$s, %3$s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -6332,7 +6349,7 @@
 "\n"
 "Kirjautuminen epäonnistui\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
@@ -6340,44 +6357,44 @@
 "\n"
 "Istunnon aloitusongelma, keskeytys.\n"
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Käyttäjänimi on NULL funktiossa %s, rivillä %d. Keskeytys."
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Virheellinen käyttäjänimi \"%s\" funktiossa %s, rivillä %d. Keskeytys."
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
 msgstr "login: Muisti lopussa\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Virheellinen käyttäjänimi"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "Käyttäjän %s kirjautuminen hylätty tällä päätteellä.\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "KÄYTTÄJÄN %s KIRJAUTUMINEN HYLÄTTIIN OSOITTEESTA %s, PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "KÄYTTÄJÄN %s KIRJAUTUMINEN HYLÄTTIIN PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Virheellinen kirjautuminen\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -6385,82 +6402,82 @@
 "Liian monta käyttäjää on jo kirjautuneena.\n"
 "Yritä myöhemmin uudelleen.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
 msgstr "Liian monta prosessia käynnissä.\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "KÄYTTÄJÄN %2$s MODEEMIYHTEYS PÄÄTTEELLÄ %1$s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
-msgstr "ROOTIN KIRJAUTUMINEN PÄÄTTEELLÄ %s OSOITTEESTA %s"
+msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s OSOITTEESTA %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
-msgstr "ROOTIN KIRJAUTUMINEN PÄÄTTEELLÄ %s"
+msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, 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:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "KÄYTTÄJÄN %2$s KIRJAUTUMINEN PÄÄTTEELLÄ %1$s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
 msgstr "Sinulle on uutta postia.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
 msgstr "Sinulle on postia.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: virhe haarautettaessa: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY epäonnistui: %m"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr "setuid() epäonnistui"
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Ei hakemistoa %s!\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr "Kirjaudutaan käyttäen kotihakemistona \"/\".\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
 msgstr "login: ei muistia kuoriskriptille.\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
-msgstr "login: ei voinut käynnistää kuoriskriptiä: %s.\n"
+msgstr "login: kuoriskriptiä ei voitu käynnistää: %s.\n"
 
-#: login-utils/login.c:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ei kuorta: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6469,62 +6486,62 @@
 "\n"
 "%s, kirjautuminen: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "tunnus aivan liian pitkä.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "NIMI liian pitkä"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
 msgstr "tunnukset eivät voi alkaa merkillä \"-\".\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "liian monta peräkkäistä rivinvaihtoa.\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "LIIKAA rivinvaihtoja"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Kirjautuminen aikakatkaistiin %d sekunnin jälkeen\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Edellinen kirjautuminen: %.*s"
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "osoitteesta %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "päätteeltä %.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "EPÄONNISTUNUT KIRJAUTUMINEN OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "EPÄONNISTUNUT KIRJAUTUMINEN PÄÄTTEELTÄ %s, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA PÄÄTTEELTÄ %s, %s"
@@ -6597,7 +6614,7 @@
 
 #: login-utils/passwd.c:225
 msgid "Only root may use the one and two argument forms.\n"
-msgstr "Vain root voi käyttää argumentteja.\n"
+msgstr "Vain pääkäyttäjä voi käyttää argumentteja.\n"
 
 #: login-utils/passwd.c:280
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
@@ -6606,7 +6623,7 @@
 #: login-utils/passwd.c:301
 #, c-format
 msgid "Can't exec %s: %s\n"
-msgstr "Ei voi käynnistää %s: %s\n"
+msgstr "Ohjelmaa %s ei voi käynnistää: %s\n"
 
 #: login-utils/passwd.c:312
 msgid "Cannot find login name"
@@ -6614,7 +6631,7 @@
 
 #: login-utils/passwd.c:319 login-utils/passwd.c:326
 msgid "Only root can change the password for others.\n"
-msgstr "Vain root voi vaihtaa muiden salasanoja.\n"
+msgstr "Vain pääkäyttäjä voi vaihtaa muiden salasanoja.\n"
 
 #: login-utils/passwd.c:334
 msgid "Too many arguments.\n"
@@ -6671,12 +6688,12 @@
 
 #: login-utils/passwd.c:404
 msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOTIN SALASANA VAIHDETTU"
+msgstr "PÄÄKÄYTTÄJÄN SALASANA VAIHDETTU"
 
 #: login-utils/passwd.c:406
 #, c-format
 msgid "password changed by root, user %s"
-msgstr "root vaihtoi salasanan, käyttäjä %s"
+msgstr "pääkäyttäjä vaihtoi käyttäjän %s salasanan"
 
 #: login-utils/passwd.c:413
 msgid "calling setpwnam to set password.\n"
@@ -6684,7 +6701,7 @@
 
 #: login-utils/passwd.c:417
 msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Salasanaa *EI* vaihdettu.  Yritä myöhemmin uudelleen.\n"
+msgstr "Salasanaa *EI* vaihdettu. Yritä myöhemmin uudelleen.\n"
 
 #: login-utils/passwd.c:423
 msgid "Password changed.\n"
@@ -6692,7 +6709,7 @@
 
 #: login-utils/shutdown.c:113
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr "Käyttö: shutdown [-h|-r] [-fqs] [now|hh:ss|+minuutit]\n"
+msgstr "Käyttö: shutdown [-h|-r] [-fqs] [now|hh:mm|+minuutit]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
@@ -6727,12 +6744,12 @@
 #: login-utils/shutdown.c:362
 #, c-format
 msgid "rebooted by %s: %s"
-msgstr "uudelleenkäynnistäjä %s: %s"
+msgstr "uudelleenkäynnisti %s: %s"
 
 #: login-utils/shutdown.c:365
 #, c-format
 msgid "halted by %s: %s"
-msgstr "sammuttaja %s: %s"
+msgstr "sammutti %s: %s"
 
 #. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
@@ -6763,7 +6780,7 @@
 #: login-utils/shutdown.c:458
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
-msgstr "Käynnistetään ohjelma \"%s\" ...\n"
+msgstr "Käynnistetään ohjelma \"%s\"...\n"
 
 #: login-utils/shutdown.c:461
 #, c-format
@@ -6784,7 +6801,7 @@
 #: login-utils/shutdown.c:497
 #, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr "Järjestelmä sammuu 1 tunnin, %d minuutin kuluttua"
+msgstr "Järjestelmä sammuu 1 tunnin ja %d minuutin kuluttua"
 
 #: login-utils/shutdown.c:500
 #, c-format
@@ -6806,24 +6823,25 @@
 
 #: login-utils/shutdown.c:567
 msgid "Cannot fork for swapoff. Shrug!"
-msgstr "Ei voi haarautua komentoa swapoff varten. Aivan sama!"
+msgstr "Haarauttaminen komentoa swapoff varten ei onnistu. Aivan sama!"
 
 #: login-utils/shutdown.c:575
 msgid "Cannot exec swapoff, hoping umount will do the trick."
-msgstr "Ei voi käynnistää komentoa swapoff, toivottavasti umount hoitaa asian."
+msgstr "Komentoa swapoff ei voi käynnistää, toivottavasti umount hoitaa asian."
 
 #: login-utils/shutdown.c:594
 msgid "Cannot fork for umount, trying manually."
-msgstr "Ei voi haarautua komentoa umount varten, yritetään manuaalisesti."
+msgstr ""
+"Haarauttaminen komentoa umount varten ei onnistu, yritetään manuaalisesti."
 
 #: login-utils/shutdown.c:603
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr "Ei voi käynnistää %s, yritetään käynnistää umount.\n"
+msgstr "Ohjelmaa %s ei voi käynnistää, yritetään käynnistää umount.\n"
 
 #: login-utils/shutdown.c:607
 msgid "Cannot exec umount, giving up on umount."
-msgstr "Ei voi käynnistää ohjelmaa umount, luovutaan irroitusyrityksestä."
+msgstr "Ohjelmaa umount ei voi käynnistää, luovutaan irrotusyrityksestä."
 
 #: login-utils/shutdown.c:612
 msgid "Unmounting any remaining filesystems..."
@@ -6832,7 +6850,7 @@
 #: login-utils/shutdown.c:648
 #, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
-msgstr "shutdown: Ei voitu irroittaa %s: %s\n"
+msgstr "shutdown: Laitetta %s ei voitu irrottaa: %s\n"
 
 #: login-utils/simpleinit.c:130
 msgid "Booting to single user mode.\n"
@@ -6852,7 +6870,7 @@
 
 #: login-utils/simpleinit.c:210
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr ""
+msgstr "virhe asetettaessa \"close-on-exec\" laitteelle /dev/initctl"
 
 #: login-utils/simpleinit.c:257
 msgid "error running finalprog\n"
@@ -6887,17 +6905,17 @@
 msgid "fork failed\n"
 msgstr "haarauttaminen epäonnistui\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
 msgstr "käynnistys epäonnistui\n"
 
 #: login-utils/simpleinit.c:561
 msgid "cannot open inittab\n"
-msgstr "ei voi avata tiedostoa inittab\n"
+msgstr "tiedostoa inittab ei voi avata\n"
 
 #: login-utils/simpleinit.c:628
 msgid "no TERM or cannot stat tty\n"
-msgstr "ei TERM-muuttujaa tai ei voi lukea päätteen tilaa\n"
+msgstr "TERM-muuttujaa ei ole tai päätteen tilaa ei voi lukea\n"
 
 #: login-utils/simpleinit.c:934
 #, c-format
@@ -6914,7 +6932,7 @@
 
 #: login-utils/ttymsg.c:139
 msgid "cannot fork"
-msgstr "ei voi haarauttaa"
+msgstr "haarauttaminen ei onnistu"
 
 #: login-utils/ttymsg.c:143
 #, c-format
@@ -6944,19 +6962,19 @@
 #: login-utils/vipw.c:164
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr "%s: ei voi linkittää %s: %s\n"
+msgstr "%s: tiedostoa %s ei voi linkittää: %s\n"
 
 #: login-utils/vipw.c:195
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
-"%s: ei voi poistaa tiedoston %s lukitusta: %s (muutoksesi ovat edelleen "
+"%s: tiedoston %s lukitusta ei voi poistaa: %s (muutoksesi ovat edelleen "
 "tiedostossa %s)\n"
 
 #: login-utils/vipw.c:218
 #, c-format
 msgid "%s: Cannot fork\n"
-msgstr "%s: Ei voi haarauttaa\n"
+msgstr "%s: Haarauttaminen ei onnistu\n"
 
 #: login-utils/vipw.c:254
 #, c-format
@@ -6989,7 +7007,7 @@
 #: login-utils/wall.c:159
 #, c-format
 msgid "%s: can't open temporary file.\n"
-msgstr "%s: ei voi avata väliaikaistiedostoa.\n"
+msgstr "%s: väliaikaistiedostoa ei voi avata.\n"
 
 #: login-utils/wall.c:186
 #, c-format
@@ -7004,17 +7022,17 @@
 #: login-utils/wall.c:209
 #, c-format
 msgid "%s: can't read %s.\n"
-msgstr "%s: ei voi lukea %s.\n"
+msgstr "%s: tiedostoa %s ei voi lukea.\n"
 
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr "%s: ei voi lukea väliaikaistiedoston tilaa.\n"
+msgstr "%s: väliaikaistiedoston tilaa ei voi lukea.\n"
 
 #: login-utils/wall.c:241
 #, c-format
 msgid "%s: can't read temporary file.\n"
-msgstr "%s: ei voi avata väliaikaistiedostoa.\n"
+msgstr "%s: väliaikaistiedostoa ei voi avata.\n"
 
 #: misc-utils/cal.c:262
 msgid "illegal month value: use 1-12"
@@ -7056,7 +7074,7 @@
 #: misc-utils/kill.c:269
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr "%s: ei löydy prosessia \"%s\"\n"
+msgstr "%s: prosessia \"%s\" ei löydy\n"
 
 #: misc-utils/kill.c:313
 #, c-format
@@ -7102,7 +7120,7 @@
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
 msgid "Could not open %s\n"
-msgstr "Ei voinut avata %s\n"
+msgstr "Tiedostoa %s ei voitu avata\n"
 
 #: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
 #, c-format
@@ -7112,12 +7130,12 @@
 #: misc-utils/namei.c:102
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
-msgstr "namei: ei voida hakea nykyistä hakemistoa - %s\n"
+msgstr "namei: nykyistä hakemistoa ei voida hakea - %s\n"
 
 #: misc-utils/namei.c:115
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
-msgstr "namei: ei voida siirtyä hakemistoon %s - %s (%d)\n"
+msgstr "namei: hakemistoon %s ei voi siirtyä - %s (%d)\n"
 
 #: misc-utils/namei.c:125
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
@@ -7125,11 +7143,11 @@
 
 #: misc-utils/namei.c:150
 msgid "namei: could not chdir to root!\n"
-msgstr "namei: ei voitu siirtyä juureen!\n"
+msgstr "namei: juureen siirtyminen epäonnistui!\n"
 
 #: misc-utils/namei.c:157
 msgid "namei: could not stat root!\n"
-msgstr "namei: ei voitu lukea juuren tilaa!\n"
+msgstr "namei: juuren tilaa ei voitu lukea!\n"
 
 #: misc-utils/namei.c:171
 msgid "namei: buf overflow\n"
@@ -7138,7 +7156,7 @@
 #: misc-utils/namei.c:217
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
-msgstr " ? ei voitu siirtyä hakemistoon %s - %s (%d)\n"
+msgstr " ? siirtyminen hakemistoon %s epäonnistui - %s (%d)\n"
 
 #: misc-utils/namei.c:246
 #, c-format
@@ -7189,12 +7207,12 @@
 msgid "Script started, file is %s\n"
 msgstr "Skripti käynnistetty, tiedosto on %s\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr "Skripti käynnistetty %s"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
@@ -7203,213 +7221,213 @@
 "\n"
 "Skripti suoritettu %s"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skripti suoritettu, tiedosto on %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr "openpty epäonnistui\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr "Pty:t lopussa\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:744
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Argumenttivirhe, käyttö\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term päätteen_nimi ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -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 "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-KONSOLIEN_MÄÄRÄ] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-KONSOLIEN_MÄÄRÄ] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumptiedostonimi ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
-msgstr "ei voi asettaa (pois) virransäästötilaa\n"
+msgstr "virransäästötilaa ei voi asettaa (pois)\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl-virhe: %s\n"
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Virhe luettaessa %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr "Virhe kirjoitettaessa näyttövedosta\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
-msgstr "ei voitu lukea %s, eikä dump-ioctl onnistu\n"
+msgstr "tiedostoa %s ei voitu lukea, eikä dump-ioctl onnistu\n"
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
-msgstr "%s: $TERM ei ole määritetty.\n"
+msgstr "%s: $TERM ei ole määritelty.\n"
 
 #: misc-utils/whereis.c:157
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -7457,118 +7475,119 @@
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr ""
-"Viesti %4$s:lle kirjautuneelta käyttäjältä %1$s@%2$s (%3$s), kello %5$s ..."
+"Viesti %4$s:lle kirjautuneelta käyttäjältä %1$s@%2$s (%3$s), kello %5$s..."
 
 #: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
-msgstr "Viesti %3$s:lle kirjautuneelta käyttäjältä %1$s@%2$s, kello %4$s ..."
+msgstr "Viesti %3$s:lle kirjautuneelta käyttäjältä %1$s@%2$s, kello %4$s..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "varoitus: virhe luettaessa %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 "virhe: ei voi avata %s: %s"
+msgstr "virhe: tiedostoa %s ei voi avata: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
-msgstr "mount: ei voinut avata %s - käytetään %s sen sijaan\n"
+msgstr ""
+"mount: tiedostoa %s ei voitu avata - käytetään tiedostoa %s sen sijaan\n"
 
 #. linktargetfile does not exist (as a file)
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:415
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr "ei voi luoda lukkotiedostoa %s: %s (käytä -n-lippua ohittaaksesi)"
+msgstr "lukkotiedostoa %s ei voi luoda: %s (käytä lippua -n ohittaaksesi)"
 
-#: mount/fstab.c:399
+#: mount/fstab.c:427
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr "ei voi linkittää lukkotiedostoa %s: %s (käytä -n-lippua ohittaaksesi)"
-
-#: mount/fstab.c:411
-#, c-format
-msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr "ei voi avata lukkotiedostoa %s: %s (käytä -n-lippua ohittaaksesi)"
-
-#: mount/fstab.c:426
-#, c-format
-msgid "Can't lock lock file %s: %s\n"
-msgstr "Ei voi avata lukkotiedostoa %s: %s\n"
+msgstr "lukkotiedostoa %s ei voi linkittää: %s (käytä lippua -n ohittaaksesi)"
 
 #: mount/fstab.c:439
 #, c-format
-msgid "can't lock lock file %s: %s"
-msgstr "ei voi lukita lukkotiedostoa %s: %s"
+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:441
+#: mount/fstab.c:454
+#, c-format
+msgid "Can't lock lock file %s: %s\n"
+msgstr "Lukkotiedostoa %s ei voi lukita: %s\n"
+
+#: mount/fstab.c:467
+#, c-format
+msgid "can't lock lock file %s: %s"
+msgstr "lukkotiedostoa %s ei voi lukita: %s"
+
+#: mount/fstab.c:469
 msgid "timed out"
 msgstr "aikakatkaistu"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:476
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
-"Ei voi luoda linkkiä %s\n"
+"Linkkiä %s ei voi luoda\n"
 "Ehkä jossakin on vanhentunut lukkotiedosto?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:525 mount/fstab.c:561
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
-msgstr "ei voi avata %s (%s) - mtabia ei päivitetty"
+msgstr "hakemistoa %s ei voi avata (%s) - mtabia ei päivitetty"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:569
 #, c-format
 msgid "error writing %s: %s"
 msgstr "virhe kirjoitettaessa %s: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:577
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "virhe muutettaessa tiedoston %s tilaa: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:595
 #, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr "ei voi nimetä %s -> %s: %s\n"
+msgstr "nimeäminen %s -> %s ei onnistu: %s\n"
 
-#: mount/lomount.c:80
+#: mount/lomount.c:173
 #, c-format
 msgid "loop: can't open device %s: %s\n"
-msgstr "loop: ei voi avata laitetta %s: %s\n"
+msgstr "loop: laitetta %s ei voi avata: %s\n"
 
-#: mount/lomount.c:86
+#: mount/lomount.c:179
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: ei voi hakea laitteen %s tietoja: %s\n"
+msgstr "loop: laitteen %s tietoja ei voi hakea: %s\n"
 
-#: mount/lomount.c:91
-#, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#: 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:177
+#: 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:181
+#: 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# väärä major-arvo?"
+"       Ehkä tiedostoilla /dev/loop# on väärä major-arvo?"
 
-#: mount/lomount.c:185
+#: mount/lomount.c:253
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -7579,7 +7598,7 @@
 "       tämä ydin ei ole tietoinen loop-laitteesta.\n"
 "       (Jos näin on, käännä uudelleen tai suorita \"insmod loop.o\".)"
 
-#: mount/lomount.c:191
+#: 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"
@@ -7589,243 +7608,291 @@
 "       loop-laitteesta (käännä uudelleen tai \"insmod loop.o\"), tai\n"
 "       ehkä /dev/loop#:in major-arvo on väärä?"
 
-#: mount/lomount.c:195
+#: mount/lomount.c:263
 msgid "mount: could not find any free loop device"
 msgstr "mount: ei löytynyt yhtään vapaata loop-laitetta"
 
-#: mount/lomount.c:225
+#: 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 "Unsupported encryption type %s\n"
-msgstr "Salaustyyppiä %s ei tueta\n"
+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:239
+#: mount/lomount.c:611
+#, 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 "Ei voitu lukita muistia, poistutaan.\n"
+msgstr "Muistia ei voitu lukita, poistutaan.\n"
 
-#: mount/lomount.c:258
+#: mount/lomount.c:654
 msgid "Init (up to 16 hex digits): "
 msgstr "Alkuarvo (korkeintaan 16 heksanumeroa): "
 
-#: mount/lomount.c:265
+#: mount/lomount.c:661
 #, c-format
 msgid "Non-hex digit '%c'.\n"
-msgstr "Ei-heksanumero '%c'.\n"
+msgstr "Ei-heksanumero \"%c\".\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:764
 #, 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"
 
-#: mount/lomount.c:288
+#: 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:299
-#, c-format
-msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: ei voi poistaa laitetta %s: %s\n"
-
-#: mount/lomount.c:309
-#, c-format
-msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s): onnistui\n"
-
-#: mount/lomount.c:317
-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:354
+#: mount/lomount.c:831
 #, 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"
+"  %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 ""
-"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:372 mount/sundries.c:30 mount/sundries.c:45
-#: mount/sundries.c:244
+#: 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 "ei riittävästi muistia"
+msgstr "muisti ei riitä"
 
-#: mount/lomount.c:443
-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/lomount.c:945
+#, fuzzy
+msgid "Error: unable to open /etc/fstab for reading\n"
+msgstr "laitetta %s ei voi avata lukua varten\n"
 
-#: mount/mntent.c:165
+#: 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/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: varoitus: tiedoston %s lopussa ei ole rivinvaihtoa\n"
 
-#: mount/mntent.c:216
+#: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: rivi %d tiedostossa %s on virheellinen%s\n"
 
-#: mount/mntent.c:219
+#: mount/mntent.c:222
 msgid "; rest of file ignored"
 msgstr "; loput tiedostosta jätetään huomioimatta"
 
-#: mount/mount.c:385
+#: mount/mount.c:396
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr "mount: mtabin mukaan %s on jo liitetty pisteeseen %s"
+msgstr "mount: tiedoston mtab mukaan %s on jo liitetty pisteeseen %s"
 
-#: mount/mount.c:389
+#: mount/mount.c:400
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
-msgstr "mount: mtabin mukaan %s on liitetty pisteeseen %s"
+msgstr "mount: tiedoston mtab mukaan %s on liitetty pisteeseen %s"
 
-#: mount/mount.c:410
+#: mount/mount.c:421
 #, c-format
 msgid "mount: can't open %s for writing: %s"
-msgstr "mount: ei voi avata %s kirjoittamista varten: %s"
+msgstr "mount: tiedostoa %s ei voi avata kirjoittamista varten: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:436 mount/mount.c:660
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: virhe kirjoitettaessa %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:443
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: virhe muutettaessa tiedoston %s tilaa: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:494
 #, c-format
 msgid "%s looks like swapspace - not mounted"
-msgstr "%s vaikutta olevan sivutustilaa - ei liitetä"
+msgstr "%s vaikuttaa olevan sivutustilaa - ei liitetä"
 
-#: mount/mount.c:538
+#: mount/mount.c:554
 msgid "mount failed"
 msgstr "liittäminen epäonnistui"
 
-#: mount/mount.c:540
+#: mount/mount.c:556
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr "mount: vain root voi liittää %s kohteeseen %s"
+msgstr "mount: vain root voi liittää %s pisteeseen %s"
 
-#: mount/mount.c:568
+#: mount/mount.c:584
 msgid "mount: loop device specified twice"
-msgstr "mount: loop-laite määritetty kahdesti"
+msgstr "mount: loop-laite annettu kahdesti"
 
-#: mount/mount.c:573
+#: mount/mount.c:589
 msgid "mount: type specified twice"
-msgstr "mount: tyyppi määritetty kahdesti"
+msgstr "mount: tyyppi annettu kahdesti"
 
-#: mount/mount.c:585
+#: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: ohitetaan loop-laitteen asettaminen\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: aiotaan käyttää loop-laitetta %s\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:614
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop-laitteen asettaminen epäonnistui\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:618
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop-laite asetettiin onnistuneesti\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:655
 #, c-format
 msgid "mount: can't open %s: %s"
-msgstr "mount: ei voi avata %s: %s"
+msgstr "mount: tiedostoa %s ei voi avata: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:678
 #, c-format
 msgid "mount: cannot open %s for setting speed"
-msgstr "mount: ei voi avata %s nopeuden asetusta varten"
+msgstr "mount: tiedostoa %s ei voi avata nopeuden asetusta varten"
 
-#: mount/mount.c:665
+#: mount/mount.c:681
 #, c-format
 msgid "mount: cannot set speed: %s"
-msgstr "mount: ei voi asettaa nopeutta: %s"
+msgstr "mount: nopeutta ei voi asettaa: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:735 mount/mount.c:1309
 #, c-format
 msgid "mount: cannot fork: %s"
-msgstr "mount: ei voi haarauttaa: %s"
+msgstr "mount: haarauttaminen ei onnistu: %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:815
 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:845
+#: mount/mount.c:854
 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:856
+#: mount/mount.c:865
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
-"mount: Tiedostojärjestelmän tyyppiä ei voitu päätellä, eikä tyyppiä ole "
+"mount: Tiedostojärjestelmän tyyppiä ei voitu määrittää, eikä tyyppiä ole "
 "annettu"
 
-#: mount/mount.c:859
+#: mount/mount.c:868
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: tiedostojärjestelmän tyyppi on annettava"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:871
 msgid "mount: mount failed"
 msgstr "mount: liitos epäonnistui"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:877 mount/mount.c:912
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: liitospiste %s ei ole hakemisto"
 
-#: mount/mount.c:870
+#: mount/mount.c:879
 msgid "mount: permission denied"
 msgstr "mount: lupa evätty"
 
-#: mount/mount.c:872
+#: mount/mount.c:881
 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:876 mount/mount.c:880
+#: mount/mount.c:885 mount/mount.c:889
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s on varattu"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:891
 msgid "mount: proc already mounted"
 msgstr "mount: proc on jo liitetty"
 
-#: mount/mount.c:884
+#: mount/mount.c:893
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s on jo liitetty tai %s on varattu"
 
-#: mount/mount.c:890
+#: mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: liitospiste %s ei ole olemassa"
 
-#: mount/mount.c:892
+#: mount/mount.c:901
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: liitospiste %s on symlinkki olemattomaan"
 
-#: mount/mount.c:895
+#: mount/mount.c:904
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: erikoislaite %s ei ole olemassa"
 
-#: mount/mount.c:905
+#: mount/mount.c:914
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7834,12 +7901,12 @@
 "mount: erikoislaite %s ei ole olemassa\n"
 "       (polun etuliite ei ole hakemisto)\n"
 
-#: mount/mount.c:918
+#: mount/mount.c:927
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ei ole vielä liitetty, tai virheellinen valitsin"
 
-#: mount/mount.c:920
+#: mount/mount.c:929
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7849,35 +7916,35 @@
 "       superlohko laitteella %s, tai liian monta liitettyä \n"
 "       tiedostojärjestelmää"
 
-#: mount/mount.c:954
+#: mount/mount.c:963
 msgid "mount table full"
 msgstr "liitostaulukko täynnä"
 
-#: mount/mount.c:956
+#: mount/mount.c:965
 #, c-format
 msgid "mount: %s: can't read superblock"
-msgstr "mount: %s: ei voi lukea superlohkoa"
+msgstr "mount: %s: superlohkoa ei voi lukea"
 
-#: mount/mount.c:960
+#: mount/mount.c:969
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: tuntematon laite"
 
-#: mount/mount.c:965
+#: mount/mount.c:974
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: ydin ei tue tiedostojärjestelmätyyppiä %s"
 
-#: mount/mount.c:977
+#: mount/mount.c:986
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: tarkoitat todennäköisesti %s"
 
-#: mount/mount.c:979
+#: mount/mount.c:988
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: ehkä tarkoitit iso9660?"
 
-#: mount/mount.c:982
+#: mount/mount.c:991
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -7885,12 +7952,12 @@
 "ole tuettu"
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:997
 #, 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:990
+#: mount/mount.c:999
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7899,100 +7966,100 @@
 "mount: ydin ei tunnista tiedostoa %s lohkolaitteeksi\n"
 "       (ehkä \"insmod ajuri\" auttaa?)"
 
-#: mount/mount.c:993
+#: mount/mount.c:1002
 #, 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:996
+#: mount/mount.c:1005
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ei ole lohkolaite"
 
-#: mount/mount.c:999
+#: mount/mount.c:1008
 #, 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:1002
+#: mount/mount.c:1011
 msgid "block device "
 msgstr "lohkolaite "
 
-#: mount/mount.c:1004
+#: mount/mount.c:1013
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: ei voi liittää %s%s vain luku -tilassa"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1017
 #, 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:1024
+#: mount/mount.c:1033
 #, 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:1111
+#: 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"
+msgstr "mount: nimiö %s esiintyy sekä paikassa %s että %s\n"
 
-#: mount/mount.c:1115
+#: mount/mount.c:1124
 #, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr "mount: %s on kaksinkertainen - ei liitetä"
 
-#: mount/mount.c:1125
+#: 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:1126
+#: mount/mount.c:1135
 msgid "UUID"
 msgstr "UUID:"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "label"
 msgstr "nimiö"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: mount/mount.c:1137 mount/mount.c:1587
 msgid "mount: no such partition found"
 msgstr "mount: osiota ei löydy"
 
-#: mount/mount.c:1136
+#: mount/mount.c:1145
 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:1141
-msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+#: mount/mount.c:1150
+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 "
-"smb\n"
+"smbfs\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1166
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: siirretään taustalle \"%s\"\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1177
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: luovutetaan \"%s\"\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1254
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s on jo liitetty paikkaan %s\n"
 
-#: mount/mount.c:1376
+#: mount/mount.c:1386
 #, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8014,100 +8081,100 @@
 "       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 fd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Käyttö: mount -V                 : näytä versio\n"
-"       mount -h                 : näytä tämä ohje\n"
-"       mount                    : näytä liitetyt tiedostojärjestelmät\n"
-"       mount -l                 : sama kuin edellä, lisäksi nimiöt\n"
+"        mount -h                 : näytä tämä ohje\n"
+"        mount                    : näytä liitetyt tiedostojärjestelmät\n"
+"        mount -l                 : sama kuin edellä, lisäksi nimiöt\n"
 "Siinä informatiivinen osuus. Seuraavaksi liittäminen.\n"
 "Komento kuuluu \"mount [-t tied.järj.tyyppi] jotakin jonnekin\".\n"
-"Tiedostossa /etc/fstab olevat yksityiskohdat voidaan jättää pois.\n"
-"       mount -a                 : liitä kaikki tiedostosta /etc/fstab\n"
-"       mount device             : liitä laite tunnettuun paikkaan\n"
-"       mount directory          : liitä tunnettu laite tänne\n"
-"       mount -t type dev dir    : ordinary mount command\n"
+"Tiedostossa /etc/fstab olevat yksityiskohdat voi jättää pois.\n"
+"        mount -a [-t|-O] ...     : liitä kaikki tiedostosta /etc/fstab\n"
+"        mount laite              : liitä laite tunnettuun paikkaan\n"
+"        mount hakemisto          : liitä tunnettu laite tänne\n"
+"        mount -t tyyppi laite hak: normaali liitoskomento\n"
 "Huomaa, että oikeasti ei liitetä laitetta, vaan laitteella oleva\n"
 "(annetun tyypin mukainen) tiedostojärjestelmä.\n"
-"Voidaan myös liittää jo näkyvä hakemistopuu muualle:\n"
-"       mount --bind vanha_hak uusi_hak\n"
+"Voidaan myös liittää jo näkyvissä oleva hakemistopuu muualle:\n"
+"        mount --bind vanha_hak uusi_hak\n"
 "tai siirtää alipuu:\n"
-"       mount --move vanha_hak uusi_hak\n"
+"        mount --move vanha_hak uusi_hak\n"
 "Laite voidaan antaa nimellä, esim. /dev/hda1 tai /dev/cdrom,\n"
 "tai nimiöllä, käyttäen  -L nimiö  tai uuid:lla, käyttäen  -U uuid .\n"
 "Muut valitsimet: [-nfFrsvw] [-o valitsimet].\n"
 "Paljon lisätietoja komennolla:  man 8 mount .\n"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1563
 msgid "mount: only root can do that"
 msgstr "mount: vain root voi tehdä tuon"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1568
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ei löytynyt %s - luodaan se..\n"
 
-#: mount/mount.c:1568
+#: 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:1575
+#: mount/mount.c:1589
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: liitetään %s\n"
 
-#: mount/mount.c:1584
+#: mount/mount.c:1598
 msgid "nothing was mounted"
 msgstr "mitään ei liitetty"
 
-#: mount/mount.c:1599
+#: mount/mount.c:1613
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s ei löydy tiedostosta %s"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1628
 #, 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:259
+#: mount/mount_by_label.c:189
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
-"mount: ei voitu avata laitetta %s, joten UUID- ja LABEL-muunnosta ei voi "
+"mount: laitetta %s ei voitu avata, joten UUID- ja LABEL-muunnosta ei voi "
 "tehdä.\n"
 
-#: mount/mount_by_label.c:378
+#: mount/mount_by_label.c:309
 msgid "mount: bad UUID"
 msgstr "mount: virheellinen UUID"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:483
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: virhe arvattaessa tiedostojärjestelmän tyyppiä\n"
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:492
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr "mount: et määrittänyt tyyppiä tiedostojärjestelmälle %s\n"
+msgstr "mount: et antanut tyyppiä tiedostojärjestelmälle %s\n"
 
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:495
 #, 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:499
+#: mount/mount_guess_fstype.c:498
 msgid "       and it looks like this is swapspace\n"
 msgstr "       ja tämä näyttää olevan sivutustilaa\n"
 
-#: mount/mount_guess_fstype.c:501
+#: mount/mount_guess_fstype.c:500
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Kokeillaan tyyppiä %s\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:588
 #, c-format
 msgid "Trying %s\n"
 msgstr "Kokeillaan %s\n"
@@ -8127,7 +8194,7 @@
 #: mount/nfsmount.c:267 mount/nfsmount.c:522
 #, c-format
 msgid "mount: can't get address for %s\n"
-msgstr "mount: ei voi hakea osoitetta nimelle %s\n"
+msgstr "mount: nimelle %s ei voi hakea osoitetta\n"
 
 #: mount/nfsmount.c:273
 msgid "mount: got bad hp->h_length\n"
@@ -8186,7 +8253,7 @@
 #: mount/nfsmount.c:754
 #, c-format
 msgid "using port %d for nfs deamon\n"
-msgstr "käytetään porttia %d nfs-demonille\n"
+msgstr "käytetään porttia %d nfs-palvelimelle\n"
 
 #: mount/nfsmount.c:765
 msgid "nfs connect"
@@ -8201,8 +8268,8 @@
 msgid "bug in xstrndup call"
 msgstr "ohjelmistovirhe xstrndup-kutsussa"
 
-#: mount/swapon.c:64
-#, fuzzy, c-format
+#: mount/swapon.c:74
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
@@ -8210,11 +8277,11 @@
 "       %s [-s]\n"
 msgstr ""
 "käyttö: %s [-hV]\n"
-"        %s -a [-v]\n"
+"        %s -a [-e] [-v]\n"
 "        %s [-v] [-p prioriteetti] erikoistiedosto ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:84
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8225,36 +8292,103 @@
 "        %s -a [-v]\n"
 "        %s [-v] erikoistiedosto ...\n"
 
-#: mount/swapon.c:178 mount/swapon.c:242
+#: mount/swapon.c:120 sys-utils/readprofile.c:69
+msgid "out of memory"
+msgstr "muisti lopussa"
+
+#: mount/swapon.c:201 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s laitteella %s\n"
 
-#: mount/swapon.c:182
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
-msgstr "swapon: ei voi lukea tiedoston %s tilaa: %s\n"
+msgstr "swapon: tiedoston %s tilaa ei voi lukea: %s\n"
 
-#: mount/swapon.c:193
+#: mount/swapon.c:216
 #, 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:205
+#: mount/swapon.c:228
 #, 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:248
+#: mount/swapon.c:271
 msgid "Not superuser.\n"
 msgstr "Et ole pääkäyttäjä.\n"
 
-#: mount/swapon.c:312 mount/swapon.c:401
+#: 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
 #, c-format
 msgid "%s: cannot open %s: %s\n"
-msgstr "%s: ei voi avata %s: %s\n"
+msgstr "%s: tiedostoa %s ei voi avata: %s\n"
 
 #: mount/umount.c:77
 msgid "umount: compiled without support for -f\n"
@@ -8287,7 +8421,7 @@
 #: mount/umount.c:227
 #, c-format
 msgid "umount: %s: can't write superblock"
-msgstr "umount: %s: ei voi kirjoittaa superlohkoa"
+msgstr "umount: %s: superlohkoa ei voi kirjoittaa"
 
 #. Let us hope fstab has a line "proc /proc ..."
 #. and not "none /proc ..."
@@ -8323,7 +8457,8 @@
 #: mount/umount.c:301
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
-msgstr "ei voitu irroittaa %s - yritetään sen sijaan irroittaa %s\n"
+msgstr ""
+"kohteen %s irrottaminen epäonnistui - yritetään sen sijaan irrottaa %s\n"
 
 #: mount/umount.c:319
 #, c-format
@@ -8333,32 +8468,33 @@
 #: mount/umount.c:329
 #, c-format
 msgid "umount: could not remount %s read-only\n"
-msgstr "umount: ei voinut uudelleenliittää %s vain luku -tilassa\n"
+msgstr ""
+"umount: kohteen %s uudelleenliittäminen vain luku -tilassa epäonnistui\n"
 
 #: mount/umount.c:338
 #, c-format
 msgid "%s umounted\n"
-msgstr "%s irroitettu\n"
+msgstr "%s irrotettu\n"
 
 #: mount/umount.c:426
 msgid "umount: cannot find list of filesystems to unmount"
-msgstr "umount: irroitettavien tiedostojärjestelmien listaa ei löydy"
+msgstr "umount: irrotettavien tiedostojärjestelmien listaa ei löydy"
 
 #: mount/umount.c:457
-#, fuzzy
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Käyttö: umount [-hV]\n"
-"        umount -a [-f] [-r] [-n] [-v] [-t vtied.järj.tyypit]\n"
-"        umount [-f] [-r] [-n] [-v] erityinen | solmu...\n"
+"        umount -a [-f] [-r] [-n] [-v] [-t vtied.järj.tyypit] [-O "
+"valitsimet]\n"
+"        umount [-f] [-r] [-n] [-v] erikoistied | solmu...\n"
 
 #: mount/umount.c:539
 #, c-format
 msgid "Trying to umount %s\n"
-msgstr "Yritetään irroittaa %s\n"
+msgstr "Yritetään irrottaa %s\n"
 
 #: mount/umount.c:543
 #, c-format
@@ -8378,25 +8514,25 @@
 #: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr "umount: %s ei ole fstabissa (etkä ole root)"
+msgstr "umount: %s ei ole tiedostossa fstab (etkä ole root)"
 
-#: mount/umount.c:564
+#: mount/umount.c:566
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s on ristiriidassa tiedoston fstab kanssa"
 
-#: mount/umount.c:598
+#: mount/umount.c:602
 #, c-format
 msgid "umount: only root can unmount %s from %s"
-msgstr "umount: vain root voi irroittaa laitteen %s paikasta %s"
+msgstr "umount: vain root voi irrottaa laitteen %s paikasta %s"
 
-#: mount/umount.c:669
+#: mount/umount.c:671
 msgid "umount: only root can do that"
 msgstr "umount: vain root voi tehdä tämän"
 
 #: sys-utils/ctrlaltdel.c:27
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr "Vain root voi määrittää Ctrl-Alt-Del -vaikutuksen.\n"
+msgstr "Vain root voi määritellä Ctrl-Alt-Del:n vaikutuksen.\n"
 
 #: sys-utils/ctrlaltdel.c:42
 msgid "Usage: ctrlaltdel hard|soft\n"
@@ -8460,27 +8596,27 @@
 #: sys-utils/cytune.c:345
 #, c-format
 msgid "Can't open %s: %s\n"
-msgstr "Ei voi avata %s: %s\n"
+msgstr "Laitetta %s ei voi avata: %s\n"
 
 #: sys-utils/cytune.c:263
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr "Ei voi asettaa laitteelle %s kynnystä %d: %s\n"
+msgstr "Laitteelle %s ei voi asettaa kynnystä %d: %s\n"
 
 #: sys-utils/cytune.c:282
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr "Ei voi asettaa laitteelle %s aikakynnystä %d: %s\n"
+msgstr "Laitteelle %s ei voi asettaa aikakynnystä %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 "Ei voi hakea kynnystä laitteelle %s: %s\n"
+msgstr "Laitteelle %s ei voi hakea kynnystä: %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 "Ei voi hakea aikarajaa laitteelle %s. %s\n"
+msgstr "Laitteelle %s ei voi hakea aikarajaa: %s\n"
 
 #: sys-utils/cytune.c:312
 #, c-format
@@ -8494,7 +8630,7 @@
 
 #: sys-utils/cytune.c:333
 msgid "Can't set signal handler"
-msgstr "Ei voi asettaa signaalikäsittelijää"
+msgstr "Signaalikäsittelijää ei voi asettaa"
 
 #: sys-utils/cytune.c:337 sys-utils/cytune.c:372
 msgid "gettimeofday failed"
@@ -8503,7 +8639,7 @@
 #: sys-utils/cytune.c:350 sys-utils/cytune.c:382
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr "Ei voi käyttää CYGETMONia laitteelle %s: %s\n"
+msgstr "Laitteelle %s ei voi käyttää CYGETMONia: %s\n"
 
 #: sys-utils/cytune.c:424
 #, c-format
@@ -8529,7 +8665,7 @@
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec; %f rec (char/sec)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Käyttö: %s [-c] [-n taso] [-s puskurin_koko]\n"
@@ -8542,7 +8678,7 @@
 #: sys-utils/ipcrm.c:84
 #, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr "ei voi poistaa id:tä %s (%s)\n"
+msgstr "id:tä %s ei voi poistaa (%s)\n"
 
 #: sys-utils/ipcrm.c:99
 #, c-format
@@ -9068,9 +9204,9 @@
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:615
 #, c-format
@@ -9177,15 +9313,15 @@
 #: sys-utils/rdev.c:70
 msgid ""
 "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (tai rdev /linux, jne) näyttää nykyisen ROOT-laitteen"
+msgstr "  rdev /dev/fd0  (tai rdev /linux, jne) näyttää nykyisen JUURIlaitteen"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2   \t  asettaa ROOTiksi /dev/hda2"
+msgstr "  rdev /dev/fd0 /dev/hda2   \t  asettaa JUUREKSI /dev/hda2"
 
 #: sys-utils/rdev.c:72
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr "  rdev -R /dev/fd0 1\t\t  aseta ROOTFLAGS (vain luku -tila)"
+msgstr "  rdev -R /dev/fd0 1\t\t  aseta JUURILIPUT (vain luku -tila)"
 
 #: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
@@ -9227,12 +9363,13 @@
 msgstr "puuttuva pilkku"
 
 # c-format
-#: sys-utils/readprofile.c:60
+#: 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"
@@ -9243,48 +9380,45 @@
 "\t -V            print version and exit\n"
 msgstr ""
 "%s: Käyttö: \"%s [valitsimet]\n"
-"\t -m <karttatied> (oletus = \"%s\")\n"
-"\t -p <profiili>   (default = \"%s\")\n"
+"\t -m <karttatied> (oletukset: \"%s\" ja\n"
+"\t\t\t\t    \"%s\")\n"
+"\t -p <profiili>   (oletus: \"%s\")\n"
 "\t -M <mult>       asettaa profilointikertoimeksi <mult>\n"
-"\t -i              näyttää vain tieto \"sampling step\":istä\n"
-"\t -v              print verbose data\n"
+"\t -i              näyttää vain tiedon \"sampling step\":istä\n"
+"\t -v              monisanaisuus\n"
 "\t -a              näyttää kaikki symbolit, vaikka määrä olisi 0\n"
 "\t -b              näyttää yksittäiset \"histogram-bin\"-määrät\n"
-"\t -r              nollaa kaikki laskurit (vain root)\n"
+"\t -r              nollaa kaikki laskurit (vain pääkäyttäjälle)\n"
 "\t -n              poistaa käytöstä tavujärjestyksen automaattitunnistuksen\n"
 "\t -V              näyttää version ja poistuu\n"
 
-#: sys-utils/readprofile.c:84
-msgid "out of memory"
-msgstr "muisti lopussa"
-
-#: sys-utils/readprofile.c:147
+#: sys-utils/readprofile.c:188
 #, c-format
-msgid "%s Version %s\n"
+msgid "%s version %s\n"
 msgstr "%s versio %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): väärä kartan rivi\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:308
 #, 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:282
+#: sys-utils/readprofile.c:334
 #, 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:323
+#: sys-utils/readprofile.c:375
 msgid "total"
 msgstr "yhteensä"
 
@@ -9403,7 +9537,7 @@
 #: text-utils/col.c:548
 #, c-format
 msgid "col: warning: can't back up %s.\n"
-msgstr "col: varoitus: ei voi varmistaa %s.\n"
+msgstr "col: varoitus: varmistaminen ei onnistu %s.\n"
 
 #: text-utils/col.c:549
 msgid "past first line"
@@ -9444,7 +9578,7 @@
 #: text-utils/more.c:263
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr "käyttö: %s [-dflpcsu] [+rivinumero | +/kuvio] nimi1 nimi2 ...\n"
+msgstr "käyttö: %s [-dflpcsu] [+rivinumero | +/hahmo] nimi1 nimi2 ...\n"
 
 #: text-utils/more.c:521
 #, c-format
@@ -9484,7 +9618,7 @@
 
 #: text-utils/more.c:855
 msgid "[Press space to continue, 'q' to quit.]"
-msgstr "[Välilyönti jatkaa, 'q' lopettaa.]"
+msgstr "[Välilyönti jatkaa, \"q\" lopettaa.]"
 
 #: text-utils/more.c:1269
 #, c-format
@@ -9495,16 +9629,16 @@
 msgid "...back 1 page"
 msgstr "...1 sivu taaksepäin"
 
-#: text-utils/more.c:1313
+#: text-utils/more.c:1314
 msgid "...skipping one line"
 msgstr "...ohitetaan yksi rivi"
 
-#: text-utils/more.c:1315
+#: text-utils/more.c:1316
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...ohitetaan %d riviä"
 
-#: text-utils/more.c:1352
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
@@ -9514,80 +9648,108 @@
 "***Takaisin***\n"
 "\n"
 
-#: text-utils/more.c:1390
+#: 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"
+"Useimpia komentoja voi edeltää valinnainen kokonaislukuargumentti k.\n"
+"Oletusasetukset hakasulkeissa.\n"
+"Asteriskilla (*) merkityissä komennoissa argumentista tulee uusi "
+"oletusarvo.\n"
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1398
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
+"<väli>                  Näytä seuraavat k riviä tekstiä [nykyinen ruudun "
+"rivimäärä]\n"
+"z                       Näytä seuraavat k riviä tekstiä [nykyinen ruudun "
+"rivimäärä]*\n"
+"<return>                Näytä seuraavat k riviä tekstiä [1]*\n"
+"d tai ctrl-D            Vieritä k riviä [nykyinen vieritysmäärä, alkuarvo 11]"
+"*\n"
+"q tai Q or <keskeytys>  Poistu moresta\n"
+"s                       Ohita k riviä ja siirry eteenpäin [1]\n"
+"f                       Ohita k ruutua tekstiä ja siirry eteenpäin [1]\n"
+"b tai ctrl-B            Ohita k ruutua tekstiä ja siirry taaksepäin [1]\n"
+"'                       Palaa kohtaan, josta edellinen haku alkoi\n"
+"=                       Näytä nykyinen rivinumero\n"
+"/<säännöllinen lauseke> Etsi säännöllisen lausekkeen k:s esiintymä [1]\n"
+"n                       Etsi edellisen säännöllisen lausekkeen k:s esiintymä "
+"[1]\n"
+"!<kom> tai :!<kom>      Käynnistä <kom> alikuoressa\n"
+"v                       Käynnistä /usr/bin/vi nykyiselle riville\n"
+"ctrl-L                  Piirrä ruutu uudelleen\n"
+":n                      Siirry k:nteen seuraavaan tiedostoon [1]\n"
+":p                      Siirry k:nteen edelliseen tiedostoon [1]\n"
+":f                      Näytä nykyinen tiedostonimi ja rivinumero\n"
+".                       Toista edellinen komento\n"
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
-msgstr "[Näppäin 'h' näyttää ohjeita.]"
+msgstr "[Näppäin \"h\" näyttää ohjeita.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" rivi %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Ei tiedosto] rivi %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
 msgstr "  Ylivuoto\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1642
 msgid "...skipping\n"
 msgstr "...ohitetaan\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
-msgstr "Virhe säännöllisessä ilmauksessa"
+msgstr "Virhe säännöllisessä lausekkeessa"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 "\n"
-"Kuviota ei löydy\n"
+"Hahmoa ei löydy\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
-msgstr "Kuvioita ei löydy"
+msgstr "Hahmoa ei löydy"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1748
 msgid "can't fork\n"
-msgstr "ei voi haarauttaa\n"
+msgstr "haarauttaminen ei onnistu\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
@@ -9595,19 +9757,19 @@
 "\n"
 "...Ohitetaan"
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1792
 msgid "...Skipping to file "
 msgstr "...Vaihdetaan tiedostoon "
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1794
 msgid "...Skipping back to file "
 msgstr "...Palataan tiedostoon "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2074
 msgid "Line too long"
 msgstr "Liian pitkä rivi"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
 msgstr "Ei edellistä komentoa korvattavaksi"
 
@@ -9627,7 +9789,7 @@
 #: text-utils/parse.c:63
 #, c-format
 msgid "hexdump: can't read %s.\n"
-msgstr "hexdump: ei voi lukea %s.\n"
+msgstr "hexdump: tiedostoa %s ei voi lukea.\n"
 
 #: text-utils/parse.c:68
 msgid "hexdump: line too long.\n"
@@ -9657,41 +9819,41 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: virheellinen muunnosmerkki %%%s.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
-"%s: Käyttö: %s [-number] [-p merkkijono] [-cefnrs] [+rivi] [+/kuvio/] "
+"%s: Käyttö: %s [-number] [-p merkkijono] [-cefnrs] [+rivi] [+/hahmo/] "
 "[tiedostot]\n"
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: valitsin vaatii argumentin -- %s\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: virheellinen valitsin -- %s\n"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 msgid "...skipping forward\n"
 msgstr "...ohitetaan eteenpäin\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 msgid "...skipping backward\n"
 msgstr "...ohitetaan taaksepäin\n"
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 msgid "No next file"
 msgstr "Ei seuraavaa tiedostoa"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 msgid "No previous file"
 msgstr "Ei edellistä tiedostoa"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Lukuvirhe tiedostosta %s\n"
@@ -9699,56 +9861,56 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Odottamaton tiedoston loppu (EOF) tiedostossa %s\n"
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Tuntematon virhe tiedostossa %s\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, c-format
 msgid "%s: Cannot create tempfile\n"
-msgstr "%s: Ei voi luoda väliaikaistiedostoa\n"
+msgstr "%s: Väliaikaistiedostoa ei voi luoda\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 msgid "RE error: "
-msgstr "RE-virhe: "
+msgstr "Virhe säännöllisessä lausekkeessa: "
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr "(tiedoston loppu)"
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr "Ei muistettua hakumerkkijonoa"
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 msgid "Cannot open "
 msgstr "Ei voi avata "
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 msgid "saved"
 msgstr "tallennettu"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !-komento ei ole sallittu rajoitetussa tilassa.\n"
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 msgid "fork() failed, try again later\n"
 msgstr "fork() epäonnistui, yritä myöhemmin uudelleen\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 msgid "(Next file: "
 msgstr "(Seuraava tiedosto: "
 
 #: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
-msgstr "Ei voi varata puskuritilaa\n"
+msgstr "Puskuritilaa ei voi varata\n"
 
 #: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
@@ -9770,7 +9932,7 @@
 
 #: text-utils/ul.c:425
 msgid "Unable to allocate buffer.\n"
-msgstr "Ei voi varata puskuria.\n"
+msgstr "Puskuria ei voi varata.\n"
 
 #: text-utils/ul.c:586
 msgid "Input line too long.\n"
@@ -9780,11 +9942,34 @@
 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 "del_loop(%s): success\n"
+#~ msgstr "del_loop(%s): onnistui\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 ""
+#~ "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 ""
+#~ "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"
+
+#~ 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 "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Osion %i loppu ei ole sylinterin rajalla:\n"
 
 #~ msgid "Can't open help file"
-#~ msgstr "Ei voi avata ohjetiedostoa"
+#~ msgstr "Ohjetiedostoa ei voi avata"
 
 #~ msgid ""
 #~ "\n"
diff --git a/po/fr.po b/po/fr.po
index 68faaec..541457b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,76 +1,74 @@
-# util-linux fr.po 
-# Copyright (C) 1999 Les Logiciels du Soleil
-# Vincent Renardias <vincent@ldsol.com>, 1999.
-# Martin Quinson <mquinson@zeppelin-cb.de>, 1999.
-# Beth Powell <bpowell@turbolinux.com>, 2000.
-# Christophe Merlet (RedFox) <christophe@merlet.net>, 2000.
+# Messages français pour util-linux.
+# Copyright © 2001 Free Software Foundation, Inc.
+# Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
 #
-# Permission is granted to copy and distribute this file and
-# modified versions of this file provided this header is not removed.
+# 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.10o\n"
-"POT-Creation-Date: 2002-11-25 00:47+0100\n"
-"PO-Revision-Date: 2000-09-07 19:17+0100\n"
-"Last-Translator: Christophe Merlet (RedFox) <christophe@merlet.net>\n"
-"Language-Team: Vincent Renardias <vincent@ldsol.com>\n"
+"Project-Id-Version: util-linux 2.11z\n"
+"POT-Creation-Date: 2003-02-05 06:31-0500\n"
+"PO-Revision-Date: 2003-07-08 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-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: disk-utils/blockdev.c:60
 msgid "set read-only"
-msgstr "défini en lecture seulement"
+msgstr "initialiser le mode lecture-seulement"
 
 #: disk-utils/blockdev.c:61
 msgid "set read-write"
-msgstr "défini en lecture-écriture"
+msgstr "initialiser le mode lecture-écriture"
 
 #: disk-utils/blockdev.c:64
 msgid "get read-only"
-msgstr ""
+msgstr "savoir si le statut du périphérique est en mode lecture-seulement"
 
 #: disk-utils/blockdev.c:67
 msgid "get sectorsize"
-msgstr ""
+msgstr "obtenir la taille des secteurs"
 
 #: disk-utils/blockdev.c:70
 msgid "get blocksize"
-msgstr ""
+msgstr "obtenir la taille des blocs"
 
 #: disk-utils/blockdev.c:73
 msgid "set blocksize"
-msgstr ""
+msgstr "initialiser la taille des blocs"
 
 #: disk-utils/blockdev.c:76
 msgid "get size"
-msgstr ""
+msgstr "obtenir la taille"
 
 #: disk-utils/blockdev.c:79
 msgid "set readahead"
-msgstr ""
+msgstr "initialiser la lecture avancée"
 
 #: disk-utils/blockdev.c:82
 msgid "get readahead"
-msgstr ""
+msgstr "obtenir la lecture avancée"
 
 #: disk-utils/blockdev.c:85
 msgid "flush buffers"
-msgstr "vide les tampons"
+msgstr "vider les tampons"
 
 #: disk-utils/blockdev.c:89
 msgid "reread partition table"
-msgstr "relecture de la table de partition"
+msgstr "relire la table de partition"
 
 #: disk-utils/blockdev.c:98
 msgid "Usage:\n"
-msgstr "Usage :\n"
+msgstr "Usage:\n"
 
 #: disk-utils/blockdev.c:100
 #, c-format
 msgid "  %s --report [devices]\n"
-msgstr ""
+msgstr "  %s --report [périphériques]\n"
 
 #: disk-utils/blockdev.c:101
 #, c-format
@@ -84,12 +82,12 @@
 #: disk-utils/blockdev.c:219
 #, c-format
 msgid "%s: Unknown command: %s\n"
-msgstr "%s : Commande inconnue : %s\n"
+msgstr "%s: commande inconnue: %s\n"
 
 #: disk-utils/blockdev.c:231 disk-utils/blockdev.c:240
 #, c-format
 msgid "%s requires an argument\n"
-msgstr "%s nécessite un argument\n"
+msgstr "%s requiert un argument\n"
 
 #: disk-utils/blockdev.c:278
 #, c-format
@@ -99,28 +97,28 @@
 #: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: cannot open %s\n"
-msgstr "%s : impossible d'ouvrir %s\n"
+msgstr "%s: ne peut ouvrir %s\n"
 
 #: disk-utils/blockdev.c:338
 #, c-format
 msgid "%s: ioctl error on %s\n"
-msgstr ""
+msgstr "%s: erreur ioctl() sur %s\n"
 
 #: disk-utils/blockdev.c:345
 msgid "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
-msgstr ""
+msgstr "RO    RA   SSZ   BSZ   Début Sec    Taille  Périphérique\n"
 
 #: disk-utils/elvtune.c:46 disk-utils/setfdprm.c:100
 msgid "usage:\n"
-msgstr "Usage :\n"
+msgstr "usage:\n"
 
 #: disk-utils/fdformat.c:31
 msgid "Formatting ... "
-msgstr "Formatage en cours ... "
+msgstr "Formattage en cours ... "
 
 #: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
 msgid "done\n"
-msgstr "terminé\n"
+msgstr "complété\n"
 
 #: disk-utils/fdformat.c:60
 msgid "Verifying ... "
@@ -128,12 +126,12 @@
 
 #: disk-utils/fdformat.c:71
 msgid "Read: "
-msgstr "Lecture : "
+msgstr "Lecture: "
 
 #: disk-utils/fdformat.c:73
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
-msgstr "Problème lors de la lecture du cylindre %d, %d attendu, %d lu\n"
+msgstr "Problème lors de la lecture du cylindre %d, expecté %d, lu %d\n"
 
 #: disk-utils/fdformat.c:79
 #, c-format
@@ -141,17 +139,17 @@
 "bad data in cyl %d\n"
 "Continuing ... "
 msgstr ""
-"Mauvaises données au cylindre %d\n"
-"Continuation..."
+"données corrompues dans le cylindre %d\n"
+"Poursuite du traitement ... "
 
 #: disk-utils/fdformat.c:94
 #, c-format
 msgid "usage: %s [ -n ] device\n"
-msgstr "Usage : %s [ -n ] périphérique\n"
+msgstr "usage: %s [ -n ] périphérique\n"
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -160,18 +158,18 @@
 msgstr "%s de %s\n"
 
 #: disk-utils/fdformat.c:130
-#, fuzzy, c-format
+#, c-format
 msgid "%s: not a block device\n"
-msgstr "%s : n'est pas un lecteur de disquettes.\n"
+msgstr "%s: n'est pas un périphérique de bloc\n"
 
 #: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
-msgstr "Impossible de déterminer le type du format en cours."
+msgstr "Ne peut déterminer le type de format courant"
 
 #: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
-msgstr "%s-faces, %d pistes, %d sec/piste. Capacité totale %d Ko.\n"
+msgstr "%s-côtés, %d pistes, %d secteurs/piste. Capacité totale %d kB.\n"
 
 #: disk-utils/fdformat.c:142
 msgid "Double"
@@ -190,106 +188,111 @@
 " -v         be more verbose\n"
 " file       file to test\n"
 msgstr ""
+"usage: %s [-hv] [-x dir] fichier\n"
+" -h         afficher l'aide\n"
+" -x dir     extraire dans le répertoire\n"
+" -v         travailler en mode bavard\n"
+" file       fichier à tester\n"
 
 #: disk-utils/fsck.cramfs.c:191
 #, c-format
 msgid "%s: error %d while decompressing! %p(%d)\n"
-msgstr ""
+msgstr "%s: erreur %d lors de la décompression! %p(%d)\n"
 
 #: disk-utils/fsck.cramfs.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "%s: size error in symlink `%s'\n"
-msgstr "Erreur d'écriture sur %s\n"
+msgstr "%s: erreur taille dans le lien symbolique « %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 ""
+msgstr "  décompression du bloc à %ld vers %ld (%ld)\n"
 
 #: disk-utils/fsck.cramfs.c:287
 #, c-format
 msgid "%s: bogus mode on `%s' (%o)\n"
-msgstr ""
+msgstr "%s: mode bogus sur « %s » (%o)\n"
 
 #: disk-utils/fsck.cramfs.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "  hole at %ld (%d)\n"
-msgstr "devrait être (%d, %d, %d)\n"
+msgstr "  trou à %ld (%d)\n"
 
 #: disk-utils/fsck.cramfs.c:337
 #, c-format
 msgid "%s: Non-block (%ld) bytes\n"
-msgstr ""
+msgstr "%s: (%ld) octets de type non bloc\n"
 
 #: disk-utils/fsck.cramfs.c:343
 #, c-format
 msgid "%s: Non-size (%ld vs %ld) bytes\n"
-msgstr ""
+msgstr "%s: (%ld vs %ld) octets de type non taille\n"
 
 #: disk-utils/fsck.cramfs.c:392
 #, c-format
 msgid "%s: invalid cramfs--bad path length\n"
-msgstr ""
+msgstr "%s: cramfs invalide -- longueur invalide du chemin\n"
 
 #: disk-utils/fsck.cramfs.c:472
-#, fuzzy, c-format
+#, c-format
 msgid "%s: compiled without -x support\n"
-msgstr "%s : non compilé avec prise en charge minix v2.\n"
+msgstr "%s: compilé sans support de -x\n"
 
 #: disk-utils/fsck.cramfs.c:498
 #, c-format
 msgid "%s: warning--unable to determine filesystem size \n"
-msgstr ""
+msgstr "%s: AVERTISSEMENT -- incapable de déterminer la taille du système de fichiers\n"
 
 #: disk-utils/fsck.cramfs.c:508
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not a block device or file\n"
-msgstr "%s : n'est pas un lecteur de disquettes.\n"
+msgstr "%s n'est pas un périphérique de type bloc ou de fichiers\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 ""
+msgstr "%s: cramfs invalide -- longueur du fichier trop courte\n"
 
 #: disk-utils/fsck.cramfs.c:541
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
-msgstr ""
+msgstr "%s: cramfs invalide -- nombre magique erroné\n"
 
 #: disk-utils/fsck.cramfs.c:554
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
-msgstr ""
+msgstr "%s: AVERTISSEMENT - longueur du fichier trop longue, remplissage de l'image?\n"
 
 #: disk-utils/fsck.cramfs.c:564
 #, c-format
 msgid "%s: invalid cramfs--crc error\n"
-msgstr ""
+msgstr "%s: cramfs invalide -- erreur CRC\n"
 
 #: disk-utils/fsck.cramfs.c:570
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
-msgstr ""
+msgstr "%s: AVERTISSEMENT -- vieille image cramfs, sans CRC\n"
 
 #: disk-utils/fsck.cramfs.c:592
 #, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
-msgstr ""
+msgstr "%s: cramfs invalide -- superbloc erroné\n"
 
 #: disk-utils/fsck.cramfs.c:608
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
-msgstr ""
+msgstr "%s: cramfs invalide -- fin des données du répertoire (%ld) != début des données du fichier (%ld)\n"
 
 #: disk-utils/fsck.cramfs.c:616
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
-msgstr ""
+msgstr "%s: cramfs invalide -- décalage invalide des données du fichier\n"
 
 #: disk-utils/fsck.minix.c:200
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr "Usage : %s [ -larvsmf ] /dev/nom\n"
+msgstr "Usage: %s [-larvsmf] /dev/nom\n"
 
 #: disk-utils/fsck.minix.c:307
 #, c-format
@@ -298,21 +301,21 @@
 
 #: disk-utils/fsck.minix.c:309
 msgid "Do you really want to continue"
-msgstr "Voulez-vous vraiment continuer ?"
+msgstr "Désirez-vous réellement continuer?"
 
 #: disk-utils/fsck.minix.c:313
 msgid "check aborted.\n"
-msgstr "Vérification interrompue.\n"
+msgstr "vérification stoppée.\n"
 
 #: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
-msgstr "Zone n° < FIRSTZONE dans fichier `%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
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
-msgstr "Zone n° >= ZONES dans fichier `%s'."
+msgstr "Zone nr >= valeur de ZONES dans le fichier « %s »."
 
 #: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
 msgid "Remove block"
@@ -321,110 +324,110 @@
 #: disk-utils/fsck.minix.c:384
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
-msgstr "Erreur de lecture : bloc impossible dans le fichier '%s'\n"
+msgstr "Erreur de lecture: incapable de repérer le bloc dans le fichier « %s »\n"
 
 #: disk-utils/fsck.minix.c:390
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
-msgstr "Erreur de lecture : mauvais bloc dans le fichier '%s'\n"
+msgstr "Erreur de lecture: bloc corrompu dans le fichier « %s »\n"
 
 #: disk-utils/fsck.minix.c:405
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
 msgstr ""
-"Erreur interne : tentative d'écriture d'un mauvais bloc.\n"
-"Requête d'écriture ignorée.\n"
+"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
 msgid "seek failed in write_block"
-msgstr "La recherche dans write_block a échoué."
+msgstr "échec de repérage durant l'écriture d'un bloc"
 
 #: disk-utils/fsck.minix.c:414
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
-msgstr "Erreur d'écriture : mauvais bloc dans le fichier '%s'\n"
+msgstr "Erreur d'écriture: bloc corrompu dans le fichier « %s »\n"
 
 #: disk-utils/fsck.minix.c:532
 msgid "seek failed in write_super_block"
-msgstr "La recherche dans write_super_block a échoué."
+msgstr "échec de repérage durant l'écriture du super bloc"
 
 #: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
 msgid "unable to write super-block"
-msgstr "Impossible d'écrire les superblocs"
+msgstr "incapble d'écrire dans le super bloc"
 
 #: disk-utils/fsck.minix.c:544
 msgid "Unable to write inode map"
-msgstr "Impossible d'écrire la table des i-noeuds"
+msgstr "incapable d'écrire la table de projection des inodes"
 
 #: disk-utils/fsck.minix.c:546
 msgid "Unable to write zone map"
-msgstr "Impossible d'écrire la table des zones"
+msgstr "incapable d'écrire dans la table de projection de zones"
 
 #: disk-utils/fsck.minix.c:548
 msgid "Unable to write inodes"
-msgstr "Impossible d'écrire les i-noeuds"
+msgstr "incapable d'écrire des inodes"
 
 #: disk-utils/fsck.minix.c:577
 msgid "seek failed"
-msgstr "La recherche a échoué."
+msgstr "échec de repérage"
 
 #: disk-utils/fsck.minix.c:579
 msgid "unable to read super block"
-msgstr "Impossible de lire les superblocs"
+msgstr "incapable de lire le super bloc"
 
 #: disk-utils/fsck.minix.c:599
 msgid "bad magic number in super-block"
-msgstr "Mauvais nombre magique dans le superbloc"
+msgstr "numéro magique corrompu dans le super bloc"
 
 #: disk-utils/fsck.minix.c:601
 msgid "Only 1k blocks/zones supported"
-msgstr "Seuls les blocs/zones de 1k sont pris en charge."
+msgstr "Blocs de 1k/zones seulement supportés"
 
 #: disk-utils/fsck.minix.c:603
 msgid "bad s_imap_blocks field in super-block"
-msgstr "Champ s_imap_blocks invalide dans le superbloc"
+msgstr "champ s_imap_blocks corrompu dans le super bloc"
 
 #: disk-utils/fsck.minix.c:605
 msgid "bad s_zmap_blocks field in super-block"
-msgstr "Champ s_zmap_blocks invalide dans le superbloc"
+msgstr "champ s_zmap_blocks corrompu dans le super bloc"
 
 #: disk-utils/fsck.minix.c:612
 msgid "Unable to allocate buffer for inode map"
-msgstr "Impossible d'allouer le tampon pour la table des i-noeuds"
+msgstr "incapable d'allouer un tampon pour la table de projection des inodes"
 
 #: disk-utils/fsck.minix.c:620
 msgid "Unable to allocate buffer for inodes"
-msgstr "Impossible d'allouer le tampon pour les i-noeuds"
+msgstr "incapable d'allouer un tampon pour des inodes"
 
 #: disk-utils/fsck.minix.c:623
 msgid "Unable to allocate buffer for inode count"
-msgstr "Impossible d'allouer le tampon pour le nombre de i-noeuds"
+msgstr "incapable d'allouer un tampon pour le compteur d'inodes"
 
 #: disk-utils/fsck.minix.c:626
 msgid "Unable to allocate buffer for zone count"
-msgstr "Impossible d'allouer le tampon pour le nombre de zones"
+msgstr "incapable d'allouer un tampon pour le compteur de zones"
 
 #: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
-msgstr "Impossible de lire la table des i-noeuds"
+msgstr "incapable de lire la table de projection des inodes"
 
 #: disk-utils/fsck.minix.c:630
 msgid "Unable to read zone map"
-msgstr "Impossible de lire la table des zones"
+msgstr "incapable de lire la table de projection de zone"
 
 #: disk-utils/fsck.minix.c:632
 msgid "Unable to read inodes"
-msgstr "Impossible de lire les i-noeuds"
+msgstr "Incapable de lire les inodes"
 
 #: disk-utils/fsck.minix.c:634
 msgid "Warning: Firstzone != Norm_firstzone\n"
-msgstr "Avertissement : Firstzone != Norm_firstzone\n"
+msgstr "AVERTISSEMENT: Firstzone != Norm_firstzone\n"
 
 #: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
 #, c-format
 msgid "%ld inodes\n"
-msgstr "%ld i-noeuds\n"
+msgstr "%ld inodes\n"
 
 #: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
 #, c-format
@@ -434,193 +437,195 @@
 #: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
-msgstr "Premièrezonededonnées=%ld (%ld)\n"
+msgstr "Firstdatazone=%ld (%ld)\n"
 
 #: disk-utils/fsck.minix.c:642 disk-utils/mkfs.minix.c:523
 #, c-format
 msgid "Zonesize=%d\n"
-msgstr "Tailledelazone=%d\n"
+msgstr "Taille zone=%d\n"
 
 #: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "Maxsize=%ld\n"
-msgstr "Taillemax=%ld\n"
+msgstr "Taille maximale=%ld\n"
 
 #: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "Filesystem state=%d\n"
-msgstr "Etat du système de fichiers=%d\n"
+msgstr "État du système de fichiers=%d\n"
 
 #: disk-utils/fsck.minix.c:645
 #, c-format
 msgid ""
 "namelen=%d\n"
 "\n"
-msgstr "longueurnom=%d\n"
+msgstr ""
+"longueur des noms=%d\n"
+"\n"
 
 #: disk-utils/fsck.minix.c:660 disk-utils/fsck.minix.c:712
-#, fuzzy, c-format
+#, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
-msgstr "I-noeud %d marqué libre, mais utilisé pour le fichier '"
+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
 msgid "Mark in use"
-msgstr "Marqué utilisé"
+msgstr "Marquage en cours"
 
 #: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
-#, fuzzy, c-format
+#, c-format
 msgid "The file `%s' has mode %05o\n"
-msgstr " a pour mode %05o\n"
+msgstr "Le fichier « %s » a pour mode %05o\n"
 
 #: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
 msgid "Warning: inode count too big.\n"
-msgstr "Avertissement : nombre de i-noeuds trop grand.\n"
+msgstr "AVERTISSEMENT: compte d'inodes trop grand.\n"
 
 #: disk-utils/fsck.minix.c:755
 msgid "root inode isn't a directory"
-msgstr "L' i-noeud root n'est pas un répertoire."
+msgstr "inode de la racine (root) n'est pas un répertoire"
 
 #: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:813
-#, fuzzy, c-format
+#, c-format
 msgid "Block has been used before. Now in file `%s'."
-msgstr "Bloc déjà utilisé. Maintenant dans le fichier `"
+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
 msgid "Clear"
-msgstr "Effacer"
+msgstr "Libre"
 
 #: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:825
-#, fuzzy, c-format
+#, c-format
 msgid "Block %d in file `%s' is marked not in use."
-msgstr "' est marqué libre."
+msgstr "Bloc %d dans le fichier « %s » est marqué non utilisé."
 
 #: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
 msgid "Correct"
 msgstr "Correct"
 
 #: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
-#, fuzzy, c-format
+#, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
-msgstr " contient un nombre i-noeuds incorrect pour le fichier "
+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
 msgid " Remove"
-msgstr "Supprimer"
+msgstr " Enlever"
 
 #: disk-utils/fsck.minix.c:990
-#, fuzzy, c-format
+#, c-format
 msgid "`%s': bad directory: '.' isn't first\n"
-msgstr ": mauvais répertoire : '.' ne vient pas en premier.\n"
+msgstr "« %s »: répertoire corrompu: « . » n'apparaît pas en premier\n"
 
 #: disk-utils/fsck.minix.c:998
-#, fuzzy, c-format
+#, c-format
 msgid "`%s': bad directory: '..' isn't second\n"
-msgstr ": mauvais répertoire : '..' ne vient pas en second.\n"
+msgstr "« %s »: répertoire corrompu: « .. » n'apparaît pas en second\n"
 
 #: disk-utils/fsck.minix.c:1058
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad directory: '.' isn't first\n"
-msgstr ": mauvais répertoire : '.' ne vient pas en premier.\n"
+msgstr "%s: répertoire corrompu: « . » n'apparaît pas en premier\n"
 
 #: disk-utils/fsck.minix.c:1067
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad directory: '..' isn't second\n"
-msgstr ": mauvais répertoire : '..' ne vient pas en second.\n"
+msgstr "%s: répertoire corrompu: « .. » n'apparaît pas en second\n"
 
 #: disk-utils/fsck.minix.c:1102
 msgid "internal error"
-msgstr "Erreur interne"
+msgstr "erreur interne"
 
 #: disk-utils/fsck.minix.c:1105 disk-utils/fsck.minix.c:1124
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad directory: size < 32"
-msgstr ": mauvais répertoire: taille < 32"
+msgstr "%s: répertoire corrompu: taille < 32"
 
 #: disk-utils/fsck.minix.c:1138
 msgid "seek failed in bad_zone"
-msgstr "La recherche dans bad_zone a échoué."
+msgstr "échec de repérage dans bad_zone"
 
 #: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1204
 #, c-format
 msgid "Inode %d mode not cleared."
-msgstr "Mode i-noeud %d non effacé."
+msgstr "Mode %d du inode pas réinitialisé."
 
 #: 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 "I-noeud %d libre, mais marqué utilisé dans le fichier 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
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
-msgstr "I-noeud %d utilisé, mais marqué libre dans le fichier bitmap."
+msgstr "Inode %d utilisé, marqué inutilisé dans la table des bits."
 
 #: 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 "I-noeud %d (mode = %07o), i_nlinks=%d, nombre=%d."
+msgstr "Inode %d (mode = %07o), i_nlinks=%d, décompte=%d."
 
 #: disk-utils/fsck.minix.c:1171 disk-utils/fsck.minix.c:1226
 msgid "Set i_nlinks to count"
-msgstr "Régler i_nlinks sur nombre"
+msgstr "Initilisation de i_nlinks pour décompte"
 
 #: 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 "Zone %d : marquée utilisée, mais aucun fichier ne l'utilise."
+msgstr "Zone %d: marqué utilisé, aucun fichier l'utilise."
 
 #: disk-utils/fsck.minix.c:1184 disk-utils/fsck.minix.c:1240
 msgid "Unmark"
-msgstr "Démarquer"
+msgstr "Non marqué"
 
 #: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
-#, fuzzy, c-format
+#, c-format
 msgid "Zone %d: in use, counted=%d\n"
-msgstr "Zone %d : %s utilisée, nombre=%d\n"
+msgstr "Zone %d: en usage, décompte=%d\n"
 
 #: disk-utils/fsck.minix.c:1192 disk-utils/fsck.minix.c:1248
-#, fuzzy, c-format
+#, c-format
 msgid "Zone %d: not in use, counted=%d\n"
-msgstr "Zone %d : %s utilisée, nombre=%d\n"
+msgstr "Zone %d: non utilisé, décompte=%d\n"
 
 #: disk-utils/fsck.minix.c:1220
 msgid "Set"
-msgstr "Définir"
+msgstr "Initialisé"
 
 #: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
 #: disk-utils/mkfs.minix.c:646
 msgid "bad inode size"
-msgstr "Taille de i-noeuds incorrecte"
+msgstr "taille d'inode corrompue"
 
 #: disk-utils/fsck.minix.c:1299
 msgid "bad v2 inode size"
-msgstr "Taille de i-noeuds v2 incorrecte"
+msgstr "taille d'inode v2 corrompu"
 
 #: disk-utils/fsck.minix.c:1325
 msgid "need terminal for interactive repairs"
-msgstr "Terminal requis pour réparations interactives"
+msgstr "nécessité d'utiliser un terminal pour des réparations en mode interactif"
 
 #: disk-utils/fsck.minix.c:1329
 #, c-format
 msgid "unable to open '%s'"
-msgstr "Impossible d'ouvrir '%s'"
+msgstr "incapable d'ouvrir « %s »"
 
 #: disk-utils/fsck.minix.c:1344
 #, c-format
 msgid "%s is clean, no check.\n"
-msgstr "%s est propre, pas de vérification.\n"
+msgstr "%s est propre, aucune vérification.\n"
 
 #: disk-utils/fsck.minix.c:1348
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
-msgstr "Forçage de la vérification du système de fichiers sur %s.\n"
+msgstr "Vérification forcée du système de fichiers sur %s.\n"
 
 #: disk-utils/fsck.minix.c:1350
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
-msgstr "Système de fichiers sur %s non propre. Vérification requise.\n"
+msgstr "Le système de fichiers de %s est corrompu, nécessité d'une vérification.\n"
 
 #: disk-utils/fsck.minix.c:1379
 #, c-format
@@ -629,12 +634,12 @@
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
 "\n"
-"%6ld i-noeuds utilisés (%ld%%)\n"
+"%6ld inodes utilisés (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1384
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
-msgstr "%6ld zones utilisées (%ld%%)\n"
+msgstr "%6ld zones utilisés (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1386
 #, c-format
@@ -650,10 +655,10 @@
 "%6d files\n"
 msgstr ""
 "\n"
-"%6d fichiers réguliers\n"
+"%6d fichier réguliers\n"
 "%6d répertoires\n"
-"%6d fichiers de périphérique de caractère\n"
-"%6d fichiers de périphérique de bloc\n"
+"%6d fichiers de caractères de périphérique\n"
+"%6d fichiers de périphérique de type bloc\n"
 "%6d liens\n"
 "%6d liens symboliques\n"
 "------\n"
@@ -665,39 +670,39 @@
 "FILE SYSTEM HAS BEEN CHANGED\n"
 "----------------------------\n"
 msgstr ""
-"------------------------------------\n"
-"LE SYSTÈME DE FICHIERS A ÉTÉ MODIFIÉ\n"
-"------------------------------------\n"
+"----------------------------\n"
+"SYSTÈME DE FICHIERS A CHANGÉ\n"
+"----------------------------\n"
 
 #: disk-utils/isosize.c:129
-#, fuzzy, c-format
+#, c-format
 msgid "%s: failed to open: %s\n"
-msgstr "Impossible d'ouvrir %s\n"
+msgstr "%s: échec d'ouverture: %s\n"
 
 #: disk-utils/isosize.c:135
-#, fuzzy, c-format
+#, c-format
 msgid "%s: seek error on %s\n"
-msgstr "Erreur d'écriture sur %s\n"
+msgstr "%s: erreur de repérage sur %s\n"
 
 #: disk-utils/isosize.c:141
-#, fuzzy, c-format
+#, c-format
 msgid "%s: read error on %s\n"
-msgstr "Erreur d'écriture sur %s\n"
+msgstr "%s: erreur de lecture sur %s\n"
 
 #: disk-utils/isosize.c:150
 #, c-format
 msgid "sector count: %d, sector size: %d\n"
-msgstr ""
+msgstr "décompte des secteurs: %d, taille de secteur: %d\n"
 
 #: disk-utils/isosize.c:198
 #, c-format
 msgid "%s: option parse error\n"
-msgstr ""
+msgstr "%s: erreur d'analyse syntaxique d'une option\n"
 
 #: disk-utils/isosize.c:206
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr ""
+msgstr "Usage: %s [-x] [-d <num>] image-iso9660\n"
 
 #: disk-utils/mkfs.bfs.c:88
 #, c-format
@@ -705,142 +710,136 @@
 "Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
 "       [-F fsname] device [block-count]\n"
 msgstr ""
+"Usage: %s [-v] [-N nb-d-inodes] [-V nom-du-volume]\n"
+"       [-F nom-système-de-fichiers] périphérique [numéro-de-bloc]\n"
 
 #: disk-utils/mkfs.bfs.c:135
-#, fuzzy
 msgid "volume name too long"
-msgstr "ligne trop longue"
+msgstr "nom de volume trop long"
 
 #: disk-utils/mkfs.bfs.c:142
-#, fuzzy
 msgid "fsname name too long"
-msgstr "Ligne trop longue"
+msgstr "nom de système de fichiers trop long"
 
 #: disk-utils/mkfs.bfs.c:167
-#, fuzzy, c-format
+#, c-format
 msgid "cannot stat device %s"
-msgstr "stat(%s) impossible"
+msgstr "ne peut évaluer par stat() le périphique %s"
 
 #: disk-utils/mkfs.bfs.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not a block special device"
-msgstr "mount : %s n'est pas un périphérique de bloc."
+msgstr "%s n'est pas un périphérique spécial de blocs"
 
 #: disk-utils/mkfs.bfs.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open %s"
-msgstr "Impossible d'ouvrir %s\n"
+msgstr "ne peut ouvrir %s"
 
 #: disk-utils/mkfs.bfs.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "cannot get size of %s"
-msgstr "Impossible de déterminer la taille du disque."
+msgstr "ne peut obtenir la taille de %s"
 
 #: disk-utils/mkfs.bfs.c:192
 #, c-format
 msgid "blocks argument too large, max is %lu"
-msgstr ""
+msgstr "argument de blocs trop grand, maximum est %lu"
 
 #: disk-utils/mkfs.bfs.c:207
 msgid "too many inodes - max is 512"
-msgstr ""
+msgstr "trop d'inodes - maximum est 512"
 
 #: disk-utils/mkfs.bfs.c:216
 #, c-format
 msgid "not enough space, need at least %lu blocks"
-msgstr ""
+msgstr "pas suffisamment d'espace, a besoin au moinds de %lu blocs"
 
 #: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2166
 #, c-format
 msgid "Device: %s\n"
-msgstr "Périphérique : %s\n"
+msgstr "Périphérique: %s\n"
 
 #: disk-utils/mkfs.bfs.c:229
 #, c-format
 msgid "Volume: <%-6s>\n"
-msgstr ""
+msgstr "Volume: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:230
 #, c-format
 msgid "FSname: <%-6s>\n"
-msgstr ""
+msgstr "Nom du système de fichiers: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "BlockSize: %d\n"
-msgstr "verrouillé"
+msgstr "Taille de bloc: %d\n"
 
 #: disk-utils/mkfs.bfs.c:233
 #, c-format
 msgid "Inodes: %d (in 1 block)\n"
-msgstr ""
+msgstr "Inodes: %d (dans 1 bloc)\n"
 
 #: disk-utils/mkfs.bfs.c:236
 #, c-format
 msgid "Inodes: %d (in %ld blocks)\n"
-msgstr ""
+msgstr "Inodes: %d (dans %ld blocs)\n"
 
 #: disk-utils/mkfs.bfs.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "Blocks: %ld\n"
-msgstr "trackskew : %d\n"
+msgstr "Blocs: %ld\n"
 
 #: disk-utils/mkfs.bfs.c:239
 #, c-format
 msgid "Inode end: %d, Data end: %d\n"
-msgstr ""
+msgstr "Fin d'inode: %d, Fin des données: %d\n"
 
 #: disk-utils/mkfs.bfs.c:244
-#, fuzzy
 msgid "error writing superblock"
-msgstr "Impossible d'écrire les superblocs"
+msgstr "erreur d'écriture du super bloc"
 
 #: disk-utils/mkfs.bfs.c:264
-#, fuzzy
 msgid "error writing root inode"
-msgstr "Erreur lors de l'écriture de %s: %s"
+msgstr "erreur d'écriture de l'inode de la racine (root)"
 
 #: disk-utils/mkfs.bfs.c:269
-#, fuzzy
 msgid "error writing inode"
-msgstr "Erreur lors de l'écriture de %s: %s"
+msgstr "erreur d'écriture d'inode"
 
 #: disk-utils/mkfs.bfs.c:272
-#, fuzzy
 msgid "seek error"
-msgstr ", erreur"
+msgstr "erreur de repérage"
 
 #: disk-utils/mkfs.bfs.c:278
-#, fuzzy
 msgid "error writing . entry"
-msgstr "Erreur lors de l'écriture de %s: %s"
+msgstr "erreur d'écriture de l'entrée « . »"
 
 #: disk-utils/mkfs.bfs.c:282
-#, fuzzy
 msgid "error writing .. entry"
-msgstr "Erreur lors de l'écriture de %s: %s"
+msgstr "erreur d'écriture de l'entrée « .. »"
 
 #: disk-utils/mkfs.bfs.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "error closing %s"
-msgstr "Erreur de fermeture de %s\n"
+msgstr "erreur de fermeture %s"
 
 #: disk-utils/mkfs.c:76
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
-msgstr "Usage : mkfs [-V] [-t fstype] [fs-options] périphérique [taille]\n"
+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-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
-msgstr "%s : A court de mémoire !\n"
+msgstr "%s: mémoire épuisée!\n"
 
 #: disk-utils/mkfs.c:99
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs version %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
+#: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
 "usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
@@ -857,305 +856,314 @@
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
+"usage: %s [-v] [-b taille_de_bloc] [-e édition] [-i fichier] [-n nom] répertoire fichier-sortie\n"
+" -h              afficher l'aide\n"
+" -v              travailler en mode bavard\n"
+" -E              transformer les avertissements en erreurs (status non zéro de fin d'exécution)\n"
+" -b blksz        utiliser cette taille de bloc, doit être égal à la taille de page\n"
+" -e édition      initialiser le numéro d'édition (partie de fsid)\n"
+" -i fichier      insérer un fichier image dans le système de fichiers (requiert >= 2.4.0)\n"
+" -n nom          initialiser le nom du système de fichiers cramfs\n"
+" -p              remplir par %d octets le code d'amorçage\n"
+" -s              trier les entrées de répertoire (option obsolète, ignorée)\n"
+" -z              faire des trous exlpicites (requiert >= 2.3.39)\n"
+" répertoire      racine du système de fichiers à être compresser\n"
+" fichier-sortie  fichier de sortie\n"
 
-#: disk-utils/mkfs.cramfs.c:328
+#: 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 ""
+"Très long (%u octets) nom de fichier « %s » repéré.\n"
+"SVP augmenter MAX_INPUT_NAMELEN dans mkcramfs.c et recompiler.  Fin d'exécution.\n"
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
-msgstr ""
+msgstr "système de ficheir trop gros. Fin d'exécution.\n"
 
-#: disk-utils/mkfs.cramfs.c:507
-msgid ""
-"Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
-"Exiting.\n"
-msgstr ""
+#: disk-utils/mkfs.cramfs.c:514
+msgid "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  Exiting.\n"
+msgstr "Dépassement de MAXENTRIES. Augmenter la valeur dans mkcramfs.c et recompiler. Fin d'exécution.\n"
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
-msgstr ""
+msgstr "AIEEE: bloc \"compressé\" vers > 2*longueur-de-bloc (%ld)\n"
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
-msgstr ""
+msgstr "%6.2f%% (%+d octets)\t%s\n"
 
-#: disk-utils/mkfs.cramfs.c:812
+#: 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 ""
+msgid "warning: guestimate of required size (upper bound) is %LdMB, but maximum image size is %uMB.  We might die prematurely.\n"
+msgstr "AVERTISSEMENT: taille estimée requise (limite supérieure) est %LdMo mais la taille maximum de l'image est %uMo. Arrêt prématuré possible.\n"
 
-#: disk-utils/mkfs.cramfs.c:853
-#, fuzzy, c-format
+#: disk-utils/mkfs.cramfs.c:860
+#, c-format
 msgid "Including: %s\n"
-msgstr "id invalide : %s\n"
+msgstr "Incluant: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
-msgstr ""
+msgstr "Données du répertoire: %d octets\n"
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
-msgstr ""
-
-#: disk-utils/mkfs.cramfs.c:872
-#, fuzzy, c-format
-msgid "Super block: %d bytes\n"
-msgstr "Espace utilisé = %d octets\n"
+msgstr "Tout: %d kiloctets\n"
 
 #: disk-utils/mkfs.cramfs.c:879
 #, c-format
-msgid "CRC: %x\n"
-msgstr ""
+msgid "Super block: %d bytes\n"
+msgstr "Super bloc: %d octets\n"
 
-#: disk-utils/mkfs.cramfs.c:884
+#: 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 ""
+msgstr "pas assez d'espace alloué pour l'image ROM (%Ld alloué, %d utilisé)\n"
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
-msgstr ""
+msgstr "Échec de l'écriture de l'image dans le ROM (%d %d)\n"
 
 #. (These warnings used to come at the start, but they scroll off the
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
-#, fuzzy
+#: disk-utils/mkfs.cramfs.c:912
 msgid "warning: filenames truncated to 255 bytes.\n"
-msgstr "Avertissement : nombre de i-noeuds trop grand.\n"
+msgstr "AVERTISSEMENT: noms de fichiers tronqués à 255 octets.\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
-msgstr ""
+msgstr "AVERTISSEMENT: fichiers escamotés en raison d'erreurs.\n"
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
-msgstr ""
+msgstr "AVERTISSEMENT: taille des fichiers tronquée à %luMo (moins 1 octets).\n"
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
-msgid ""
-"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr ""
+msgid "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "AVERTISSEMENT: uids tronqués à %u bits. (Ceci peut créer un problème de sécurité.)\n"
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
-msgid ""
-"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
-msgstr ""
+msgid "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgstr "AVERTISSEMENT: gids tronqués à %u bits. (Ceci peut créer un problème de sécurité.)\n"
 
-#: disk-utils/mkfs.cramfs.c:926
+#: 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 ""
+"AVERTISSEMENT: numéros de périphériques tronqués à %u bits.  Cela signifie que\n"
+"certains fichiers de périphériques seront erronés.\n"
 
 #: disk-utils/mkfs.minix.c:175
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
-msgstr "Usage : %s [-c | -l nomdefichier] [-nXX] [-iXX] /dev/nom [blocs]\n"
+msgstr "Usage: %s [-c | -l nom-de-fichier] [-nXX] [-iXX] /dev/name [blocs]\n"
 
 #: disk-utils/mkfs.minix.c:199
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
-msgstr "%s est monté ; pas de création de système de fichiers ici !"
+msgstr "%s est monté; ne peut faire un système de fichier ici!"
 
 #: disk-utils/mkfs.minix.c:260
 msgid "seek to boot block failed in write_tables"
-msgstr "La recherche de bloc d'amorce dans write_tables a échoué."
+msgstr "échec de repérage du bloc d'amorçage dans write_tables"
 
 #: disk-utils/mkfs.minix.c:262
 msgid "unable to clear boot sector"
-msgstr "Impossible d'effacer le secteur d'amorce."
+msgstr "incapable de libérer le secteur d'amorçage"
 
 #: disk-utils/mkfs.minix.c:264
 msgid "seek failed in write_tables"
-msgstr "La recherche dans write_tables a échoué."
+msgstr "échec de repérage dans write_tables"
 
 #: disk-utils/mkfs.minix.c:268
 msgid "unable to write inode map"
-msgstr "Impossible d'écrire la table des i-noeuds."
+msgstr "incapable d'écrire la table de projection des inodes"
 
 #: disk-utils/mkfs.minix.c:270
 msgid "unable to write zone map"
-msgstr "Impossible d'écrire la table des zones."
+msgstr "incapable d'écrire la table de projections des zones"
 
 #: disk-utils/mkfs.minix.c:272
 msgid "unable to write inodes"
-msgstr "Impossible d'écrire les i-noeuds."
+msgstr "incapable d'écrire les inodes"
 
 #: disk-utils/mkfs.minix.c:281
 msgid "write failed in write_block"
-msgstr "L'écriture dans write_block a échoué."
+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
 msgid "too many bad blocks"
-msgstr "Trop de mauvais blocs."
+msgstr "trop de blocs corrompus"
 
 #: disk-utils/mkfs.minix.c:297
 msgid "not enough good blocks"
-msgstr "Pas assez de bons blocs."
+msgstr "pas assez de blocs en bon état"
 
 #: disk-utils/mkfs.minix.c:509
 msgid "unable to allocate buffers for maps"
-msgstr "Impossible d'allouer le tampon pour les tables."
+msgstr "incapable d'allouer des tampons pour les tables de projection"
 
 #: disk-utils/mkfs.minix.c:518
 msgid "unable to allocate buffer for inodes"
-msgstr "Impossible d'allouer le tampon pour les i-noeuds."
+msgstr "incapable d'allouer un tampons pour les inodes"
 
 #: disk-utils/mkfs.minix.c:524
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
 "\n"
-msgstr "Taillemax=%ld\n"
+msgstr ""
+"Taille maximum=%ld\n"
+"\n"
 
 #: disk-utils/mkfs.minix.c:538
 msgid "seek failed during testing of blocks"
-msgstr "La recherche lors du test des blocs a échoué."
+msgstr "éched de repérage durant l'examen des blocs"
 
 #: disk-utils/mkfs.minix.c:546
 msgid "Weird values in do_check: probably bugs\n"
-msgstr "Valeurs étranges dans do_check : sans doute des bogues.\n"
+msgstr "Valeur étranges dans do_check: probablement un bug\n"
 
 #: disk-utils/mkfs.minix.c:577 disk-utils/mkswap.c:372
 msgid "seek failed in check_blocks"
-msgstr "La recherche dans check_blocks a échoué."
+msgstr "échec de repérage dans check_blocks"
 
 #: disk-utils/mkfs.minix.c:586
 msgid "bad blocks before data-area: cannot make fs"
-msgstr "Mauvais blocs avant la zone de données : impossible de créer 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
 #, c-format
 msgid "%d bad blocks\n"
-msgstr "%d mauvais blocs\n"
+msgstr "%d blocc corrompus\n"
 
 #: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
 msgid "one bad block\n"
-msgstr "un mauvais bloc\n"
+msgstr "un bloc corrompu\n"
 
 #: disk-utils/mkfs.minix.c:604
 msgid "can't open file of bad blocks"
-msgstr "Impossible d'ouvrir le fichier contenant les mauvais blocs."
+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 : non compilé avec prise en charge minix v2.\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 : nombre de blocs non indiqué.'"
+msgstr "erreur strtol(): numbre de blocs non spécifié"
 
 #: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
-msgstr "Impossible d'ouvrir %s"
+msgstr "incapable d'ouvrir %s"
 
 #: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
-msgstr "stat de %s impossible"
+msgstr "incapable d'évaluer par stat() %s"
 
 #: disk-utils/mkfs.minix.c:731
 #, c-format
 msgid "will not try to make filesystem on '%s'"
-msgstr "Pas de tentative de création d'un système de fichiers sur '%s'."
+msgstr "n'essayera pas de créer un système de fichiers sur « %s »"
 
 #: disk-utils/mkswap.c:178
 #, c-format
 msgid "Bad user-specified page size %d\n"
-msgstr "Mauvaise taille de page %d spécifié par l'utilisateur\n"
+msgstr "Taille de page erronée tel que spécifiée par l'usager %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 ""
-"Utilise une taille de page %d spécifié par l'utilisateur, au lieu des "
-"valeurs système %d/%d\n"
+msgstr "Utilise la taille de page spécifiée par l'usager %d, au lieu de %d/%d\n"
 
 #: disk-utils/mkswap.c:191
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr "Pages de format %d (pas %d) attendues.\n"
+msgstr "On assume des pages de taille %d (pas %d)\n"
 
 #: disk-utils/mkswap.c:326
 #, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
-msgstr "Usage : %s [-c] [-v0|-v1] [-pTAILLEPG] /dev/nom [taille en blocs]\n"
+msgstr "Usage: %s [-c] [-v0|-v1] [-pTAILLE-PAGES] /dev/name [blocs]\n"
 
 #: disk-utils/mkswap.c:349
 msgid "too many bad pages"
-msgstr "Trop de mauvaises pages"
+msgstr "trop de pages corrompus"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1145
+#: text-utils/more.c:2064 text-utils/more.c:2075
 msgid "Out of memory"
-msgstr "A court de mémoire"
+msgstr "Mémoire épuisée"
 
 #: disk-utils/mkswap.c:380
 msgid "one bad page\n"
-msgstr "une mauvaise page\n"
+msgstr "une page corrompue\n"
 
 #: disk-utils/mkswap.c:382
 #, c-format
 msgid "%d bad pages\n"
-msgstr "%d mauvaises pages\n"
+msgstr "%d pages corrompues\n"
 
 #: disk-utils/mkswap.c:501
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
-msgstr "%s : erreur  : aucun endroit défini pour l'échange ?\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"
-msgstr ""
-"%s : erreur : la taille %ld est plus grande que celle du périphérique : %d\n"
+msgstr "%s: erreur: taille %ld est plus grande que la taille du périphérique %d\n"
 
 #: disk-utils/mkswap.c:538
 #, c-format
 msgid "%s: error: unknown version %d\n"
-msgstr "%s : erreur : version inconnue %d\n"
+msgstr "%s: erreur: version inconnue %d\n"
 
 #: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
-msgstr ""
-"%s : erreur : la taille de la zone d'échange doit être d'au moins %ldKo\n"
+msgstr "%s: erreur: zone d'échange (swap) a besoin d'une taille d'au moins %ldkB\n"
 
 #: disk-utils/mkswap.c:562
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
-msgstr "%s : avertissement : troncature de la zone d'échange à %ldKo\n"
+msgstr "%s: AVERTISSEMENT: truncation de la zone d'échange (swap) à %ldkB\n"
 
+# disk-utils/mkswap.c:566
 #: disk-utils/mkswap.c:576
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
-msgstr "Pas d'essai de création de périphérique d'échange sur '%s'"
+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
 msgid "fatal: first page unreadable"
-msgstr "Erreur bloquante : première page illisible."
+msgstr "ERREUR FATALE: la première page est illisible"
 
 #: disk-utils/mkswap.c:591
 #, c-format
@@ -1165,77 +1173,78 @@
 "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 : Le périphérique '%s' contient un libellé de disque Sun valide.\n"
-"Ceci signifie probablement que la création du swap v0 détruirait la table de "
-"partition.\n"
-"Aucun swap créé. Si vous voulez toujours créer un swap v0 sur ce "
-"périphérique, utilisez\n"
-"l'option -f pour forcer celui-ci.\n"
+"%s: périphérique « %s » contient une étiquette de disque Sun valide.\n"
+"Ce veut dire probablement que la création de la zone d'change (swap) v0\n"
+"détruirait la table de partitions. Aucune zone d'échange(swap) n'a été créée\n"
+"Si vous désirez en créer une sur ce périphérique, utiliser l'option -f\n"
+"pour forcer sa création.\n"
 
+# disk-utils/mkswap.c:605
 #: disk-utils/mkswap.c:615
 msgid "Unable to set up swap-space: unreadable"
-msgstr "Impossible de configurer l'espace d'échange : illisible."
+msgstr "Incapable de fixer l'espace de swap: illisible"
 
+# disk-utils/mkswap.c:606
 #: disk-utils/mkswap.c:616
-#, fuzzy, c-format
+#, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
-msgstr "Configuration de l'espace d'échange version %d, taille = %ld octets\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
 msgid "unable to rewind swap-device"
-msgstr "Impossible de rembobiner le périphérique d'échange."
+msgstr "incapable de rembobiner le périphérique de swap"
 
 #: disk-utils/mkswap.c:625
 msgid "unable to write signature page"
-msgstr "Impossible d'écrire la page de signature."
+msgstr "incapable d'écrire la page de signature"
 
+# disk-utils/mkswap.c:623
 #: disk-utils/mkswap.c:633
 msgid "fsync failed"
-msgstr "Échec de fsync."
+msgstr "Échec de la synchronisation du système de fichiers par fsync"
 
 #: disk-utils/setfdprm.c:31
 #, c-format
 msgid "Invalid number: %s\n"
-msgstr "Nombre invalide : %s\n"
+msgstr "Nombre invalide: %s\n"
 
 #: disk-utils/setfdprm.c:81
 #, c-format
 msgid "Syntax error: '%s'\n"
-msgstr "Erreur de syntaxe : '%s'\n"
+msgstr "Erreur de syntaxe: « %s »\n"
 
 #: disk-utils/setfdprm.c:91
 #, c-format
 msgid "No such parameter set: '%s'\n"
-msgstr "Ce paramètre n'est pas défini : '%s'\n"
+msgstr "Aucun paramètre de ce type initialisé: « %s »\n"
 
 #: disk-utils/setfdprm.c:101
-#, fuzzy, c-format
+#, c-format
 msgid "   %s [ -p ] dev name\n"
-msgstr "Usage : %s [ -p ] nom périph\n"
+msgstr "   %s [ -p ] périphérique nom\n"
 
+# disk-utils/setfdprm.c:101
 #: disk-utils/setfdprm.c:102
-#, fuzzy, c-format
-msgid ""
-"   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"       %s [ -p ] périph taille sect têtes pistes étendue intervalle taux "
-"spec1 fmt_intervalle\n"
+#, c-format
+msgid "   %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+msgstr "   %s [ -p ] périphérique taille sect têtes pistes stretch intervalle taux spec1 format_de_intervalle\n"
 
 #: disk-utils/setfdprm.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "   %s [ -c | -y | -n | -d ] dev\n"
-msgstr "       %s [ -c | -y | -n | -d ] périph\n"
+msgstr "   %s [ -c | -y | -n | -d ] périphérique\n"
 
 #: disk-utils/setfdprm.c:107
-#, fuzzy, c-format
+#, c-format
 msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr "       %s [ -c | -y | -n ] périph\n"
+msgstr "   %s [ -c | -y | -n ] périphérique\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1993
 msgid "Unusable"
 msgstr "Inutilisable"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Espace libre"
 
@@ -1244,19 +1253,16 @@
 msgstr "Linux ext2"
 
 #: fdisk/cfdisk.c:402
-#, fuzzy
 msgid "Linux ext3"
-msgstr "Linux ext2"
+msgstr "Linux ext3"
 
 #: fdisk/cfdisk.c:404
-#, fuzzy
 msgid "Linux XFS"
-msgstr "Linux"
+msgstr "Linux XFS"
 
 #: fdisk/cfdisk.c:406
-#, fuzzy
 msgid "Linux ReiserFS"
-msgstr "Linux"
+msgstr "Linux ReiserFS"
 
 #. also Solaris
 #: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57
@@ -1277,13 +1283,11 @@
 
 #: fdisk/cfdisk.c:428
 msgid "Disk has been changed.\n"
-msgstr "Le disque a été changé.\n"
+msgstr "Disque a été changé.\n"
 
 #: fdisk/cfdisk.c:429
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
-msgstr ""
-"Réamorcez le système pour être sûr que la table de partition a été "
-"correctement mise à jour.\n"
+msgstr "Réamorcer le système pour s'assurer que la table de partition a été correctement mise à jour.\n"
 
 #: fdisk/cfdisk.c:432
 msgid ""
@@ -1293,29 +1297,29 @@
 "page for additional information.\n"
 msgstr ""
 "\n"
-"AVERTISSEMENT : Si vous avez créé ou modifié\n"
-"une des partitions DOS 6.x, reportez-vous au manuel\n"
-"de cfdisk pour plus d'informations.\n"
+"AVERTISSEMENT: si vous avez créé ou modifié une\n"
+"partition DOS 6.x, svp consulter les pages du manuel\n"
+"de cfdisk pour de plus amples informations.\n"
 
 #: fdisk/cfdisk.c:527
 msgid "FATAL ERROR"
-msgstr "ERREUR BLOQUANTE"
+msgstr "ERREUR FATALE"
 
 #: fdisk/cfdisk.c:528
 msgid "Press any key to exit cfdisk"
-msgstr "Appuyez sur une touche pour quitter cfdisk."
+msgstr "Appuyer n'importe quelle clé pour quitter cfdisk"
 
 #: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
 msgid "Cannot seek on disk drive"
-msgstr "Erreur d'accès sur le disque dur"
+msgstr "Ne peut effectuer de repérage sur l'unité de disque"
 
 #: fdisk/cfdisk.c:577
 msgid "Cannot read disk drive"
-msgstr "Impossible de lire le disque dur"
+msgstr "Ne peut lire à partir de l'unité de disque"
 
 #: fdisk/cfdisk.c:585
 msgid "Cannot write disk drive"
-msgstr "Impossible d'écrire sur le disque dur"
+msgstr "Ne peut lire de l'unité de disque"
 
 #: fdisk/cfdisk.c:885
 msgid "Too many partitions"
@@ -1323,763 +1327,724 @@
 
 #: fdisk/cfdisk.c:890
 msgid "Partition begins before sector 0"
-msgstr "La partition commence avant le secteur 0."
+msgstr "La partition débute avant le secteur 0"
 
 #: fdisk/cfdisk.c:895
 msgid "Partition ends before sector 0"
-msgstr "La partition se termine avant le secteur 0."
+msgstr "La partition se termine avant le secteur 0"
 
 #: fdisk/cfdisk.c:900
 msgid "Partition begins after end-of-disk"
-msgstr "La partition commence après la fin du disque."
+msgstr "La partition débute après la fin du disque"
 
 #: fdisk/cfdisk.c:905
 msgid "Partition ends after end-of-disk"
-msgstr "La partition se termine après la fin du disque."
+msgstr "La partition se termine après la fin du disque"
 
 #: fdisk/cfdisk.c:910
 msgid "Partition ends in the final partial cylinder"
-msgstr ""
+msgstr "Partition se termine dans le cylindre final"
 
 #: fdisk/cfdisk.c:934
 msgid "logical partitions not in disk order"
-msgstr "Les partitions logiques ne suivent pas l'ordre du disque."
+msgstr "partitions logiques ne sont pas en ordre sur le disque"
 
 #: fdisk/cfdisk.c:937
 msgid "logical partitions overlap"
-msgstr "Les partitions logiques se chevauchent."
+msgstr "chevauchement des partitions logiques"
 
 #: fdisk/cfdisk.c:939
 msgid "enlarged logical partitions overlap"
-msgstr "Les partitions logiques étendues se chevauchent."
+msgstr "chevauchement des partitions logiques qui ont été grossies"
 
 #: fdisk/cfdisk.c:969
-msgid ""
-"!!!! Internal error creating logical drive with no extended partition !!!!"
-msgstr ""
-"!!!! Erreur interne lors de la création d'un lecteur logique sans partition "
-"étendue !!!!"
+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
-msgid ""
-"Cannot create logical drive here -- would create two extended partitions"
-msgstr ""
-"Impossible de créer un lecteur logique ici -- cela créerait deux partitions "
-"étendues."
+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
 msgid "Menu item too long. Menu may look odd."
-msgstr "Elément de menu trop long. Le menu risque de paraître bizarre."
+msgstr "Item de menu trop long. Le menu pourrait paraître erroné."
 
 #: fdisk/cfdisk.c:1193
 msgid "Menu without direction. Defaulting horizontal."
-msgstr "Menu sans direction. Horizontal par défaut."
+msgstr "Menu sans direction. Mis en horizontal par défaut."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
-msgstr "Touche non valide"
+msgstr "Clé illégale"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
-msgstr "Appuyez sur une touche pour continuer."
+msgstr "Appuyer sur une touche pour continuer"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2497
 msgid "Primary"
 msgstr "Primaire"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Créer une nouvelle partition primaire"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2497
 msgid "Logical"
 msgstr "Logique"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Créer une nouvelle partition logique"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Annuler"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
-msgstr "Ne pas créer la partition"
+msgstr "Ne pas créer une partition"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Erreur interne !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
-msgstr "Taille (en Mo) : "
+msgstr "Taille (en MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Début"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
-msgstr "Ajouter la partition au début de l'espace libre"
+msgstr "Ajouter une partition au début de l'espace libre"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Fin"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
-msgstr "Ajouter la partition à la fin de l'espace libre"
+msgstr "Ajouter une partition à la fin de l'espace libre"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
-msgstr "Pas de place pour créer une partition étendue"
+msgstr "Pas d'espace pour créer une partition étendue"
 
-#: fdisk/cfdisk.c:1522
-#, fuzzy
+#: fdisk/cfdisk.c:1512
 msgid "No partition table or unknown signature on partition table"
-msgstr "Mauvaise signature de la table de partition"
+msgstr "Pas de table de partitions ou signature inconnue dans la table de partitions"
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1514
 msgid "Do you wish to start with a zero table [y/N] ?"
-msgstr ""
+msgstr "Voulez-vous débuter avec une table à zéro [o/N]"
 
-#: fdisk/cfdisk.c:1576
+#: fdisk/cfdisk.c:1566
 msgid "You specified more cylinders than fit on disk"
-msgstr "Vous avez spécifié plus de cylindres que le disque ne peut contenir."
+msgstr "Vous avez spécifié plus de cylindres que le disque ne peut contenir"
 
-#: fdisk/cfdisk.c:1606
+#: fdisk/cfdisk.c:1596
 msgid "Cannot open disk drive"
-msgstr "Impossible d'ouvrir le disque dur."
+msgstr "Ne peut ouvrir l'unité de disque"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1598 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
-msgstr ""
-"Disque ouvert en lecture seule : vous n'avez pas les permissions d'écriture."
+msgstr "Disque ouvert en mode lecture seulement - aucune permission d'écriture"
 
-#: fdisk/cfdisk.c:1629
+#: fdisk/cfdisk.c:1619
 msgid "Cannot get disk size"
-msgstr "Impossible de déterminer la taille du disque."
+msgstr "Ne peut obtenir la taille du disque"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
-msgstr "Mauvaise partition primaire"
+msgstr "Partition primaire erronée"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
-msgstr "Mauvaise partition logique"
+msgstr "Partition logique erronnée"
+
+#: 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: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:1799
-msgid "Warning!!  This may destroy data on your disk!"
-msgstr "Avertissement !! Cela peut détruire des données sur votre disque !"
-
-#: fdisk/cfdisk.c:1803
-msgid "Are you sure you want write the partition table to disk? (yes or no): "
-msgstr ""
-"Etes-vous sûr de vouloir écrire la table de partition sur le disque ? (oui "
-"ou non) : "
-
-#: fdisk/cfdisk.c:1809
 msgid "no"
 msgstr "non"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
-msgstr "Table de partition non écrite sur le disque"
+msgstr "N'a pas écrit la table de partitions sur le disque"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "oui"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
-msgstr "Répondez par `oui' ou par `non'."
+msgstr "SVP répondre « yes » ou « no »"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
-msgstr "Ecriture de la table de partition sur le disque..."
+msgstr "Écriture de la table de partitions sur le disque..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
-msgstr "Table de partition écrite sur le disque."
+msgstr "Table de partitions écrite sur le disque"
+
+#: 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:1846
-msgid ""
-"Wrote partition table, but re-read table failed.  Reboot to update table."
-msgstr ""
-"Table de partition écrite, mais échec de sa relecture. Redémarrez pour la "
-"mettre à jour."
-
-#: fdisk/cfdisk.c:1856
-#, fuzzy
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
-msgstr ""
-"Il n'y a pas exactement une partition primaire amorçable. Le MBR DOS ne "
-"pourra pas fonctionner."
+msgstr "Aucune partition primaire marqué amorçable. DOS MBR ne peut amorcer."
 
-#: fdisk/cfdisk.c:1858
-#, fuzzy
-msgid ""
-"More than one primary partition is marked bootable. DOS MBR cannot boot this."
-msgstr ""
-"Il n'y a pas exactement une partition primaire amorçable. Le MBR DOS ne "
-"pourra pas fonctionner."
+#: 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:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1906 fdisk/cfdisk.c:2025 fdisk/cfdisk.c:2109
 msgid "Enter filename or press RETURN to display on screen: "
-msgstr ""
-"Entrez un nom de fichier ou appuyez sur ENTRÉE pour afficher à l'écran : "
+msgstr "Entrer le nom du fichier ou appuyer « RETURN » pour affichage à l'écran:"
 
-#: fdisk/cfdisk.c:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1915 fdisk/cfdisk.c:2033 fdisk/cfdisk.c:2117
 #, c-format
 msgid "Cannot open file '%s'"
-msgstr "Impossible d'ouvrir le fichier '%s'"
+msgstr "Ne peut ouvrir le fichier « %s »"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
-msgstr "Disque dur : %s\n"
+msgstr "Unité de disque: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
-msgstr "Secteur 0 :\n"
+msgstr "Secteur 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
-msgstr "Secteur %d :\n"
+msgstr "Secteur %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
-msgstr "   Aucun  "
+msgstr "   Aucun   "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
-msgstr "  Primaire"
+msgstr "   Primaire"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Logique"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
 #: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2005
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Amorce (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2007 fdisk/cfdisk.c:2503
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Inconnu (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2009
 #, c-format
 msgid "None (%02X)"
 msgstr "Aucun (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
-msgstr "Table de partition pour %s\n"
+msgstr "Table de partitions de %s\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2046
 msgid "            First    Last\n"
 msgstr "            Premier  Dernier\n"
 
-#: fdisk/cfdisk.c:2057
-msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
-msgstr ""
-" # Type     Secteur  Secteur  Décalage  Longueur Syst.Fich. Type (ID)   "
-"Indicateurs\n"
+# fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:2047
+msgid " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+msgstr " # Type     Secteur  Secteur  Offset  Longueur Sys.FichierType (ID)   Fanions\n"
 
-#: fdisk/cfdisk.c:2058
-msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
-msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+#: fdisk/cfdisk.c:2048
+msgid "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
+msgstr "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2131
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
-msgstr "         ---Début---      ----Fin----    Numéro de début de\n"
+msgstr "         --- Début  ---      ---- Fin  ----    No de départ de\n"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2132
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
-msgstr ""
-" # Indicateurs Tête Sect Cyl   ID  Tête Sect Cyl    Secteur  Secteurs\n"
+msgstr " # Fan.  Tête Sect Cyl   ID  Tête Sect Cyl    Secteur Secteurs\n"
 
-#: fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2133
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Brut"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
-msgstr "Afficher la table au format des données brutes"
+msgstr "Afficher le contenu de la table en format brut"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2269
 msgid "Sectors"
 msgstr "Secteurs"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
-msgstr "Afficher la table triée par secteurs"
+msgstr "Afficher le contenu de la table ordonné par secteurs"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Table"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
-msgstr "Afficher la table de partition seulement"
+msgstr "Afficher juste le contenue de la table de partitions"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
-msgstr "Ne pas afficher la table"
+msgstr "Ne pas afficher le contenu de la table"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
-msgstr "Ecran d'aide de cfdisk "
+msgstr "Écran d'aide pour cfdisk"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2199
 msgid "This is cfdisk, a curses based disk partitioning program, which"
-msgstr "Voici cfdisk, un programme de partitionnement de disque, qui"
+msgstr "cfdisk, est un programme de partionnement basé sur curses. cfdisk"
 
-#: fdisk/cfdisk.c:2210
+#: fdisk/cfdisk.c:2200
 msgid "allows you to create, delete and modify partitions on your hard"
-msgstr "permet de créer, supprimer ou modifier des partitions sur votre disque"
+msgstr "permet de créer, détruire et modifier les partitions de votre unité de"
 
-#: fdisk/cfdisk.c:2211
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
-msgstr "dur."
+msgstr "disque dur."
 
-#: fdisk/cfdisk.c:2213
+#: 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:2215
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "Commande     Signification"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
-msgstr "--------     -------------"
+msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
-msgstr ""
-"  b          (Dés)active l'indicateur Bootable de la partition courante"
+msgstr "  b          basculer le fanion d'amorce sur la partition courante"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2208
 msgid "  d          Delete the current partition"
-msgstr "  d          Supprime la partition courante"
+msgstr "  d          détruire la partition courante"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2209
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
-msgstr ""
-" g          Change les paramètres cylindres, têtes et secteurs-par-piste"
+msgstr "  g          modifier les paramètres: cylindres, têtes, secteurs par piste"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2210
 msgid "             WARNING: This option should only be used by people who"
-msgstr ""
-"             AVERTISSEMENT : Cette option doit être utilisée uniquement"
+msgstr "             AVERTISSEMENT: cette option ne doit pas être utilisé par"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2211
 msgid "             know what they are doing."
-msgstr "            si vous savez réellement comment procéder."
+msgstr "             des gens qui ne savent pas ce qu'ils font."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2212
 msgid "  h          Print this screen"
-msgstr "  h          Afficher cet écran"
+msgstr "  h          afficher cet écran d'aide"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2213
 msgid "  m          Maximize disk usage of the current partition"
-msgstr ""
-"  m          Optimiser l'utilisation du disque pour la partition courante"
+msgstr "  m          maximiser l'usage du disque de la partition courante"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2214
 msgid "             Note: This may make the partition incompatible with"
-msgstr "            Remarque : Cela peut rendre la partition incompatible avec"
+msgstr "             Note: cela peut rendre la partition incompatible avec"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2215
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2216
 msgid "  n          Create new partition from free space"
-msgstr "  n          Crée une nouvelle partition à partir de l'espace libre"
+msgstr "  n          créer une nouvelle partition à partir de l'espace libre"
+
+#: 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:2218
+msgid "             There are several different formats for the partition"
+msgstr "             Il y a plusieurs formats différents pour la partition"
+
+#: fdisk/cfdisk.c:2219
+msgid "             that you can choose from:"
+msgstr "             que vous désirez:"
+
+#: 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:2221
+msgid "                s - Table ordered by sectors"
+msgstr "                s - table ordonnée par secteurs"
+
+#: fdisk/cfdisk.c:2222
+msgid "                t - Table in raw format"
+msgstr "                t - table en format brut"
+
+#: 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:2224
+msgid "  t          Change the filesystem type"
+msgstr "  t          modifier le type de système de fichiers"
+
+#: 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:2226
+msgid "             Rotates through MB, sectors and cylinders"
+msgstr "             faire la rotation avec MB, secteurs et cylindres"
 
 #: fdisk/cfdisk.c:2227
-msgid "  p          Print partition table to the screen or to a file"
-msgstr " p          Affiche la table de partition à l'écran ou dans un fichier"
+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:2228
-msgid "             There are several different formats for the partition"
-msgstr "             Vous pouvez choisir entre différents formats pour"
+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:2229
-msgid "             that you can choose from:"
-msgstr "             la table de partition :"
+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:2230
-msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr ""
-"                r - Données brutes (exactement ce que cfdisk écrirait sur le "
-"disque)"
+msgid "             `no'"
+msgstr "             « no »"
 
 #: fdisk/cfdisk.c:2231
-msgid "                s - Table ordered by sectors"
-msgstr "                s - Table triée par secteurs"
+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:2232
-msgid "                t - Table in raw format"
-msgstr "                t - Table au format brut"
+msgid "Down Arrow   Move cursor to the next partition"
+msgstr "Flèche-bas   déplacer le curseur vers la partition suivante"
 
 #: fdisk/cfdisk.c:2233
-msgid "  q          Quit program without writing partition table"
-msgstr "  q          Quitte le programme sans écrire la table de partition"
+msgid "CTRL-L       Redraws the screen"
+msgstr "CTRL-L       réafficher le contenu à l'écran"
 
 #: fdisk/cfdisk.c:2234
-msgid "  t          Change the filesystem type"
-msgstr "  t          Change le type du système de fichiers"
-
-#: fdisk/cfdisk.c:2235
-msgid "  u          Change units of the partition size display"
-msgstr "  u          Change l'unité utilisée pour la taille des partitions"
+msgid "  ?          Print this screen"
+msgstr "  ?          afficher cet écran d'aide"
 
 #: fdisk/cfdisk.c:2236
-msgid "             Rotates through MB, sectors and cylinders"
-msgstr "             Alternativement : Mo, secteurs et cylindres"
+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:2237
-msgid "  W          Write partition table to disk (must enter upper case W)"
-msgstr ""
-"  W          Ecrit la table de partition sur le disque (W doit être en "
-"majuscule)"
-
-#: fdisk/cfdisk.c:2238
-msgid "             Since this might destroy data on the disk, you must"
-msgstr "             Étant donné que cela peut détruire des données"
-
-#: fdisk/cfdisk.c:2239
-msgid "             either confirm or deny the write by entering `yes' or"
-msgstr "             sur le disque, vous devrez confirmer en entrant `oui'"
-
-#: fdisk/cfdisk.c:2240
-msgid "             `no'"
-msgstr "             ou `non'"
-
-#: fdisk/cfdisk.c:2241
-msgid "Up Arrow     Move cursor to the previous partition"
-msgstr "Flèche Haut  Déplace le curseur vers la partition précédente"
-
-#: fdisk/cfdisk.c:2242
-msgid "Down Arrow   Move cursor to the next partition"
-msgstr "Flèche Bas      Déplace le curseur vers la partition suivante"
-
-#: fdisk/cfdisk.c:2243
-msgid "CTRL-L       Redraws the screen"
-msgstr "CTRL-L       Redessine l'écran"
-
-#: fdisk/cfdisk.c:2244
-msgid "  ?          Print this screen"
-msgstr "  ?          Affiche cet écran"
-
-#: fdisk/cfdisk.c:2246
-msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "Remarque : Toutes ces commandes peuvent être saisies en majuscules ou"
-
-#: fdisk/cfdisk.c:2247
 msgid "case letters (except for Writes)."
-msgstr "minuscules (à l'exception de Write)."
+msgstr "majuscules ou minuscules (sauf pour les écritures)."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2597 fdisk/fdisksunlabel.c:322
 #: fdisk/fdisksunlabel.c:324
 msgid "Cylinders"
 msgstr "Cylindres"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2267
 msgid "Change cylinder geometry"
-msgstr "Changer la géométrie des cylindres"
+msgstr "Modifier la géométrie des cylindres"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:319
 msgid "Heads"
 msgstr "Têtes"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2268
 msgid "Change head geometry"
-msgstr "Changer la géométrie des têtes"
+msgstr "Modifier la géométrie de tête"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2269
 msgid "Change sector geometry"
-msgstr "Changer la géométrie des secteurs"
+msgstr "Modifier la géométrie de secteur"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2270
 msgid "Done"
-msgstr "Terminé"
+msgstr "Complété"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2270
 msgid "Done with changing geometry"
-msgstr "Changement de géométrie terminé"
+msgstr "Modification de la géométrie complété"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2283
 msgid "Enter the number of cylinders: "
-msgstr "Entrez le nombre de cylindres : "
+msgstr "Entrer le nombre de cylindres: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2865
 msgid "Illegal cylinders value"
-msgstr "Nombre de cylindres non valide"
+msgstr "Valeur illégale pour les cylindres"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
-msgstr "Entrez le nombre de têtes : "
+msgstr "Entrer le nombre de têtes: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2875
 msgid "Illegal heads value"
-msgstr "Nombre de têtes non valide"
+msgstr "Valeur illégale pour les têtes"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
-msgstr "Entrez le nombre de secteurs par piste : "
+msgstr "Entrer le nombre de secteurs par piste: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2882
 msgid "Illegal sectors value"
-msgstr "Nombre de secteurs non valide"
+msgstr "Valeur illégale pour les secteurs"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
-msgstr "Entrez le type de système de fichiers : "
+msgstr "Entrer le type de système de fichiers:"
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
-msgstr "Impossible de changer le type de SF sur vide"
+msgstr "Ne peut modifier le type de SF pour aucun type"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
-msgstr "Impossible de changer le type de SF sur étendu"
+msgstr "Ne peut modifier le type de SF à étendu"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2472 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Amorce"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2474
 #, c-format
 msgid "Unk(%02X)"
-msgstr "Inc(%02X)"
+msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2477 fdisk/cfdisk.c:2480
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2485 fdisk/cfdisk.c:2488
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2496
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Disk Drive: %s"
-msgstr "Disque dur : %s"
+msgstr "Unité de disque: %s"
 
-#: fdisk/cfdisk.c:2588
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2578
+#, c-format
 msgid "Size: %lld bytes, %ld MB"
-msgstr "Taille : %lld octets"
+msgstr "Taille: %lld octets,  %ld Mo"
 
-#: fdisk/cfdisk.c:2591
-#, fuzzy, c-format
+#: fdisk/cfdisk.c:2581
+#, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
-msgstr "Taille : %lld octets"
+msgstr "Taille: %lld octets,  %ld.%ld Go"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2585
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
-msgstr "Têtes : %d   Secteurs par piste : %d  Cylindres : %d"
+msgstr "Têtes: %d   Secteurs par piste: %d  Cylindres: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2589
 msgid "Name"
 msgstr "Nom"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2590
 msgid "Flags"
-msgstr "Indicateurs"
+msgstr "Fanions"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2591
 msgid "Part Type"
-msgstr "Type de partition"
+msgstr "Part Type"
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2592
 msgid "FS Type"
 msgstr "Type SF"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2593
 msgid "[Label]"
-msgstr "[Libellé]"
+msgstr "[Étiq.]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2595
 msgid "  Sectors"
-msgstr " Secteurs"
+msgstr "  Secteurs"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2599
 msgid "Size (MB)"
-msgstr "Taille(Mo)"
+msgstr "Taille (MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2601
 msgid "Size (GB)"
-msgstr "Taille (Go)"
+msgstr "Taille (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2656
 msgid "Bootable"
-msgstr "Bootable"
+msgstr "Amorçable"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2656
 msgid "Toggle bootable flag of the current partition"
-msgstr "(Dés)active l'indicateur bootable pour la partition courante"
+msgstr "Basculer le fanion d'amorce pour la partition courante"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2657
 msgid "Delete"
-msgstr "Supprimer"
+msgstr "Détruire"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2657
 msgid "Delete the current partition"
-msgstr "Supprime la partition courante"
+msgstr "Détruire la partition courante"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2658
 msgid "Geometry"
 msgstr "Géométrie"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2658
 msgid "Change disk geometry (experts only)"
-msgstr "Change la géométrie du disque (experts seulement)"
+msgstr "Modifier la géométrie du disque (pour expert seulement)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2659
 msgid "Help"
 msgstr "Aide"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2659
 msgid "Print help screen"
-msgstr "Affiche l'écran d'aide"
+msgstr "Afficher l'écran d'aide"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2660
 msgid "Maximize"
-msgstr "Optimiser"
+msgstr "Maximiser"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2660
 msgid "Maximize disk usage of the current partition (experts only)"
-msgstr ""
-"Optimise l'utilisation du disque pour la partition courante (experts "
-"seulement)"
+msgstr "Maximiser l'usage du disque de la partition courante (experts seulement)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2661
 msgid "New"
-msgstr "Nouvelle"
+msgstr "Nouveau"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2661
 msgid "Create new partition from free space"
-msgstr "Crée une nouvelle partition"
+msgstr "Créer une nouvelle partition à partir de l'espace libre"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2662
 msgid "Print"
-msgstr "Imprimer"
+msgstr "Afficher"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2662
 msgid "Print partition table to the screen or to a file"
-msgstr "Imprime la table de partition à l'écran ou dans un fichier"
+msgstr "Afficher le contenu de la table de partitions à l'écran (ou dans un fichier)"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2663
 msgid "Quit"
 msgstr "Quitter"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2663
 msgid "Quit program without writing partition table"
-msgstr "Quitte le programme sans écrire la table de partition"
+msgstr "Quitter le programme sans écrire la table de partitions"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2664
 msgid "Type"
 msgstr "Type"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2664
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
-msgstr "Change le type de système de fichiers (DOS, Linux, OS/2, etc.)"
+msgstr "Modifier le type de système de fichier (DOS, Linux, OS/2, etc)"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2665
 msgid "Units"
 msgstr "Unités"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2665
 msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "Change l'unité pour la taille des partitions (Mo, sect, cyl)"
+msgstr "Mofifier les unités d'affichage des taille des partitions (MB, sect, cyl)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2666
 msgid "Write"
 msgstr "Écrire"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2666
 msgid "Write partition table to disk (this might destroy data)"
-msgstr "Écrit la table de partition sur le disque (peut détruire des données)"
+msgstr "ÉCrire la table de partitions sur le dsique (cela peut détruire les données)"
+
+#: fdisk/cfdisk.c:2712
+msgid "Cannot make this partition bootable"
+msgstr "Ne peut créer cette partition comme étant amorçable"
 
 #: fdisk/cfdisk.c:2722
-msgid "Cannot make this partition bootable"
-msgstr "Impossible de rendre cette partition amorçable."
-
-#: fdisk/cfdisk.c:2732
 msgid "Cannot delete an empty partition"
-msgstr "Impossible de supprimer une partition vide."
+msgstr "Ne peut détruire une partition vide"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2742 fdisk/cfdisk.c:2744
 msgid "Cannot maximize this partition"
-msgstr "Impossible d'optimiser cette partition."
+msgstr "Ne peut maaximiser cette partition"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2752
 msgid "This partition is unusable"
-msgstr "Cette partition est inutilisable."
+msgstr "Cette partition est inutilisable"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2754
 msgid "This partition is already in use"
-msgstr "Cette partition est déjà utilisée."
+msgstr "Cette partition est déjà en usage"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2771
 msgid "Cannot change the type of an empty partition"
-msgstr "Impossible de changer le type d'une partition vide."
+msgstr "Ne peut changer le type d'une partition vide"
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2798 fdisk/cfdisk.c:2804
 msgid "No more partitions"
-msgstr "Plus de partition"
+msgstr "Pas de partition disponible"
+
+#: fdisk/cfdisk.c:2811
+msgid "Illegal command"
+msgstr "Commande illégale"
 
 #: fdisk/cfdisk.c:2821
-msgid "Illegal command"
-msgstr "Commande non valide"
-
-#: fdisk/cfdisk.c:2831
-#, fuzzy
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-2000 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:2838
+#: fdisk/cfdisk.c:2828
 #, c-format
 msgid ""
 "\n"
@@ -2099,24 +2064,22 @@
 "\n"
 msgstr ""
 "\n"
-"Usage :\n"
-"Afficher la version :\n"
+"Usage:\n"
+"Afficher le numéro de version:\n"
 "        %s -v\n"
-"Afficher la table de partition :\n"
+"Afficher le contenu la table de partition:\n"
 "        %s -P {r|s|t} [options] périphérique\n"
-"Utilisation interactive :\n"
+"Utilisation intéractive:\n"
 "        %s [options] périphérique\n"
 "\n"
-"Options :\n"
-"-a: Utilise une flèche à la place de la mise en surbrillance ;\n"
-"-z: Démarre avec une table de partition vide au lieu de lire celle du "
-"disque ;\n"
-"-c C -h T -s S : Force l'idée que se fait le kernel du nombre de cylindres,\n"
-"                de têtes et de secteurs par piste.\n"
+"Options:\n"
+"-a: utiliser les touches fléchées au lieu de la sur-brillance;\n"
+"-z: débuter avec un table de partition 0, au lieu de lire le pointeur du disque;\n"
+"-c C -h H -s S: écraser les paramètres contenus dans le kernel: le nombre de cylindres\n"
+"                le nombre de têtes et le nombre de secteurs par piste.\n"
 "\n"
 
 #: fdisk/fdisk.c:197
-#, fuzzy
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2127,15 +2090,14 @@
 "-u: give Start and End in sector (instead of cylinder) units\n"
 "-b 2048: (for certain MO disks) use 2048-byte sectors\n"
 msgstr ""
-"Usage : fdisk [-b SSZ] [-u] DISQUE     Change la table de partition\n"
-"       fdisk -l [-b SSZ] [-u] DISQUE  Affiche la/les table(s) de partition\n"
-"       fdisk -s PARTITION           Affiche la/les taille(s) des partitions "
-"en blocs\n"
-"       fdisk -v                     Affiche la version de fdisk\n"
-"Ici, DISQUE représente une entrée de type /dev/hdb ou /dev/sda\n"
-"et PARTITION une entrée de type /dev/hda7\n"
-"-u: Affiche le Début et la Fin en unités de secteurs (au lieu de cylindres)\n"
-"-b 2048 : (pour certains disques MO) Utilise des secteurs de 2048 octets\n"
+"Usage: fdisk [-b TAILLE] [-u] DISQUE    modifier la table de partitions\n"
+"       fdisk -l [-b TAILLE] [-u] DISQUE lister les tables de partitions\n"
+"       fdisk -s PARTITION               donner la taille de partition en blocs\n"
+"       fdisk -v                         afficher la version de fdisk\n"
+"Où le disque est quelque chose du genre: /dev/hdb ou /dev/sda\n"
+"et PARTITION est quelque chose du genre: /dev/hda7\n"
+"-u: donne le Début et la Fin en unités de secteurs (au lieu de cylindres)\n"
+"-b 2048: (pour certains disques MO) utilise 2048-octets par secteur\n"
 
 #: fdisk/fdisk.c:209
 msgid ""
@@ -2146,216 +2108,214 @@
 "  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
 "  ...\n"
 msgstr ""
-"Usage : fdisk [-l] [-b SSZ] [-u] périphérique\n"
-"Ex : fdisk /dev/hda  (pour le premier disque IDE)\n"
-"  ou : fdisk /dev/sdc  (pour le troisième disque SCSI)\n"
-"  ou : fdisk /dev/eda  (pour le premier disque ESDI PS/2)\n"
-"  ou : fdisk /dev/rd/c0d0  ou : fdisk /dev/ida/c0d0  (pour les périphériques "
-"RAID)\n"
+"Usage: fdisk [-l] [-b TAILLE] [-u] périphérique\n"
+"i.e.: fdisk /dev/hda  (pour le premier disqeu IDE)\n"
+"  ou: fdisk /dev/sdc  (pour le 3e disque SCSI)\n"
+"  ou: fdisk /dev/eda  (pour le 1er disque PS/2 ESDI)\n"
+"  ou: fdisk /dev/rd/c0d0  ou: fdisk /dev/ida/c0d0  (pour des périphériques RAID)\n"
 "  ...\n"
 
 #: fdisk/fdisk.c:218
 #, c-format
 msgid "Unable to open %s\n"
-msgstr "Impossible d'ouvrir %s\n"
+msgstr "Incapable d'ouvrir %s\n"
 
 #: fdisk/fdisk.c:222
 #, c-format
 msgid "Unable to read %s\n"
-msgstr "Impossible de lire %s\n"
+msgstr "Incapable de lire %s\n"
 
 #: fdisk/fdisk.c:226
 #, c-format
 msgid "Unable to seek on %s\n"
-msgstr "Impossible de rechercher %s\n"
+msgstr "Incapable de repérage sur %s\n"
 
 #: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to write %s\n"
-msgstr "Impossible d'écrire %s\n"
+msgstr "Incapable d'écrire %s\n"
 
 #: fdisk/fdisk.c:234
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
-msgstr "Échec de BLKGETSIZE ioctl sur %s\n"
+msgstr "échec de BLKGETSIZE ioctl sur %s\n"
 
 #: fdisk/fdisk.c:238
 msgid "Unable to allocate any more memory\n"
-msgstr "Impossible d'allouer plus de mémoire\n"
+msgstr "Incapable d'allouer de la mémoire additionnelle\n"
 
 #: fdisk/fdisk.c:241
 msgid "Fatal error\n"
-msgstr "Erreur fatale\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/fdiskbsdlabel.c:129
 msgid "Command action"
-msgstr "Action de commande"
+msgstr "Commande action"
 
 #: fdisk/fdisk.c:326
 msgid "   a   toggle a read only flag"
-msgstr "   a   (Dés)active un indicateur en lecture seule"
+msgstr "   a   basculer le fanion de lecture seulement"
 
 #. sun
 #: fdisk/fdisk.c:327 fdisk/fdisk.c:371
 msgid "   b   edit bsd disklabel"
-msgstr "   b   Edite le libellé de disque bsd"
+msgstr "   b   éditer l'étiquette BSD du disque"
 
 #: fdisk/fdisk.c:328
 msgid "   c   toggle the mountable flag"
-msgstr "   c   (Dés)active l'indicateur Mountable"
+msgstr "   c   basculer le fanion mount"
 
 #. sun
 #: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   d   delete a partition"
-msgstr "   d   Supprime une partition"
+msgstr "   d   détruire la partition"
 
 #: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
 msgid "   l   list known partition types"
-msgstr "   l   Répertorie les types de partition connus"
+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/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
-msgstr "   m   Affiche ce menu"
+msgstr "   m   afficher ce menu"
 
 #: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
 msgid "   n   add a new partition"
-msgstr "   n   Ajoute une nouvelle partition"
+msgstr "   n   ajouter une nouvelle partition"
 
 #: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
 msgid "   o   create a new empty DOS partition table"
-msgstr "   o   Crée une nouvelle table de partition DOS vide"
+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
 msgid "   p   print the partition table"
-msgstr "   p   Affiche la table de partition"
+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/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
-msgstr "   q   Quitte le programme sans enregistrer les modifications"
+msgstr "   q   quitter sans faire de sauvegarde"
 
 #: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:366 fdisk/fdisk.c:380
 msgid "   s   create a new empty Sun disklabel"
-msgstr "   s   Crée un nouveau libellé de disque Sun vide"
+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
 msgid "   t   change a partition's system id"
-msgstr "   t   Change l'ID système d'une partition"
+msgstr "   t   modifier l'identificateur de la partition système"
 
 #: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
 msgid "   u   change display/entry units"
-msgstr "   u   Change l'unité d'affichage/saisie"
+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
 msgid "   v   verify the partition table"
-msgstr "   v   Vérifie la table de partition"
+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
 msgid "   w   write table to disk and exit"
-msgstr "   w   Ecrit la table sur le disque et quitte le programme"
+msgstr "   w   écrire la table sur le disque et quitter"
 
 #: fdisk/fdisk.c:341 fdisk/fdisk.c:385
 msgid "   x   extra functionality (experts only)"
-msgstr "   x   Fonctions supplémentaires (experts seulement)"
+msgstr "   x   fonctionnalité additionnelle (pour experts seulement)"
 
 #: fdisk/fdisk.c:345
 msgid "   a   select bootable partition"
-msgstr "   a   Sélectionne la partition amorçable"
+msgstr "   a   sélectionner une partition amorçable"
 
 #. sgi flavour
 #: fdisk/fdisk.c:346
 msgid "   b   edit bootfile entry"
-msgstr "   b   Edite l'entrée du fichier amorce"
+msgstr "   b   éditier l'entrée du fichier d'amorce"
 
 #. sgi
 #: fdisk/fdisk.c:347
 msgid "   c   select sgi swap partition"
-msgstr "   c   Sélectionne la partition de swap SGI"
+msgstr "   c   sélectionner une partition swap ppour SGI"
 
 #: fdisk/fdisk.c:370
 msgid "   a   toggle a bootable flag"
-msgstr "   a   (Dés)active un indicateur Bootable"
+msgstr "   a   bascule le fanion d'amorce"
 
 #: fdisk/fdisk.c:372
 msgid "   c   toggle the dos compatibility flag"
-msgstr "   c   (Dés)active l'indicateur de compatibilité DOS"
+msgstr "   c   basculer le fanion de compatibilité DOS"
 
 #: fdisk/fdisk.c:393
 msgid "   a   change number of alternate cylinders"
-msgstr "   a   Change le nombre de cylindres de remplacement"
+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
 msgid "   c   change number of cylinders"
-msgstr "   c   Change le nombre de cylindres"
+msgstr "   c   modifier le nombre de cylindres"
 
 #: fdisk/fdisk.c:395 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:445
 msgid "   d   print the raw data in the partition table"
-msgstr "   d   Affiche les données brutes de la table de partition"
+msgstr "   d   afficher les données brutes de la table de partition"
 
 #: fdisk/fdisk.c:396
 msgid "   e   change number of extra sectors per cylinder"
-msgstr "   e   Change le nombre de secteurs supplémentaires par cylindre"
+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
 msgid "   h   change number of heads"
-msgstr "   h   Change le nombre de têtes"
+msgstr "   h   modifier le nombre de têtes"
 
 #: fdisk/fdisk.c:398
 msgid "   i   change interleave factor"
-msgstr "   i   Change le facteur d'entrelacement"
+msgstr "   i   changer le facteur d'inter-feuillage"
 
 #. sun
 #: fdisk/fdisk.c:399
 msgid "   o   change rotation speed (rpm)"
-msgstr "   o   Change la vitesse de rotation (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/fdiskbsdlabel.c:138
 msgid "   r   return to main menu"
-msgstr "   r   Revient au menu principal"
+msgstr "   r   retourner au menu principal"
 
 #: fdisk/fdisk.c:404 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
 msgid "   s   change number of sectors/track"
-msgstr "   s   Change le nombre de secteurs/piste"
+msgstr "   s   modifier le nombre de secteurs par piste"
 
 #: fdisk/fdisk.c:407
 msgid "   y   change number of physical cylinders"
-msgstr "   y   Change le nombre de cylindres physiques"
+msgstr "   y   modifier le nombre de cylindres physiques"
 
 #: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
 msgid "   b   move beginning of data in a partition"
-msgstr "   b   Déplace le début des données d'une 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
 msgid "   e   list extended partitions"
-msgstr "   e   Répertorie les partitions étendues"
+msgstr "   e   lister les partitions étendues"
 
 #. !sun
 #: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
-#, fuzzy
 msgid "   g   create an IRIX (SGI) partition table"
-msgstr "   g   Crée une table de partition IRIX"
+msgstr "   g   créer une table de partitions de type IRIX (SGI)"
 
 #. !sun
 #: fdisk/fdisk.c:447
 msgid "   f   fix partition order"
-msgstr "   f   fixe l'ordre des partitions"
+msgstr "   f   fixer l'ordonnancement des partitions"
 
 #: fdisk/fdisk.c:564
 msgid "You must set"
-msgstr "Vous devez définir les"
+msgstr "Vous devez initialiser"
 
 #: fdisk/fdisk.c:578
 msgid "heads"
@@ -2377,7 +2337,7 @@
 "You can do this from the extra functions menu.\n"
 msgstr ""
 "%s%s.\n"
-"Vous pouvez le faire depuis le menu des fonctions supplémentaires.\n"
+"Vous pouvez faire cela à partir du menu des fonctions additionnelles.\n"
 
 #: fdisk/fdisk.c:587
 msgid " and "
@@ -2394,28 +2354,32 @@
 "2) booting and partitioning software from other OSs\n"
 "   (e.g., DOS FDISK, OS/2 FDISK)\n"
 msgstr ""
+"\n"
+"Le nombre de cylindres pour ce disque est initialisé à %d.\n"
+"Il n'y a rien d''incorrect avec cela, mais c'est plus grand que 1024,\n"
+"et cela pourrait causer des problèmes en fonction pour certaines configurations:\n"
+"1) logiciels qui sont exécutés à l'amorçage (i.e., vieilles versions de LILO)\n"
+"2) logiciels d'amorçage et de partitionnement pour d'autres SE\n"
+"   (i.e., DOS FDISK, OS/2 FDISK)\n"
 
 #: fdisk/fdisk.c:627
 msgid "Bad offset in primary extended partition\n"
-msgstr "Mauvais décalage dans la partition primaire étendue\n"
+msgstr "Décalage erronée dans la partition primaire étendue\n"
 
 #: fdisk/fdisk.c:641
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
-msgstr "Avertissement : suppression des partitions après %d\n"
+msgstr "AVERTISSEMENT: destruction de partitions après %d\n"
 
 #: fdisk/fdisk.c:658
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
-msgstr ""
-"Avertissement : pointeur de lien en trop dans la table de partition %d\n"
+msgstr "AVERTISSEMENT: pointeur additionnel dans la table de partitions %d\n"
 
 #: fdisk/fdisk.c:666
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
-msgstr ""
-"Avertissement : va ignorer les données supplémentaires de la table de "
-"partition %d\n"
+msgstr "AVERTISSEMENT: données surperflues ignorées dans la table de partition %d\n"
 
 #: fdisk/fdisk.c:711
 msgid ""
@@ -2424,35 +2388,31 @@
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Création d'un nouveau libellé de disque DOS. Les modifications seront "
-"uniquement conservées en mémoire,\n"
-"jusqu'à ce que vous décidiez de les écrire. Une fois terminé, le contenu "
-"précédent\n"
-"ne pourra être restauré.\n"
+"Création d'une nouvelle étiquette DOS. Les modifications resteront en mémoire\n"
+"jusqu'à ce qu'elles soient écrites. Après quoi, bien sûr, le contenu précédent\n"
+"ne sera par récupérable.\n"
 "\n"
 
 #: fdisk/fdisk.c:755
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
-msgstr "Remarque : la taille de secteur est %d (pas %d)\n"
+msgstr "Note: taille de secteur est %d (et non pas %d)\n"
 
 #: fdisk/fdisk.c:888
 msgid "You will not be able to write the partition table.\n"
-msgstr "Vous ne pourrez pas écrire la table de partition.\n"
+msgstr "Vous ne serez pas capable d'écrire la table de partitions.\n"
 
 #: fdisk/fdisk.c:917
 msgid ""
 "This disk has both DOS and BSD magic.\n"
 "Give the 'b' command to go to BSD mode.\n"
 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
-msgid ""
-"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
-"disklabel\n"
-msgstr ""
-"Le périphérique ne contient ni une table de partition DOS valide, ni un "
-"libellé de disque Sun, SGI ou OSF.\n"
+msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
+msgstr "Le périphérique ne contient ni une partition ni une étiquette DOS, Sun, SGI ou OSF\n"
 
 #: fdisk/fdisk.c:944
 msgid "Internal error\n"
@@ -2461,16 +2421,12 @@
 #: fdisk/fdisk.c:957
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
-msgstr "Va ignorer la partition étendue supplémentaire %d\n"
+msgstr "Partition additionnelle étendue ignorée %d\n"
 
 #: fdisk/fdisk.c:969
 #, c-format
-msgid ""
-"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
-"(rite)\n"
-msgstr ""
-"Avertissement : l'indicateur invalide 0x%04x de la table de partition %d "
-"sera corrigé par w(rite).\n"
+msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n"
+msgstr "AVERTISSEMENT: fanion 0x%04x invalide de la table de partitions %d sera corrigé par w(écriture)\n"
 
 #: fdisk/fdisk.c:991
 msgid ""
@@ -2478,16 +2434,16 @@
 "got EOF thrice - exiting..\n"
 msgstr ""
 "\n"
-"EOF obtenu à trois reprises. Fermeture en cours...\n"
+"a obtenu EOF 3 fois - fin du programme...\n"
 
 #: fdisk/fdisk.c:1030
 msgid "Hex code (type L to list codes): "
-msgstr "Code hexadécimal (tapez L pour afficher une liste des codes) : "
+msgstr "Code Hex (taper L pour lister les codes): "
 
 #: fdisk/fdisk.c:1069
 #, c-format
 msgid "%s (%d-%d, default %d): "
-msgstr "%s (%d-%d, %d par défaut) : "
+msgstr "%s (%d-%d, par défaut %d): "
 
 #: fdisk/fdisk.c:1134
 #, c-format
@@ -2496,30 +2452,29 @@
 
 #: fdisk/fdisk.c:1138
 msgid "Value out of range.\n"
-msgstr "Valeur hors plage.\n"
+msgstr "Valeur hors gamme.\n"
 
 #: fdisk/fdisk.c:1148
 msgid "Partition number"
-msgstr "Nombre de partitions"
+msgstr "Numéro de partition"
 
 #: fdisk/fdisk.c:1159
 #, c-format
 msgid "Warning: partition %d has empty type\n"
-msgstr "Avertissement : la partition %d a un type vide.\n"
+msgstr "AVERTISSEMENT: partition %d a un type vide\n"
 
 #: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207
-#, fuzzy, c-format
+#, c-format
 msgid "Selected partition %d\n"
-msgstr "Va ignorer la partition étendue supplémentaire %d\n"
+msgstr "Partition sélectionnée %d\n"
 
 #: fdisk/fdisk.c:1184
-#, fuzzy
 msgid "No partition is defined yet!\n"
-msgstr "Aucune partition définie\n"
+msgstr "Aucune partition n'est définie encore!\n"
 
 #: fdisk/fdisk.c:1210
 msgid "All primary partitions have been defined already!\n"
-msgstr ""
+msgstr "Toutes les partitions primaires ont déjà été définies!\n"
 
 #: fdisk/fdisk.c:1220
 msgid "cylinder"
@@ -2532,25 +2487,25 @@
 #: fdisk/fdisk.c:1229
 #, c-format
 msgid "Changing display/entry units to %s\n"
-msgstr "Remplacement des unités d'affichage/saisie par %s\n"
+msgstr "Modification des unités d'affichage/saisie à %s\n"
 
 #: fdisk/fdisk.c:1240
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
-msgstr "AVERTISSEMENT : La partition %d est une partition étendue.\n"
+msgstr "AVERTISSEMENT: Partition %d est une partition étendue\n"
 
 #: fdisk/fdisk.c:1251
 msgid "DOS Compatibility flag is set\n"
-msgstr "L'indicateur de compatibilité DOS est défini.\n"
+msgstr "Fanion de compatibilité DOS est initialisé\n"
 
 #: fdisk/fdisk.c:1255
 msgid "DOS Compatibility flag is not set\n"
-msgstr "L'indicateur de compatibilité DOS n'est pas défini.\n"
+msgstr "Fanion de compatibilité DOS n'est initialisé\n"
 
 #: fdisk/fdisk.c:1347
 #, c-format
 msgid "Partition %d does not exist yet!\n"
-msgstr "La partition %d n'existe pas encore !\n"
+msgstr "Partition %d n'existe pas encore!\n"
 
 #: fdisk/fdisk.c:1352
 msgid ""
@@ -2559,20 +2514,18 @@
 "type 0 is probably unwise. You can delete\n"
 "a partition using the `d' command.\n"
 msgstr ""
-"La saisie de 0 équivaut à de l'espace libre dans le cas de nombreux "
-"systèmes\n"
-"(mais pas dans le cas de Linux). Définir des partitions de\n"
-"type 0 n'est pas une bonne idée. Vous pouvez supprimer\n"
-"une partition à l'aide de la commande `d'.\n"
+"Type 0 signifie libérer l'espace sur plusieurs systèmes\n"
+"(mais pas pour Linux). Avoir des partitions de\n"
+"type 0 n'est pas recommandé. Vous pouvez détruire\n"
+"la partition en utilisant la commande « d ».\n"
 
 #: fdisk/fdisk.c:1361
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
-"Vous ne pouvez pas remplacer une partition par une partition étendue, ou "
-"inversement.\n"
-"Supprimez-la d'abord.\n"
+"Vous ne pouvez la modifier en partition étendue et vice versa.\n"
+"Vous devez la détruire d'abord.\n"
 
 #: fdisk/fdisk.c:1370
 msgid ""
@@ -2580,8 +2533,8 @@
 "as SunOS/Solaris expects it and even Linux likes it.\n"
 "\n"
 msgstr ""
-"Envisagez de conserver la partition 3 en tant que disque entier (5),\n"
-"car SunOS/Solaris s'y attend et Linux aime également l'utiliser.\n"
+"Considérer de laisser la partition 3 comme un disque entier (5),\n"
+"tel que SunOS/Solaris l'exige et tel que qu'il est préférable  pour Linux.\n"
 "\n"
 
 #: fdisk/fdisk.c:1376
@@ -2590,20 +2543,19 @@
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
 "\n"
 msgstr ""
-"Envisagez de conserver la partition 9 en tant qu'en-tête de volume (0),\n"
-"et la partition 11 en tant que volume entier (6) car IRIX s'y attend.\n"
+"Considérer de laisser la partition 9 comme une en-tête de volume (0),\n"
+"et la partition 11 comme un volume entier (6) tel que IRIX l'exige.\n"
 "\n"
 
 #: fdisk/fdisk.c:1389
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
-msgstr "Le type de système de la partition %d a été remplacé par %x (%s).\n"
+msgstr "Type de partition système modifié de %d à %x (%s)\n"
 
 #: fdisk/fdisk.c:1443
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
-msgstr ""
-"La partition %d a des débuts physique/logique différents (non-Linux ?) :\n"
+msgstr "Partition %d a des débuts différents physique/logique (non Linux?):\n"
 
 #: fdisk/fdisk.c:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
 #, c-format
@@ -2618,12 +2570,12 @@
 #: fdisk/fdisk.c:1451
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
-msgstr "La partition %d a des fins physique/logique différentes :\n"
+msgstr "Partition %d a des fins différentes physique/logique:\n"
 
 #: fdisk/fdisk.c:1460
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
-msgstr "La partition %i ne commence pas à la limite du cylindre :\n"
+msgstr "Partition %i ne débute pas sur une frontière de cylindre:\n"
 
 #: fdisk/fdisk.c:1463
 #, c-format
@@ -2631,9 +2583,9 @@
 msgstr "devrait être (%d, %d, 1)\n"
 
 #: fdisk/fdisk.c:1469
-#, fuzzy, c-format
+#, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr "La partition %d ne se termine pas à la limite du cylindre.\n"
+msgstr "La partition %i ne se termine pas sur une frontière de cylindre.\n"
 
 #: fdisk/fdisk.c:1473
 #, c-format
@@ -2646,29 +2598,27 @@
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
+"\n"
+"Disque %s: %ld Mo, %lld octets\n"
 
 #: fdisk/fdisk.c:1488
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 "\n"
-"Disque %s : %d têtes, %d secteurs, %d cylindres\n"
-"\n"
+"Disque %s: %ld.%ld Go, %lld octets\n"
 
 #: fdisk/fdisk.c:1490
-#, fuzzy, c-format
+#, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
-msgstr ""
-"\n"
-"Disque %s : %d têtes, %d secteurs, %d cylindres\n"
-"\n"
+msgstr "%d têtes, %d secteurs/piste, %d cylindres"
 
 #: fdisk/fdisk.c:1493
 #, c-format
 msgid ", total %lu sectors"
-msgstr ""
+msgstr ", total %lu secteurs"
 
 #: fdisk/fdisk.c:1496
 #, c-format
@@ -2676,19 +2626,21 @@
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
+"Unités = %s de %d * %d = %d octets\n"
+"\n"
 
 #: fdisk/fdisk.c:1604
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
-"Rien à faire. L'ordre est déjà correct.\n"
+"Rien à faire. L'ordonnancement est déjà correct.\n"
 "\n"
 
 #: fdisk/fdisk.c:1668
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
-msgstr "%*s Amorce    Début       Fin    Blocs   Id  Système\n"
+msgstr "%*s Amorce  Début       Fin    Blocs    Id  Système\n"
 
 #: fdisk/fdisk.c:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
 msgid "Device"
@@ -2700,7 +2652,7 @@
 "Partition table entries are not in disk order\n"
 msgstr ""
 "\n"
-"Les entrées de la table de partitions ne suivent pas l'ordre du disque.\n"
+"Les entrées de la table de partitions ne sont pas dans l'ordre du disque\n"
 
 #: fdisk/fdisk.c:1716
 #, c-format
@@ -2710,76 +2662,72 @@
 "\n"
 msgstr ""
 "\n"
-"Disque %s : %d têtes, %d secteurs, %d cylindres\n"
+"Disq %s: %d têtes, %d secteurs, %d cylindres\n"
 "\n"
 
 #: fdisk/fdisk.c:1718
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
-msgstr "N° DA Tt Sec  Cyl  Tt Sec  Cyl   Début    Taille ID\n"
+msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Début     Tail.ID\n"
 
 #: fdisk/fdisk.c:1762
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
-msgstr "Avertissement : la partition %d contient un secteur 0.\n"
+msgstr "AVERTISSEMENT: partition %d contient un secteur 0\n"
 
 #: fdisk/fdisk.c:1765
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
-msgstr "Partition %d : tête %d supérieure à la valeur maximum %d\n"
+msgstr "Partition %d: tête %d plus grand que le maximum %d\n"
 
 #: fdisk/fdisk.c:1768
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
-msgstr "Partition %d : secteur %d supérieur à la valeur maximum %d\n"
+msgstr "Partition %d: secteur %d plus grand que le maximum %d\n"
 
 #: fdisk/fdisk.c:1771
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
-msgstr "Partition %d : cylindre %d supérieur à la valeur maximum %d.\n"
+msgstr "Partitions %d: cylindre %d plus grand que le maximum %d\n"
 
 #: fdisk/fdisk.c:1775
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
-msgstr ""
-"Partition %d : secteurs %d précédents ne correspondent pas au total %d.\n"
+msgstr "Partition %d: secteurs précédents %d ne concorde pas avec le total %d\n"
 
 #: fdisk/fdisk.c:1807
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
-msgstr "Avertissement : mauvaises données de début dans la partition %d.\n"
+msgstr "AVERTISSEMENT: start-of-data erroné dans la partition %d\n"
 
 #: fdisk/fdisk.c:1815
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
-msgstr "Avertissement : la partition %d chevauche la partition %d.\n"
+msgstr "AVERTISSEMENT: la partition %d chevauche la partition %d.\n"
 
 #: fdisk/fdisk.c:1835
 #, c-format
 msgid "Warning: partition %d is empty\n"
-msgstr "Avertissement : la partition %d est vide.\n"
+msgstr "AVERTISSEMENT: la partition %d est vide\n"
 
 #: fdisk/fdisk.c:1840
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
-msgstr "La partition logique %d n'est pas complètement dans la partition %d.\n"
+msgstr "La partition logique %d n'est pas entièrement dans la partition %d\n"
 
 #: fdisk/fdisk.c:1846
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
-msgstr ""
-"Le total des secteurs alloués %d est supérieur à la valeur maximum %d.\n"
+msgstr "Nombre total de secteurs alloués %d plus grand que le maximum %d\n"
 
 #: fdisk/fdisk.c:1849
 #, c-format
 msgid "%d unallocated sectors\n"
-msgstr "%d secteurs non alloués\n"
+msgstr "%d secteurs non-alloués\n"
 
 #: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr ""
-"La partition %d est déjà définie. Supprimez-la avant de l'ajouter de "
-"nouveau.\n"
+msgstr "Partition %d est déjà défini.  La détruire avant de la rajouter.\n"
 
 #: fdisk/fdisk.c:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
 #: fdisk/fdisksunlabel.c:522
@@ -2790,16 +2738,16 @@
 #: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
 #, c-format
 msgid "Sector %d is already allocated\n"
-msgstr "Le secteur %d est déjà alloué.\n"
+msgstr "Secteur %d est déjà alloué\n"
 
 #: fdisk/fdisk.c:1937
 msgid "No free sectors available\n"
-msgstr "Aucun secteur libre disponible.\n"
+msgstr "Aucun secteur disponible\n"
 
 #: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
-msgstr "Dernier %s ou +size ou +sizeM ou +sizeK"
+msgstr "Dernier %s ou +taille or +tailleM ou +tailleK"
 
 #: fdisk/fdisk.c:2011
 msgid ""
@@ -2808,16 +2756,18 @@
 "\ta new empty DOS partition table first. (Use o.)\n"
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
+"\tDésolé - cette version de fdisk ne peut traiter les étiquettes de disques AIX.\n"
+"\tSi vous désirez ajouter des partitions de type DOS, créer d'abord\n"
+"\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:2023 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
-msgstr "Le nombre maximum de partitions a déjà été créé.\n"
+msgstr "Le nombre maximum de partitions a été créé\n"
 
 #: fdisk/fdisk.c:2031
 msgid "You must delete some partition and add an extended partition first\n"
-msgstr ""
-"Vous devez d'abord supprimer une partition et ajouter une partition "
-"étendue.\n"
+msgstr "Vous devez détruire quelques partitions et ajouter une partition étendue d'abord\n"
 
 #: fdisk/fdisk.c:2036
 #, c-format
@@ -2828,32 +2778,32 @@
 msgstr ""
 "Action de commande\n"
 "   %s\n"
-"   p   Partition primaire (1-4)\n"
+"   p   partition primaire (1-4)\n"
 
 #: fdisk/fdisk.c:2038
 msgid "l   logical (5 or over)"
-msgstr "l   Logique (5 ou plus)"
+msgstr "l   logique (5 ou plus)"
 
 #: fdisk/fdisk.c:2038
 msgid "e   extended"
-msgstr "e   Etendue"
+msgstr "e   étendue"
 
 #: fdisk/fdisk.c:2057
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
-msgstr "Nombre de partitions non valide pour le type `%c'.\n"
+msgstr "Numéro invalide de partition pour le type « %c »\n"
 
 #: fdisk/fdisk.c:2093
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
-"La table de partition a été modifiée !\n"
+"La table de partitions a été altérée!\n"
 "\n"
 
 #: fdisk/fdisk.c:2102
 msgid "Calling ioctl() to re-read partition table.\n"
-msgstr "Appel de ioctl() pour relire la table de partition.\n"
+msgstr "Appel de ioctl() pour relire la table de partitions.\n"
 
 #: fdisk/fdisk.c:2118
 #, c-format
@@ -2863,6 +2813,10 @@
 "The kernel still uses the old table.\n"
 "The new table will be used at the next reboot.\n"
 msgstr ""
+"\n"
+"AVERTISSEMENT: la re-lecture de la table de partitions a échoué avec l'erreur %d: %s.\n"
+"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:2128
 msgid ""
@@ -2872,9 +2826,9 @@
 "information.\n"
 msgstr ""
 "\n"
-"AVERTISSEMENT: Si vous avez créé ou modifié\n"
-"une partition DOS 6.x, reportez-vous au manuel de fdisk\n"
-"pour plus d'informations.\n"
+"AVERTISSEMENT: si vous avez créé ou modifié une partition DOS 6.x, \n"
+"svp consulter les pages du manuel de fdisk pour des informations\n"
+"additionnelles.\n"
 
 #: fdisk/fdisk.c:2135
 msgid "Syncing disks.\n"
@@ -2883,7 +2837,7 @@
 #: fdisk/fdisk.c:2182
 #, c-format
 msgid "Partition %d has no data area\n"
-msgstr "La partition %d ne contient pas de zone de données.\n"
+msgstr "Partition %d n'a pas de zone de données\n"
 
 #: fdisk/fdisk.c:2187
 msgid "New beginning of data"
@@ -2891,68 +2845,61 @@
 
 #: fdisk/fdisk.c:2203
 msgid "Expert command (m for help): "
-msgstr "Commande Expert (m pour aide) :"
+msgstr "Commande pour experts (m pour de l'aide): "
 
 #: fdisk/fdisk.c:2216
 msgid "Number of cylinders"
-msgstr "Nombre de cylindres"
+msgstr "Numbre de cylindres"
 
 #: fdisk/fdisk.c:2243
 msgid "Number of heads"
-msgstr "Nombre de têtes"
+msgstr "Numbre de têtes"
 
 #: fdisk/fdisk.c:2268
 msgid "Number of sectors"
-msgstr "Nombre de secteurs"
+msgstr "Numbre de secteurs"
 
 #: fdisk/fdisk.c:2271
 msgid "Warning: setting sector offset for DOS compatiblity\n"
-msgstr ""
-"Avertissement : définition du décalage des secteurs pour la compatibilité "
-"DOS\n"
+msgstr "AVERTISSEMENT: initialisation du décalage de secteur pour compatibilité DOS\n"
 
 #: fdisk/fdisk.c:2346
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
-msgstr "Le disque %s ne contient pas de table de partition valide.\n"
+msgstr "Disque %s ne contient pas une table de partition valide\n"
 
 #: fdisk/fdisk.c:2360
 #, c-format
 msgid "Cannot open %s\n"
-msgstr "Impossible d'ouvrir %s\n"
+msgstr "Ne peut ouvrir %s\n"
 
 #: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
 #, c-format
 msgid "cannot open %s\n"
-msgstr "Impossible d'ouvrir %s\n"
+msgstr "ne peut ouvrir %s\n"
 
 #: fdisk/fdisk.c:2398
 #, c-format
 msgid "%c: unknown command\n"
-msgstr "%c : commande inconnue\n"
+msgstr "%c: commande inconnue\n"
 
 #: fdisk/fdisk.c:2466
 msgid "This kernel finds the sector size itself - -b option ignored\n"
-msgstr ""
-"Ce kernel trouve lui-même la taille de secteur, option  - -b ignorée.\n"
+msgstr "Ce kernel repère lui-même la taille des secteurs - -b option ignorée\n"
 
 #: fdisk/fdisk.c:2470
-msgid ""
-"Warning: the -b (set sector size) option should be used with one specified "
-"device\n"
-msgstr ""
-"Avertissement : l'option -b (définition de la taille de secteur) doit être "
-"utilisée avec un périphériquedéfini.\n"
+msgid "Warning: the -b (set sector size) option should be used with one specified device\n"
+msgstr "AVERTISSEMENT: l'option -b (initialisé la taille de secteur) doit être utilisé avec le périphérique spécifié\n"
 
 #. OSF label, and no DOS label
 #: fdisk/fdisk.c:2529
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-msgstr ""
+msgstr "Détection d'une étiquette de disque pour OSF/1 sur %s, passage en mode d'édition d'étiquette.\n"
 
 #: fdisk/fdisk.c:2539
 msgid "Command (m for help): "
-msgstr "Commande (m pour aide) : "
+msgstr "Commande (m pour l'aide): "
 
 #: fdisk/fdisk.c:2555
 #, c-format
@@ -2961,15 +2908,15 @@
 "The current boot file is: %s\n"
 msgstr ""
 "\n"
-"Le fichier amorce en cours est : %s.\n"
+"Le fichier courant d'amorçage est: %s\n"
 
 #: fdisk/fdisk.c:2557
 msgid "Please enter the name of the new boot file: "
-msgstr "Entrez le nom du nouveau fichier amorce : "
+msgstr "SVP entrer le nom du nouveau fichier d'amorçage: "
 
 #: fdisk/fdisk.c:2559
 msgid "Boot file unchanged\n"
-msgstr "Fichier amorce inchangé\n"
+msgstr "Fichier d'amorçage n'a pas été modifié\n"
 
 #: fdisk/fdisk.c:2624
 msgid ""
@@ -2978,7 +2925,7 @@
 "\n"
 msgstr ""
 "\n"
-"\tDésolé, aucun menu Experts disponible pour les tables de partition SGI.\n"
+"\tDésolé, il n'y a pas de menu pour experts pour les tables de partitions de type SGI.\n"
 "\n"
 
 #: fdisk/fdiskaixlabel.c:28
@@ -2997,18 +2944,17 @@
 "\t   machine.  (Otherwise you become an AIXpert)."
 msgstr ""
 "\n"
-"\tIl existe un libellé AIX valide sur ce disque.\n"
-"\tLinux ne peut malheureusement pas gérer ces\n"
-"\tdisques pour l'instant. Quelques conseils\n"
-"\ttoutefois :\n"
-"\t1. fdisk détruira son contenu lors d'une commande write.\n"
-"\t2. Assurez-vous que le disque n'est PLUS une partie\n"
-"\t   vitale du groupe de volumes. (Sinon, vous risquez\n"
-"\t   d'effacer également les autres disques, si ceux-ci sont mis en "
-"miroir.)\n"
-"\t3. Avant de supprimer ce volume physique, assurez-vous\n"
-"\t   de supprimer logiquement le disque de votre ordinateur AIX.\n"
-"\t   (Sinon, vous deviendrez un AIXpert)."
+"\tIl y a une étiquette AIX valide sur ce disque.\n"
+"\tmalheureusement Linux ne traiter ce type de disque\n"
+"\tpour le moment.  Néammoins voici quelques\n"
+"\tconseils:\n"
+"\t1. fdisk détruire ra son contenu lors d'une écriture.\n"
+"\t2. soyez sûre que le disque ne contient pas de données VITALES\n"
+"\t   faisant partie d'un groupe de volumes. (Si tel était le cas, vous pouvez\n"
+"\t   effacer les autres disques aussi, si pas en mode miroir.)\n"
+"\t3. Avant de détuire physiquement le contenu physique du disque\n"
+"\t   retirer le disque logique de votre machine AIX\n"
+"\t   (Autrement vous devenez un expert AIX)."
 
 #: fdisk/fdiskbsdlabel.c:122
 #, c-format
@@ -3017,98 +2963,98 @@
 "BSD label for device: %s\n"
 msgstr ""
 "\n"
-"Libellé BSD pour le périphérique : %s\n"
+"Étiquette BSD sur le périphérique: %s\n"
 
 #: fdisk/fdiskbsdlabel.c:130
 msgid "   d   delete a BSD partition"
-msgstr "   d   Efface une partition BSD"
+msgstr "   d   détruire une partition BSD"
 
 #: fdisk/fdiskbsdlabel.c:131
 msgid "   e   edit drive data"
-msgstr "   e   Edite les données du disque"
+msgstr "   e   éditer les données du périphérique"
 
 #: fdisk/fdiskbsdlabel.c:132
 msgid "   i   install bootstrap"
-msgstr "   i   Installe une amorce"
+msgstr "   i   installer une amorce"
 
 #: fdisk/fdiskbsdlabel.c:133
 msgid "   l   list known filesystem types"
-msgstr "   l   Répertorie les types de système de fichiers connus"
+msgstr "   l   lister les types de système de fichiers connus"
 
 #: fdisk/fdiskbsdlabel.c:135
 msgid "   n   add a new BSD partition"
-msgstr "   n   Ajoute une nouvelle partition BSD"
+msgstr "   n   ajouter une nouvelle partition BSD"
 
 #: fdisk/fdiskbsdlabel.c:136
 msgid "   p   print BSD partition table"
-msgstr "   p   Affiche la table de partition BSD"
+msgstr "   p   afficher la table de partitions BSD"
 
 #: fdisk/fdiskbsdlabel.c:139
 msgid "   s   show complete disklabel"
-msgstr "   s   Affiche le libellé de disque complet"
+msgstr "   s   montrer l'étiquette complète du disque"
 
 #: fdisk/fdiskbsdlabel.c:140
 msgid "   t   change a partition's filesystem id"
-msgstr "   t   Change l'ID du système de fichiers d'une partition"
+msgstr "   t   modifier l'identificateur de partition de système de fichiers"
 
 #: fdisk/fdiskbsdlabel.c:141
 msgid "   u   change units (cylinders/sectors)"
-msgstr "   u   Change d'unités (cylindres/secteurs)"
+msgstr "   u   modifier les unités (cylindres/secteurs)"
 
 #: fdisk/fdiskbsdlabel.c:142
 msgid "   w   write disklabel to disk"
-msgstr "   w   Écrit le libellé de disque dans un disque"
+msgstr "   w   écrire l'étiquette sur le disque"
 
 #: fdisk/fdiskbsdlabel.c:144
 msgid "   x   link BSD partition to non-BSD partition"
-msgstr "   x   Lie la partition BSD à une partition non BSD"
+msgstr "   x   lier la partition BSD à une partition qui n'est pas de type BSD"
 
 #: fdisk/fdiskbsdlabel.c:176
 #, c-format
 msgid "Partition %s has invalid starting sector 0.\n"
-msgstr "La partition %s a un secteur de début 0 non valide.\n"
+msgstr "Partition %s a un secteur 0 de départ invalide 0.\n"
 
 #: fdisk/fdiskbsdlabel.c:180
 #, c-format
 msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "Lecture du libellé de disque de %s dans le secteur %d.\n"
+msgstr "Lecture de l'étiquette du disque %s au secteur %d.\n"
 
 #: fdisk/fdiskbsdlabel.c:190
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
-msgstr "Il n'y a aucune partition *BSD sur %s.\n"
+msgstr "Il n'y a pas de partition *BSD sur %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:204
 msgid "BSD disklabel command (m for help): "
-msgstr "Commande de libellé de disque BSD (m pour aide) : "
+msgstr "Commande d'étiquetage BSD (m pour de l'aide): "
 
 #: fdisk/fdiskbsdlabel.c:318
 #, c-format
 msgid "type: %s\n"
-msgstr "type : %s\n"
+msgstr "type: %s\n"
 
 #: fdisk/fdiskbsdlabel.c:320
 #, c-format
 msgid "type: %d\n"
-msgstr "type : %d\n"
+msgstr "type: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:321
 #, c-format
 msgid "disk: %.*s\n"
-msgstr "disque : %.*s\n"
+msgstr "disque: %.*s\n"
 
 #: fdisk/fdiskbsdlabel.c:322
 #, c-format
 msgid "label: %.*s\n"
-msgstr "libellé : %.*s\n"
+msgstr "étiquette: %.*s\n"
 
 #: fdisk/fdiskbsdlabel.c:323
 msgid "flags:"
-msgstr "indicateurs :"
+msgstr "fanions:"
 
 #: fdisk/fdiskbsdlabel.c:325
 msgid " removable"
-msgstr " supprimable"
+msgstr " retirable"
 
 #: fdisk/fdiskbsdlabel.c:327
 msgid " ecc"
@@ -3116,68 +3062,68 @@
 
 #: fdisk/fdiskbsdlabel.c:329
 msgid " badsect"
-msgstr " badsect"
+msgstr " mauvais secteur"
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "bytes/sector: %ld\n"
-msgstr "octets/secteur : %ld\n"
+msgstr "octets/secteur: %ld\n"
 
 #: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "sectors/track: %ld\n"
-msgstr "secteurs/piste : %ld\n"
+msgstr "secteurs/piste: %ld\n"
 
 #: fdisk/fdiskbsdlabel.c:335
 #, c-format
 msgid "tracks/cylinder: %ld\n"
-msgstr "pistes/cylindre : %ld\n"
+msgstr "pistes/cylindre: %ld\n"
 
 #: fdisk/fdiskbsdlabel.c:336
 #, c-format
 msgid "sectors/cylinder: %ld\n"
-msgstr "secteurs/cylindre : %ld\n"
+msgstr "secteurs/cylindre: %ld\n"
 
 #: fdisk/fdiskbsdlabel.c:337
 #, c-format
 msgid "cylinders: %ld\n"
-msgstr "cylindres : %ld\n"
+msgstr "cylindres: %ld\n"
 
 #: fdisk/fdiskbsdlabel.c:338
 #, c-format
 msgid "rpm: %d\n"
-msgstr "tpm : %d\n"
+msgstr "rpm: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:339
 #, c-format
 msgid "interleave: %d\n"
-msgstr "interleave : %d\n"
+msgstr "inter-feuillage: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:340
 #, c-format
 msgid "trackskew: %d\n"
-msgstr "trackskew : %d\n"
+msgstr "décalage de piste: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:341
 #, c-format
 msgid "cylinderskew: %d\n"
-msgstr "cylinderskew : %d\n"
+msgstr "décalage de cylindre: %d\n"
 
 #: fdisk/fdiskbsdlabel.c:342
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr "headswitch : %ld\t\t# millisecondes\n"
+msgstr "commutation de têtes: %ld\t\t#millisecondes\n"
 
 #: fdisk/fdiskbsdlabel.c:344
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
-msgstr "track-to-track seek : %ld\t# millisecondes\n"
+msgstr "repérage piste-à-piste: %ld\t# millisecondes\n"
 
 #: fdisk/fdiskbsdlabel.c:346
 msgid "drivedata: "
-msgstr "drivedata : "
+msgstr "données de périphérique: "
 
 #: fdisk/fdiskbsdlabel.c:355
 #, c-format
@@ -3186,25 +3132,25 @@
 "%d partitions:\n"
 msgstr ""
 "\n"
-"%d partitions :\n"
+"%d partitions:\n"
 
 #: fdisk/fdiskbsdlabel.c:356
 msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr "N°      début       fin      taille   fstype   [fsize bsize   cpg]\n"
+msgstr "#       début       fin      taille   typeSF   [tailF tailb   cpg]\n"
 
 #: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
 #, c-format
 msgid "Writing disklabel to %s.\n"
-msgstr "Ecriture du libellé de disque dans %s.\n"
+msgstr "Écriture de l'étiquette de disque sur %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
 #, c-format
 msgid "%s contains no disklabel.\n"
-msgstr "%s ne contient aucun libellé de disque.\n"
+msgstr "%s ne contient pas d'étiquette.\n"
 
 #: fdisk/fdiskbsdlabel.c:427
 msgid "Do you want to create a disklabel? (y/n) "
-msgstr "Voulez-vous créer un libellé de disque ? (y/n) "
+msgstr "Voulez-vous créer une étiquette de disque? (o/n) "
 
 #: fdisk/fdiskbsdlabel.c:467
 msgid "bytes/sector"
@@ -3228,36 +3174,36 @@
 
 #: fdisk/fdiskbsdlabel.c:483
 msgid "rpm"
-msgstr "tpm"
+msgstr "rpm"
 
 #: fdisk/fdiskbsdlabel.c:484
 msgid "interleave"
-msgstr "interleave"
+msgstr "inter-feuillage"
 
 #: fdisk/fdiskbsdlabel.c:485
 msgid "trackskew"
-msgstr "trackskew"
+msgstr "décalage de pistes"
 
 #: fdisk/fdiskbsdlabel.c:486
 msgid "cylinderskew"
-msgstr "cylinderskew"
+msgstr "décalage de cylindres"
 
 #: fdisk/fdiskbsdlabel.c:487
 msgid "headswitch"
-msgstr "headswitch"
+msgstr "commutation de têtes"
 
 #: fdisk/fdiskbsdlabel.c:488
 msgid "track-to-track seek"
-msgstr "track-to-track seek"
+msgstr "repérage piste-à-piste"
 
 #: fdisk/fdiskbsdlabel.c:529
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
-msgstr "Amorce : %sboot -> boot%s (%s) : "
+msgstr "Amorce: %sboot -> boot%s (%s): "
 
 #: fdisk/fdiskbsdlabel.c:554
 msgid "Bootstrap overlaps with disk label!\n"
-msgstr "L'amorce chevauche le libellé de disque !\n"
+msgstr "L'amorce chevauche l'étiquette du disque!\n"
 
 #: fdisk/fdiskbsdlabel.c:575 fdisk/fdiskbsdlabel.c:577
 #, c-format
@@ -3267,17 +3213,16 @@
 #: fdisk/fdiskbsdlabel.c:599
 #, c-format
 msgid "Partition (a-%c): "
-msgstr "Partition (a-%c) : "
+msgstr "Partition (a-%c): "
 
 #: fdisk/fdiskbsdlabel.c:630
 msgid "This partition already exists.\n"
-msgstr "Cette partition existe déjà .\n"
+msgstr "Cette partition existe déjà.\n"
 
 #: fdisk/fdiskbsdlabel.c:756
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr ""
-"Avertissement : partitions trop nombreuses (%d, le nombre maximum est %d).\n"
+msgstr "AVERTISSEMENT: trop de partition (%d, maximum is %d).\n"
 
 #: fdisk/fdiskbsdlabel.c:804
 msgid ""
@@ -3313,7 +3258,7 @@
 
 #: fdisk/fdisksgilabel.c:84
 msgid "SGI volume"
-msgstr "volume SGI"
+msgstr "SGI volume"
 
 #: fdisk/fdisksgilabel.c:85
 msgid "SGI efs"
@@ -3332,50 +3277,43 @@
 msgstr "SGI xfs"
 
 #: fdisk/fdisksgilabel.c:89
-#, fuzzy
 msgid "SGI xfslog"
-msgstr "SGI xfs"
+msgstr "SGI xfslog"
 
 #: fdisk/fdisksgilabel.c:90
-#, fuzzy
 msgid "SGI xlv"
-msgstr "SGI xlvol"
+msgstr "SGI xlv"
 
 #: fdisk/fdisksgilabel.c:91
-#, fuzzy
 msgid "SGI xvm"
-msgstr "SGI xlvol"
+msgstr "SGI xvm"
 
 #. Minix 1.4b and later
 #: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
-msgstr "Echange Linux"
+msgstr "Linux swap"
 
 #: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
-msgstr "Linux natif"
+msgstr "Linux native"
 
 #: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
 #: fdisk/fdisksgilabel.c:95
-#, fuzzy
 msgid "Linux RAID"
-msgstr "Linux"
+msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:158
-msgid ""
-"According to MIPS Computer Systems, Inc the Label must not contain more than "
-"512 bytes\n"
-msgstr ""
-"Selon MIPS Computer Systems, Inc le libellé ne doit pas contenir plus de 512 "
-"octets\n"
+msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
+msgstr "Selon la MIPS Computer Systems Inc, l'étiquette ne doit pas contenir plus de 512 octets\n"
 
 #: fdisk/fdisksgilabel.c:177
 msgid "Detected sgi disklabel with wrong checksum.\n"
-msgstr "Libellé de disque SGI détecté avec total de contrôle incorrect.\n"
+msgstr "Étiquette de disque SGI détectée avec une somme de contrôle erronée.\n"
 
+# fdisk/fdisksgilabel.c:202
 #: fdisk/fdisksgilabel.c:200
 #, c-format
 msgid ""
@@ -3388,11 +3326,11 @@
 "\n"
 msgstr ""
 "\n"
-"Disque %s (libellé de disque SGI) : %d têtes, %d secteurs\n"
+"Disque %s (étiquette SGI de disque): %d têtes, %d secteurs\n"
 "%d cylindres, %d cylindres physiques\n"
-"%d secteurs suppl/cyl, entrelacement %d :1\n"
+"%d secteurs additionnels/cyl, interleave %d:1\n"
 "%s\n"
-"Unités = %s sur %d * 512 octets\n"
+"Unités = %s of %d * 512 octets\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:212
@@ -3404,34 +3342,34 @@
 "\n"
 msgstr ""
 "\n"
-"Disque %s (libellé de disque SGI) : %d têtes, %d secteurs, %d cylindres\n"
-"Unités = %s sur %d * 512 octets\n"
+"Disque %s (étiquette SGI de disque): %d têtes, %d secteurs, %d cylindres\n"
+"Unités = %s de %d * 512 octets\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:218
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "----- partitions -----\n"
 "Pt# %*s  Info     Start       End   Sectors  Id  System\n"
 msgstr ""
 "----- partitions -----\n"
-"%*s  Infos      Début       Fin   Secteurs  Id  Système\n"
+"Pt# %*s  Info     Début       Fin   Secteurs Id  Système\n"
 
 #: fdisk/fdisksgilabel.c:240
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "----- Bootinfo -----\n"
 "Bootfile: %s\n"
 "----- Directory Entries -----\n"
 msgstr ""
-"----- bootinfo -----\n"
-"Fichier amorce : %s\n"
-"----- entrées de répertoire -----\n"
+"----- Info d'amorce -----\n"
+"Fichier d'amorce: %s\n"
+"----- Entrées de répertoire -----\n"
 
 #: fdisk/fdisksgilabel.c:250
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
-msgstr "%2d : %-10s secteur%5u taille%8u\n"
+msgstr "%2d: %-10s secteur%5u taille%8u\n"
 
 #: fdisk/fdisksgilabel.c:304
 msgid ""
@@ -3441,9 +3379,9 @@
 "\te.g. \"/unix\" or \"/unix.save\".\n"
 msgstr ""
 "\n"
-"Fichier amorce non valide !\n"
-"\tLe fichier amorce doit être un nom de chemin absolu non nul,\n"
-"\tpar exemple, \"/unix\" ou \"/unix.save\".\n"
+"Fichier d'amorce invalide!\n"
+"\tLe fichier d'amorce doit avoir un chemin absolu d'accès non nul (non zéro),\n"
+"\te.g. « /unix » ou \"/unix.save\".\n"
 
 #: fdisk/fdisksgilabel.c:311
 msgid ""
@@ -3451,7 +3389,7 @@
 "\tName of Bootfile too long:  16 bytes maximum.\n"
 msgstr ""
 "\n"
-"\tNom du fichier amorce trop long : 16 octets maximum.\n"
+"\tNom du fichier d'amorce trop long:  16 octets au maximum.\n"
 
 #: fdisk/fdisksgilabel.c:316
 msgid ""
@@ -3459,7 +3397,7 @@
 "\tBootfile must have a fully qualified pathname.\n"
 msgstr ""
 "\n"
-"\tLe fichier amorce doit avoir un nom de chemin valide.\n"
+"\tFichier d'amorce doit avoir un chemin d'accès complètement conforme.\n"
 
 #: fdisk/fdisksgilabel.c:321
 msgid ""
@@ -3468,9 +3406,8 @@
 "\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n"
 msgstr ""
 "\n"
-"\tN'oubliez pas l'existence du fichier amorce n'est pas vérifiée.\n"
-"\tLa valeur par défaut de SGI est \"/unix\" et celle de sauvegarde est \"/"
-"unix.save\".\n"
+"\tSoyez avisé que le fichier d'amorce n'est pas vérifié pour son existence.\n"
+"\tPar défaut pour SGI, il est « /unix » et pour archive « /unix.save ».\n"
 
 #: fdisk/fdisksgilabel.c:349
 #, c-format
@@ -3479,11 +3416,11 @@
 "\tBootfile is changed to \"%s\".\n"
 msgstr ""
 "\n"
-"\tFichier amorce remplacé par \"%s\".\n"
+"\tLe fichier d'amorce a été modifié pour « %s ».\n"
 
 #: fdisk/fdisksgilabel.c:447
 msgid "More than one entire disk entry present.\n"
-msgstr "Il existe plus d'une entrée de disque entier.\n"
+msgstr "Plus d'une entrée entière de disque présente.\n"
 
 #: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
 msgid "No partitions defined\n"
@@ -3491,7 +3428,7 @@
 
 #: fdisk/fdisksgilabel.c:462
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
-msgstr "IRIX préfère lorsque la Partition 11 couvre le disque entier.\n"
+msgstr "Pour IRIX il est recommandé que la partition 11 couvre entièrement le disque.\n"
 
 #: fdisk/fdisksgilabel.c:464
 #, c-format
@@ -3499,8 +3436,8 @@
 "The entire disk partition should start at block 0,\n"
 "not at diskblock %d.\n"
 msgstr ""
-"La partition de disque entier doit commencer au bloc 0,\n"
-"non pas au bloc de disque %d.\n"
+"La partition entière du disque doit débuter au bloc 0,\n"
+"pas au bloc %d.\n"
 
 #: fdisk/fdisksgilabel.c:468
 #, c-format
@@ -3508,32 +3445,32 @@
 "The entire disk partition is only %d diskblock large,\n"
 "but the disk is %d diskblocks long.\n"
 msgstr ""
-"La partition de disque entier ne couvre que %d blocs de disque,\n"
-"mais le disque a une longueur de %d blocs de disque.\n"
+"La partition entière du disque est seulement de %d blocs de largeur,\n"
+"alors que le disque contient %d blocs de disque.\n"
 
 #: fdisk/fdisksgilabel.c:475
 msgid "One Partition (#11) should cover the entire disk.\n"
-msgstr "Une partition (N°11) doit couvrir le disque entier.\n"
+msgstr "La partition (#11) devrait couvrir le disque en entier.\n"
 
 #: fdisk/fdisksgilabel.c:487
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
-msgstr "La partition %d ne commence pas à la limite du cylindre.\n"
+msgstr "La partition %d ne débute pas sur une frontière de cylindre.\n"
 
 #: fdisk/fdisksgilabel.c:494
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
-msgstr "La partition %d ne se termine pas à la limite du cylindre.\n"
+msgstr "La partition %d ne se termine pas sur une frontière de cylindre.\n"
 
 #: fdisk/fdisksgilabel.c:502
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
-msgstr "Les partitions %d et %d se chevauchent de %d secteurs.\n"
+msgstr "Les partitions %d et %d se chevauchent sur %d secteurs.\n"
 
 #: fdisk/fdisksgilabel.c:511 fdisk/fdisksgilabel.c:531
 #, c-format
 msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
-msgstr "Intervalle inutilisé de %8d secteurs - secteurs %8d-%d\n"
+msgstr "Espace inutilisé de %8d secteurs - secteurs %8d-%d\n"
 
 #: fdisk/fdisksgilabel.c:544
 msgid ""
@@ -3541,7 +3478,7 @@
 "The boot partition does not exist.\n"
 msgstr ""
 "\n"
-"La partition d'amorçage n'existe pas.\n"
+"La partition d'amorce n'existe pas.\n"
 
 #: fdisk/fdisksgilabel.c:548
 msgid ""
@@ -3549,7 +3486,7 @@
 "The swap partition does not exist.\n"
 msgstr ""
 "\n"
-"La partition d'échange n'existe pas.\n"
+"La partition de swap n'existe pas.\n"
 
 #: fdisk/fdisksgilabel.c:553
 msgid ""
@@ -3557,16 +3494,15 @@
 "The swap partition has no swap type.\n"
 msgstr ""
 "\n"
-"La partition d'échange n'a pas de type d'échange.\n"
+"La partition de swap n'est pas de type swap.\n"
 
 #: fdisk/fdisksgilabel.c:557
 msgid "\tYou have chosen an unusual boot file name.\n"
-msgstr "\tVous avez choisi un nom de fichier amorce inhabituel.\n"
+msgstr "\tVous avez choisi un nom de fichier d'amorce inhabituel.\n"
 
 #: fdisk/fdisksgilabel.c:568
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr ""
-"Désolé. Vous pouvez uniquement changer la balise des partitions non vides.\n"
+msgstr "Désolé. Vous pouvez modifié l'étiquette des partitions occupées.\n"
 
 #: fdisk/fdisksgilabel.c:575
 msgid ""
@@ -3576,52 +3512,45 @@
 "Only the \"SGI volume\" entire disk section may violate this.\n"
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
-"Il est fortement recommandé que la partition au décalage 0\n"
-"soit de type \"SGI volhdr\". Le système IRIX s'appuiera dessus pour\n"
-"effectuer des récupérations depuis ses outils autonomes de répertoire tels "
-"que sash et fx.\n"
-"Seule la section du disque entier \"SGI volume\" peut passer outre cette "
-"recommandation.\n"
-"Tapez OUI si vous êtes certain de vouloir baliser cette partition "
-"différemment.\n"
+"Il est fortement recommandé que la partition à l'adresse relative 0\n"
+"soit de type \"SGI volhdr\", le système IRIX compte dessus\n"
+"afin de récupérer ses répertoires avec les outils en mode usager simple\n"
+"comme sash et fx. Seul \"SGI volume\" couvrant la section entière du\n"
+"disque peut enfreindre cette règle.\n"
+"Taper OUI si vous êtes certain de l'étiquetage différent de cette partition.\n"
 
 #: fdisk/fdisksgilabel.c:580 fdisk/fdisksunlabel.c:631
 msgid "YES\n"
-msgstr ""
+msgstr "YES\n"
 
 #. rebuild freelist
 #: fdisk/fdisksgilabel.c:606
 msgid "Do You know, You got a partition overlap on the disk?\n"
-msgstr ""
-"Savez-vous qu'il existe un chevauchement de partitions sur le disque ?\n"
+msgstr "Saviez-vous que vous avez un chevauchement de partition sur le disque?\n"
 
 #: fdisk/fdisksgilabel.c:668
 msgid "Attempting to generate entire disk entry automatically.\n"
-msgstr "Tentative de génération automatique de l'entrée de disque entier.\n"
+msgstr "Tentative de génération d'une entrée complète de disque automatiquement.\n"
 
 #: fdisk/fdisksgilabel.c:675
 msgid "The entire disk is already covered with partitions.\n"
-msgstr "Le disque entier est déjà partitionné.\n"
+msgstr "Le disque entier est déjà plein de partitions.\n"
 
 #: fdisk/fdisksgilabel.c:680
 msgid "You got a partition overlap on the disk. Fix it first!\n"
-msgstr ""
-"Il y a un chevauchement de partitions sur le disque. Rectifiez d'abord ce "
-"problème !\n"
+msgstr "Il y a un chevauchement de partition sur le disque. SVP le corriger!\n"
 
 #: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
 msgstr ""
-"Il est fortement recommandé que la onzième partition\n"
-"couvre le disque entier et soit de type `SGI volume'.\n"
+"Il est fortement recommandé the la 11e partition\n"
+"couvre le disque en entier pour ce type « SGI volume »\n"
 
 #: fdisk/fdisksgilabel.c:705
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
-msgstr ""
-"Le disque contiendra un chevauchement de partitions. Rectifiez d'abord ce "
-"problème !\n"
+msgstr "Vous aller obtenir un chevauchement de partition sur ce disque. SVP le corriger!\n"
 
 #: fdisk/fdisksgilabel.c:710
 #, c-format
@@ -3635,9 +3564,10 @@
 "content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
-"Création d'un nouveau libellé de disque SGI. Les modifications seront\n"
-"uniquement conservées en mémoire jusqu'à ce que vous décidiez de les\n"
-"écrire. Une fois terminé, le contenu précédent ne pourra être restauré.\n"
+"Construction d'une nouvelle étiquette de disque SGI. Les modifications vont demeurer\n"
+"en mémoire jusqu'à ce que vous décidiez de les écrire.\n"
+"Par la suite, bine sûr, le contenu précédent sera perdu de façon\n"
+"irrécupérable.\n"
 "\n"
 
 #: fdisk/fdisksgilabel.c:758
@@ -3648,7 +3578,7 @@
 #: fdisk/fdisksgilabel.c:760
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
-msgstr "ID=%02x\tSTART=%d\tLENGTH=%d\n"
+msgstr "ID=%02x\tDÉBUT=%d\tLONGUEUR=%d\n"
 
 #: fdisk/fdisksunlabel.c:44 fdisk/i386_sys_types.c:6
 msgid "Empty"
@@ -3656,15 +3586,15 @@
 
 #: fdisk/fdisksunlabel.c:46
 msgid "SunOS root"
-msgstr "Root SunOS"
+msgstr "SunOS root"
 
 #: fdisk/fdisksunlabel.c:47
 msgid "SunOS swap"
-msgstr "Echange SunOS"
+msgstr "SunOS swap"
 
 #: fdisk/fdisksunlabel.c:48
 msgid "SunOS usr"
-msgstr "Util SunOS"
+msgstr "SunOS usr"
 
 #: fdisk/fdisksunlabel.c:49
 msgid "Whole disk"
@@ -3685,8 +3615,9 @@
 #. DOS 3.3+ secondary
 #: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:98
 msgid "Linux raid autodetect"
-msgstr "Détection auto RAID Linux"
+msgstr "Linux raid autodetect"
 
+# fdisk/fdisksunlabel.c:132
 #: fdisk/fdisksunlabel.c:133
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3694,15 +3625,15 @@
 "e.g. heads, sectors, cylinders and partitions\n"
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
-"Libellé de disque Sun avec total de contrôle incorrect détecté.\n"
-"Vous devrez sans doute définir toutes les valeurs,\n"
-"par exemple, têtes, secteurs, cylindres et partitions\n"
-"ou forcer un nouveau libellé (commande s du menu principal).\n"
+"Détection d'une étiquette de disque Sun avec une somme de contrôle erronée.\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"
 
 #: fdisk/fdisksunlabel.c:232
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
-msgstr "Le programme de configuration automatique a trouvé un %s%s%s\n"
+msgstr "L'autoconfiguration a repéré %s%s%s\n"
 
 #: fdisk/fdisksunlabel.c:259
 msgid ""
@@ -3711,11 +3642,9 @@
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Création d'un nouveau libellé de disque Sun. Les modifications seront "
-"uniquement conservées en\n"
-"mémoire jusqu'à ce que vous décidiez de les écrire. Une fois terminé, le "
-"contenu précédent\n"
-"ne pourra être restauré.\n"
+"Construction d'une nouvelle étiquette Sun pour disque. Les modifications resteront\n"
+"en mémoire jusqu'à écriture. Après quoi, bien sûr, le précédent contenu\n"
+"sera irrécupérable.\n"
 "\n"
 
 #: fdisk/fdisksunlabel.c:270
@@ -3724,17 +3653,18 @@
 "   ?   auto configure\n"
 "   0   custom (with hardware detected defaults)"
 msgstr ""
-"Type de disque\n"
-"   ?   configuration auto\n"
-"   0   personnalisé (avec détection des paramètres matériels par défaut)"
+"Type de périphérique\n"
+"   ?   autoconfiguration\n"
+"   0   configuration manuelle (à l'aide de la détection\n"
+"        matérielle des paramètres par défaut)"
 
 #: fdisk/fdisksunlabel.c:280
 msgid "Select type (? for auto, 0 for custom): "
-msgstr "Sélectionnez le type (? pour auto, 0 pour personnalisé) : "
+msgstr "Sélectionner le type (? pour autoconfiguration, 0 pour configuration manuelle)"
 
 #: fdisk/fdisksunlabel.c:292
 msgid "Autoconfigure failed.\n"
-msgstr "Échec de la configuration automatique.\n"
+msgstr "Échec d'autoconfiguration.\n"
 
 #: fdisk/fdisksunlabel.c:320
 msgid "Sectors/track"
@@ -3742,7 +3672,7 @@
 
 #: fdisk/fdisksunlabel.c:327
 msgid "Alternate cylinders"
-msgstr "Cylindres de remplacement"
+msgstr "Cylindres alternatifs"
 
 #: fdisk/fdisksunlabel.c:330
 msgid "Physical cylinders"
@@ -3750,48 +3680,47 @@
 
 #: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
 msgid "Rotation speed (rpm)"
-msgstr "Vitesse de rotation (tpm)"
+msgstr "Vitesse de rotation (rpm)"
 
 #: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
 msgid "Interleave factor"
-msgstr "Facteur d'entrelacement"
+msgstr "Facteur d'inter-feuillage"
 
 #: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
 msgid "Extra sectors per cylinder"
-msgstr "Secteurs supplémentaires par cylindre"
+msgstr "Secteurs additionnels par cylindre"
 
 #: fdisk/fdisksunlabel.c:352
 msgid "You may change all the disk params from the x menu"
-msgstr "Vous pouvez modifier tous les paramètres de disque depuis le menu x."
+msgstr "Vous pouvez modifier toues les paramètres du disque à partir du menu x"
 
 #: fdisk/fdisksunlabel.c:359
 msgid "3,5\" floppy"
-msgstr "Disquette 3,5\""
+msgstr "3,5\" disquette"
 
 #: fdisk/fdisksunlabel.c:359
 msgid "Linux custom"
-msgstr "Linux personnalisé"
+msgstr "Configuration Linux"
 
 #: fdisk/fdisksunlabel.c:446
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
-msgstr "La partition %d ne se termine pas sur une limite de cylindre.\n"
+msgstr "La partition %d ne se termine pas sur une frontière de cylindre\n"
 
 #: fdisk/fdisksunlabel.c:466
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
-msgstr ""
-"La partition %d chevauche d'autres partitions dans les secteurs %d-%d.\n"
+msgstr "La partition %d en chevauche d'autres dans les secteurs %d-%d\n"
 
 #: fdisk/fdisksunlabel.c:488
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
-msgstr "Intervalle inutilisé - secteurs 0-%d\n"
+msgstr "Espace inutilisé - secteurs 0-%d\n"
 
 #: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
-msgstr "Intervalle inutilisé - secteurs %d-%d\n"
+msgstr "Espace inutilisé - secteurs %d-%d\n"
 
 #: fdisk/fdisksunlabel.c:517
 msgid ""
@@ -3799,7 +3728,7 @@
 "Delete some/shrink them before retry.\n"
 msgstr ""
 "D'autres partitions couvrent déjà le disque entier.\n"
-"Supprimez ou réduisez-en avant d'essayer de nouveau.\n"
+"En détruire/réduire quelques unes avant de ré-essayer.\n"
 
 #: fdisk/fdisksunlabel.c:593
 #, c-format
@@ -3808,9 +3737,9 @@
 "%d %s covers some other partition. Your entry has been changed\n"
 "to %d %s\n"
 msgstr ""
-"La troisième partition ne couvre pas le disque entier, mais la valeur\n"
-"%d %s couvre une autre partition. Votre entrée a été remplacée\n"
-"par %d %s.\n"
+"Vous n'avez pas couvert le disque entier avec la 3e partition,\n"
+"mais la valeur %d %s en couvre d'autres. Votre entrée a été modifiée\n"
+"à %d %s\n"
 
 #: fdisk/fdisksunlabel.c:613
 #, c-format
@@ -3818,9 +3747,8 @@
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
-"Si vous voulez maintenir la compatibilité SunOS/Solaris, envisagez de "
-"conserver cette\n"
-"partition en tant que disque entier (5), commençant à 0, avec %u secteurs.\n"
+"Si vous désirez maintenir une compatibilité SunOS/Solaris, considérer laisser cette\n"
+"partition comme disque entier (5), débutant à 0, avec les secteurs %u\n"
 
 #: fdisk/fdisksunlabel.c:626
 msgid ""
@@ -3831,12 +3759,12 @@
 "tagged with 82 (Linux swap): "
 msgstr ""
 "Il est fortement recommandé que la partition au décalage 0\n"
-"soit le système de fichiers UFS, EXT2FS ou le swap SunOS. Le fait d'y placer "
-"le swap Linux\n"
-"risque de détruire la table de partition et le bloc d'amorçage.\n"
-"Tapez OUI si vous êtes certain de vouloir baliser cette partition\n"
-"avec la valeur 82 (swap Linux) : "
+"soit un système de fichiers UFS, EXT2FS ou SunOS swap. Utiliser Linux swap\n"
+"pourrait détruire votre table de partitions et le bloc d'amorçage.\n"
+"Taper YES (pour OUI) si vous êtes certain que vous voulez que cette partition\n"
+"soit étiquetée 82 (Linux swap): "
 
+# fdisk/fdisksunlabel.c:656
 #: fdisk/fdisksunlabel.c:657
 #, c-format
 msgid ""
@@ -3849,9 +3777,9 @@
 "\n"
 msgstr ""
 "\n"
-"Disque %s (libellé de disque Sun) : %d têtes, %d secteurs, %d tpm\n"
-"%d cylindres, %d cylindres de remplacement, %d cylindres physiques\n"
-"%d secteurs suppl/cyl, entrelacement %d :1\n"
+"Disque %s (étiquette de disque Sun): %d têtes, %d secteurs, %d rpm\n"
+"%d cylindres, %d cylindres alternatifs, %d cylindres physiques\n"
+"%d secteurs/cyl additionnels, interleave %d:1\n"
 "%s\n"
 "Unités = %s de %d * 512 octets\n"
 "\n"
@@ -3865,18 +3793,18 @@
 "\n"
 msgstr ""
 "\n"
-"Disque %s (libellé de disque Sun) : %d têtes, %d secteurs, %d cylindres\n"
-"Unités = %s sur %d * 512 octects\n"
+"Disque %s (étiquette de disque Sun): %d têtes, %d secteurs, %d cylindres\n"
+"Unités = %s de %d * 512 octets\n"
 "\n"
 
 #: fdisk/fdisksunlabel.c:676
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
-msgstr "%*s Indicateur    Début       Fin    Blocs   Id  Système\n"
+msgstr "%*s Fanions Début       Fin    Blocs    Id  Système\n"
 
 #: fdisk/fdisksunlabel.c:701
 msgid "Number of alternate cylinders"
-msgstr "Nombre de cylindres de remplacement"
+msgstr "Nombre de cylindres alternatifs"
 
 #: fdisk/fdisksunlabel.c:734
 msgid "Number of physical cylinders"
@@ -3888,11 +3816,11 @@
 
 #: fdisk/i386_sys_types.c:8
 msgid "XENIX root"
-msgstr "root XENIX"
+msgstr "XENIX root"
 
 #: fdisk/i386_sys_types.c:9
 msgid "XENIX usr"
-msgstr "util XENIX"
+msgstr "XENIX usr"
 
 #: fdisk/i386_sys_types.c:10
 msgid "FAT16 <32M"
@@ -3900,7 +3828,7 @@
 
 #: fdisk/i386_sys_types.c:11
 msgid "Extended"
-msgstr "Etendue"
+msgstr "Extended"
 
 #. DOS 3.3+ extended partition
 #: fdisk/i386_sys_types.c:12
@@ -3920,12 +3848,12 @@
 #. AIX boot (AIX -- PS/2 port) or SplitDrive
 #: fdisk/i386_sys_types.c:15
 msgid "AIX bootable"
-msgstr "AIX amorçable"
+msgstr "AIX bootable"
 
 #. AIX data or Coherent
 #: fdisk/i386_sys_types.c:16
 msgid "OS/2 Boot Manager"
-msgstr "Gestionnaire d'amorçage OS/2"
+msgstr "OS/2 Boot Manager"
 
 #. OS/2 Boot Manager
 #: fdisk/i386_sys_types.c:17
@@ -3943,7 +3871,7 @@
 
 #: fdisk/i386_sys_types.c:20
 msgid "Win95 Ext'd (LBA)"
-msgstr "Win95 Etdue (LBA)"
+msgstr "Win95 Ext'd (LBA)"
 
 #: fdisk/i386_sys_types.c:21
 msgid "OPUS"
@@ -3951,39 +3879,39 @@
 
 #: fdisk/i386_sys_types.c:22
 msgid "Hidden FAT12"
-msgstr "FAT12 caché"
+msgstr "Hidden FAT12"
 
 #: fdisk/i386_sys_types.c:23
 msgid "Compaq diagnostics"
-msgstr "Diagnostics Compaq"
+msgstr "Compaq diagnostics"
 
 #: fdisk/i386_sys_types.c:24
 msgid "Hidden FAT16 <32M"
-msgstr "FAT16 caché <32M"
+msgstr "Hidden FAT16 <32M"
 
 #: fdisk/i386_sys_types.c:25
 msgid "Hidden FAT16"
-msgstr "FAT16 caché"
+msgstr "Hidden FAT16"
 
 #: fdisk/i386_sys_types.c:26
 msgid "Hidden HPFS/NTFS"
-msgstr "HPFS/NTFS caché"
+msgstr "Hidden 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 "Win95 FAT32 caché"
+msgstr "Hidden Win95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
 msgid "Hidden Win95 FAT32 (LBA)"
-msgstr "Win95 FAT32 caché (LBA)"
+msgstr "Hidden Win95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
 msgid "Hidden Win95 FAT16 (LBA)"
-msgstr "Win95 FAT16 caché (LBA)"
+msgstr "Hidden Win95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -3995,7 +3923,7 @@
 
 #: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
-msgstr "Reprise PartitionMagic"
+msgstr "PartitionMagic recovery"
 
 #: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
@@ -4003,7 +3931,7 @@
 
 #: fdisk/i386_sys_types.c:35
 msgid "PPC PReP Boot"
-msgstr "Amorce PPC PReP"
+msgstr "PPC PReP Boot"
 
 #: fdisk/i386_sys_types.c:36
 msgid "SFS"
@@ -4015,11 +3943,11 @@
 
 #: fdisk/i386_sys_types.c:38
 msgid "QNX4.x 2nd part"
-msgstr "QNX4.x 2ème partie"
+msgstr "QNX4.x 2nd part"
 
 #: fdisk/i386_sys_types.c:39
 msgid "QNX4.x 3rd part"
-msgstr "QNX4.x 3ème partie"
+msgstr "QNX4.x 3rd part"
 
 #: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
@@ -4063,7 +3991,7 @@
 
 #: fdisk/i386_sys_types.c:49
 msgid "GNU HURD or SysV"
-msgstr "GNU HURD ou SysV"
+msgstr "GNU HURD or SysV"
 
 #. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
 #: fdisk/i386_sys_types.c:50
@@ -4089,19 +4017,19 @@
 #. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
-msgstr "Minix / ancien Linux"
+msgstr "Minix / old Linux"
 
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
-msgstr "Lecteur C: caché OS/2"
+msgstr "OS/2 hidden C: drive"
 
 #: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
-msgstr "Linux étendu"
+msgstr "Linux extended"
 
 #: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
-msgstr "Ensemble de volumes NTFS"
+msgstr "NTFS volume set"
 
 #: fdisk/i386_sys_types.c:63
 msgid "Amoeba"
@@ -4119,11 +4047,11 @@
 #. BSDI
 #: fdisk/i386_sys_types.c:66
 msgid "IBM Thinkpad hibernation"
-msgstr "Hibernation Thinkpad IBM"
+msgstr "IBM Thinkpad hibernation"
 
 #: fdisk/i386_sys_types.c:67
 msgid "FreeBSD"
-msgstr ""
+msgstr "FreeBSD"
 
 #. various BSD flavours
 #: fdisk/i386_sys_types.c:68
@@ -4136,16 +4064,15 @@
 
 #: fdisk/i386_sys_types.c:70
 msgid "Darwin UFS"
-msgstr ""
+msgstr "UFS Darwin"
 
 #: fdisk/i386_sys_types.c:71
-#, fuzzy
 msgid "NetBSD"
-msgstr "OpenBSD"
+msgstr "NetBSD"
 
 #: fdisk/i386_sys_types.c:72
 msgid "Darwin boot"
-msgstr ""
+msgstr "Amorce Darwin"
 
 #: fdisk/i386_sys_types.c:73
 msgid "BSDI fs"
@@ -4153,15 +4080,15 @@
 
 #: fdisk/i386_sys_types.c:74
 msgid "BSDI swap"
-msgstr "Swap BSDI"
+msgstr "BSDI swap"
 
 #: fdisk/i386_sys_types.c:75
 msgid "Boot Wizard hidden"
-msgstr ""
+msgstr "Boot Wizard hidden"
 
 #: fdisk/i386_sys_types.c:76
 msgid "Solaris boot"
-msgstr ""
+msgstr "Amorce Solaris"
 
 #: fdisk/i386_sys_types.c:77
 msgid "DRDOS/sec (FAT-12)"
@@ -4181,7 +4108,7 @@
 
 #: fdisk/i386_sys_types.c:81
 msgid "Non-FS data"
-msgstr ""
+msgstr "Non-FS data"
 
 #: fdisk/i386_sys_types.c:82
 msgid "CP/M / CTOS / ..."
@@ -4191,24 +4118,23 @@
 #. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:84
 msgid "Dell Utility"
-msgstr ""
+msgstr "Dell Utility"
 
 #. Dell PowerEdge Server utilities
 #: fdisk/i386_sys_types.c:85
-#, fuzzy
 msgid "BootIt"
-msgstr "Amorce"
+msgstr "BootIt"
 
 #. BootIt EMBRM
 #: fdisk/i386_sys_types.c:86
 msgid "DOS access"
-msgstr "Accès DOS"
+msgstr "DOS access"
 
 #. DOS access or SpeedStor 12-bit FAT
 #. extended partition
 #: fdisk/i386_sys_types.c:88
 msgid "DOS R/O"
-msgstr "R/O DOS"
+msgstr "DOS R/O"
 
 #. SpeedStor 16-bit FAT extended
 #. partition < 1024 cyl.
@@ -4218,22 +4144,22 @@
 
 #: fdisk/i386_sys_types.c:92
 msgid "EFI GPT"
-msgstr ""
+msgstr "EFI GPT"
 
 #. Intel EFI GUID Partition Table
 #: 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:94
 msgid "Linux/PA-RISC boot"
-msgstr ""
+msgstr "Linux/PA-RISC boot"
 
 #. SpeedStor large partition
 #: fdisk/i386_sys_types.c:97
 msgid "DOS secondary"
-msgstr "DOS secondaire"
+msgstr "DOS secondary"
 
 #. New (2.2.x) raid partition with
 #. autodetect using persistent
@@ -4250,126 +4176,119 @@
 #: fdisk/sfdisk.c:151
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
-msgstr "Erreur de recherche sur %s - impossible de rechercher vers %lu\n"
+msgstr "erreur de repérage sur %s - ne peut repérer %lu\n"
 
 #: fdisk/sfdisk.c:156
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
-msgstr "Erreur de recherche : 0x%08x%08x voulu, 0x%08x%08x obtenu\n"
+msgstr "erreur de repérage: désiré 0x%08x%08x, obtenu 0x%08x%08x\n"
 
 #: fdisk/sfdisk.c:202
 msgid "out of memory - giving up\n"
-msgstr "A court de mémoire - abandon.\n"
+msgstr "mémoire épuisée - abandon\n"
 
 #: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
-msgstr "Erreur de lecture sur %s - impossible de lire le secteur %lu.\n"
+msgstr "erreur de lecture sur %s - ne peut lire le secteur %lu\n"
 
 #: fdisk/sfdisk.c:225
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
-msgstr "ERREUR : le secteur %lu n'a aucune signature msdos.\n"
+msgstr "ERREUR: secteur %lu n'a pas un signature MS-DOS\n"
 
 #: fdisk/sfdisk.c:240
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
-msgstr "Erreur d'écriture sur %s - impossible d'écrire le secteur %lu.\n"
+msgstr "Erreur d'écriture sur %s - ne peut écrire le secteur %lu\n"
 
 #: fdisk/sfdisk.c:278
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
-msgstr ""
-"Impossible d'ouvrir le fichier d'enregistrement des secteurs de partition (%"
-"s).\n"
+msgstr "Ne peut ouvrir le fichier de sauvegarde de secteur de partition (%s)\n"
 
 #: fdisk/sfdisk.c:296
 #, c-format
 msgid "write error on %s\n"
-msgstr "Erreur d'écriture sur %s\n"
+msgstr "erreur d'écriture sur %s\n"
 
 #: fdisk/sfdisk.c:314
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
-msgstr "stat du fichier de restauration de partition (%s) impossible.\n"
+msgstr "ne peut évaluer par stat() le fichier de recouvrement de partition (%s)\n"
 
 #: fdisk/sfdisk.c:319
 msgid "partition restore file has wrong size - not restoring\n"
-msgstr ""
-"La taille du fichier de restauration de partition est incorrecte - "
-"restauration impossible.\n"
+msgstr "le fichier de recouvrement de partition a une taille erronée - pas de recouvrement\n"
 
 #: fdisk/sfdisk.c:323
 msgid "out of memory?\n"
-msgstr "A court de mémoire ?\n"
+msgstr "mémoire épuisée?\n"
 
 #: fdisk/sfdisk.c:329
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
-msgstr "Impossible d'ouvrir le fichier de restauration de partition (%s).\n"
+msgstr "ne peut ouvrir le fichier de recouvrement de partition (%s)\n"
 
 #: fdisk/sfdisk.c:335
 #, c-format
 msgid "error reading %s\n"
-msgstr "Erreur de lecture de %s.\n"
+msgstr "erreur de lecture %s\n"
 
 #: fdisk/sfdisk.c:342
 #, c-format
 msgid "cannot open device %s for writing\n"
-msgstr "Impossible d'ouvrir le périphérique %s pour écriture.\n"
+msgstr "ne peut ouvrir le périphérique %s pour écriture\n"
 
 #: fdisk/sfdisk.c:354
 #, c-format
 msgid "error writing sector %lu on %s\n"
-msgstr "Erreur d'écriture du secteur %lu sur %s.\n"
+msgstr "erreur d'écriture du secteur %lu sur %s\n"
 
 #: fdisk/sfdisk.c:405
 #, c-format
 msgid "Disk %s: cannot get size\n"
-msgstr "Disque %s : impossible d'obtenir la taille.\n"
+msgstr "Disque %s: ne peut obtenir sa taille\n"
 
 #: fdisk/sfdisk.c:410
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
-msgstr "Disque %s : impossible d'obtenir la géométrie.\n"
+msgstr "Disque %s: ne peut obtenir la géométrie\n"
 
 #: fdisk/sfdisk.c:434
-#, fuzzy, c-format
+#, 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 ""
-"Avertissement : début=%d - ceci semble être une partition plutôt que\n"
-"le disque entier. L'utilisation de fdisk est probablement inutile.\n"
-"[Utilisez l'option --force si vous souhaitez quand même opérer.]\n"
+"AVERTISSEMENT: début=%lu - cela ressemble à une partition plutôt qu'à\n"
+"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
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
-msgstr "Avertissement : HDIO_GETGEO indique qu'il y a %d têtes.\n"
+msgstr "AVERTISSEMENT: HDIO_GETGEO indique qu'il a %lu têtes\n"
 
 #: fdisk/sfdisk.c:444
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
-msgstr "Avertissement : HDIO_GETGEO indique qu'il y a %d secteurs.\n"
+msgstr "AVERTISSEMENT: HDIO_GETGEO indique qu'il y a %lu secteurs\n"
 
 #: fdisk/sfdisk.c:448
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
-msgstr ""
-"Avertissement : BLKGETSIZE/HDIO_GETGEO indique qu'il y a %d cylindres.\n"
+msgstr "AVERTISSEMENT: BLKGETSIZE/HDIO_GETGEO indique qu'il y a %lu cylindres\n"
 
 #: fdisk/sfdisk.c:452
-#, fuzzy, c-format
+#, 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 ""
-"Avertissement : nombre de secteurs (%d) peu probable - 63 maximum "
-"généralement.\n"
-"Ceci entraînera des problèmes avec tous les logiciels utilisant l'adressage "
-"C/T/S.\n"
+"AVERTISSEMENT: le nombre de secteurs (%lu) - habituellement au plus de 63\n"
+"Cela occasionnera des problèmes avec tous les logiciels qui utilisent un adressage C/H/S.\n"
 
 #: fdisk/sfdisk.c:456
 #, c-format
@@ -4378,77 +4297,66 @@
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 "\n"
-"Disque %s : %lu cylindres, %lu têtes, %lu secteurs/piste\n"
+"Disque %s: %lu cylindres, %lu têtes, %lu secteurs/piste\n"
 
 #: fdisk/sfdisk.c:538
-#, fuzzy, c-format
-msgid ""
-"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
-msgstr ""
-"%s de la partition %s a une valeur impossible pour la tête : %d (doit être "
-"compris dans 0-%d).\n"
+#, c-format
+msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr "%s de la partition %s a une valeur impossible pour la tête: %lu (devrait être 0-%lu)\n"
 
 #: fdisk/sfdisk.c:543
-#, fuzzy, c-format
-msgid ""
-"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
-"lu)\n"
-msgstr ""
-"%s de la partition %s a une valeur impossible pour le secteur : %d (doit "
-"être compris dans 1-%d).\n"
+#, c-format
+msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
+msgstr "%s de la partition %s a une valeur impossible pour le secteur: %lu (devrait être 1-%lu)\n"
 
 #: fdisk/sfdisk.c:548
-#, fuzzy, c-format
-msgid ""
-"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
-"lu)\n"
-msgstr ""
-"%s de la partition %s a une valeur impossible pour le cylindre : %d (doit "
-"être compris dans 0-%d).\n"
+#, c-format
+msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
+msgstr "%s de la partition %s a une valeur impossible pour les cylindres: %lu (devrait être 0-%lu)\n"
 
 #: fdisk/sfdisk.c:588
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr ""
-"Nom Id\n"
+"Id  Nom\n"
 "\n"
 
 #: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
-msgstr "Relecture de la table de partition en cours...\n"
+msgstr "Relecture de la table de partitions ...\n"
 
 #: fdisk/sfdisk.c:747
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
-"Échec de la commande de relecture de la table de partition.\n"
-"Redémarrez le système maintenant avant d'utiliser mkfs.\n"
+"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
 #, c-format
 msgid "Error closing %s\n"
-msgstr "Erreur de fermeture de %s\n"
+msgstr "Erreur de fermeture %s\n"
 
 #: fdisk/sfdisk.c:790
 #, c-format
 msgid "%s: no such partition\n"
-msgstr "%s : cette partition n'existe pas.\n"
+msgstr "%s: pas de telle partition\n"
 
 #: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
-msgstr "Format non reconnu - utilisation des secteurs.\n"
+msgstr "format non reconnu - utilisation de secteurs\n"
 
 #: fdisk/sfdisk.c:852
 #, c-format
 msgid "# partition table of %s\n"
-msgstr "N° table de partition de %s\n"
+msgstr "# table de partitions de %s\n"
 
 #: fdisk/sfdisk.c:863
 #, c-format
 msgid "unimplemented format - using %s\n"
-msgstr "Format non mis en oeuvre - utilisation de %s.\n"
+msgstr "format non implanté - using %s\n"
 
 #: fdisk/sfdisk.c:867
 #, c-format
@@ -4456,14 +4364,12 @@
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unités = cylindres de %lu octets, blocs de 1024 octets, à partir de %d\n"
+"Unités= cylindres de %lu octets, blocs de 1024 octets, décompte à partir de %d\n"
 "\n"
 
 #: fdisk/sfdisk.c:870
-#, fuzzy
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
-msgstr ""
-"   Périphérique Amorce Début     Fin   Nb cyls   Nb blocs   Id  Système\n"
+msgstr "   Périph Amor Début     Fin   #cyls    #blocs    Id  Système\n"
 
 #: fdisk/sfdisk.c:875
 #, c-format
@@ -4471,13 +4377,12 @@
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unités = secteurs de 512 octets, à partir de %d\n"
+"Unités= secteurs de 512 octets, décompte à partir de %d\n"
 "\n"
 
 #: fdisk/sfdisk.c:877
-#, fuzzy
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
-msgstr "   Périphérique Amorce    Début       Fin  Nb secteurs  Id  Système\n"
+msgstr "   Périph Amorce  Début       Fin   #secteurs Id  Système\n"
 
 #: fdisk/sfdisk.c:880
 #, c-format
@@ -4485,108 +4390,99 @@
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Unités = blocs de 1024 octets, à partir de %d\n"
+"Unités= blocs de 1024 octets, décompte à partir de %d\n"
 "\n"
 
 #: fdisk/sfdisk.c:882
-#, fuzzy
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
-msgstr "   Périphérique Amorce   Début       Fin   Nb blocs   Id  Système\n"
+msgstr "   Périph Amorce Début       Fin    #blocs    Id  Système\n"
 
 #: 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 ""
-"Unités = méga-octets de 1048576 octets, blocs de 1024 octets, à partir de %"
-"d\n"
+"Unités= mégaoctets de 1048576 octets, blocs de 1024 octets, décompte à partir de %d\n"
 "\n"
 
 #: fdisk/sfdisk.c:887
-#, fuzzy
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
-msgstr "   Périphérique Amorce Début   Fin     Mo   Nb blocs   Id  Système\n"
+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
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "\t\tdébut : (c,t,s) (%ld,%ld,%ld) attendus (%ld,%ld,%ld) trouvés\n"
+msgstr "\t\tdébut: (c,h,s) expecté (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1054
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr "\t\tfin : (c,t,s) (%ld,%ld,%ld) attendus (%ld,%ld,%ld) trouvés\n"
+msgstr "\t\tfin: (c,h,s) expecté (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1057
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
-msgstr ""
-"La partition se termine au cylindre %ld, au delà de la fin du disque.\n"
+msgstr "partition se termine sur le cylindre %ld, au delà de la fin du disque\n"
 
 #: fdisk/sfdisk.c:1067
 msgid "No partitions found\n"
-msgstr "Aucune partition trouvée\n"
+msgstr "Aucune partition repérée\n"
 
 #: fdisk/sfdisk.c:1071
-#, fuzzy, c-format
+#, 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 ""
-"Avertissement : La première partition semble avoir été créée\n"
-" pour C/T/S=*/%ld/%ld (au lieu de %ld/%ld/%ld).\n"
-"Cette liste est basée sur cette géométrie.\n"
+"AVERTISSEMENT: la table de partitions semble avoir été créée\n"
+"  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
 msgid "no partition table present.\n"
-msgstr "Il n'existe aucune table de partition.\n"
+msgstr "aucune table de partitions présente.\n"
 
 #: fdisk/sfdisk.c:1122
 #, c-format
 msgid "strange, only %d partitions defined.\n"
-msgstr "Etrange, seules %d partitions sont définies.\n"
+msgstr "étrange, seulement %d partitions définies.\n"
 
 #: fdisk/sfdisk.c:1131
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr ""
-"Avertissement : la partition %s a une taille égale à 0 mais n'est pas "
-"marquée vide.\n"
+msgstr "AVERTISSEMENT: partition %s a une taille 0 mais n'est pas marquée Empty\n"
 
 #: fdisk/sfdisk.c:1134
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr ""
-"Avertissement : la partition %s a une taille égale à 0 et est amorçable.\n"
+msgstr "AVERTISSEMENT: partition %s a une taille 0 et est amorçable\n"
 
 #: fdisk/sfdisk.c:1137
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
-msgstr ""
-"Avertissement : la partition %s a une taille égale à 0 et un début autre que "
-"zéro.\n"
+msgstr "AVERTISSEMENT: partition %s a une taille 0 et une adresse de début non à zéro\n"
 
 #: fdisk/sfdisk.c:1148
 #, c-format
 msgid "Warning: partition %s "
-msgstr "Avertissement : la partition %s "
+msgstr "AVERTISSEMENT: partition %s "
 
 #: fdisk/sfdisk.c:1149
 #, c-format
 msgid "is not contained in partition %s\n"
-msgstr "n'est pas contenue dans la partition %s.\n"
+msgstr "n'est par contenue dans la partition %s\n"
 
 #: fdisk/sfdisk.c:1160
 #, c-format
 msgid "Warning: partitions %s "
-msgstr "Avertissement : les partitions %s "
+msgstr "AVERTISSEMENT: partitions %s "
 
 #: fdisk/sfdisk.c:1161
 #, c-format
 msgid "and %s overlap\n"
-msgstr "et %s se chevauchent.\n"
+msgstr "et %s se chevauchent\n"
 
 #: fdisk/sfdisk.c:1172
 #, c-format
@@ -4594,136 +4490,138 @@
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
+"AVERTISSEMENT: la partition %s contient une partie de la table de partitions (secteur %lu),\n"
+"et cela la détruira lorsqu'elle se remplira\n"
 
 #: fdisk/sfdisk.c:1184
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
-msgstr "Avertissement : la partition %s commence au secteur 0.\n"
+msgstr "AVERTISSEMENT: la partition %s débute au secteur 0\n"
 
 #: fdisk/sfdisk.c:1188
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
-msgstr "Avertissement : la partition %s va au delà de la fin du disque.\n"
+msgstr "AVERTISSEMENT: la partition %s s'étend au delà de la fin du disque\n"
 
 #: fdisk/sfdisk.c:1203
-#, fuzzy
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
-msgstr "Parmi les partitions primaires, une seule peut être étendue\n"
+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
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
-msgstr ""
-"Avertissement : la partition %s ne commence pas à une limite de cylindre.\n"
+msgstr "AVERTISSEMENT: la partition %s ne débute pas sur une frontière de cylindre\n"
 
 #: fdisk/sfdisk.c:1227
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
-msgstr ""
-"Avertissement : la partition %s ne se termine pas à une limite de cylindre.\n"
+msgstr "AVERTISSMENT: la partition %s ne se termine pas sur une frontière de cylindre\n"
 
 #: 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 ""
-"Avertissement : plus d'une partition primaire est marquée amorçable "
-"(active).\n"
-"Cela est sans importance pour LILO, mais le MBR DOS n'amorcera pas ce "
-"disque.\n"
+"AVERTISSEMENT: plus d'une partition primaire marquée amorçable (active)\n"
+"Cela n'a pas d'importance pour LILO, mais en a pour DOS MBR qui n'amorcera ce disque.\n"
 
 #: fdisk/sfdisk.c:1252
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
-"Avertissement : vous pouvez généralement amorcer depuis des partitions "
-"primaires. Seul\n"
-"LILO ignore l'indicateur `bootable'.\n"
+"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
 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 ""
-"Avertissement : aucune partition primaire n'est marquée amorçable (active).\n"
-"Cela est sans importance pour LILO, mais le MBR DOS n'amorcera pas ce "
-"disque.\n"
+"AVERTISSEMENT: aucune partition primaire marquée amorçable (active)\n"
+"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
+msgid "start"
+msgstr "début"
 
 #: fdisk/sfdisk.c:1275
 #, c-format
-msgid ""
-"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
-"Partition %s : début : (c,t,s) (%ld,%ld,%ld) attendus (%ld,%ld,%ld) trouvés\n"
+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
+msgid "end"
+msgstr "fin"
 
 #: fdisk/sfdisk.c:1284
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
-"Partition %s : fin : (c,t,s) (%ld,%ld,%ld) attendus (%ld,%ld,%ld) trouvés\n"
+msgstr "partition %s: fin: (c,h,s) espéré (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
 #: fdisk/sfdisk.c:1287
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
-msgstr ""
-"La partition %s se termine au cylindre %ld, au delà de la fin du disque.\n"
+msgstr "partition %s se termine sur le cylindre %ld, au delà de la fin du disque\n"
 
 #: fdisk/sfdisk.c:1312
-#, fuzzy, c-format
+#, 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 "Avertissement : début décalé de la partition étendu de %ld vers %ld.\n"
+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
-#, fuzzy
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
-"Avertissement : la partition étendu ne commence pas à une limite de "
-"cylindre.\n"
+"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
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
-msgstr "Trop de partitions - celles après le n° (%d) sont ignorées.\n"
+msgstr "top de partitions - celles au delà de nr (%d) sont ignorées\n"
 
 #: fdisk/sfdisk.c:1351
 msgid "tree of partitions?\n"
-msgstr "Arborescence des partitions ?\n"
+msgstr "arbre de partitions?\n"
 
 #: fdisk/sfdisk.c:1472
 msgid "detected Disk Manager - unable to handle that\n"
-msgstr "Gestionnaire de disques détecté - gestion impossible\n"
+msgstr "Gestionnaire de disque détecté - incapable de traiter cela\n"
 
 #: fdisk/sfdisk.c:1479
 msgid "DM6 signature found - giving up\n"
-msgstr "Signature DM6 trouvée - abandon\n"
+msgstr "signature DM6 signature repéré - abandon\n"
 
 #: fdisk/sfdisk.c:1499
 msgid "strange..., an extended partition of size 0?\n"
-msgstr "Étrange..., une partition étendue de taille 0 ?\n"
+msgstr "étrange..., une partition étendue de taille 0?\n"
 
 #: fdisk/sfdisk.c:1506 fdisk/sfdisk.c:1517
 msgid "strange..., a BSD partition of size 0?\n"
-msgstr "Étrange..., une partition BSD de taille 0 ?\n"
+msgstr "étrange..., une partition BSD de taille 0?\n"
 
 #: fdisk/sfdisk.c:1551
 #, c-format
 msgid " %s: unrecognized partition\n"
-msgstr " %s : partition non reconnue\n"
+msgstr " %s: une partition non reconnue\n"
 
 #: fdisk/sfdisk.c:1563
 msgid "-n flag was given: Nothing changed\n"
-msgstr "Indicateur -n attribué : aucune modification\n"
+msgstr "-n flag a été utilisé: rien n'a changé\n"
 
 #: fdisk/sfdisk.c:1577
 msgid "Failed saving the old sectors - aborting\n"
-msgstr "Échec de l'enregistrement des anciens secteurs - annulation\n"
+msgstr "Échec de sauvegarde des vieux secteurs - abandon\n"
 
 #: fdisk/sfdisk.c:1582
 #, c-format
@@ -4732,87 +4630,85 @@
 
 #: fdisk/sfdisk.c:1659
 msgid "long or incomplete input line - quitting\n"
-msgstr "Ligne d'entrée longue ou incomplète - fermeture\n"
+msgstr "ligne d'entrée longue ou incomplète - abandon\n"
 
 #: fdisk/sfdisk.c:1695
 #, c-format
 msgid "input error: `=' expected after %s field\n"
-msgstr "Erreur d'entrée : `=' attendu après le champ %s\n"
+msgstr "erreur d'entrée: « = » espéré après le champ %s\n"
 
 #: fdisk/sfdisk.c:1702
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
-msgstr "Erreur d'entrée : caractère %c inattendu après le champ %s\n"
+msgstr "erreur d'entrée: caractère inattendu %c après le champ %s\n"
 
 #: fdisk/sfdisk.c:1708
 #, c-format
 msgid "unrecognized input: %s\n"
-msgstr "Entrée non reconnue : %s\n"
+msgstr "entrée non reconnu: %s\n"
 
 #: fdisk/sfdisk.c:1750
 msgid "number too big\n"
-msgstr "Nombre trop élevé\n"
+msgstr "numbre trop grand\n"
 
 #: fdisk/sfdisk.c:1754
 msgid "trailing junk after number\n"
-msgstr "Caractères de fin indésirables après le nombre\n"
+msgstr "rebut après le nombre\n"
 
 #: fdisk/sfdisk.c:1875
 msgid "no room for partition descriptor\n"
-msgstr "Pas de place pour le descriptif de partition\n"
+msgstr "aucun espace pour le descripteur de partition\n"
 
 #: fdisk/sfdisk.c:1908
 msgid "cannot build surrounding extended partition\n"
-msgstr "Impossible de construire autour de la partition étendue\n"
+msgstr "ne peut construire autour de la partition étendue\n"
 
 #: fdisk/sfdisk.c:1959
 msgid "too many input fields\n"
-msgstr "Champs d'entrée trop nombreux\n"
+msgstr "trop de champs à l'entrée\n"
 
 #. no free blocks left - don't read any further
 #: fdisk/sfdisk.c:1993
 msgid "No room for more\n"
-msgstr "Plus de place\n"
+msgstr "Aucun espace pour en accepter d'avantage\n"
 
 #: fdisk/sfdisk.c:2012
 msgid "Illegal type\n"
-msgstr "Type non valide\n"
+msgstr "Type illégal\n"
 
 #: fdisk/sfdisk.c:2044
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr ""
-"Avertissement : la taille donnée (%lu) dépasse la taille maximale allouable "
-"(%lu)\n"
+msgstr "AVERTISSEMENT: la taille donnée (%lu) excède la taille maximale allouable (%lu)\n"
 
 #: fdisk/sfdisk.c:2050
 msgid "Warning: empty partition\n"
-msgstr "Avertissement : partition vide\n"
+msgstr "AVERTISSEMENT: partition vide\n"
 
 #: fdisk/sfdisk.c:2064
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
-msgstr "Avertissement : début de partition incorrect (%lu au plus tôt)\n"
+msgstr "AVERTISSEMENT: début de partition corrompu (auparavant %lu)\n"
 
 #: fdisk/sfdisk.c:2077
 msgid "unrecognized bootable flag - choose - or *\n"
-msgstr "Indicateur Bootable non reconnu - choisissez  la commande - or *\n"
+msgstr "fanion d'amorçage non reconnu - choisir « - » ou « * »\n"
 
 #: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
 msgid "partial c,h,s specification?\n"
-msgstr "Spécification c,t,s partielle ?\n"
+msgstr "spécification partielle c,h,s?\n"
 
 #: fdisk/sfdisk.c:2118
 msgid "Extended partition not where expected\n"
-msgstr "Partition étendue non attendue ici\n"
+msgstr "Partition étendue par à l'endroit attendu\n"
 
 #: fdisk/sfdisk.c:2150
 msgid "bad input\n"
-msgstr "Entrée incorrecte\n"
+msgstr "entrée erronée\n"
 
 #: fdisk/sfdisk.c:2172
 msgid "too many partitions\n"
-msgstr "Trop de partitions\n"
+msgstr "trop de partitions\n"
 
 #: fdisk/sfdisk.c:2205
 msgid ""
@@ -4820,241 +4716,219 @@
 "<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 ""
-"Entrez des valeurs selon le format suivant ; les champs absents prennent une "
-"valeur par défaut.\n"
-"<début> <taille> <type [E,S,L,X,hex]> <bootable [-,*]> <c,t,s> <c,t,s>\n"
-"Vous devez en général définir uniquement <début> et <taille> (voire "
-"<type>).\n"
+"L'entrée utiliser un des formats suivants; les champs absents prennent\n"
+"la valeur par défaut:\n"
+"<début> <taille> <type [E,S,L,X,hex]> <amorçable [-,*]> <c,h,s> <c,h,s>\n"
+"Habituellement vous n'avez besoin que de spécifier:\n"
+"<début> et <taille> (et parfois <type>).\n"
 
 #: fdisk/sfdisk.c:2225
 msgid "version"
-msgstr "Version "
+msgstr "version"
 
 #: fdisk/sfdisk.c:2231
 #, c-format
 msgid "Usage: %s [options] device ...\n"
-msgstr "Usage : %s [options] périphérique ...\n"
+msgstr "Usage: %s [options] périphérique ...\n"
 
 #: fdisk/sfdisk.c:2232
 msgid "device: something like /dev/hda or /dev/sda"
-msgstr "Périphérique : quelque chose comme /dev/hda ou /dev/sda"
+msgstr "périphérique: quelque chose comme /dev/hda ou /dev/sda"
 
 #: fdisk/sfdisk.c:2233
 msgid "useful options:"
-msgstr "Options utiles :"
+msgstr "options utiles:"
 
 #: fdisk/sfdisk.c:2234
 msgid "    -s [or --show-size]: list size of a partition"
-msgstr "    -s [ou --show-size] : Affiche la taille d'une partition"
+msgstr "    -s [ou --show-size]: lister la taille d'une partition"
 
 #: fdisk/sfdisk.c:2235
 msgid "    -c [or --id]:        print or change partition Id"
-msgstr "    -c [ou --id] :        Affiche ou modifie l'Id de partition"
+msgstr "    -c [ou --id]:        afficher ou modifier l'identificateur de partition"
 
 #: fdisk/sfdisk.c:2236
 msgid "    -l [or --list]:      list partitions of each device"
-msgstr ""
-"    -l [ou --list] :      Répertorie les partitions de chaque périphérique"
+msgstr "    -l [ou --list]:      lister les partitions de chaque périphérique"
 
 #: fdisk/sfdisk.c:2237
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
-msgstr ""
-"    -d [ou --dump] :      Idem, mais dans un format approprié à une entrée "
-"ultérieure"
+msgstr "    -d [ou --dump]:      identique, mais dans un format utile pour une saisie ultérieure"
 
 #: fdisk/sfdisk.c:2238
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
-msgstr ""
-"    -i [ou --increment] : Enumère les cylindres etc. à partir de 1 au lieu "
-"de 0"
+msgstr "    -i [ou --increment]: numbre de cylindres etc. de 1 au lieu de 0"
 
 #: fdisk/sfdisk.c:2239
-msgid ""
-"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
-"MB"
-msgstr ""
-"    -uS, -uB, -uC, -uM :  Accepte/rapporte en unités desecteurs/blocs/"
-"cylindres/Mo"
+msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
+msgstr "    -uS, -uB, -uC, -uM:  accepter/reporter en unités de secteurs/blocs/cylindres/MB"
 
 #: fdisk/sfdisk.c:2240
 msgid "    -T [or --list-types]:list the known partition types"
-msgstr "    -T [ou --list-types] : Répertorie les types de partition connus"
+msgstr "    -T [ou --list-types]:lister les types de partitions connus"
 
 #: fdisk/sfdisk.c:2241
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
-msgstr ""
-"    -D [ou --DOS] :       Pour la compatibilité DOS : occupe un peu d'espace"
+msgstr "    -D [ou --DOS]:       pour la compatibilité DOS: perte d'un peu d'espace"
 
 #: fdisk/sfdisk.c:2242
 msgid "    -R [or --re-read]:   make kernel reread partition table"
-msgstr ""
-"    -R [ou --re-read] :   Fait relire la table de partition par le kernel"
+msgstr "    -R [ou --re-read]:   forcer le kernel à relire la table de partitions"
 
 #: fdisk/sfdisk.c:2243
 msgid "    -N# :                change only the partition with number #"
-msgstr ""
-"    -N# :                Change uniquement la partition portant le numéro #"
+msgstr "    -N# :                modifier seulement la partition ayant le numéro #"
 
 #: fdisk/sfdisk.c:2244
 msgid "    -n :                 do not actually write to disk"
-msgstr "    -n :                 N'écrit pas sur le disque"
+msgstr "    -n :                 ne pas écrire sur le disque"
 
 #: fdisk/sfdisk.c:2245
-msgid ""
-"    -O file :            save the sectors that will be overwritten to file"
-msgstr ""
-"    -O file :            Enregistre les secteurs qui seront écrasés dans un "
-"fichier"
+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:2246
 msgid "    -I file :            restore these sectors again"
-msgstr "    -I file :            Restaure ces secteurs"
+msgstr "    -I fichier :         restaurer ces secteurs à nouveau"
 
 #: fdisk/sfdisk.c:2247
 msgid "    -v [or --version]:   print version"
-msgstr "    -v [ou --version] :   Affiche la version"
+msgstr "    -v [ou --version]:   afficher la version"
 
 #: fdisk/sfdisk.c:2248
 msgid "    -? [or --help]:      print this message"
-msgstr "    -? [ou --help] :      Affiche ce message"
+msgstr "    -? [ou --help]:      afficher l'aide mémoire"
 
 #: fdisk/sfdisk.c:2249
 msgid "dangerous options:"
-msgstr "Options dangereuses :"
+msgstr "options dangereuses:"
 
 #: fdisk/sfdisk.c:2250
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
-"    -g [ou --show-geometry] : Affiche l'idée que se fait le kernel de la "
-"géométrie"
+"    -g [ou --show-geometry]: afficher les données contenues dans le\n"
+"                             kernel de la géométrie"
 
 #: fdisk/sfdisk.c:2251
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
-"    -x [ou --show-extended] : Répertorie également les partitions étendues à "
-"la sortie\n"
-"                             ou attend des descriptifs de celles-ci à "
-"l'entrée"
+"    -x [ou --show-extended]: lister aussi les partitions étendues en sortie\n"
+"                             ou les descripteurs attendus à l'entrée pour ellest"
 
 #: fdisk/sfdisk.c:2253
-msgid ""
-"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
-msgstr ""
-"    -L  [ou --Linux] :      Ne se plaint pas de problèmes ne concernant pas "
-"Linux"
+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:2254
 msgid "    -q  [or --quiet]:      suppress warning messages"
-msgstr "    -q  [ou --quiet] :      Supprime les messages d'avertissement"
+msgstr "    -q  [ou --quiet]:      supprimer tous les messages d'avertissement"
 
 #: fdisk/sfdisk.c:2255
 msgid "    You can override the detected geometry using:"
-msgstr "    Vous pouvez écraser la géométrie détectée à l'aide de :"
+msgstr "    Vous pouvez écraser la géométrie en utilisant:"
 
 #: fdisk/sfdisk.c:2256
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
-msgstr "    -C# [ou --cylinders #] : Définit le nombre de cylindres à utiliser"
+msgstr "    -C# [ou --cylinders #]:initialiser le nombre de cylindres à utiliser"
 
 #: fdisk/sfdisk.c:2257
 msgid "    -H# [or --heads #]:    set the number of heads to use"
-msgstr "    -H# [ou --heads #] :    Définit le nombre de têtes à utiliser"
+msgstr "    -H# [ou --heads #]:    initialiser le nombre de têtes à utiliser"
 
 #: fdisk/sfdisk.c:2258
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
-msgstr "    -S# [ou --sectors #] :  Définit le nombre de secteurs à utiliser"
+msgstr "    -S# [ou --sectors #]:  initialiser le numbre de secteurs à utiliser"
 
 #: fdisk/sfdisk.c:2259
 msgid "You can disable all consistency checking with:"
-msgstr "Vous pouvez désactiver toute vérification de cohérence à l'aide de :"
+msgstr "Vous pouvez désactiver toutes les vérifications de consistence avec:"
 
 #: fdisk/sfdisk.c:2260
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
-msgstr "    -f  [ou --force] :      Force une action, même inadaptée"
+msgstr "    -f  [ou --force]:      exécuter aveuglément la commande donnée"
 
 #: fdisk/sfdisk.c:2266
 msgid "Usage:"
-msgstr "Usage :"
+msgstr "Usage:"
 
 #: fdisk/sfdisk.c:2267
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
-msgstr ""
-"%s périphérique\t\t Répertorie les partitions actives sur le périphérique\n"
+msgstr "%s périphérique\t\t lister les partitions actives du périphérique\n"
 
 #: fdisk/sfdisk.c:2268
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
-msgstr ""
-"%s périphérique n1 n2 ... Active les partitions n1 ..., désactive le reste\n"
+msgstr "%s périphérique n1 n2 ... activer les partitions n1 ..., désactiver les autres\n"
 
 #: fdisk/sfdisk.c:2269
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
-msgstr "%s -An périphérique\t Active la partition n, désactive les autres\n"
+msgstr "%s -An préiphérique\t activer la partition n, désactiver les autres\n"
 
 #: fdisk/sfdisk.c:2421
 msgid "no command?\n"
-msgstr "Aucune commande ?\n"
+msgstr "pas de commande?\n"
 
 #: fdisk/sfdisk.c:2539
 #, c-format
 msgid "total: %d blocks\n"
-msgstr "total : %d blocs\n"
+msgstr "total: %d blocs\n"
 
 #: fdisk/sfdisk.c:2576
 msgid "usage: sfdisk --print-id device partition-number\n"
-msgstr "usage : sfdisk --print-id périphérique numéro-partition \n"
+msgstr "usage: sfdisk --print-id périphérique numéro-de-partition\n"
 
 #: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --change-id device partition-number Id\n"
-msgstr "usage : sfdisk --change-id périphérique numéro-partition Id\n"
+msgstr "usage: sfdisk --change-id périphérique numéro-de-partition Id\n"
 
 #: fdisk/sfdisk.c:2580
 msgid "usage: sfdisk --id device partition-number [Id]\n"
-msgstr "usage : sfdisk --id périphérique numéro-partition [Id]\n"
+msgstr "usage: sfdisk --id périphérique numéro-de-partition [Id]\n"
 
 #: fdisk/sfdisk.c:2587
 msgid "can specify only one device (except with -l or -s)\n"
-msgstr "Peut uniquement spécifier un périphérique (sauf avec -l ou -s)\n"
+msgstr "vous ne pouvez spécifier seulement un périphérique (sauf avec -l ou -s)\n"
 
 #: fdisk/sfdisk.c:2613
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open %s read-write\n"
-msgstr "Impossible d'ouvrir %s\n"
+msgstr "ne peut ouvrir %s en lecture-écriture\n"
 
 #: fdisk/sfdisk.c:2615
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open %s for reading\n"
-msgstr "Impossible d'ouvrir %s pour lecture."
+msgstr "ne peut ouvrir %s en lecture\n"
 
 #: fdisk/sfdisk.c:2640
 #, c-format
 msgid "%s: OK\n"
-msgstr "%s : OK\n"
+msgstr "%s: OK\n"
 
 #: fdisk/sfdisk.c:2657
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
-msgstr "%s : %ld cylindres, %ld têtes, %ld secteurs/piste\n"
+msgstr "%s: %ld cylindres, %ld têtes, %ld secteurs/piste\n"
 
 #: fdisk/sfdisk.c:2674
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
-msgstr "BLKGETSIZE ioctl a échoué pour %s\n"
+msgstr "Échec de BLKGETSIZE ioctl pour %s\n"
 
 #: fdisk/sfdisk.c:2751
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
-msgstr "Mauvais octet actif : 0x%x au lieu de 0x80\n"
+msgstr "octet actif erroné: 0x%x au lieu de 0x80\n"
 
 #: fdisk/sfdisk.c:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
 msgid ""
 "Done\n"
 "\n"
 msgstr ""
-"Terminé\n"
+"Complété\n"
 "\n"
 
 #: fdisk/sfdisk.c:2777
@@ -5063,37 +4937,36 @@
 "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 ""
-"Il y a %d partitions primaires actives. Ce n'est pas un problème pour LILO,\n"
-"mais le MBR DOS amorcera uniquement 1 disque ayant une seule partition "
-"active.\n"
+"Vous avez %d partitions primaires actives. Cela n'a aucun effet pour LILO,\n"
+"mais en a un pour DOS MBR qui ne pourra amorcer un disque qu'avec une seule partition active.\n"
 
 #: fdisk/sfdisk.c:2791
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
-msgstr "La partition %s a l'Id %x et n'est pas cachée.\n"
+msgstr "partition %s a un identificateur %x qui n'est pas caché\n"
 
 #: fdisk/sfdisk.c:2848
-#, fuzzy, c-format
+#, c-format
 msgid "Bad Id %lx\n"
-msgstr "Mauvais Id %x\n"
+msgstr "Identifcateur erroné %lx\n"
 
 #: fdisk/sfdisk.c:2863
 msgid "This disk is currently in use.\n"
-msgstr "Ce disque est déjà utilisé.\n"
+msgstr "Le disque est présentement en usage.\n"
 
 #: fdisk/sfdisk.c:2880
 #, c-format
 msgid "Fatal error: cannot find %s\n"
-msgstr "Erreur fatale : %s introuvable\n"
+msgstr "Erreur fatale: ne peut trouver %s\n"
 
 #: fdisk/sfdisk.c:2883
 #, c-format
 msgid "Warning: %s is not a block device\n"
-msgstr "Avertissement : %s n'est pas un périphérique de bloc.\n"
+msgstr "AVERTISSEMENT: %s n'est pas un périphérique fonctionnant par blocs\n"
 
 #: fdisk/sfdisk.c:2889
 msgid "Checking that no-one is using this disk right now ...\n"
-msgstr "Vérification que personne n'utilise le disque en ce moment ...\n"
+msgstr "Vérification qu'aucun autre n'utilise le disque en ce moment ...\n"
 
 #: fdisk/sfdisk.c:2891
 msgid ""
@@ -5103,15 +4976,14 @@
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
-"Ce disque est en cours d'utilisation. Un repartitionnement n'est pas "
-"adéquat. Démontez tous les systèmes de fichiers et effectuer un swapoff des "
-"partitions d'échange sur le disque. Utilisez l'indicateur --no-reread pour "
-"supprimer cette vérification.\n"
+"Le disque est présentement utilisé - le repartitionner est probablement une mauvaise idée.\n"
+"Démonter tous les systèmes de fichiers, et stopper le swap sur toutes les\n"
+"partitions swap sur ce disque.\n"
+"Utiliser le fanion --no-reread pour supprimer cette vérification.\n"
 
 #: fdisk/sfdisk.c:2895
 msgid "Use the --force flag to overrule all checks.\n"
-msgstr ""
-"Utilisez l'indicateur --force pour passer outre toutes les vérifications.\n"
+msgstr "Utiliser l'option --force pour annuler toutes les vérifications.\n"
 
 #: fdisk/sfdisk.c:2899
 msgid "OK\n"
@@ -5119,36 +4991,36 @@
 
 #: fdisk/sfdisk.c:2908
 msgid "Old situation:\n"
-msgstr "Ancienne situation :\n"
+msgstr "Vieille situation:\n"
 
 #: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
-msgstr "La partition %d n'existe pas, impossible de la modifier.\n"
+msgstr "La partition %d n'existe pas, ne peut la modifer\n"
 
 #: fdisk/sfdisk.c:2920
 msgid "New situation:\n"
-msgstr "Nouvelle situation :\n"
+msgstr "Nouvelle situation:\n"
 
 #: fdisk/sfdisk.c:2925
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
-"Je n'aime pas ces partitions - rien d'inchangé.\n"
-"(Si vous le souhaitez vraiment, utilisez l'option --force.)\n"
+"Ces partitions sont questionnables -- rien n'a changé.\n"
+"(Si vous désirez cela, utiliser l'option --force.)\n"
 
 #: fdisk/sfdisk.c:2928
 msgid "I don't like this - probably you should answer No\n"
-msgstr "Je n'aime pas ça - vous devriez sans doute répondre Non.\n"
+msgstr "Cette situation n'est pas recommandable -- vous devriez probablement répondre Non\n"
 
 #: fdisk/sfdisk.c:2933
 msgid "Are you satisfied with this? [ynq] "
-msgstr "Etes-vous satisfait ? [ynq] "
+msgstr "Êtes-vous satisfait avec cela? [ynq] "
 
 #: fdisk/sfdisk.c:2935
 msgid "Do you want to write this to disk? [ynq] "
-msgstr "Voulez-vous écrire cet élément dans un disque ? [ynq] "
+msgstr "Voulez-vous écrire cela sur le disque? [ynq] "
 
 #: fdisk/sfdisk.c:2940
 msgid ""
@@ -5156,22 +5028,22 @@
 "sfdisk: premature end of input\n"
 msgstr ""
 "\n"
-"sfdisk : fin prématurée de l'entrée\n"
+"sfdisk: fin prématurée de l'entrée\n"
 
 #: fdisk/sfdisk.c:2942
 msgid "Quitting - nothing changed\n"
-msgstr "Fermeture en cours - rien d'inchangé\n"
+msgstr "Abandon - rien n'a changé\n"
 
 #: fdisk/sfdisk.c:2948
 msgid "Please answer one of y,n,q\n"
-msgstr "Veuillez répondre à y,n,q\n"
+msgstr "SVP fournir une réponse suivante: y,n,q\n"
 
 #: fdisk/sfdisk.c:2956
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
-"L'écriture de la nouvelle table de partition a abouti.\n"
+"Succès d'écriture de la nouvelle table de partitions\n"
 "\n"
 
 #: fdisk/sfdisk.c:2962
@@ -5180,150 +5052,140 @@
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
-"Si vous avez créé ou modifié une partition DOS, /dev/foo7, par exemple, "
-"utilisez alors dd(1)\n"
-"pour mettre à zéro les 512 premiers octets :  dd if=/dev/zero of=/dev/foo7 "
-"bs=512 count=1\n"
-"(Voir fdisk(8).)\n"
+"Si vous créez ou modifiez une partition DOS, /dev/foo7, par exemple, alors\n"
+"utiliser dd(1) pour mettre à zéro les premiers 512 octets:  \n"
+"dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
+"(Consulter fdisk(8).)\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
-msgstr "Essayez `getopt --help' pour plus d'informations.\n"
+msgstr "Essayer « getopt --help » pour plus d'informations.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
-msgstr "Longue option vide après -l ou argument --long"
+msgstr "option longue vide après l'argument -l ou --long"
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
-msgstr "Shell inconnu après -s ou argument --shell"
+msgstr "shell inconnu après l'argument -s ou --shell"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
-msgstr "Usage : getopt paramètres optstring\n"
+msgstr "Usage: getopt chaîne-d-options paramètres\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
-msgstr "       getopt [options] [--] paramètres optstring\n"
+msgstr "       getopt [options] [--] paramètres de la chaîne d'option\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-msgstr "       getopt [options] -o|--options optstring [options] [--]\n"
+msgstr "       getopt [options] -o|--options chaine d'options [options] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "              paramètres\n"
 
-#: getopt-1.1.2/getopt.c:328
-msgid ""
-"  -a, --alternative            Allow long options starting with single -\n"
-msgstr ""
-"  -a, --alternative            Autorise les options longues commençant par "
-"un seul -\n"
+#: getopt/getopt.c:328
+msgid "  -a, --alternative            Allow long options starting with single -\n"
+msgstr "  -a, --alternative            parmettre les options de forme longue avec un simple -\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
-msgstr "  -h, --help                   Ce petit guide d'utilisation\n"
+msgstr "  -h, --help                   afficher l'aide mémoire\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-msgstr "  -l, --longoptions=longopts   Options longues à reconnaître\n"
+msgstr "  -l, --longoptions=opt-long   reconnaîtres les options de forme longue\n"
 
-#: getopt-1.1.2/getopt.c:331
-msgid ""
-"  -n, --name=progname          The name under which errors are reported\n"
-msgstr ""
-"  -n, --name=progname          Nom sous lequel les erreurs sont rapportées\n"
+#: getopt/getopt.c:331
+msgid "  -n, --name=progname          The name under which errors are reported\n"
+msgstr "  -n, --name=nom-de-programme le nom sous lequel les erreurs sont rapportées\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
-msgstr "  -o, --options=optstring      Options courtes à reconnaître\n"
+msgstr "  -o, --options=chaîne-opt    reconnaître les options de forme courte\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-msgstr ""
-"  -q, --quiet                  Désactive le rapport d'erreur avec getopt(3)\n"
+msgstr "  -q, --quiet                  désactiver les rapports d'erreur par getopt(3)\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
-msgstr "  -Q, --quiet-output           Aucune sortie normale\n"
+msgstr "  -Q, --quiet-output           pas d'affichage normal\n"
 
-#: getopt-1.1.2/getopt.c:335
+# getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-msgstr ""
-"  -s, --shell=shell            Définit les conventions de déclaration du "
-"shell\n"
+msgstr "  -s, --shell=shell            initialiser la convention de commentaire du shell\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
-msgstr "  -T, --test                   Teste la version getopt(1)\n"
+msgstr "  -T, --test                   afficher la version de getopt(1)\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr "  -u, --unqote                 Ne pas quoter la sortie\n"
+msgstr "  -u, --unqote                 ne pas commenter avec des guillemets la sortie\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
-msgstr "  -V, --version                Affiche les informations de version\n"
+msgstr "  -V, --version                afficher la version\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
-msgstr "Argument optstring manquant"
+msgstr "la chaîne d'options de l'argument est manquante"
 
-#: getopt-1.1.2/getopt.c:441
-#, fuzzy
-msgid "getopt (enhanced) 1.1.2\n"
-msgstr "getopt (avancé) 1.1.0\n"
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (amélioré) 1.1.3\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
-msgstr "Erreur interne, contactez l'auteur."
+msgstr "erreur interne, contacter l'auteur."
 
 #: hwclock/cmos.c:172
 msgid "booted from MILO\n"
-msgstr "amorçé à partir de MILO\n"
+msgstr "amorcé à partir de MILO\n"
 
 #: hwclock/cmos.c:181
 msgid "Ruffian BCD clock\n"
-msgstr "horloge Ruffian BCD\n"
+msgstr "Horloge Ruffian BCD\n"
 
 #: hwclock/cmos.c:197
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
-msgstr "port horloge ajusté à 0x%x\n"
+msgstr "le port d'horloge a été ajusté à 0x%x\n"
 
 #: hwclock/cmos.c:209
 msgid "funky TOY!\n"
-msgstr "funky TOY!\n"
+msgstr "drôle de TOY!\n"
 
 #: hwclock/cmos.c:263
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr "%s : échec de %s atomique pour 1000 itérations !"
+msgstr "%s: atomic %s a échoué pour 1000 itérations!"
 
 #: hwclock/cmos.c:587
 #, c-format
 msgid "Cannot open /dev/port: %s"
-msgstr "Impossible d'ouvrir /dev/port : %s"
+msgstr "Ne peut ouvrir le port /dev/port: %s"
 
 #: hwclock/cmos.c:594
 msgid "I failed to get permission because I didn't try.\n"
-msgstr ""
-"Je n'ai pas réussi à obtenir l'autorisation parce que je n'ai pas essayé.\n"
+msgstr "Échec d'obtention des permissions parce qu'aucun essai n'a été tenté.\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 ne peut pas accéder au port d'E/S : l'appel à iopl(3) a échoué.\n"
+msgstr "%s incapable d'obtenir un port d'accès d'E/S :  l'appel à iopl(3) a échoué.\n"
 
 #: hwclock/cmos.c:600
 msgid "Probably you need root privileges.\n"
-msgstr "Vous avez probablement besoin des privilèges root.\n"
+msgstr "Probablement que vous avez besoin des privilèges de root.\n"
 
 #: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
-msgstr "Suppose que l'horloge matérielle est à l'heure %s.\n"
+msgstr "On assume que l'horloge matérielle est conservée dans le temps de %s.\n"
 
 #: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
@@ -5331,34 +5193,31 @@
 
 #: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
-msgstr "local"
+msgstr "locale"
 
 #: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
-msgstr ""
-"%s : Avertissement : le fichier adjtime contient une troisième ligne non "
-"reconnue.\n"
+msgstr "%s: AVERTISSEMENT: 3e ligne non reconnue dans le fichier d'ajustement de l'heure\n"
 
 #: hwclock/hwclock.c:305
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
-msgstr "(Attendu : `UTC' ou `LOCAL' ou rien.)\n"
+msgstr "(Attendu: « UTC » ou « LOCAL » ou nothing.)\n"
 
 #: hwclock/hwclock.c:312
-#, fuzzy, c-format
+#, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
-msgstr ""
-"Dernier ajustement du facteur de dérive effectué %d secondes après 1969\n"
+msgstr "Le dernier ajustement de dérive a été fait %ld secondes après 1969\n"
 
 #: hwclock/hwclock.c:314
-#, fuzzy, c-format
+#, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
-msgstr "Dernier calibrage effectué %d secondes après 1969\n"
+msgstr "La dernière calibration a été faite %ld secondes après 1969\n"
 
 #: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
-msgstr "L'horloge matérielle est à l'heure %s\n"
+msgstr "L'horloge matérielle fonctionne selon le temps %s\n"
 
 #: hwclock/hwclock.c:318
 msgid "unknown"
@@ -5366,40 +5225,35 @@
 
 #: hwclock/hwclock.c:342
 msgid "Waiting for clock tick...\n"
-msgstr "Attente du tic de l'horloge...\n"
+msgstr "En attente d'un tic d'horloge...\n"
 
 #: hwclock/hwclock.c:346
 msgid "...got clock tick\n"
-msgstr "...tic de l'horloge reçu\n"
+msgstr "...a obtenu un tic d'horloge\n"
 
 #: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr ""
-"Valeurs incorrectes dans l'horloge matérielle : %4d/%.2d/%.2d %.2d:%.2d:"
-"%.2d\n"
+msgstr "valeurs invalides dans l'horloge matérielle: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
 #: hwclock/hwclock.c:407
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
-msgstr ""
-"Heure à l'horloge matérielle : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld secondes "
-"depuis 1969\n"
+msgstr "Heure de l'horloge matérielle : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld secondes depuis 1969\n"
 
 #: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-msgstr "Heure lue à l'horloge matérielle : %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr "Heure lu de l'horloge matérielle: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
 #: hwclock/hwclock.c:462
-#, fuzzy, c-format
+#, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
-msgstr ""
-"Réglage de l'horloge matérielle à %.2d:%.2d:%.2d = %d secondes depuis 1969\n"
+msgstr "Initialiser l'horloge matérielle à %.2d:%.2d:%.2d = %ld secondes depuis 1969\n"
 
 #: hwclock/hwclock.c:468
 msgid "Clock not changed - testing only.\n"
-msgstr "Horloge non modifiée. Test.\n"
+msgstr "Horloge n'est pas modifiée - test seulement.\n"
 
 #: hwclock/hwclock.c:516
 #, c-format
@@ -5407,17 +5261,15 @@
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the next full second.\n"
 msgstr ""
-"Le temps écoulé depuis l'heure de référence est de %.6f secondes.\n"
-"Délai supplémentaire jusqu'à la prochaine seconde.\n"
+"Le temps écoulé depuis le temps de référence a été de %.6f secondes.\n"
+"Delai en cours pour atteindre la prochaine seconde complète.\n"
 
 #: hwclock/hwclock.c: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"
+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 ""
-"L'horloge matérielle contient soit des valeurs invalides (comme le 50ème "
-"jour du mois) ou en dehors de l'intervalle pris en charge (comme l'année "
-"2095).\n"
+"Les registres de l'horloge matérielle contiennent des valeurs qui sont\n"
+"soit invalides (i.e. 50e jour du mois) ou en dehors de la plage\n"
+"pouvant être traitée (i.e. année 2095).\n"
 
 #: hwclock/hwclock.c:555
 #, c-format
@@ -5426,11 +5278,11 @@
 
 #: hwclock/hwclock.c:589
 msgid "No --date option specified.\n"
-msgstr "Pas d'option --date spécifiée.\n"
+msgstr "Aucune option --date spécifié.\n"
 
 #: hwclock/hwclock.c:595
 msgid "--date argument too long\n"
-msgstr ""
+msgstr "--date argument trop long\n"
 
 #: hwclock/hwclock.c:602
 msgid ""
@@ -5438,23 +5290,21 @@
 "In particular, it contains quotation marks.\n"
 msgstr ""
 "La valeur de l'option --date n'est pas une date valide.\n"
-"Elle contient, en particulier, des points d'interrogation.\n"
+"En particulier, elle contient des guillemets.\n"
 
 #: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
-msgstr "Réponse de la commande date : %s\n"
+msgstr "Émission de la commande de date: %s\n"
 
 #: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr ""
-"Impossible de lancer le programme 'date' dans le shell /bin/sh. popen() a "
-"échoué."
+msgstr "Échec de popen(), incapable d'exécuter « date » à partir de /bin/sh shell"
 
 #: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
-msgstr "Réponse de la commande date = %s\n"
+msgstr "réponse de la commande date = %s\n"
 
 #: hwclock/hwclock.c:624
 #, c-format
@@ -5465,45 +5315,40 @@
 "The response was:\n"
 "  %s\n"
 msgstr ""
-"La commande date lancée par %s a retourné des résultats inattendus.\n"
-"La commande était :\n"
+"La commande date soumise par %s a retourné des résultats inattendus.\n"
+"La commande était:\n"
 "  %s\n"
-"Le résultat était :\n"
+"Le résultat est:\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 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 ""
-"La commande date lancée par %s n'a pas retourné de valeur entière là où "
-"l'heure convertie était attendue.\n"
-"La commande était :\n"
+"La commande date soumise par %s a retourné quelque chose d'autre qu'un\n"
+"entier alors que des valeurs de temps converties étaient attendues.\n"
+"La commande était:\n"
 "  %s\n"
-"Le résultat était :\n"
+"Le résultat est:\n"
 "  %s\n"
 
 #: hwclock/hwclock.c:647
-#, fuzzy, c-format
+#, c-format
 msgid "date string %s equates to %ld seconds since 1969.\n"
-msgstr "La chaîne de date %s équivaut à %d secondes depuis 1969.\n"
+msgstr "la chaîne de date %s équivaut à %ld secondes depuis 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 ""
-"L'horloge matérielle ne contient pas d'heure valide. On ne peut donc pas "
-"régler l'horloge système à partir de celle-ci.\n"
+msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
+msgstr "L'horloge matérielle ne contient de temps valide, aussi on ne peut pas initialisé l'heure du système à partir d'elle.\n"
 
 #: hwclock/hwclock.c:701
 msgid "Calling settimeofday:\n"
-msgstr "Appel de settimeofday :\n"
+msgstr "Appel de settimeofday:\n"
 
 #: hwclock/hwclock.c:702
 #, c-format
@@ -5517,67 +5362,54 @@
 
 #: hwclock/hwclock.c:707
 msgid "Not setting system clock because running in test mode.\n"
-msgstr ""
-"L'horloge système n'a pas été modifiée car l'exécution est en mode test.\n"
+msgstr "Ne peut initialiser l'horloge système parce que le programme tourne en mode test.\n"
 
 #: hwclock/hwclock.c:716
 msgid "Must be superuser to set system clock.\n"
-msgstr "Vous devez être un superutilisateur pour définir l'horloge système.\n"
+msgstr "Vous devez être le super-usager pour initialiser l'horloge système.\n"
 
 #: hwclock/hwclock.c:719
 msgid "settimeofday() failed"
-msgstr "settimeofday() a échoué."
+msgstr "Échec de settimeofday()"
 
 #: hwclock/hwclock.c:749
-msgid ""
-"Not adjusting drift factor because the Hardware Clock previously contained "
-"garbage.\n"
-msgstr ""
-"Pas de modification du facteur de dérive car l'horloge matérielle contient "
-"des déchets.\n"
+msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
+msgstr "Pas d'ajustement du facteur de dérive parce l'horloge matérielle contient déjà des donnéez corrompues.\n"
 
 #: hwclock/hwclock.c:754
-#, fuzzy
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
 "so history is bad and calibration startover is necessary.\n"
 msgstr ""
-"Le facteur de dérive n'a pas été modifié car le dernier calibrage a moins "
-"d'un jour.\n"
+"Pas d'ajustement du facteur de dérive parce le dernier de temps de calibration indique zéro.\n"
+"L'hitorique étant erroné une recalibration est nécessaire.\n"
 
 #: hwclock/hwclock.c:760
-msgid ""
-"Not adjusting drift factor because it has been less than a day since the "
-"last calibration.\n"
-msgstr ""
-"Le facteur de dérive n'a pas été modifié car le dernier calibrage a moins "
-"d'un jour.\n"
+msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
+msgstr "Pas d'ajustement du facteur de dérive parce qu'elle est moins qu'un jour depuis la dernière calibration.\n"
 
 #: hwclock/hwclock.c:808
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
-"of %f seconds/day.\n"
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"L'horloge a dérivé de %d secondes durant les %d dernières secondes, malgré "
-"le facteur de dérive de %f secondes par jour.\n"
-"Ajustement du facteur de dérive à %f secondes par jour.\n"
+"L'horloge a dérivé de %.1f secondes durant les dernières %d secondes en dépit d'un facteur de dérive de %f secondes/jour.\n"
+"Ajustement du facteur de dérive de %f secondes/jour\n"
 
 #: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
-msgstr "Il s'est écoulé %d secondes depuis le dernier ajustement.\n"
+msgstr "L'heure depuis le dernier ajustement est de %d secondes\n"
 
 #: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
-msgstr ""
-"Il faut ajouter %d secondes, et se référer à %.6f secondes dans le passé.\n"
+msgstr "Besoin d'insérer %d secondes et de faire une référence arrière dans le temps de %.6f secondes\n"
 
 #: hwclock/hwclock.c:890
 msgid "Not updating adjtime file because of testing mode.\n"
-msgstr "Fichier adjtime non modifiable en mode test.\n"
+msgstr "Pas de mise à jour du fichier de temps d'ajustement en raison du mode test.\n"
 
 #: hwclock/hwclock.c:891
 #, c-format
@@ -5585,79 +5417,67 @@
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
-"Aurait écrit ce qui suit sur %s :\n"
+"Devrait avoir écrit ce qui suit dans %s:\n"
 "%s"
 
 #: hwclock/hwclock.c:915
 msgid "Drift adjustment parameters not updated.\n"
-msgstr "Facteur de dérive non modifié.\n"
+msgstr "Ajustement des paramètres de dérive n'ont pas été mis à jour.\n"
 
 #: hwclock/hwclock.c:956
-msgid ""
-"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr ""
-"L'horloge matérielle ne contient pas d'heure valide, on ne peut donc pas "
-"l'ajuster.\n"
+msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr "L'horloge matérielle ne contient pas une heure valide, on ne peut l'ajuster\n"
 
 #: hwclock/hwclock.c:988
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
-msgstr ""
-"L'ajustement nécessaire est inférieur à une seconde, pas de changement "
-"effectué.\n"
+msgstr "L'ajustement requis est inférieur à une seconde, pas d'initialisation de l'horloge.\n"
 
 #: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
-msgstr "Utilisation de %s.\n"
+msgstr "Utilisant %s.\n"
 
 #: hwclock/hwclock.c:1016
 msgid "No usable clock interface found.\n"
-msgstr "Aucune interface avec l'horloge utilisable trouvée.\n"
+msgstr "Aucune interface d'horloge utilisable n'a été repérée.\n"
 
 #: hwclock/hwclock.c:1112
 msgid "Unable to set system clock.\n"
-msgstr "Impossible de régler l'horloge système.\n"
+msgstr "Incapable d'initialiser l'horloge système.\n"
 
 #: 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 ""
-"Le kernel utilise un format pour l'horloge matérielle adapté aux machines "
-"Alpha.\n"
-"Cette version de hwclock a été compilée pour une architecture autre "
-"qu'Alpha\n"
-"(et n'est, par conséquent, sans doute pas exécutée sur un Alpha). Aucune "
-"action entreprise.\n"
+"Le kernel conserve une valeur d'époque pour l'horloge matérielle uniquement sur une machine Alpha.\n"
+"Cette copie de l'horloge matérielle a été prévue pour une autre d'un autre type que Alpha\n"
+"(et présumément ne tournant pas sur un Alpha maintenant).  Aucune action n'a été exécutée.\n"
 
 #: hwclock/hwclock.c:1151
 msgid "Unable to get the epoch value from the kernel.\n"
-msgstr "Impossible d'obtenir la valeur epoch depuis le kernel.\n"
+msgstr "Incapable d'obtenir la valeur d'époque à partir du kernel.\n"
 
 #: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
-msgstr "Le kernel suppose une valeur epoch de %lu\n"
+msgstr "Le kernel assume une valeur d'époque de %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 ""
-"Pour définir une valeur epoch, utilisez l'option 'epoch' pour indiquer la "
-"valeur sur laquelle elle doit être réglée.\n"
+msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n"
+msgstr "Pour initialiser la valeur d'époque, vous devez utiliser l'option « epoch » pour y mettre la valeur voulue.\n"
 
 #: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
-msgstr "Valeur epoch non définie sur %d. Test uniquement.\n"
+msgstr "La valeur d'époque %d n'est pas utilisée pour initialisation - test seulement.\n"
 
 #: hwclock/hwclock.c:1162
 msgid "Unable to set the epoch value in the kernel.\n"
-msgstr "Impossible de modifier la valeur epoch du kernel.\n"
+msgstr "Incapable d'initialiser la valeur d'époque dans le kernel.\n"
 
+# hwclock/hwclock.c:1108
 #: hwclock/hwclock.c:1196
 #, c-format
 msgid ""
@@ -5689,273 +5509,267 @@
 "  --noadjfile   do not access /etc/adjtime. Requires the use of\n"
 "                either --utc or --localtime\n"
 msgstr ""
+"hwclock - interroger et initialiser l'horloge matérielle (en temps réel)\n"
+"\n"
+"Usage: hwclock [fonction] [options...]\n"
+"\n"
+"Fonctions:\n"
+"  --help        afficher l'aide mémoire\n"
+"  --show        lire l'horloge et afficher les résultats\n"
+"  --set         initialiser l'horloge en temps réel à l'heure indiquée\n"
+"                avec les paramètres fournis à l'aide de --date\n"
+"  --hctosys     initialiser l'heure système à partir de l'horloge matérielle\n"
+"  --systohc     initialiser l'horloge matérielle à l'heure courante du système\n"
+"  --adjust      ajuster l'horloge en temps réel en tenant compte d'une dérive\n"
+"                systématique depuis que l'horloge a été initialisée\n"
+"                ou ajustée\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"
 
 #: 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"
+"                indiquer hwclock le type de alpha en usage (voir hwclock(8))\n"
 
 #: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
-msgstr "L'option %s ne prend pas d'argument. Cependant, vous avez donné %d.\n"
+msgstr "%s ne peut pas prendre des arguments d'options qui n'en sont pas. Vous avez fourni %d.\n"
 
 #: hwclock/hwclock.c:1403
-#, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
-"Vous avez défini plusieurs options de fonction.\n"
-"Vous pouvez effectuer une seule fonction à la fois.\n"
+"Vous avez spécifé de multiples options de fonctions.\n"
+"Vous ne pouvez qu'en exécuter une à la fois.\n"
 
 #: hwclock/hwclock.c:1410
 #, c-format
-msgid ""
-"%s: The --utc and --localtime options are mutually exclusive.  You specified "
-"both.\n"
-msgstr ""
-"%s : Les options --utc et --localtime s'excluent mutuellement. Vous avez "
-"défini les deux.\n"
+msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
+msgstr "%s: les options --utc et --localtime sont mutuellement exclusives. Vous avez soumis les deux.\n"
 
 #: hwclock/hwclock.c:1417
-#, fuzzy, c-format
-msgid ""
-"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
-"specified both.\n"
-msgstr ""
-"%s : Les options --utc et --localtime s'excluent mutuellement. Vous avez "
-"défini les deux.\n"
+#, c-format
+msgid "%s: The --adjust and --noadjfile options are mutually exclusive.  You specified both.\n"
+msgstr "%s: les options --adjust et --noadjfile sont mutuellement exclusives. Vous avez soumis les deux.\n"
 
 #: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
-msgstr ""
+msgstr "%s: avec --noadjfile, vous devez spécifier soit --utc ou --localtime\n"
 
 #: hwclock/hwclock.c:1438
 msgid "No usable set-to time.  Cannot set clock.\n"
-msgstr "Aucune heure utilisable. Impossible de régler l'horloge.\n"
+msgstr "Pas utilisable pour initialiser l'heure.  Ne peut initialiser l'horloge.\n"
 
 #: hwclock/hwclock.c:1454
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr ""
-"Désolé, seul le superutilisateur est autorisé à modifier l'horloge "
-"matérielle.\n"
+msgstr "Désolé, seul le super usager peut modifier l'horloge matérielle.\n"
 
 #: hwclock/hwclock.c:1459
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr ""
-"Désolé, seul le superutilisateur est autorisé à modifier l'horloge système.\n"
+msgstr "Désolé, seul le super usager peut modifier l'horloge système.\n"
 
 #: hwclock/hwclock.c:1464
-msgid ""
-"Sorry, only the superuser can change the Hardware Clock epoch in the "
-"kernel.\n"
-msgstr ""
-"Désolé, seul le superutilisateur est autorisé à modifier la valeur epoch de "
-"l'horloge matérielle dans le kernel.\n"
+msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
+msgstr "Désole, seul le super usager peut modifier l'époque de l'horloge matérielle dans le kernel.\n"
 
 #: hwclock/hwclock.c:1484
 msgid "Cannot access the Hardware Clock via any known method.\n"
-msgstr ""
-"Impossible d'accéder à l'horloge matériel à l'aide d'une méthode connue.\n"
+msgstr "Ne peut accéder l'horloge matérielle par le biais d'une méthode connue.\n"
 
 #: hwclock/hwclock.c:1488
-msgid ""
-"Use the --debug option to see the details of our search for an access "
-"method.\n"
-msgstr ""
-"Utilisez l'option --debug pour afficher les détails de la recherche d'une "
-"méthode d'accès.\n"
+msgid "Use the --debug option to see the details of our search for an access method.\n"
+msgstr "Utiliser l'option --debug pour voir les détails de la recherche d'une méthode connue.\n"
 
 #: hwclock/kd.c:43
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
-msgstr "Attente en boucle du changement d'heure dans KDGHWCLK.\n"
+msgstr "Attente dans la boucle d'obtention d'un changement depuis KDGHWCLK\n"
 
 #: hwclock/kd.c:46
 msgid "KDGHWCLK ioctl to read time failed"
-msgstr "La lecture de l'heure par KDGHWCLK ioctl a échoué."
+msgstr "Échec de KDGHWCLK ioctl pour la lecture de l'heure"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
-msgstr "Temporisation de l'attente du changement d'heure.\n"
+msgstr "Expiration de la minuterie lors de l'attente du changement de l'heure.\n"
 
 #: hwclock/kd.c:71
 msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr "La lecture de l'heure par KDGHWCLK ioctl a échoué dans la boucle."
+msgstr "KDGHWCLK ioctl pour la lecture de l'heure a échoué dans une boucle"
 
 #: hwclock/kd.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "ioctl() failed to read time from %s"
-msgstr "ioctl() a échoué lors de la lecture de l'heure de /dev/tty1."
+msgstr "Échec de ioctl() lors de la lecture de l'heure depuis %s"
 
 #: hwclock/kd.c:129
-#, fuzzy
 msgid "ioctl KDSHWCLK failed"
-msgstr "Échec de KDGHWCLK ioctl."
+msgstr "Échec de ioctl KDSHWCLK"
 
 #: hwclock/kd.c:166
-#, fuzzy
 msgid "Can't open /dev/tty1 or /dev/vc/1"
-msgstr "Impossible d'ouvrir /dev/tty1."
+msgstr "Ne peut ouvrir /dev/tty1 ou /dev/vc/1"
 
 #: hwclock/kd.c:171
 msgid "KDGHWCLK ioctl failed"
-msgstr "Échec de KDGHWCLK ioctl."
+msgstr "Échec de KDGHWCLK ioctl"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
-msgstr "open() de %s a échoué."
+msgstr "Échec de open() de %s"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
-msgstr "ioctl() sur %s pour lire l'heure a échoué.\n"
+msgstr "Échec ioctl() vers %s lors de la lecture de l'heure\n"
 
-#: hwclock/rtc.c:171
+#: hwclock/rtc.c:170
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
-msgstr "Attente en boucle du changement de l'heure de %s.\n"
+msgstr "Attente dans un boucle pour que le temps %s se modifie\n"
 
-#: hwclock/rtc.c:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
-msgstr "%s n'a pas de fonctions d'interruption. "
+msgstr "%s n'a pas de fonction d'interruption"
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
-msgstr "read() sur %s pour attendre le tic de l'horloge a échoué."
+msgstr "Échec de read() de %s durant l'attente d'un tic d'horloge"
 
-#: hwclock/rtc.c:244
+#: hwclock/rtc.c:243
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
-msgstr ""
-"ioctl() sur %s pour désactiver les interruptions de mise à jour a échoué."
+msgstr "Échec de ioctl() de %s durant l'arrêt des mises à jour par interruption"
 
-#: hwclock/rtc.c:247
+#: hwclock/rtc.c:246
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
-msgstr ""
-"ioctl() sur %s pour activer les interruptions de mise à jour a échoué de "
-"manière inattendue."
+msgstr "Échec de ioctl() de %s pour permettre les mises à jour par interruption de façon inattendue"
 
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:305
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
-msgstr "ioctl() sur %s pour régler l'heure a échoué.\n"
+msgstr "ioctl() de %s pour initialiser l'heure a échoué.\n"
 
-#: hwclock/rtc.c:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
-msgstr "ioctl(%s) a abouti.\n"
+msgstr "ioctl(%s) a réussi.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
-msgstr "L'ouverture de %s a échoué."
+msgstr "Ouverture de %s a échoué"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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 ""
-"Afin de pouvoir manipuler la valeur epoch dans le kernel, nous devons "
-"accéder au pilote de périphérique Linux 'rtc' depuis le fichier spécial de "
-"périphérique %s. Ce fichier est introuvable sur le système.\n"
+msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s.  This file does not exist on this system.\n"
+msgstr "Pour manipuler la valeur de l'époque dans le kernel, vous devez accéder le 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:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
-msgstr "Impossible d'ouvrir %s."
+msgstr "Incapable d'ouvrir %s"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr "ioctl(RTC_EPOCH_READ) sur %s a échoué."
+msgstr "ioctl(RTC_EPOCH_READ) de %s a échoué"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr "Valeur epoch lue %ld depuis %s avec RTC_EPOCH_READ ioctl.\n"
+msgstr "l'époque %ld a été lu à partir de %s à l'aide de RTC_EPOCH_READ ioctl().\n"
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:397
+#: hwclock/rtc.c:396
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr ""
-"La valeur epoch doit être supérieure ou égale à 1900. Vous avez demandé %"
-"ld.\n"
+msgstr "La valeur de l'époque ne peut pas être plus petite que 1900. Vous avez demandé %ld\n"
 
-#: hwclock/rtc.c:415
+#: hwclock/rtc.c:414
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
-msgstr "Réglage de la valeur epoch sur %ld avec RTC_EPOCH_SET ioctl sur %s.\n"
+msgstr "initilisation de l'époque à %ld à l'aide de RTC_EPOCH_SET ioctl vers %s.\n"
 
-#: hwclock/rtc.c:420
+#: hwclock/rtc.c:419
 #, c-format
-msgid ""
-"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
-msgstr ""
-"Le pilote de périphérique du kernel pour %s ne dispose pas de RTC_EPOCH_SET "
-"ioctl.\n"
+msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+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:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
-msgstr "ioctl(RTC_EPOCH_SET) sur %s a échoué."
+msgstr "Échec de ioctl(RTC_EPOCH_SET) vers %s"
 
 #: login-utils/agetty.c:312
 msgid "calling open_tty\n"
-msgstr "Appel de open_tty\n"
+msgstr "appel de open_tty\n"
 
 #. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
-msgstr "Appel de termio_init\n"
+msgstr "appel de termio_init\n"
 
 #: login-utils/agetty.c:330
 msgid "writing init string\n"
-msgstr "écriture de la chaîne init\n"
+msgstr "chaîne d'initialisation en écriture\n"
 
 #. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
-msgstr "avant autobaud\n"
+msgstr "avant le mode autobaud\n"
 
 #: login-utils/agetty.c:352
 msgid "waiting for cr-lf\n"
-msgstr "Attente de cr-lf\n"
+msgstr "en attente de cr-lf\n"
 
 #: login-utils/agetty.c:356
 #, c-format
 msgid "read %c\n"
-msgstr "Lecture de %c\n"
+msgstr "lire %c\n"
 
 #. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
-msgstr "Lecture du nom de connexion\n"
+msgstr "lecture du nom de login\n"
 
 #: login-utils/agetty.c:386
 #, c-format
 msgid "%s: can't exec %s: %m"
-msgstr "%s : impossible d'exécuter %s : %m"
+msgstr "%s: ne peut exécuter %s: %m"
 
 #: login-utils/agetty.c:406
 msgid "can't malloc initstring"
-msgstr "malloc initstring impossible"
+msgstr "ne peut exécuter malloc() pour la chaîne d'initialisation"
 
 #: login-utils/agetty.c:471
 #, c-format
 msgid "bad timeout value: %s"
-msgstr "Valeur de temporisation incorrecte : %s"
+msgstr "valeur erronée d'expiration de la minuterie: %s"
 
 #: login-utils/agetty.c:480
 msgid "after getopt loop\n"
@@ -5963,34 +5777,34 @@
 
 #: login-utils/agetty.c:530
 msgid "exiting parseargs\n"
-msgstr "quitter parseargs\n"
+msgstr "quitte parseargs\n"
 
 #: login-utils/agetty.c:542
 msgid "entered parse_speeds\n"
-msgstr "entrer parse_speeds\n"
+msgstr "entre dans parse_speeds\n"
 
 #: login-utils/agetty.c:545
 #, c-format
 msgid "bad speed: %s"
-msgstr "Vitesse incorrecte : %s"
+msgstr "vitesse erronée: %s"
 
 #: login-utils/agetty.c:547
 msgid "too many alternate speeds"
-msgstr "Trop de vitesses secondaires"
+msgstr "trop de vitesses alternatives"
 
 #: login-utils/agetty.c:549
 msgid "exiting parsespeeds\n"
-msgstr "quitter parsespeeds\n"
+msgstr "quitte parsespeeds\n"
 
 #: login-utils/agetty.c:649
 #, c-format
 msgid "/dev: chdir() failed: %m"
-msgstr "/dev : chdir() a échoué : %m"
+msgstr "/dev: chdir() a échoué: %m"
 
 #: login-utils/agetty.c:653
 #, c-format
 msgid "/dev/%s: not a character device"
-msgstr "/dev/%s : n'est pas un périphérique de caractère"
+msgstr "/dev/%s: n'est pas périphérique pour caractères"
 
 #. ignore close(2) errors
 #: login-utils/agetty.c:660
@@ -6000,23 +5814,23 @@
 #: login-utils/agetty.c:662
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
-msgstr "/dev/%s : ouverture impossible en entrée standard : %m"
+msgstr "/dev/%s: ne peut ouvrir en tant qu'entrées standard: %m"
 
 #: login-utils/agetty.c:672
 #, c-format
 msgid "%s: not open for read/write"
-msgstr "%s : non ouvert pour lecture/écriture"
+msgstr "%s: n,est pas ouvert pour lecture/écriture"
 
 #. Set up standard output and standard error file descriptors.
 #: login-utils/agetty.c:676
 msgid "duping\n"
-msgstr "duping\n"
+msgstr "dup() en cours\n"
 
 #. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
-msgstr "%s : problème dup : %m"
+msgstr "%s: problème avec dup: %m"
 
 #: login-utils/agetty.c:752
 msgid "term_io 2\n"
@@ -6024,52 +5838,48 @@
 
 #: login-utils/agetty.c:937
 msgid "user"
-msgstr "utilisateur"
+msgstr "usager"
 
 #: login-utils/agetty.c:937
 msgid "users"
-msgstr "utilisateurs"
+msgstr "usagers"
 
 #: login-utils/agetty.c:1025
 #, c-format
 msgid "%s: read: %m"
-msgstr "%s : lire : %m"
+msgstr "%s: lu: %m"
 
 #: login-utils/agetty.c:1071
 #, c-format
 msgid "%s: input overrun"
-msgstr "%s : débordement d'entrée"
+msgstr "%s: dépassement du tampon d'entrée"
 
 #: 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 ""
-"Usage : %s [-hiLmw] [-l programme_connexion] [-t temporisation] [-I chaîne "
-"d'initialisation] [-H hôte_connexion] débit_bauds,... ligne [typeterm]\n"
-"ou\t[-hiLmw] [-l programme_connexion] [-t temporisation] [-I chaîne "
-"d'initialisation] [-H hôte_connexion] ligne débit_bauds,... [typetype]\n"
+"Usage: %s [-hiLmw] [-l programme-de-login] [-t minuterie-d-expiration] [-I chaîne-init] [-H hôte-cible] vitesse-en-bauds,... ligne [type-de-terminal]\n"
+"ou\t[-hiLmw] [-l programme-de-login] [-t minuterie-d-expiration] [-I chaîne-init] [-H hôte-cible] ligne vitesse-en-bauds,... [type-de-terminal]\n"
 
 #: login-utils/checktty.c:104 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
-msgstr "Connexion : mémoire faible, échec possible de la connexion\n"
+msgstr "login: bas en espace mémoire, login peut échouer\n"
 
 #: login-utils/checktty.c:105
 msgid "can't malloc for ttyclass"
-msgstr "malloc impossible pour ttyclass"
+msgstr "ne peut exécuter malloc() pour ttyclass"
 
 #: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
-msgstr "malloc impossible pour grplist"
+msgstr "ne peut exécuter malloc() pour grplist"
 
 #. there was a default rule, but user didn't match, reject!
 #: login-utils/checktty.c:422
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
-msgstr "Connexion à %s à partir de %s refusée par défaut.\n"
+msgstr "Login sur %s de %s n'est pas permis par défaut.\n"
 
 #. if we get here, /etc/usertty exists, there's a line
 #. matching our username, but it doesn't contain the
@@ -6078,40 +5888,39 @@
 #: login-utils/checktty.c:433
 #, c-format
 msgid "Login on %s from %s denied.\n"
-msgstr "Connexion sur %s à partir de %s refusée.\n"
+msgstr "Login sur %s de %s n'est pas permis.\n"
 
 #: login-utils/chfn.c:122 login-utils/chsh.c:107
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
-msgstr "%s : vous (utilisateur %d) n'existez pas.\n"
+msgstr "%s: vous (usager %d) n'existez pas.\n"
 
 #: login-utils/chfn.c:129 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr "%s : l'utilisateur \"%s\" n'existe pas.\n"
+msgstr "%s: usager « %s » n'existe pas.\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 ""
-"%s : peut seulement changer les entrées locales ; utilisez plutôt yp%s.\n"
+msgstr "%s: on ne peut changer que les entrées locales; utiliser yp%s à la place.\n"
 
 #: login-utils/chfn.c:146
 #, c-format
 msgid "Changing finger information for %s.\n"
-msgstr "Changement des informations utilisateur pour %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
 msgid "Password error."
-msgstr "Erreur de mot de passe."
+msgstr "Erreur de mot de passe"
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
+#: 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:249
 #: mount/lomount.c:254
 msgid "Password: "
-msgstr "Mot de passe : "
+msgstr "Mot de passe: "
 
 #: login-utils/chfn.c:179 login-utils/chsh.c:170
 msgid "Incorrect password."
@@ -6119,20 +5928,20 @@
 
 #: login-utils/chfn.c:190
 msgid "Finger information not changed.\n"
-msgstr "Informations utilisateur non changées.\n"
+msgstr "L'information de finger n'a pas changé.\n"
 
 #: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr "Usage : %s [ -f nom-complet ] [ -o bureau ] "
+msgstr "Usage: %s [ -f nom-complet ] [ -o bureau ] "
 
 #: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
-"[ -p téléphone-bureau ]\n"
-"\t[ -h téléphone-maison ] "
+"[ -p no-téléphone-au-bureau ]\n"
+"\t[ -h no-téléphone-à-la-maison ] "
 
 #: login-utils/chfn.c:294
 msgid "[ --help ] [ --version ]\n"
@@ -6148,40 +5957,38 @@
 
 #: login-utils/chfn.c:398
 msgid "field is too long.\n"
-msgstr "champ trop long.\n"
+msgstr "le champ est trop long.\n"
 
 #: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr "'%c' n'est pas un caractère permis.\n"
+msgstr "« %c » n'est pas permis.\n"
 
 #: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
-msgstr "Les caractères de contrôle ne sont pas permis.\n"
+msgstr "Caractères de contrôle ne sont pas permis.\n"
 
 #: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
-msgstr ""
-"Informations utilisateur *NON* changées. Essayez de nouveau plus tard.\n"
+msgstr "L'information de finger *N'A PAS* changé. Essayer à nouveau plus tard.\n"
 
 #: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
-msgstr "Informations utilisateur changées.\n"
+msgstr "L'information de finger a changé.\n"
 
 #: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
 msgid "malloc failed"
-msgstr "Échec de malloc"
+msgstr "échec de malloc()"
 
 #: login-utils/chsh.c:130
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr ""
-"%s : Votre shell n'est pas dans /etc/shells, changement de shell annulé.\n"
+msgstr "%s: votre shell n'est pas dans /etc/shells, modification de shell interdite\n"
 
 #: login-utils/chsh.c:137
 #, c-format
 msgid "Changing shell for %s.\n"
-msgstr "Changement du shell pour %s.\n"
+msgstr "MOdification du shell pour %s.\n"
 
 #: login-utils/chsh.c:178
 msgid "New shell"
@@ -6189,72 +5996,74 @@
 
 #: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
-msgstr "Shell non changé.\n"
+msgstr "Shell n'a pas été changé.\n"
 
 #: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr "Shell *NON* changé. Essayez de nouveau plus tard.\n"
+msgstr "Shell *N'A PAS* changé.  Essayer plus tard.\n"
 
 #: login-utils/chsh.c:195
 msgid "Shell changed.\n"
-msgstr "Le shell a été changé.\n"
+msgstr "Shell a changé.\n"
 
 #: login-utils/chsh.c:260
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
-msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
+msgstr ""
+"Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ nom-usager ]\n"
 
 #: login-utils/chsh.c:303
 #, c-format
 msgid "%s: shell must be a full path name.\n"
-msgstr "%s : le shell doit être un chemin complet.\n"
+msgstr "%s: shell doit utiliser le nom du chemin d'accès complet.\n"
 
 #: login-utils/chsh.c:307
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
-msgstr "%s : \"%s\" n'existe pas.\n"
+msgstr "%s: « %s » n'existe pas.\n"
 
 #: login-utils/chsh.c:311
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
-msgstr "%s : \"%s\" n'est pas exécutable.\n"
+msgstr "%s: « %s » n'est pas exécutable.\n"
 
 #: login-utils/chsh.c:318
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr "%s : '%c' n'est pas autorisé.\n"
+msgstr "%s: « %c » n'est pas permis.\n"
 
 #: login-utils/chsh.c:322
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
-msgstr "%s : Les caractères de contrôle ne sont pas permis.\n"
+msgstr "%s: les caractères de contrôle ne sont par permis.\n"
 
 #: login-utils/chsh.c:329
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
-msgstr "Avertissement : \"%s\" n'est pas listé dans /etc/shells.\n"
+msgstr "AVERTISSEMENT: « %s » n'apparaît pas dans /etc/shells\n"
 
 #: login-utils/chsh.c:331
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
-msgstr "%s : \"%s\" n'est pas listé dans /etc/shells.\n"
+msgstr "%s: « %s » n'apparaît pas dans /etc/shells.\n"
 
 #: login-utils/chsh.c:333
 #, c-format
 msgid "%s: use -l option to see list\n"
-msgstr "%s : utilisez l'option -l pour voir la liste.\n"
+msgstr "%s: utiliser l'option -l option pour afficher la liste\n"
 
 #: login-utils/chsh.c:339
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
-msgstr "Avertissement : \"%s\" n'est pas listé dans /etc/shells.\n"
+msgstr "AVERTISSEMENT: « %s » n'apparaît pas dans /etc/shells.\n"
 
 #: login-utils/chsh.c:340
 #, c-format
 msgid "Use %s -l to see list.\n"
-msgstr "Utilisez %s -l pour voir la liste.\n"
+msgstr "Utiliser %s -l pour afficher la liste.\n"
 
 #: login-utils/chsh.c:360
 msgid "No known shells.\n"
@@ -6262,45 +6071,44 @@
 
 #: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
-msgstr "Impossible d'ouvrir /dev/urandom"
+msgstr "ne peut ouvrir /dev/urandom"
 
 #: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
-msgstr "Impossible de lire les données aléatoires depuis /dev/urandom."
+msgstr "ne peut lire des données au hasard à partir de /dev/urandom"
 
 #: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
-msgstr "Impossible d'ouvrir %s pour lecture."
+msgstr "ne peut ouvrir %s pour lecture"
 
 #: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
-msgstr "stat(%s) impossible"
+msgstr "ne peut évaluer par stat(%s)"
 
 #: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
-msgstr "%s n'a pas les modes de fichiers corrects"
+msgstr "%s n'a pas les modes d'accès corrects"
 
 #: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
-msgstr "Impossible de lire les données depuis %s"
+msgstr "nepeut lire les données à partir de %s"
 
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
-msgstr "Impossible de lire %s, fermeture."
+msgstr "Ne peut lire %s, abandon."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr ""
-"Usage : dernier [-#] [-f fichier] [-t tty] [-h nom-hôte] [utilisateur ...]\n"
+msgstr "usage: last [-#] [-f fichier] [-t tty] [-h nom-de-l'hôte] [usager ...]\n"
 
 #: login-utils/last.c:312
 msgid "  still logged in"
-msgstr "  toujours connecté"
+msgstr "  encore loggé au système"
 
 #: login-utils/last.c:340
 #, c-format
@@ -6309,15 +6117,15 @@
 "wtmp begins %s"
 msgstr ""
 "\n"
-"wtmp commence %s"
+"wtmp débute %s"
 
 #: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
 msgid "last: malloc failure.\n"
-msgstr "dernier : échec de malloc.\n"
+msgstr "last: échec de malloc().\n"
 
 #: login-utils/last.c:441
 msgid "last: gethostname"
-msgstr "dernier : gethostname"
+msgstr "last: obtention du nom de l'hôte"
 
 #: login-utils/last.c:490
 #, c-format
@@ -6326,34 +6134,34 @@
 "interrupted %10.10s %5.5s \n"
 msgstr ""
 "\n"
-"%10.10s %5.5s interrompu\n"
+"interruption %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
-#, fuzzy, c-format
+#: login-utils/login.c:254
+#, c-format
 msgid "FATAL: can't reopen tty: %s"
-msgstr "mount : impossible d'ouvrir %s: %s"
+msgstr "Erreur fatale: ne peut réouvrir tty: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
-msgstr ""
+msgstr "Erreur fatale: tty erroné"
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
-msgstr "connexion : -h pour superutilisateur uniquement.\n"
+msgstr "login: -h pour le super usager seulement.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
-msgstr "usage : connexion [-fp] [nom-utilisateur]\n"
+msgstr "usage: login [-fp] [nom-d-usager]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
-msgstr "connexion : échec de PAM, abandon : %s\n"
+msgstr "Échec de login: PAM, arrêt de l'exécution: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
-msgstr "Initialisation de PAM impossible : %s"
+msgstr "Ne peut initialiser PAM: %s"
 
 #.
 #. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
@@ -6361,238 +6169,238 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
-msgstr "connexion : "
+msgstr "login: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr "ECHEC DE LA CONNEXION %d DEPUIS %s POUR %s, %s"
+msgstr "ÉCHEC DE LOGIN %d À PARTIR DE %s POUR %s, %s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
-"Connexion incorrecte\n"
+"Login incorrect\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
-msgstr "TENTATIVES DE CONNEXION TROP NOMBREUSES (%d) DEPUIS %s POUR %s, %s"
+msgstr "TROP DE TENTATIVES DE LOGIN (%d) DE %s POUR %s, %s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr "ÉCHEC DE LA SESSION DE CONNEXION DEPUIS %s POUR %s, %s"
+msgstr "ÉCHEC DE LOGIN POUR UNE SESSION DE %s POUR %s, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 "\n"
-"Connexion incorrecte\n"
+"Login incorrect\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
+"\n"
+"Problème d'initialisation de la session, abandon.\n"
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
-msgstr ""
+msgstr "Nom d'usager null dans %s:%d. Abandon."
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr ""
+msgstr "Nom d'usager invalide « %s » dans %s:%d. Abandon."
 
-#: login-utils/login.c:673
-#, fuzzy
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
-msgstr "%s : A court de mémoire !\n"
+msgstr "login: mémoire épuisée\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
-msgstr "Nom utilisateur non valide"
+msgstr "Nom d'usager illégal"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
-msgstr "Connexion %s refusée sur ce terminal.\n"
+msgstr "%s login refusé sur ce terminal.\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr "CONNEXION %s REFUSÉE DEPUIS %s SUR TTY %s"
+msgstr "LOGIN %s REFUSÉ DE %s SUR TTY %s"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr "CONNEXION %s REFUSÉE SUR TTY %s"
+msgstr "LOGIN %s REFUSÉ SUR TTY %s"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
-msgstr "Connexion incorrecte\n"
+msgstr "Login incorrect\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
 msgstr ""
-"Trop d'utilisateurs déjà connectés.\n"
-"Essayez de nouveau plus tard.\n"
+"Trop d'usagers présentement.\n"
+"Essayer plus tard.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
-msgstr "Trop de processus en cours d'exécution.\n"
+msgstr "Vous avez trop de processus actifs.\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
-msgstr "ACCÈS DISTANT À %s PAR %s"
+msgstr "APPEL à %s fait par %s"
+
+#: login-utils/login.c:1071
+#, c-format
+msgid "ROOT LOGIN ON %s FROM %s"
+msgstr "ROOT LOGIN DE %s À PARTIR DE %s"
+
+#: login-utils/login.c:1074
+#, c-format
+msgid "ROOT LOGIN ON %s"
+msgstr "ROOT LOGIN SUR %s"
 
 #: login-utils/login.c:1077
 #, c-format
-msgid "ROOT LOGIN ON %s FROM %s"
-msgstr "CONNEXION ROOT À %s DEPUIS %s"
+msgid "LOGIN ON %s BY %s FROM %s"
+msgstr "LOGIN SUR %s PAR %s À PARTIR DE %s"
 
 #: login-utils/login.c:1080
 #, c-format
-msgid "ROOT LOGIN ON %s"
-msgstr "CONNEXION ROOT À %s"
-
-#: login-utils/login.c:1083
-#, c-format
-msgid "LOGIN ON %s BY %s FROM %s"
-msgstr "CONNEXION À %s PAR %s DEPUIS %s"
-
-#: login-utils/login.c:1086
-#, c-format
 msgid "LOGIN ON %s BY %s"
-msgstr "CONNEXION À %s PAR %s"
+msgstr "LOGIN SUR %s PAR %s"
 
-#: login-utils/login.c:1098
-#, fuzzy
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
-msgstr "Vous avez %smail.\n"
+msgstr "Vous avez du courrier.\n"
 
-#: login-utils/login.c:1100
-#, fuzzy
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
-msgstr "Vous avez %smail.\n"
+msgstr "Vous avez du courrier.\n"
 
+# login-utils/login.c:1087too many bare linefeeds.\n"
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
-msgstr "Connexion : échec de fork : %s"
+msgstr "login: échec d'établissement de relais par fork(): %s "
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
-msgstr ""
+msgstr "Éched de TIOCSCTTY: %m"
+
+#: login-utils/login.c:1155
+msgid "setuid() failed"
+msgstr "échec de setuid()"
 
 #: login-utils/login.c:1161
-msgid "setuid() failed"
-msgstr "setuid() a échoué"
-
-#: login-utils/login.c:1167
 #, c-format
 msgid "No directory %s!\n"
-msgstr "Aucun répertoire %s !\n"
+msgstr "Pas de répertoire %s!\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
-msgstr "Connexion avec home = \"/\".\n"
+msgstr "Login avec un répertoire home = « / ».\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
-msgstr "Connexion : mémoire insuffisante pour le script de shell.\n"
+msgstr "login: mémoire épuisée pour le script du shell.\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
-msgstr "Connexion : impossible d'exécuter le script de shell : %s.\n"
+msgstr "login: ne peut exécuter le script du shell: %s.\n"
 
-#: login-utils/login.c:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
-msgstr "Connexion : aucun shell : %s.\n"
+msgstr "login: pas de shell: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 "\n"
-"Connexion %s : "
+"%s login: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
-msgstr "nom de connexion beaucoup trop long.\n"
+msgstr "nom du compte usager login trop long.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "NOM trop long"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
-msgstr "Les noms de connexion ne peuvent pas commencer par '-'.\n"
+msgstr "noms de login ne peuvent débuter avec « - ».\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
-msgstr "Trop de sauts de ligne vides.\n"
+msgstr "trop de sauts de page (linefeeds)\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
-msgstr "Sauts de ligne EXCESSIFS"
+msgstr "Nombre escessif de sauts de page (linefeeds)"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
-msgstr "Temporisation de la connexion après %d secondes.\n"
+msgstr "Expiration du délai de grâce lors du login après %d secondes\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
-msgstr "Dernière connexion : %.*s "
+msgstr "Dernier login: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
-msgstr "depuis %.*s\n"
+msgstr "à partir de %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
-msgstr "à %.*s\n"
+msgstr "sur %.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
-msgstr "ÉCHEC DE LA CONNEXION DEPUIS %s, %s"
+msgstr "Échec de login à partir de %s, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
-msgstr "ÉCHEC DE LA CONNEXION À %s, %s"
+msgstr "Échec de login à partir de %s, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr "%d ÉCHECS DE CONNEXION DEPUIS %s, %s"
+msgstr "%d login en échec à partir de %s, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr "%d ÉCHECS DE CONNEXION À %s, %s"
+msgstr "%d login en échec sur %s, %s"
 
 #: login-utils/mesg.c:89
 msgid "is y\n"
@@ -6604,36 +6412,35 @@
 
 #: login-utils/mesg.c:112
 msgid "usage: mesg [y | n]\n"
-msgstr "Usage : mesg [y | n]\n"
+msgstr "usage: mesg [y | n]\n"
 
 #: login-utils/newgrp.c:68
 msgid "newgrp: Who are you?"
-msgstr "Nouveau groupe : Qui êtes-vous ?"
+msgstr "newgrp: Qui êtes-vous?"
 
 #: login-utils/newgrp.c:76 login-utils/newgrp.c:86
 msgid "newgrp: setgid"
-msgstr "Nouveau groupe : setgid"
+msgstr "newgrp: setgid"
 
 #: login-utils/newgrp.c:81
 msgid "newgrp: No such group."
-msgstr "Nouveau groupe : Aucun groupe de ce nom."
+msgstr "newgrp: pas de tel groupe."
 
 #: login-utils/newgrp.c:90
 msgid "newgrp: Permission denied"
-msgstr "Nouveau groupe : Autorisation refusée"
+msgstr "newgrp: permission refusée"
 
 #: login-utils/newgrp.c:97
 msgid "newgrp: setuid"
-msgstr "Nouveau groupe : setuid"
+msgstr "newgrp: setuid"
 
 #: login-utils/newgrp.c:103
 msgid "No shell"
-msgstr "Aucun shell"
+msgstr "Pas de shell"
 
 #: login-utils/passwd.c:161
 msgid "The password must have at least 6 characters, try again.\n"
-msgstr ""
-"Le mot de passe doit contenir au moins 6 caractères. Essayez de nouveau.\n"
+msgstr "Le mot de passe doit avoir au moins 6 caractères, essayer encore.\n"
 
 #: login-utils/passwd.c:174
 msgid ""
@@ -6641,46 +6448,46 @@
 "classes:  upper and lower case letters, digits and non alphanumeric\n"
 "characters. See passwd(1) for more information.\n"
 msgstr ""
+"Le mot de passe doit contenir des caractères en dehors des classes\n"
+"suivantes: majuscules et minuscules, chiffres et caractères non\n"
+"alphanuériques. Consulter passwd(1) pour plus d'informations.\n"
 
 #: login-utils/passwd.c:183
 msgid "You cannot reuse the old password.\n"
-msgstr "Vous ne pouvez pas réutiliser l'ancien mot de passe.\n"
+msgstr "Vous ne pouvez pas réutiliser votre ancien mot de passe.\n"
 
 #: login-utils/passwd.c:188
 msgid "Please don't use something like your username as password!\n"
-msgstr "N'utilisez pas votre nom d'utilisateur comme mot de passe !\n"
+msgstr "SVP ne pas utiliser quelque choses comme votre nom de compte usager comme mot de passe!\n"
 
 #: login-utils/passwd.c:199 login-utils/passwd.c:206
 msgid "Please don't use something like your realname as password!\n"
-msgstr "N'utilisez pas votre nom réel comme mot de passe !\n"
+msgstr "SVP ne pas utiliser quelque chose comme votre vrai nom comme mot de passe!\n"
 
 #: login-utils/passwd.c:224
 msgid "Usage: passwd [username [password]]\n"
-msgstr "Usage : passwd [nom-utilisateur [mot de passe]]\n"
+msgstr "Usage: passwd [nom-d-usager [mot-de-passe]]\n"
 
 #: login-utils/passwd.c:225
 msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
-"Seul l'utilisateur root peut utiliser les formes d'argument un et deux.\n"
+msgstr "Seul le super usager peut utiliser une des deux formes d'arguments.\n"
 
 #: login-utils/passwd.c:280
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Usage : passwd [-foqsvV] [utilisateur [mot de passe]]\n"
+msgstr "Usage: passwd [-foqsvV] [usager [mot-de-passe]]\n"
 
 #: login-utils/passwd.c:301
 #, c-format
 msgid "Can't exec %s: %s\n"
-msgstr "Impossible d'exécuter %s : %s\n"
+msgstr "Ne peut exécuter %s: %s\n"
 
 #: login-utils/passwd.c:312
 msgid "Cannot find login name"
-msgstr "Nom de connexion introuvable"
+msgstr "Ne peut repérer le nom de login"
 
 #: login-utils/passwd.c:319 login-utils/passwd.c:326
 msgid "Only root can change the password for others.\n"
-msgstr ""
-"Seul l'utilisateur root peut modifier le mot de passe d'autres "
-"utilisateurs.\n"
+msgstr "Seul le super usager peut modifier le mot de passe des autres.\n"
 
 #: login-utils/passwd.c:334
 msgid "Too many arguments.\n"
@@ -6689,19 +6496,15 @@
 #: login-utils/passwd.c:339
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"Impossible de trouver ce nom d'utilisateur. Est-ce que `%s' est réellement "
-"un utilisateur ?"
+msgstr "Ne peut repérer le nom de l'usager.Est-ce que « %s » est réellement un usager?"
 
 #: login-utils/passwd.c:343
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr ""
-"Désolé, je peux seulement changer les mots de passe locaux. Utilisez "
-"yppasswd à la place."
+msgstr "Désolé, seuls les mots de passe locaux peuvent être modifiés. Utiliser ypasswd à la place."
 
 #: login-utils/passwd.c:349
 msgid "UID and username does not match, imposter!"
-msgstr "UID et le nom d'utilisateur ne correspondent pas, imposteur !"
+msgstr "Le nom de l'usager et le UID ne concordent pas, imposteur!"
 
 #: login-utils/passwd.c:354
 #, c-format
@@ -6710,97 +6513,97 @@
 
 #: login-utils/passwd.c:358
 msgid "Enter old password: "
-msgstr "Entrez l'ancien mot de passe : "
+msgstr "Entrer le vieux mot de passe: "
 
 #: login-utils/passwd.c:360
 msgid "Illegal password, imposter."
-msgstr "Mot de passe non valide, imposteur !"
+msgstr "Mot de passe illégal, imposteur."
 
 #: login-utils/passwd.c:372
 msgid "Enter new password: "
-msgstr "Entrez le nouveau mot de passe : "
+msgstr "Entrer le nouveau mot de passe: "
 
 #: login-utils/passwd.c:374
 msgid "Password not changed."
-msgstr "Mot de passe inchangé."
+msgstr "Le mot de passe n'a pas été modifié."
 
 #: login-utils/passwd.c:383
 msgid "Re-type new password: "
-msgstr "Re-tapez le nouveau mot de passe : "
+msgstr "Re-taper le nouveau mot de passe: "
 
 #: login-utils/passwd.c:386
 msgid "You misspelled it. Password not changed."
-msgstr "Vous avez fait une faute de frappe. Mot de passe inchangé."
+msgstr "Vous l'avez mal epelé. Le mot de passe n'a pas été changé."
 
 #: login-utils/passwd.c:401
 #, c-format
 msgid "password changed, user %s"
-msgstr "Mot de passe changé pour l'utilisateur %s."
+msgstr "mot de passe modifié. usager %s"
 
 #: login-utils/passwd.c:404
 msgid "ROOT PASSWORD CHANGED"
-msgstr "MOT DE PASSE ROOT CHANGÉ"
+msgstr "Mot de passe du compte ROOT modifié"
 
 #: login-utils/passwd.c:406
 #, c-format
 msgid "password changed by root, user %s"
-msgstr "Mot de passe changé par l'utilisateur root pour l'utilisateur %s."
+msgstr "mot de passe modifié par root, usager %s"
 
 #: login-utils/passwd.c:413
 msgid "calling setpwnam to set password.\n"
-msgstr "Appel de setpwnam pour définir le mot de passe.\n"
+msgstr "appel de setpwnam() pour initialiser le mot de passe.\n"
 
 #: login-utils/passwd.c:417
 msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Mot de passe *NON* changé. Essayez de nouveau plus tard.\n"
+msgstr "Mot de passe *NON* modifié. Essayer à nouveau plus tard.\n"
 
 #: login-utils/passwd.c:423
 msgid "Password changed.\n"
-msgstr "Mot de passe changé.\n"
+msgstr "Mot de passe modifié.\n"
 
 #: login-utils/shutdown.c:113
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr "Usage : shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+msgstr "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
-msgstr "Processus de fermeture abandonné."
+msgstr "Processus d'arrêt avorté"
 
 #: login-utils/shutdown.c:162
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr "%s : Seul l'utilisateur root peut éteindre le système.\n"
+msgstr "%s: seul le super usager peut arrêter un système.\n"
 
 #: login-utils/shutdown.c:256
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr "Ca doit être demain, ne pouvez-vous pas attendre jusque là ?\n"
+msgstr "Ce doit être demain, ne pouvez-vous pas attendre jusque là?\n"
 
 #: login-utils/shutdown.c:307
 msgid "for maintenance; bounce, bounce"
-msgstr "pour la maintenance ; bounce, bounce"
+msgstr "pour l'entretien; rebondit, rebondit (ie bounce)"
 
 #: login-utils/shutdown.c:311
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
-msgstr "timeout = %d, quiet = %d, reboot = %d\n"
+msgstr "expiration du délai = %d, silencieux = %d, réamorçage = %d\n"
 
 #: login-utils/shutdown.c:336
 msgid "The system is being shut down within 5 minutes"
-msgstr "Le système sera fermé dans 5 minutes."
+msgstr "Le système sera arrête d'ici 5 minutes"
 
 #: login-utils/shutdown.c:340
 msgid "Login is therefore prohibited."
-msgstr "Connexion non autorisée par conséquent."
+msgstr "Les logins sont par conséquent interdits."
 
 #: login-utils/shutdown.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "rebooted by %s: %s"
-msgstr "%s par %s : %s"
+msgstr "réamorçé par %s: %s"
 
 #: login-utils/shutdown.c:365
-#, fuzzy, c-format
+#, c-format
 msgid "halted by %s: %s"
-msgstr "%s par %s : %s"
+msgstr "stoppé par %s: %s"
 
 #. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
@@ -6809,7 +6612,7 @@
 "Why am I still alive after reboot?"
 msgstr ""
 "\n"
-"Pourquoi suis-je encore vivant après le redémarrage ?"
+"Pourquoi suis-je encore actif après un réamorçage?"
 
 #: login-utils/shutdown.c:431
 msgid ""
@@ -6817,56 +6620,55 @@
 "Now you can turn off the power..."
 msgstr ""
 "\n"
-"Vous pouvez éteindre la machine maintenant..."
+"Maintenant vous pouvez éteindre l'alimentation électrique..."
 
 #: login-utils/shutdown.c:447
 msgid "Calling kernel power-off facility...\n"
-msgstr "Appel de la fonction de mise hors tension du kernel...\n"
+msgstr "Appel du service de coupure de courant électrique du kernel...\n"
 
 #: login-utils/shutdown.c:450
 #, c-format
 msgid "Error powering off\t%s\n"
-msgstr "Erreur lors de la mise hors tension de\t%s\n"
+msgstr "Erreur lors de la coupure de courant\t%s\n"
 
 #: login-utils/shutdown.c:458
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
-msgstr "Exécution en cours du programme \"%s\" ...\n"
+msgstr "Exécution du programme « %s » ...\n"
 
 #: login-utils/shutdown.c:461
 #, c-format
 msgid "Error executing\t%s\n"
-msgstr "Erreur lors de l'exécution de\t%s\n"
+msgstr "Erreur d'exécution\t%s\n"
 
 #. gettext crashes on \a
 #: login-utils/shutdown.c:488
-#, fuzzy, c-format
+#, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr "URGENT: message broadcast depuis %s :"
+msgstr "URGENT: diffusion de message de la part de %s:"
 
 #: login-utils/shutdown.c:494
-#, fuzzy, c-format
+#, c-format
 msgid "System going down in %d hours %d minutes"
-msgstr "Arrêt du système dans %d heure%s %d minutes."
+msgstr "Le système sera arrêté dans %d heures %d minutes"
 
 #: login-utils/shutdown.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr "Arrêt du système dans %d heure%s %d minutes."
+msgstr "Le système sera arrêté dans 1 heure %d minutes"
 
 #: login-utils/shutdown.c:500
-#, fuzzy, c-format
+#, c-format
 msgid "System going down in %d minutes\n"
-msgstr "Arrêt du système dans %d minute%s.\n"
+msgstr "Le système sera arrêté dans %d minutes\n"
 
 #: login-utils/shutdown.c:503
-#, fuzzy
 msgid "System going down in 1 minute\n"
-msgstr "Arrêt du système dans %d minute%s.\n"
+msgstr "Le système sera arrêté dans 1 minute\n"
 
 #: login-utils/shutdown.c:505
 msgid "System going down IMMEDIATELY!\n"
-msgstr "Arrêt IMMEDIAT du système !\n"
+msgstr "Le système sera arrêté IMMÉDIATEMENT!\n"
 
 #: login-utils/shutdown.c:510
 #, c-format
@@ -6875,64 +6677,62 @@
 
 #: login-utils/shutdown.c:567
 msgid "Cannot fork for swapoff. Shrug!"
-msgstr "fork pour swapoff impossible. "
+msgstr "Ne peut établir un relais pour swapoff."
 
 #: login-utils/shutdown.c:575
 msgid "Cannot exec swapoff, hoping umount will do the trick."
-msgstr "exec swapoff impossible. Il reste à espérer que umount fera l'affaire."
+msgstr "Ne peut exécuter un swapoff, en espérant que umount fera le travail."
 
 #: login-utils/shutdown.c:594
 msgid "Cannot fork for umount, trying manually."
-msgstr "fork pour umount impossible. Essayez manuellement."
+msgstr "Ne peut établir un relais fork() pour umount, essayer manuellement."
 
 #: login-utils/shutdown.c:603
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr "exec %s impossible. Essayez umount.\n"
+msgstr "Ne peut exécuter %s, on tente un umount.\n"
 
 #: login-utils/shutdown.c:607
 msgid "Cannot exec umount, giving up on umount."
-msgstr "exec umount impossible. Abandon de umount."
+msgstr "Ne peut exécuter un umount, abandon sur le umount."
 
 #: login-utils/shutdown.c:612
 msgid "Unmounting any remaining filesystems..."
-msgstr "Démontage en cours des systèmes de fichiers restants..."
+msgstr "Démonter tous les systèmes de fichiers restants..."
 
 #: login-utils/shutdown.c:648
 #, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
-msgstr "Fermeture : umount %s impossible : %s\n"
+msgstr "arrêt système: ne peut démonter %s: %s\n"
 
 #: login-utils/simpleinit.c:130
 msgid "Booting to single user mode.\n"
-msgstr "Amorçage en mode utilisateur unique.\n"
+msgstr "Amorçage en mode usager simple.\n"
 
 #: login-utils/simpleinit.c:134
 msgid "exec of single user shell failed\n"
-msgstr "exec utilisateur unique a échoué.\n"
+msgstr "échec d'exécution du shell usager simple\n"
 
 #: login-utils/simpleinit.c:138
 msgid "fork of single user shell failed\n"
-msgstr "fork utilisateur unique a échoué.\n"
+msgstr "échec du fork() du shell de l'usager simple\n"
 
 #: login-utils/simpleinit.c:206
 msgid "error opening fifo\n"
-msgstr "erreur lors de l'ouverture du fifo\n"
+msgstr "erreur d'ouverture d'un fifo\n"
 
 #: login-utils/simpleinit.c:210
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr ""
+msgstr "erreur d'initialisaton close-on-exec sur /dev/initctl"
 
 #: login-utils/simpleinit.c:257
-#, fuzzy
 msgid "error running finalprog\n"
-msgstr "erreur lors de l'exécution du programme\n"
+msgstr "erreur d'exécution de finalprog\n"
 
 #. Error
 #: login-utils/simpleinit.c:261
-#, fuzzy
 msgid "error forking finalprog\n"
-msgstr "erreur lors de l'ouverture du fifo\n"
+msgstr "erreur de fork() de finalprog\n"
 
 #: login-utils/simpleinit.c:343
 msgid ""
@@ -6940,161 +6740,158 @@
 "Wrong password.\n"
 msgstr ""
 "\n"
-"Mot de passe incorrect.\n"
+"Mot de passe erroné.\n"
 
 #: login-utils/simpleinit.c:416
-#, fuzzy
 msgid "lstat of path failed\n"
-msgstr "l'état du chemin a échoué\n"
+msgstr "échec d'évaluation par lstat() du chemin\n"
 
 #: login-utils/simpleinit.c:424
 msgid "stat of path failed\n"
-msgstr "l'état du chemin a échoué\n"
+msgstr "échec d'évaluation par stat du chemin\n"
 
 #: login-utils/simpleinit.c:432
 msgid "open of directory failed\n"
-msgstr "Échec de l'ouverture du répertoire.\n"
+msgstr "échec d'ouverture du répertoire\n"
 
 #: login-utils/simpleinit.c:506
 msgid "fork failed\n"
-msgstr "Échec de fork.\n"
+msgstr "échec de fork()\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1708
 msgid "exec failed\n"
-msgstr "Échec de exec.\n"
+msgstr "échec de exec()\n"
 
 #: login-utils/simpleinit.c:561
 msgid "cannot open inittab\n"
-msgstr "Impossible d'ouvrir inittab.\n"
+msgstr "ne peut ouvrir inittab\n"
 
 #: login-utils/simpleinit.c:628
 msgid "no TERM or cannot stat tty\n"
-msgstr "aucun TERM ou stat tty impossible.\n"
+msgstr "pas de TERM ou ne peut évaluer tty par stat()\n"
 
 #: login-utils/simpleinit.c:934
-#, fuzzy, c-format
+#, c-format
 msgid "error stopping service: \"%s\""
-msgstr "Erreur lors de l'écriture de %s: %s"
+msgstr "erreur d'arrêt de service: « %s »"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr "Trop de iov (changez le code dans wall/ttymsg.c)"
+msgstr "trop de iov (modifier le code dans wall/ttymsg.c)"
 
 #: login-utils/ttymsg.c:85
 msgid "excessively long line arg"
-msgstr "Arg de ligne beaucoup trop long."
+msgstr "ligne d'arguments excessivement longue"
 
 #: login-utils/ttymsg.c:139
 msgid "cannot fork"
-msgstr "fork impossible."
+msgstr "ne peut faire de relais fork()"
 
 #: login-utils/ttymsg.c:143
 #, c-format
 msgid "fork: %s"
-msgstr "fork : %s"
+msgstr "fork: %s"
 
 #: login-utils/ttymsg.c:171
 #, c-format
 msgid "%s: BAD ERROR"
-msgstr "%s : MAUVAISE ERREUR"
+msgstr "%s: MAUVAISE EEREUR"
 
 #: login-utils/vipw.c:139
-#, fuzzy, c-format
+#, c-format
 msgid "%s: the password file is busy.\n"
-msgstr "%s : le fichier %s est occupé.\n"
+msgstr "%s: le fichier de mots de passe est occupé.\n"
 
 #: login-utils/vipw.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "%s: the group file is busy.\n"
-msgstr "%s : le fichier %s est occupé.\n"
+msgstr "%s: le fichier de groupes est occupé.\n"
 
 #: login-utils/vipw.c:158
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
-msgstr "%s : le fichier %s est occupé (%s présent)\n"
+msgstr "%s: le fichier %s est occupé (%s présent)\n"
 
 #: login-utils/vipw.c:164
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr "%s : impossible de lier %s: %s\n"
+msgstr "%s: ne peut faire un lien %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 ""
-"%s : impossible de déverrouiller %s: %s (vos modifications sont toujours "
-"dans %s).\n"
+msgstr "%s: ne peut déverrouiller %s: %s (vos modifications sont encore dans %s)\n"
 
 #: login-utils/vipw.c:218
 #, c-format
 msgid "%s: Cannot fork\n"
-msgstr "%s : fork impossible\n"
+msgstr "%s: ne peut faire un relais par fork()\n"
 
 #: login-utils/vipw.c:254
 #, 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
 #, c-format
 msgid "%s: no changes made\n"
-msgstr "%s : aucun changement effectué\n"
+msgstr "%s: aucun changement n'a été fait\n"
 
 #: login-utils/vipw.c:328
 msgid "You are using shadow groups on this system.\n"
-msgstr ""
+msgstr "Vous utilisez 'shadow groups» sur ce système.\n"
 
 #: login-utils/vipw.c:329
 msgid "You are using shadow passwords on this system.\n"
-msgstr ""
+msgstr "Vous utilisez 'shadow passwords» sur ce système.\n"
 
 #: login-utils/vipw.c:330
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
-msgstr ""
+msgstr "Voulez-vous éditer %s maintenant [y/n]? "
 
 #: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr "Usage : %s [fichier]\n"
+msgstr "usage: %s [fichier]\n"
 
 #: login-utils/wall.c:159
 #, c-format
 msgid "%s: can't open temporary file.\n"
-msgstr "%s : impossible d'ouvrir le fichier temporaire.\n"
+msgstr "%s: ne peut ouvrir un fichier temporaires.\n"
 
 #: login-utils/wall.c:186
 #, c-format
 msgid "Broadcast Message from %s@%s"
-msgstr "Message Broadcast depuis %s@%s"
+msgstr "Diffusion de message de %s@%s"
 
 #: login-utils/wall.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr "%s : impossible de lire %s.\n"
+msgstr "%s: ne lira pas %s - utiliser stdin.\n"
 
 #: login-utils/wall.c:209
 #, c-format
 msgid "%s: can't read %s.\n"
-msgstr "%s : impossible de lire %s.\n"
+msgstr "%s: ne peut lire %s.\n"
 
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr "%s : stat du fichier temporaire impossible.\n"
+msgstr "%s: ne peut évaluer par stat() le fichier temporaire.\n"
 
 #: login-utils/wall.c:241
 #, c-format
 msgid "%s: can't read temporary file.\n"
-msgstr "%s : lecture du fichier temporaire impossible.\n"
+msgstr "%s: ne peut lire du fichier temporaire.\n"
 
 #: misc-utils/cal.c:262
 msgid "illegal month value: use 1-12"
-msgstr "Valeur de mois non valide : utilisez les valeurs 1 à 12."
+msgstr "valeur de mois illégal: utiliser 1-12"
 
 #: misc-utils/cal.c:266
 msgid "illegal year value: use 1-9999"
-msgstr "Valeur d'année non valide : utilisez 1-9999."
+msgstr "valeur d'année illégale: utiliser 1-9999"
 
 #. %s is the month name, %d the year number.
 #. * you can change the order and/or add something here; eg for
@@ -7104,17 +6901,16 @@
 #: misc-utils/cal.c:373
 #, c-format
 msgid "%s %d"
-msgstr ""
+msgstr "%s %d"
 
 #: misc-utils/cal.c:676
-#, fuzzy
 msgid "usage: cal [-13smjyV] [[month] year]\n"
-msgstr "Usage : cal [-mjyV] [[mois] année]\n"
+msgstr "usage: cal [-13smjyV] [[mois] année]\n"
 
 #: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr "Usage : %s [+format] [jour mois année]\n"
+msgstr "usage: %s [+format] [jour mois année]\n"
 
 #. handle St. Tib's Day
 #: misc-utils/ddate.c:252
@@ -7124,22 +6920,22 @@
 #: misc-utils/kill.c:206
 #, c-format
 msgid "%s: unknown signal %s\n"
-msgstr "%s : signal %s inconnu\n"
+msgstr "%s: signal inconnu %s\n"
 
 #: misc-utils/kill.c:269
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr "%s : processus \"%s\" introuvable\n"
+msgstr "%s: ne peut repérer le processus « %s »\n"
 
 #: misc-utils/kill.c:313
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
-msgstr "%s : signal %s inconnu ; signaux valides :\n"
+msgstr "%s: signal inconnu %s; signaux valides:\n"
 
 #: misc-utils/kill.c:353
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr "Usage : %s [ -s signal | -p ] [ -a ] pid ...\n"
+msgstr "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 
 #: misc-utils/kill.c:354
 #, c-format
@@ -7149,99 +6945,95 @@
 #: misc-utils/logger.c:140
 #, c-format
 msgid "logger: %s: %s.\n"
-msgstr "Utilisateur tentant de se connecter : %s: %s.\n"
+msgstr "logger: %s: %s.\n"
 
 #: misc-utils/logger.c:247
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
-msgstr "Utilisateur : nom de fonction inconnu : %s.\n"
+msgstr "logger: nom de service inconnu: %s.\n"
 
 #: misc-utils/logger.c:259
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
-msgstr "Utilisateur : nom de priorité inconnu : %s.\n"
+msgstr "logger: nom de priorité inconnu: %s.\n"
 
 #: misc-utils/logger.c:286
-msgid ""
-"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr ""
-"usage : utilisateur [-is] [-f fichier] [-p pri] [-t balise] [-u socket] "
-"[ message ... ]\n"
+msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr "usage: logger [-is] [-f fichier] [-p priorité] [-t étiquette] [-u socket] [ message ... ]\n"
 
 #: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr "usage : look [-dfa] [-t car] string [fichier]\n"
+msgstr "usage: look [-dfa] [-t caractère] chaîne [fichier]\n"
 
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
 msgid "Could not open %s\n"
-msgstr "Impossible d'ouvrir %s\n"
+msgstr "Ne peut ouvrir %s\n"
 
 #: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
 #, c-format
 msgid "Got %d bytes from %s\n"
-msgstr "%d octets reçus de %s\n"
+msgstr "A obtenu %d octets de %s\n"
 
 #: misc-utils/namei.c:102
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
-msgstr "namei : impossible d'obtenir le répertoire en cours - %s\n"
+msgstr "namei: incapable de repérer le répertoire courant - %s\n"
 
 #: misc-utils/namei.c:115
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
-msgstr "namei : chdir impossible dans %s - %s (%d)\n"
+msgstr "namei: incapable de changer de répertoire vers %s - %s (%d)\n"
 
 #: misc-utils/namei.c:125
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr "Usage : namei [-mx] pathname [nom-chemin ...]\n"
+msgstr "usage: namei [-mx] chemin-d-accès [chemin-d-accès ...]\n"
 
 #: misc-utils/namei.c:150
 msgid "namei: could not chdir to root!\n"
-msgstr "namei : chdir impossible dans le répertoire root !\n"
+msgstr "namei: ne peut changer de répertoire vers root!\n"
 
 #: misc-utils/namei.c:157
 msgid "namei: could not stat root!\n"
-msgstr "namei : stat du répertoire root impossible !\n"
+msgstr "namei: ne peut évaluer par stat() root!\n"
 
 #: misc-utils/namei.c:171
-#, fuzzy
 msgid "namei: buf overflow\n"
-msgstr "  Dépassement\n"
+msgstr "namei: débordement de tampon\n"
 
 #: misc-utils/namei.c:217
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
-msgstr " ? chdir impossible dans %s - %s (%d)\n"
+msgstr " ? ne peut changer de répertoire dans %s - %s (%d)\n"
 
 #: misc-utils/namei.c:246
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
-msgstr " ? problèmes lors de la lecture du lien symbolique %s - %s (%d)\n"
+msgstr " ? problèmes de lecture des liens symboliques %s - %s (%d)\n"
 
 #: misc-utils/namei.c:256
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
-msgstr "  *** LIMITE UNIX DE LIENS SYMBOLIQUES DEPASSÉE ***\n"
+msgstr "  *** LIMITE DES LIENS SYMBOLIQUE DÉPASSÉE ***\n"
 
 #: misc-utils/namei.c:293
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
-msgstr "namei : type de fichier inconnu 0%06o dans le fichier %s\n"
+msgstr "namei: type de fichier inconnu 0%06o du le fichier %s\n"
 
 #: misc-utils/rename.c:38
-#, fuzzy, c-format
+#, c-format
 msgid "%s: out of memory\n"
-msgstr "%s : A court de mémoire !\n"
+msgstr "%s: mémoire épuisée\n"
 
 #: misc-utils/rename.c:56
-#, fuzzy, c-format
+#, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr "Impossible de renommer %s par %s: %s\n"
+msgstr "%s: changer le nom de %s vers %s a échoué: %s\n"
 
 #: misc-utils/rename.c:86
 #, c-format
 msgid "call: %s from to files...\n"
-msgstr ""
+msgstr "call: %s vers les fichiers...\n"
 
 #: misc-utils/script.c:106
 #, c-format
@@ -7250,399 +7042,395 @@
 "Use `%s [options] %s' if you really want to use it.\n"
 "Script not started.\n"
 msgstr ""
+"AVERTISSEMENT: « %s » est un lien symbolique.\n"
+"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
-#, fuzzy
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr "Usage : script [-a] [-f] [fichier]\n"
+msgstr "usage: script [-a] [-f] [-q] [-t] [fichier]\n"
 
 #: misc-utils/script.c:178
 #, c-format
 msgid "Script started, file is %s\n"
-msgstr "Le script a commencé, le fichier est %s\n"
+msgstr "Le script a débuté, le fichier est %s\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
-msgstr "Début du script sur %s"
+msgstr "Le script a débuté sur %s"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 "\n"
-"Script terminé sur %s"
+"Script complété sur %s"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
-msgstr "Script terminé, le fichier est %s\n"
+msgstr "Script complélé, le fichier est %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
-msgstr "openpty a échoué.\n"
+msgstr "échec de openpty\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
-msgstr "A court de pty\n"
+msgstr "Manque de 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 "%s : Erreur d'argument, usage\n"
-
-#: misc-utils/setterm.c:746
-msgid "  [ -term terminal_name ]\n"
-msgstr "  [ -term nom_terminal ]\n"
+msgstr "%s: erreur d,arguement, usage\n"
 
 #: misc-utils/setterm.c:747
+msgid "  [ -term terminal_name ]\n"
+msgstr "  [ -term nom-de-terminal ]\n"
+
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -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 "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
-msgid "  [ -file dumpfilename ]\n"
-msgstr "  [ -file dumpfilename ]\n"
-
 #: misc-utils/setterm.c:788
+msgid "  [ -file dumpfilename ]\n"
+msgstr "  [ -file nom-de-fichier-de-vidange ]\n"
+
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
-msgstr "  [ -bfreq freqnumber ]\n"
+msgstr "  [ -bfreq nombre-de-la-fréquence ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
-msgstr "Impossible de (dés)activer le mode veille.\n"
+msgstr "ne peut exécuter le mode (un)set powersave\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
-msgstr "Erreur klogctl : %s\n"
-
-#: misc-utils/setterm.c:1134
-#, c-format
-msgid "Error reading %s\n"
-msgstr "Erreur lors de la lecture de %s\n"
+msgstr "erreur klogctl: %s\n"
 
 #: misc-utils/setterm.c:1149
-msgid "Error writing screendump\n"
-msgstr "Erreur lors de l'écriture de la capture d'écran\n"
+#, c-format
+msgid "Error reading %s\n"
+msgstr "Erreur de lecture %s\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1164
+msgid "Error writing screendump\n"
+msgstr "Erreur lors de l'écriture du screendump\n"
+
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
-msgstr "Lecture de %s impossible, et ioctl dump impossible.\n"
+msgstr "ne peut lire %s et ne peut peut faire un dump via ioctl()\n"
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
-msgstr "%s : $TERM n'est pas défini.\n"
+msgstr "%s: $TERM n'est pas défini.\n"
 
 #: misc-utils/whereis.c:157
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
-msgstr "whereis [ -sbmu ] [ -SBM dir ... -f ] nom...\n"
+msgstr "whereis [ -sbmu ] [ -SBM répertorie ... -f ] nom...\n"
 
 #: misc-utils/write.c:99
 msgid "write: can't find your tty's name\n"
-msgstr "write : nom tty introuvable\n"
+msgstr "write: ne peut repérer le nom de votre tty\n"
 
 #: misc-utils/write.c:110
 msgid "write: you have write permission turned off.\n"
-msgstr "write : permission d'écriture désactivée.\n"
+msgstr "write: vos permissions d'écriture sont désactivées.\n"
 
 #: misc-utils/write.c:131
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
-msgstr "write : %s non connecté sur %s.\n"
+msgstr "write: %s n'est pas loggé sur %s.\n"
 
 #: misc-utils/write.c:139
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
-msgstr "write : %s a des messages désactivés sur %s\n"
+msgstr "write: %s a désactivé la réception de messages sur %s\n"
 
 #: misc-utils/write.c:146
 msgid "usage: write user [tty]\n"
-msgstr "Usage : utilisateur write [tty]\n"
+msgstr "usage: write usager [tty]\n"
 
 #: misc-utils/write.c:234
 #, c-format
 msgid "write: %s is not logged in\n"
-msgstr "write : %s n'est pas connecté\n"
+msgstr "write: %s n'est pas loggé\n"
 
 #: misc-utils/write.c:243
 #, c-format
 msgid "write: %s has messages disabled\n"
-msgstr "write : %s a les messages désactivés\n"
+msgstr "write: %s a desactivé la réception de messages\n"
 
 #: misc-utils/write.c:247
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
-msgstr "write : %s est connecté plus d'une fois ; écriture dans %s.\n"
+msgstr "write: %s est loggé à plus d'un endroit; on écrit à %s\n"
 
 #: misc-utils/write.c:313
-#, fuzzy, c-format
+#, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
-msgstr "Message de %s@%s dans %s at %s ..."
+msgstr "Message de %s@%s (comme %s) sur %s à %s ..."
 
 #: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
-msgstr "Message de %s@%s dans %s at %s ..."
+msgstr "Message de %s@%s sur %s à %s ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
-msgstr "Avertissement : erreur lors de la lecture de %s : %s"
+msgstr "AVERTISSEMENT: erreur de lecture %s: %s"
 
-#: mount/fstab.c:141 mount/fstab.c:164
+#: mount/fstab.c:142 mount/fstab.c:165
 #, c-format
 msgid "warning: can't open %s: %s"
-msgstr "Avertissement : impossible d'ouvrir %s : %s"
+msgstr "AVERTISSEMENT: ne peut ouvrir %s: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:146
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
-msgstr "mount : impossible d'ouvrir %s - utilisation de %s à la place\n"
+msgstr "mount: ne peut ouvrir %s - on utilise %s à la place\n"
 
 #. linktargetfile does not exist (as a file)
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:413
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr ""
-"Impossible de créer le fichier de verrouillage %s : %s (utilisez "
-"l'indicateur -n pour passer outre)"
+msgstr "ne peut créer le fichier verrou %s: %s (utiliser l'option -n pour l'écraser)"
 
-#: mount/fstab.c:399
+#: mount/fstab.c:425
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr ""
-"Impossible de lier le fichier de verrouillage %s : %s (utilisez l'indicateur "
-"-n pour passer outre)"
+msgstr "ne peut lier le fichier verrou %s: %s (utiliser l'option  -n pour l'écraser)"
 
-#: mount/fstab.c:411
+#: mount/fstab.c:437
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr ""
-"Impossible d'ouvrir le fichier de verrouillage %s : %s (utilisez la balise -"
-"n pour passer outre)"
+msgstr "ne peut ouvrir le fichier verrou %s : %s (utiliser l'option -n pour l'écraser)"
 
-#: mount/fstab.c:426
+#: mount/fstab.c:452
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
-msgstr "Impossible de verrouiller le fichier de verrouillage %s : %s\n"
+msgstr "Ne peut verrrouiller le fichier verrou %s: %s\n"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:465
 #, c-format
 msgid "can't lock lock file %s: %s"
-msgstr "Impossible de verrouiller le fichier de verrouillage %s : %s"
+msgstr "ne peut verrouiller le fichier verrou %s: %s"
 
-#: mount/fstab.c:441
+#: mount/fstab.c:467
 msgid "timed out"
-msgstr "Temporisé"
+msgstr "expiration du délai"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:474
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
-"Impossible de créer le lien %s\n"
-"Peut etre qu'il y a un fichier de verrouillage latent ?\n"
+"Ne peut créer le lien %s\n"
+"Peut-être y-a-t-il un fichier verrouillé en panne?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:523 mount/fstab.c:559
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
-msgstr "Impossible d'ouvrir %s (%s) - mtab pas mis à jour"
-
-#: mount/fstab.c:541
-#, c-format
-msgid "error writing %s: %s"
-msgstr "Erreur lors de l'écriture de %s: %s"
-
-#: mount/fstab.c:549
-#, c-format
-msgid "error changing mode of %s: %s\n"
-msgstr "Erreur lors du changement du mode de %s: %s\n"
+msgstr "ne peut ouvrir %s (%s) - mtab n'est pas à jour"
 
 #: mount/fstab.c:567
 #, c-format
+msgid "error writing %s: %s"
+msgstr "erreur d'écriture %s: %s"
+
+#: mount/fstab.c:575
+#, c-format
+msgid "error changing mode of %s: %s\n"
+msgstr "erreur de changement de mode de %s: %s\n"
+
+#: mount/fstab.c:593
+#, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr "Impossible de renommer %s par %s: %s\n"
+msgstr "ne peut renommer %s à %s: %s\n"
 
 #: mount/lomount.c:80
 #, c-format
 msgid "loop: can't open device %s: %s\n"
-msgstr "loop : impossible d'ouvrir le périphérique %s: %s\n"
+msgstr "loop: ne peut ouvrir le périphérique %s: %s\n"
 
 #: mount/lomount.c:86
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop : impossible d'obtenir des infos sur le périphérique %s: %s\n"
+msgstr "loop: ne peut obtenir les infos sur le périphérique %s: %s\n"
 
 #: mount/lomount.c:91
 #, c-format
 msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
-msgstr "%s : [%04x]:%ld (%s) décalage %d, %s cryptage\n"
+msgstr "%s: [%04x]:%ld (%s) décalage %d, %s encryptage\n"
 
 #: mount/lomount.c:177
 msgid "mount: could not find any device /dev/loop#"
-msgstr "mount : périphérique introuvable dans /dev/loop#"
+msgstr "mount: ne peut trouver aucun périphérique /dev/loop#"
 
 #: mount/lomount.c:181
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
 msgstr ""
-"mount : périphérique de boucle introuvable.\n"
-" /dev/loop# a peut-être un nombre majeur incorrect ?"
+"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:185
 #, c-format
@@ -7651,9 +7439,9 @@
 "       this kernel does not know about the loop device.\n"
 "       (If so, then recompile or `insmod loop.o'.)"
 msgstr ""
-"mount : périphérique de boucle introuvable. Selon %s,\n"
-"       ce kernel ne sait rien du périphérique de boucle.\n"
-"       (Si tel est le cas, recompilez ou effectuez `insmod loop.o'.)"
+"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 ».)"
 
 #: mount/lomount.c:191
 msgid ""
@@ -7661,57 +7449,55 @@
 "       about the loop device (then recompile or `insmod loop.o'), or\n"
 "       maybe /dev/loop# has the wrong major number?"
 msgstr ""
-"mount : périphérique de boucle introuvable. Ce kernel ne sait peut-être "
-"rien\n"
-"       du périphérique de boucle (recompilez alors ou effectuez `insmod loop."
-"o'). Il se peut aussi que\n"
-"       /dev/loop# ait un nombre majeur incorrect."
+"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/lomount.c:195
 msgid "mount: could not find any free loop device"
-msgstr "mount : impossible de trouver un périphérique de boucle disponible"
+msgstr "mount: ne peut repérer un périphérique de type loop disponible"
 
 #: mount/lomount.c:225
 #, c-format
 msgid "Unsupported encryption type %s\n"
-msgstr "Type de cryptage %s non pris en charge\n"
+msgstr "Type d'encryptage non supporté %s\n"
 
 #: mount/lomount.c:239
 msgid "Couldn't lock into memory, exiting.\n"
-msgstr "Impossible de verrouiller en mémoire, quitte.\n"
+msgstr "Ne peut verrouiller en mémoire, fin d'exécutio.\n"
 
 #: mount/lomount.c:258
 msgid "Init (up to 16 hex digits): "
-msgstr "Init(jusqu'à 16 chiffres hexadécimaux) : "
+msgstr "Init (jusqu'à 16 nombres hexadécimaux): "
 
 #: mount/lomount.c:265
 #, c-format
 msgid "Non-hex digit '%c'.\n"
-msgstr "Chiffre non hexadécimal '%c'.\n"
+msgstr "Nombre non hexadécimla « %c ».\n"
 
 #: mount/lomount.c:272
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
-msgstr "Ne sais pas comment obtenir la clé du système de cryptage %d\n"
+msgstr "Ne sait comment obtenir la clé pour l'encryptage système %d\n"
 
 #: mount/lomount.c:288
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
-msgstr "set_loop(%s,%s,%d) : succès\n"
+msgstr "set_loop(%s,%s,%d): succès\n"
 
 #: mount/lomount.c:299
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
-msgstr "loop : impossible de supprimer le périphérique %s: %s\n"
+msgstr "loop: ne peut détruire le périphérique %s: %s\n"
 
 #: mount/lomount.c:309
 #, c-format
 msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s) : succès\n"
+msgstr "del_loop(%s): succès\n"
 
 #: mount/lomount.c:317
 msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr "Ce montage a été compilé sans prise en charge de boucle. Recompilez.\n"
+msgstr "Cette version de mount a été compilée sans support de boucle. SVP recompiler.\n"
 
 #: mount/lomount.c:354
 #, c-format
@@ -7721,363 +7507,347 @@
 "  %s -d loop_device                                   # delete\n"
 "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
-"Usage :\n"
-"  %s périphérique_boucle                                      # donner "
-"infos\n"
-"  %s -d périphérique_boucle                                   # supprimer\n"
-"  %s [ -e cryptage ] [ -o décalage ] fichier périphérique_boucle # "
-"configurer\n"
+"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:372 mount/sundries.c:30 mount/sundries.c:45
 #: mount/sundries.c:244
 msgid "not enough memory"
-msgstr "Mémoire insuffisante"
+msgstr "pas assez de mémoire"
 
 #: mount/lomount.c:443
 msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr ""
-"Aucune prise en charge de boucle disponible au moment de la compilation. "
-"Recompilez.\n"
+msgstr "Aucun support de boucle n'était disponible au moment de la compilation. SVP recompiler.\n"
 
 #: mount/mntent.c:165
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
-msgstr ""
-"[mntent] : avertissement : aucune nouvelle ligne finale à la fin de %s\n"
+msgstr "[mntent]: AVERTISSEMENT: aucun nouvelle ligne finale à la fin de %s\n"
 
 #: mount/mntent.c:216
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
-msgstr "[mntent] : la ligne %d dans %s est incorrecte%s\n"
+msgstr "[mntent]: ligne %d dans %s est erroné%s\n"
 
 #: mount/mntent.c:219
 msgid "; rest of file ignored"
-msgstr "; reste du fichier ignoré"
+msgstr "; reste du fichier est ignoré"
 
-#: mount/mount.c:385
+#: mount/mount.c:388
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr "mount : selon mtab, %s est déjà monté sur %s"
+msgstr "mount: selon mtab %s est déjà monté sur %s"
 
-#: mount/mount.c:389
+#: mount/mount.c:392
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
-msgstr "mount : selon mtab, %s est monté sur %s"
+msgstr "mount: selon mtab %s est monté sur %s"
 
-#: mount/mount.c:410
+#: mount/mount.c:413
 #, c-format
 msgid "mount: can't open %s for writing: %s"
-msgstr "mount : impossible d'ouvrir %s pour écriture : %s"
+msgstr "mount: ne peut ouvrir %s en écriture: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:428 mount/mount.c:647
 #, c-format
 msgid "mount: error writing %s: %s"
-msgstr "mount : erreur lors de l'écriture de %s: %s"
+msgstr "mount: erreur d'écriture %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:435
 #, c-format
 msgid "mount: error changing mode of %s: %s"
-msgstr "mount : erreur lors du changement du mode de %s: %s"
+msgstr "mount: erreur lors du changement de mode de %s: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:481
 #, c-format
 msgid "%s looks like swapspace - not mounted"
-msgstr "%s ressemble à un espace d'échange - non monté"
+msgstr "%s ressemble à un esapce de swap - n'a pas été monté"
 
-#: mount/mount.c:538
+#: mount/mount.c:541
 msgid "mount failed"
-msgstr "Échec du montage"
+msgstr "échec de mount"
 
-#: mount/mount.c:540
+#: mount/mount.c:543
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr "mount : seul l'utilisateur root peut monter %s sur %s"
+msgstr "mount: seul l'usager ROOT peut monter %s sur %s"
 
-#: mount/mount.c:568
+#: mount/mount.c:571
 msgid "mount: loop device specified twice"
-msgstr "mount : périphérique de boucle spécifié deux fois"
+msgstr "mount: périphérique de type loop spécifié deux fois"
 
-#: mount/mount.c:573
+#: mount/mount.c:576
 msgid "mount: type specified twice"
-msgstr "mount : type spécifié deux fois"
+msgstr "mount: type spécifié deux fois"
 
-#: mount/mount.c:585
+#: mount/mount.c:588
 msgid "mount: skipping the setup of a loop device\n"
-msgstr "mount : saut de la configuration d'un périphérique de boucle\n"
+msgstr "mount: escamotage du setup du périphérique de type loop\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:597
 #, c-format
 msgid "mount: going to use the loop device %s\n"
-msgstr "mount : le périphérique de boucle %s va être utilisé\n"
+msgstr "mount: on se prépare à utiliser le périphérique de type loop %s\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:601
 msgid "mount: failed setting up loop device\n"
-msgstr "mount : échec de la configuration du périphérique de boucle\n"
+msgstr "mount: échec d'initialisation du périphérique de type loop\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:605
 msgid "mount: setup loop device successfully\n"
-msgstr "mount : la configuration du périphérique de boucle a abouti\n"
+msgstr "mount: réussite d'initialisation du périphérique de type loop\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:642
 #, c-format
 msgid "mount: can't open %s: %s"
-msgstr "mount : impossible d'ouvrir %s: %s"
-
-#: mount/mount.c:662
-#, fuzzy, c-format
-msgid "mount: cannot open %s for setting speed"
-msgstr "mount : impossible d'ouvrir %s pour définir la vitesse"
+msgstr "mount: ne peut ouvrir %s: %s"
 
 #: mount/mount.c:665
 #, c-format
-msgid "mount: cannot set speed: %s"
-msgstr "mount : impossible de définir la vitesse : %s"
+msgid "mount: cannot open %s for setting speed"
+msgstr "mount: ne peut ouvrir %s pour ajuster la vitesse"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:668
+#, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount: ne peut initialiser la vitesse: %s"
+
+#: mount/mount.c:722 mount/mount.c:1296
 #, c-format
 msgid "mount: cannot fork: %s"
-msgstr "mount : fork impossible : %s"
+msgstr "mount: ne peut établir un relais fork(): %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:802
 msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount : cette version a été compilée sans prise en charge du type `nfs'"
+msgstr "mount: cette version a été compilé sans support pour le type « nfs »"
 
-#: mount/mount.c:845
+#: mount/mount.c:841
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
-msgstr "mount : échec avec nfs mount version 4, essaye avec la 3...\n"
+msgstr "mount: échec avec la version 4 de mount nfs, on tente la 3..\n"
 
-#: mount/mount.c:856
-msgid ""
-"mount: I could not determine the filesystem type, and none was specified"
-msgstr ""
-"mount : Impossible de déterminer le type du système de fichiers et aucun "
-"n'était spécifié."
+#: mount/mount.c:852
+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:859
+#: mount/mount.c:855
 msgid "mount: you must specify the filesystem type"
-msgstr "mount : vous devez indiquer le type de système de fichiers."
+msgstr "mount: vous devez spécifier le type de système de fichiers"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:858
 msgid "mount: mount failed"
-msgstr "mount : échec du montage"
+msgstr "mount: échec de mount"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:864 mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s is not a directory"
-msgstr "mount : le point de montage %s n'est pas un répertoire."
+msgstr "mount: le point de montage %s n'est pas un répertoire"
 
-#: mount/mount.c:870
+#: mount/mount.c:866
 msgid "mount: permission denied"
-msgstr "mount : permission refusée."
+msgstr "mount: permission refusée"
 
-#: mount/mount.c:872
+#: mount/mount.c:868
 msgid "mount: must be superuser to use mount"
-msgstr ""
-"mount : vous devez être l'utilisateur root pour utiliser la fonction de "
-"montage."
+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:876 mount/mount.c:880
+#: mount/mount.c:872 mount/mount.c:876
 #, c-format
 msgid "mount: %s is busy"
-msgstr "mount : %s est occupé"
+msgstr "mount: %s est occupé"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:878
 msgid "mount: proc already mounted"
-msgstr "mount : proc déjà monté"
+msgstr "mount: proc déjà monté"
 
-#: mount/mount.c:884
+#: mount/mount.c:880
 #, c-format
 msgid "mount: %s already mounted or %s busy"
-msgstr "mount : %s déjà monté ou %s occupé"
+msgstr "mount: %s est déjà monté ou %s est occupé"
 
-#: mount/mount.c:890
+#: mount/mount.c:886
 #, c-format
 msgid "mount: mount point %s does not exist"
-msgstr "mount : le point de montage %s n'existe pas."
+msgstr "mount: le point de montage %s n'existe pas"
 
-#: mount/mount.c:892
+#: mount/mount.c:888
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr "mount : le point de montage %s est un lien symbolique avec rien"
+msgstr "mount: le point de montage %s est un lien symbolique qui pointe vers nulle part"
 
-#: mount/mount.c:895
+#: mount/mount.c:891
 #, c-format
 msgid "mount: special device %s does not exist"
-msgstr "mount : le périphérique spécial %s n'existe pas."
+msgstr "mount: périphérique spécial %s n'existe pas"
 
-#: mount/mount.c:905
+#: mount/mount.c:901
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
-"mount : le périphérique spécial %s n'existe pas\n"
+"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:918
+#: mount/mount.c:914
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
-msgstr "mount : %s pas encore monté, ou option incorrecte"
+msgstr "mount: %s n'est pas déjà monté ou option erronée"
 
-#: mount/mount.c:920
+#: mount/mount.c:916
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
-"mount : type fs incorrect, option incorrecte, superbloc incorrect sur %s,\n"
+"mount: type de sys. de fichiers erroné, option erronée, super bloc erroné sur %s,\n"
 "       ou trop de systèmes de fichiers montés"
 
-#: mount/mount.c:954
+#: mount/mount.c:950
 msgid "mount table full"
-msgstr "Table de montage complète"
+msgstr "table de périphériques montés est pleine"
+
+#: mount/mount.c:952
+#, c-format
+msgid "mount: %s: can't read superblock"
+msgstr "mount: %s: ne peut lire le super bloc"
 
 #: mount/mount.c:956
 #, c-format
-msgid "mount: %s: can't read superblock"
-msgstr "mount : %s: impossible de lire le superbloc"
-
-#: mount/mount.c:960
-#, fuzzy, c-format
 msgid "mount: %s: unknown device"
-msgstr "umount : %s : périphérique de bloc non valide"
+msgstr "mount: %s: périphérique inconnnu"
 
-#: mount/mount.c:965
+#: mount/mount.c:961
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
-msgstr "mount : type fs %s non pris en charge par le kernel"
+msgstr "mount: type de syst. de fichiers %s n,est pas supporté par le kernel"
 
-#: mount/mount.c:977
+#: mount/mount.c:973
 #, c-format
 msgid "mount: probably you meant %s"
-msgstr "mount : vous vouliez sans doute dire %s."
+msgstr "mount: probablement vous voulez dire %s"
 
-#: mount/mount.c:979
+#: mount/mount.c:975
 msgid "mount: maybe you meant iso9660 ?"
-msgstr "mount : vous vouliez peut-être dire iso9660 ?"
+msgstr "mount: peut-être voulez-vous dire iso9660 ?"
 
-#: mount/mount.c:982
+#: mount/mount.c:978
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
-msgstr ""
-"mount : %s a un numéro de périphérique incorrect ou le type fs %s n'est pas "
-"pris en charge."
+msgstr "mount: %s a un nombre de périphérique erroné ou le type du syst. de fichiers %s n'est pas supporté"
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:984
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount : %s n'est pas un périphérique de bloc. Échec de stat ?"
+msgstr "mount: %s n'est pas un périphérique de type bloc et stat() a échoué?"
 
-#: mount/mount.c:990
+#: mount/mount.c:986
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
-"mount : le kernel ne reconnaît pas %s comme périphérique de bloc\n"
-"       (peut-être `insmod driver' ?)"
+"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:993
+#: mount/mount.c:989
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr "mount : %s n'est pas un périphérique de bloc (essayez `-o loop' ?)."
+msgstr "mount: %s n'est pas un périphérique de type bloc (essayer « -o loop » ?)"
 
-#: mount/mount.c:996
+#: mount/mount.c:992
 #, c-format
 msgid "mount: %s is not a block device"
-msgstr "mount : %s n'est pas un périphérique de bloc."
+msgstr "mount: %s n'est pas un périphérique de type bloc"
 
-#: mount/mount.c:999
+#: mount/mount.c:995
 #, c-format
 msgid "mount: %s is not a valid block device"
-msgstr "mount : %s n'est pas un périphérique de bloc valide."
+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:1002
+#: mount/mount.c:998
 msgid "block device "
-msgstr "Périphérique de bloc"
+msgstr "périphérique de type bloc"
+
+#: mount/mount.c:1000
+#, c-format
+msgid "mount: cannot mount %s%s read-only"
+msgstr "mount: ne peut monter %s%s en lecture seulement"
 
 #: mount/mount.c:1004
 #, c-format
-msgid "mount: cannot mount %s%s read-only"
-msgstr "mount : impossible de monter %s%s en lecture seule."
-
-#: mount/mount.c:1008
-#, 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'indicateur `-w' a été "
-"explicitement donné."
+msgstr "mount: %s%s est protégé en écriture mais l'option « -w » a été fournie"
 
-#: mount/mount.c:1024
+#: mount/mount.c:1020
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
-msgstr "mount : %s%s est protégé en écriture. Montage en lecture seule."
+msgstr "mount: %s%s est protégé en écriture, on le monte en lecture seulement"
+
+#: mount/mount.c:1107
+#, 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:1111
 #, c-format
-msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr ""
-
-#: mount/mount.c:1115
-#, fuzzy, c-format
 msgid "mount: %s duplicate - not mounted"
-msgstr "umount : %s: non monté"
+msgstr "mount: %s en double - n'a pas été monté"
 
-#: mount/mount.c:1125
+#: mount/mount.c:1121
 #, c-format
 msgid "mount: going to mount %s by %s\n"
-msgstr "mount : envisagez de monter %s par %s.\n"
+msgstr "mount: on va monter %s par %s\n"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1122
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1122
 msgid "label"
-msgstr "Libellé"
+msgstr "étiquette"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: mount/mount.c:1124 mount/mount.c:1573
 msgid "mount: no such partition found"
-msgstr "mount : partition introuvable"
+msgstr "mount: pas de telle partition repérée"
 
-#: mount/mount.c:1136
+#: mount/mount.c:1132
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
-msgstr "mount : aucun type donné - nfs supposé en raison du point virgule\n"
+msgstr "mount: aucun type n'a été donné - ja vais assumer nfs en raison du « : »\n"
 
-#: mount/mount.c:1141
-#, fuzzy
+#: mount/mount.c:1137
 msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
-msgstr "mount : aucun type donné - nfs supposé en raison du point virgule\n"
+msgstr "mount: aucun type n'a été fourni - je vais assumer smb en raison du préfixe //\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1153
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
-msgstr "mount : tentative de montage en arrière-plan en cours \"%s\"\n"
+msgstr "mount: mise en arrière plan de \"%s\"\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1164
 #, c-format
 msgid "mount: giving up \"%s\"\n"
-msgstr "mount : abandon de \"%s\"\n"
+msgstr "mount: abandon \"%s\"\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1241
 #, c-format
 msgid "mount: %s already mounted on %s\n"
-msgstr "mount : %s déjà monté sur %s\n"
+msgstr "mount: %s est déjà monté sur %s\n"
 
-#: mount/mount.c:1376
-#, fuzzy
+# mount/mount.c:1323
+#: mount/mount.c:1373
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8101,216 +7871,210 @@
 "Other options: [-nfFrsvw] [-o options].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
-"Usage : mount -V                 : affiche la version\n"
-"        mount -h                 : affiche cette aide\n"
-"        mount                    : liste les sytèmes de fichiers montés\n"
-"        mount -l                 : idem, inclus les noms de volumes\n"
-"Pour la partie information. Vient le montage.\n"
-"La commande est `mount [-t fstype] quelquechose quelquepart'.\n"
-"Détails trouvé dans /etc/fstab peuvent etre omis.\n"
-"        mount -a                 : monte tout /etc/fstab\n"
-"        mount périphérique       : monte le périphérique à la place connue\n"
-"        mount répertoire         : monte le périphérique connu ici\n"
-"        mount -t type pér rép    : commande de montage normal\n"
-"Notez que celle ci ne monte pas vraiment un périphérique, elle monte\n"
-"un système de fichier (du type donné) trouvé sur le périphérique.\n"
-"Celle ci peut aussi monter un répertoire déjà visible autrepart :\n"
-"        mount --bind ancienrép nouveaurép\n"
-"Un périphérique peut etre désigné par son nom, /dev/hda1 ou /dev/cdrom,\n"
-"ou par son label, en utilisant  -L label ou par son uuid, en utilisant\n"
-"-U uuid .\n"
-"Les montages simultanés sont spécifiés en utilisant une des options\n"
-"        --replace, --after, --before, --over\n"
-"Autres options : [-nfFrsvw] [-o options].\n"
-"Pour plus de détails, voyez man 8 mount .\n"
+"Usage: mount -V                 : afficher la version\n"
+"       mount -h                 : afficher l'aide\n"
+"       mount                    : lister les systèmes de fichiers montés\n"
+"       mount -l                 : idem, incluant les étiquettes de volumes\n"
+"Cela pour la partie informative. Suit la partie portant sur le montage.\n"
+"La commande est « mount [-t type-sys-fichier] quelque-chose quelque-part ».\n"
+"Les détails se trouvant dans /etc/fstab peuvent être omis.\n"
+"       mount -a [-t|-O] ...     : monter tous les périphérique listés dans /etc/fstab\n"
+"       mount périphérique       : monter le périphérique à l'endroit connu\n"
+"       mount répertoire         : monter le périphérique connu ici\n"
+"       mount -t type périph rép : commande de montage ordinaire\n"
+"Noter que celle-ci ne monte pas réellement un périphérique, une monte\n"
+"un système de fichiers (d'un type donné) trouvé sur le périphérique.\n"
+"Une peut aussi monter une arborescence de répertoires déjà visibles quelque part:\n"
+"       mount --bind ancien-rép nouveau-rép\n"
+"ou déplacer une sous-arborescence:\n"
+"       mount --move ancien-rép nouveau-rép\n"
+"Un périphérique peut être identifié par un nom comme /dev/hda1 ou /dev/cdrom,\n"
+"ou par une étiquette, en utilisant -L étiquette  ou par uuid, en utulisant  -U uuid .\n"
+"Autres options: [-nfFrsvw] [-o options].\n"
+"Pour plus de détails exécuter:  man 8 mount .\n"
 
 #: mount/mount.c:1549
 msgid "mount: only root can do that"
-msgstr "mount : seul l'utilisateur root peut le faire."
+msgstr "mount: seul l'usager ROOT peut faire cela"
 
 #: mount/mount.c:1554
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr "mount : %s introuvable - création en cours..\n"
+msgstr "mount: %s n'a pas été repéré - on le crée..\n"
 
 #: mount/mount.c:1568
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr ""
+msgstr "mount: l'étiquette %s apparaît sur %s et %s - n'a pas été monté\n"
 
 #: mount/mount.c:1575
 #, c-format
 msgid "mount: mounting %s\n"
-msgstr "mount : montage de %s en cours...\n"
+msgstr "mount: on monte %s\n"
 
 #: mount/mount.c:1584
 msgid "nothing was mounted"
-msgstr ""
+msgstr "rien n'a été monté"
 
 #: mount/mount.c:1599
 #, c-format
 msgid "mount: cannot find %s in %s"
-msgstr "mount : impossible de trouver %s dans %s"
+msgstr "mount: ne peut repérer %s dans %s"
 
 #: mount/mount.c:1614
 #, c-format
 msgid "mount: can't find %s in %s or %s"
-msgstr "mount : impossible de trouver %s dans %s ou %s"
+msgstr "mount: ne peut repérer %s dans %s ou %s"
 
-#: mount/mount_by_label.c:259
+#: mount/mount_by_label.c:153
 #, c-format
-msgid ""
-"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
-msgstr ""
-"mount : impossible d'ouvrir %s, tant que la conversion UUID et LABEL n'a pas "
-"été faite.\n"
+msgid "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr "mount: ne peut ouvrir %s, la conversion de UUID et LABEL ne peut être faite.\n"
 
-#: mount/mount_by_label.c:378
+#: mount/mount_by_label.c:272
 msgid "mount: bad UUID"
-msgstr "mount : UUID incorrect"
+msgstr "mount: UUID erroné"
 
-#: mount/mount_guess_fstype.c:484
-#, fuzzy
+#: mount/mount_guess_fstype.c:486
 msgid "mount: error while guessing filesystem type\n"
-msgstr "mount : vous devez indiquer le type de système de fichiers."
+msgstr "mount: error lors de la tentative d'identification du système de fichiers\n"
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:495
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr "mount : aucun type de système de fichiers spécifié pour %s\n"
+msgstr "mount: vous n'avez pas spécifier le type de système de fichiers pour %s\n"
 
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:498
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
-msgstr "       Essayer des autres types mentionnés dans %s ou %s\n"
-
-#: mount/mount_guess_fstype.c:499
-msgid "       and it looks like this is swapspace\n"
-msgstr "       et il semble que ce soit un espace d'échange\n"
+msgstr "       Je vais essayer tous les types mentionnés dans %s ou %s\n"
 
 #: mount/mount_guess_fstype.c:501
+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:503
 #, c-format
 msgid "       I will try type %s\n"
-msgstr "      Essayer avec le type %s\n"
+msgstr "       Je vais essayer le type %s\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:591
 #, c-format
 msgid "Trying %s\n"
-msgstr "Essaye %s\n"
+msgstr "On tente %s\n"
 
 #: mount/nfsmount.c:237
 msgid "mount: excessively long host:dir argument\n"
-msgstr "mount : argument hôte:dir beaucoup trop long\n"
+msgstr "mount: argument excessivement long  pour hôte:répertoire\n"
 
 #: mount/nfsmount.c:251
 msgid "mount: warning: multiple hostnames not supported\n"
-msgstr "mount : avertissement: noms d'hôtes multiples non pris en charge\n"
+msgstr "mount: AVERTISSEMENT: multiples noms d'hôtes non supportés\n"
 
 #: mount/nfsmount.c:256
 msgid "mount: directory to mount not in host:dir format\n"
-msgstr "mount : le répertoire à monter n'est pas au format hôte:dir.\n"
+msgstr "mount: le répertoire à monter n'utilise pas le format hôte:répertoire\n"
 
 #: mount/nfsmount.c:267 mount/nfsmount.c:522
 #, c-format
 msgid "mount: can't get address for %s\n"
-msgstr "mount : impossible d'obtenir l'adresse pour %s\n"
+msgstr "mount: ne peut obtenir l'adresse de %s\n"
 
 #: mount/nfsmount.c:273
 msgid "mount: got bad hp->h_length\n"
-msgstr "mount : hp->h_length incorrect reçu\n"
+msgstr "mount: a obtenu un hp->h_length erroné\n"
 
 #: mount/nfsmount.c:290
 msgid "mount: excessively long option argument\n"
-msgstr "mount : argument option beaucoup trop long\n"
+msgstr "mount: argument excessivement long pour une option\n"
 
 #: mount/nfsmount.c:382
 msgid "Warning: Unrecognized proto= option.\n"
-msgstr "Avertissement : option proto= non reconnue.\n"
+msgstr "AVERTISSEMENT: l'option proto= n'est pas reconnue.\n"
 
 #: mount/nfsmount.c:389
 msgid "Warning: Option namlen is not supported.\n"
-msgstr "Avertissement : option namlen non prise en charge.\n"
+msgstr "AVERTISSEMENT: l'option namlen n'est pas supportée.\n"
 
 #: mount/nfsmount.c:393
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
-msgstr "Paramètre de montage nfs inconnu : %s=%d\n"
+msgstr "paramètre mount nfs inconnu: %s=%d\n"
 
 #: mount/nfsmount.c:427
 msgid "Warning: option nolock is not supported.\n"
-msgstr "Avertissement : option nolock non prise en charge.\n"
+msgstr "AVERTISSEMENT: l'option nolock n'est pas supportée.\n"
 
 #: mount/nfsmount.c:432
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
-msgstr "Option de montage nfs inconnue : %s%s\n"
+msgstr "option mount nfs inconnue: %s%s\n"
 
 #: mount/nfsmount.c:528
 msgid "mount: got bad hp->h_length?\n"
-msgstr "mount : hp->h_length incorrect reçu ?\n"
+msgstr "mount: a obtenu un hp->h_length erroné?\n"
 
 #: mount/nfsmount.c:716
 msgid "NFS over TCP is not supported.\n"
-msgstr "NFS sur TCP non pris en charge.\n"
+msgstr "NFS sur TCP n'est pas supporté.\n"
 
 #: mount/nfsmount.c:723
 msgid "nfs socket"
-msgstr "nfs socket"
+msgstr "socket nfs"
 
 #: mount/nfsmount.c:727
 msgid "nfs bindresvport"
-msgstr "nfs bindresvport"
+msgstr "bindresvport nfs"
 
 #: mount/nfsmount.c:741
 msgid "nfs server reported service unavailable"
-msgstr ""
+msgstr "serveur nfs rapporte que le service n'est pas disponible"
 
 #: mount/nfsmount.c:750
 msgid "used portmapper to find NFS port\n"
-msgstr "Mappeur de port utilisé pour trouver le port NFS\n"
+msgstr "utilisation du portmapper pour repérer le port NFS\n"
 
 #: mount/nfsmount.c:754
 #, c-format
 msgid "using port %d for nfs deamon\n"
-msgstr "Utilisation du port %d pour le daemon nfs\n"
+msgstr "utilisation du port %d pour le démon nfs\n"
 
 #: mount/nfsmount.c:765
 msgid "nfs connect"
-msgstr "nfs connect"
+msgstr "connexion nfs"
 
 #: mount/nfsmount.c:852
 #, c-format
 msgid "unknown nfs status return value: %d"
-msgstr "Valeur de l'état nfs renvoyée inconnue : %d"
+msgstr "valeur d'état retournée nfs inconnue: %d"
 
 #: mount/sundries.c:55
 msgid "bug in xstrndup call"
-msgstr "Bogue dans l'appel de xstrndup"
+msgstr "problème dans l'appel de xstrndup"
 
 #: mount/swapon.c:64
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
 "       %s [-v] [-p priority] special ...\n"
 "       %s [-s]\n"
 msgstr ""
-"Usage : %s [-hV]\n"
-"        %s -a [-v]\n"
-"        %s [-v] [-p priorité] special ...\n"
-"        %s [-s]\n"
+"usage: %s [-hV]\n"
+"       %s -a [-e] [-v]\n"
+"       %s [-v] [-p priorité] spécial ...\n"
+"       %s [-s]\n"
 
 #: mount/swapon.c:74
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-v]\n"
 "       %s [-v] special ...\n"
 msgstr ""
-"Usage : %s [-hV]\n"
-"        %s -a [-v]\n"
-"        %s [-v] [-p priorité] special ...\n"
-"        %s [-s]\n"
+"usage: %s [-hV]\n"
+"       %s -a [-v]\n"
+"       %s [-v] spécial ...\n"
 
 #: mount/swapon.c:178 mount/swapon.c:242
 #, c-format
@@ -8320,109 +8084,105 @@
 #: mount/swapon.c:182
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
-msgstr "swapon : stat %s impossible: %s\n"
+msgstr "swapon: ne peut évaluer pas stat() %s: %s\n"
 
 #: mount/swapon.c:193
-#, fuzzy, c-format
+#, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
-msgstr ""
-"swapon : avertissement : %s a les permissions non sécurisées %04o, 0600 "
-"suggérées.\n"
+msgstr "swapon: AVERTISSEMENT: %s a des permissions non sécuritaires %04o, %04o est suggéré\n"
 
 #: mount/swapon.c:205
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
-msgstr "swapon : Saut du fichier %s - il semble contenir des trous.\n"
+msgstr "swapon: escamotage du fichier %s - il semble avoir des trous.\n"
 
 #: mount/swapon.c:248
-#, fuzzy
 msgid "Not superuser.\n"
-msgstr "Non défini\n"
+msgstr "N'est pas super usager.\n"
 
 #: mount/swapon.c:312 mount/swapon.c:401
 #, c-format
 msgid "%s: cannot open %s: %s\n"
-msgstr "%s : impossible d'ouvrir %s : %s\n"
+msgstr "%s: ne peut ouvrir %s: %s\n"
 
 #: mount/umount.c:77
 msgid "umount: compiled without support for -f\n"
-msgstr "umount : compilé sans prise en charge de -f\n"
+msgstr "umount: compilé sans support pour -f\n"
 
 #: mount/umount.c:150
 #, c-format
 msgid "host: %s, directory: %s\n"
-msgstr "hôte : %s, répertoire : %s\n"
+msgstr "hôte: %s, répertoire: %s\n"
 
 #: mount/umount.c:170
 #, c-format
 msgid "umount: can't get address for %s\n"
-msgstr "umount : impossible d'obtenir l'adresse pour %s\n"
+msgstr "umount: ne peut obtenir l'adresse pour %s\n"
 
 #: mount/umount.c:175
 msgid "umount: got bad hostp->h_length\n"
-msgstr "umount : hostp->h_length incorrect reçu\n"
+msgstr "umount: a obtenu un hostp->h_length erroné\n"
 
 #: mount/umount.c:223
 #, c-format
 msgid "umount: %s: invalid block device"
-msgstr "umount : %s : périphérique de bloc non valide"
+msgstr "umount: %s: périphérique de type bloc invalide"
 
 #: mount/umount.c:225
 #, c-format
 msgid "umount: %s: not mounted"
-msgstr "umount : %s: non monté"
+msgstr "umount: %s: n'est pas monté"
 
 #: mount/umount.c:227
 #, c-format
 msgid "umount: %s: can't write superblock"
-msgstr "umount : %s : impossible d'écrire le superbloc"
+msgstr "umount: %s: ne peut écrire sur le super bloc"
 
 #. Let us hope fstab has a line "proc /proc ..."
 #. and not "none /proc ..."
 #: mount/umount.c:231
 #, c-format
 msgid "umount: %s: device is busy"
-msgstr "umount : %s : périphérique occupé"
+msgstr "umount: %s: périphérique occupé"
 
 #: mount/umount.c:233
 #, c-format
 msgid "umount: %s: not found"
-msgstr "umount : %s : introuvable"
+msgstr "umount: %s: n'a pas été trouvé"
 
 #: mount/umount.c:235
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr ""
-"umount : %s : seul l'utilisateur root peut effectuer une commande umount"
+msgstr "umount: %s: doit être le super usager pour utiliser umount"
 
 #: mount/umount.c:237
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
-msgstr "umount : %s : périphériques de blocs non autorisés sur fs"
+msgstr "umount: %s: périphérique de type bloc non autorisé sur le système de fichiers"
 
 #: mount/umount.c:239
 #, c-format
 msgid "umount: %s: %s"
-msgstr "umount : %s : %s"
+msgstr "umount: %s: %s"
 
 #: mount/umount.c:285
 msgid "no umount2, trying umount...\n"
-msgstr "Aucun umount2, essai avec umount...\n"
+msgstr "pas de umount2, tentative avec umount...\n"
 
 #: mount/umount.c:301
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
-msgstr "umount %s impossible - essai avec %s à la place\n"
+msgstr "ne peut démonter %s - essayer %s à la place\n"
 
 #: mount/umount.c:319
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
-msgstr "umount : %s en cours d'utilisation - remonté en lecture seule\n"
+msgstr "umount: %s est occupé - remonté en lecture seulement\n"
 
 #: mount/umount.c:329
 #, c-format
 msgid "umount: could not remount %s read-only\n"
-msgstr "umount : impossible de remonter %s en lecture seule\n"
+msgstr "umount: ne peut remonter %s en lecture seulement\n"
 
 #: mount/umount.c:338
 #, c-format
@@ -8431,70 +8191,64 @@
 
 #: mount/umount.c:426
 msgid "umount: cannot find list of filesystems to unmount"
-msgstr ""
-"umount : impossible de trouver la liste des systèmes de fichiers à démonter"
+msgstr "umount: ne peut repérer la liste des systèmes de fichiers à démonter"
 
 #: mount/umount.c:457
-#, fuzzy
 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 ""
-"Usage : umount [-hV]\n"
-"        umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
-"        umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount [-hV]\n"
+"       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
 #, c-format
 msgid "Trying to umount %s\n"
-msgstr "Tentative de démonter %s\n"
+msgstr "Tentative pour démonter %s\n"
 
 #: mount/umount.c:543
 #, c-format
 msgid "Could not find %s in mtab\n"
-msgstr "Impossible de trouver %s dans mtab\n"
+msgstr "Ne peut repérer %s dans mtab\n"
 
 #: mount/umount.c:547
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
-msgstr "umount : %s n'est pas monté (selon mtab)."
+msgstr "umount: %s n'est pas monté (selon mtab)"
 
 #: mount/umount.c:549
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr "umount : il semble que %s soit monté à plusieurs endroits."
+msgstr "umount: il semble que %s ait été monté plusieurs fois"
 
 #: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr ""
-"umount : %s n'est pas dans le fichier fstab (et vous n'êtes pas un "
-"utilisateur root)."
+msgstr "umount: %s n'est pas dans fstab (et vous n'êtes pas l'usager ROOT)"
 
 #: mount/umount.c:564
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
-msgstr "umount : %s est en désaccord avec le fichier fstab."
+msgstr "umount: %s mount est en désaccord avec fstab"
 
 #: mount/umount.c:598
 #, c-format
 msgid "umount: only root can unmount %s from %s"
-msgstr "umount : seul l'utilisateur root peut démonter %s de %s."
+msgstr "umount: seul l'usager ROOT peut démonter %s de %s"
 
 #: mount/umount.c:669
 msgid "umount: only root can do that"
-msgstr "umount : seul l'utilisateur root peut effectuer cette action."
+msgstr "umount: seul l'usager ROOT peut exécuter la commande"
 
 #: sys-utils/ctrlaltdel.c:27
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr ""
-"Vous devez être un utilisateur root pour définir le comportement de Ctrl-Alt-"
-"Del.\n"
+msgstr "Vous devez être l'usager ROOT pour activer le comportement de CTRL-Alt-Del.\n"
 
 #: sys-utils/ctrlaltdel.c:42
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr "Usage : ctrlaltdel hard|soft\n"
+msgstr "Usage: ctrlaltdel hard|soft\n"
 
 #: sys-utils/cytune.c:120
 #, c-format
@@ -8502,158 +8256,145 @@
 "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 ""
-"Fichier %s, Pour la valeur de seuil %lu, les caractères maximum dans fifo "
-"étaient de %d,\n"
-"et le débit de transfert maximum en caractères/seconde était de %f.\n"
+"Fichier %s, pour la valeur de seuil %lu, nombre maxumum de caractères dans le fifo était de %d,\n"
+"et le taux de transfert maximum en caractères/secondes était de %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 ""
-"Fichier %s, Pour la valeur de seuil %lu et la valeur de temporisation %lu, "
-"les caractères maximum dans fifo étaient de %d,\n"
-"et le débit de transfert maximum en caractères/seconde était de %f\n"
+"Fichier %s, pour la valeur de seuil %lu et le délai de grâce était %lu, nombre maxumum de caractères dans le fifo était de %d,\n"
+"et le taux de transfert maximum en caractères/secondes était de %f\n"
 
 #: sys-utils/cytune.c:195
 #, c-format
 msgid "Invalid interval value: %s\n"
-msgstr "Valeur d'intervalle non valide : %s\n"
+msgstr "Valeur interne invalide: %s\n"
 
 #: sys-utils/cytune.c:203
 #, c-format
 msgid "Invalid set value: %s\n"
-msgstr "Valeur de définition non valide : %s\n"
+msgstr "Valeur d'initialisation invalide: %s\n"
 
 #: sys-utils/cytune.c:211
 #, c-format
 msgid "Invalid default value: %s\n"
-msgstr "Valeur par défaut non valide : %s\n"
+msgstr "Valeur par défaut invalide: %s\n"
 
 #: sys-utils/cytune.c:219
 #, c-format
 msgid "Invalid set time value: %s\n"
-msgstr "Valeur de temps définie non valide : %s\n"
+msgstr "Valeur de temps invalide: %s\n"
 
 #: sys-utils/cytune.c:227
 #, c-format
 msgid "Invalid default time value: %s\n"
-msgstr "Valeur de temps par défaut non valide : %s\n"
+msgstr "Valeur de temps par défaut invalide: %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 ""
-"Usage : %s [-q [-i intervalle]] ([-s valeur]|[-S valeur]) ([-t valeur]|[-T "
-"valeur]) [-g|-G] fichier [fichier...]\n"
+msgid "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) [-g|-G] file [file...]\n"
+msgstr "Usage: %s [-q [-i interval]] ([-s valeur]|[-S valeur]) ([-t valeur]|[-T valeur]) [-g|-G] fichier [fichier...]\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 "Impossible d'ouvrir %s: %s\n"
+msgstr "Ne peut ouvrir %s: %s\n"
 
 #: sys-utils/cytune.c:263
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr "Impossible de définir %s sur le seuil %d: %s\n"
+msgstr "Ne peut inialiser %s au seuil %d: %s\n"
 
 #: sys-utils/cytune.c:282
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr "Impossible de définir %s sur le seuil de temps %d: %s\n"
+msgstr "Ne peut initialiser %s au temps de seuil %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 "Impossible d'obtenir le seuil pour %s: %s\n"
+msgstr "Ne peut obtenir la valeur de seuil pour %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 "Impossible d'obtenir la temporisation pour %s: %s\n"
+msgstr "Ne peut obtenir la valeur du délai de grâce pour %s: %s\n"
 
 #: sys-utils/cytune.c:312
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %ld current threshold and %ld current timeout\n"
-msgstr "%s: seuil %ld %s et temporisation %ld %s\n"
+msgstr "%s: %ld seuil courant et %ld délais de grâce courant\n"
 
 #: sys-utils/cytune.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %ld default threshold and %ld default timeout\n"
-msgstr "%s: seuil %ld %s et temporisation %ld %s\n"
+msgstr "%s: %ld seuil par défaut et %ld délai de grâce par défaut\n"
 
 #: sys-utils/cytune.c:333
 msgid "Can't set signal handler"
-msgstr "Impossible d'obtenir le gestionnaire de signaux"
+msgstr "Ne peut initialiser le traitement de signaux"
 
 #: sys-utils/cytune.c:337 sys-utils/cytune.c:372
 msgid "gettimeofday failed"
-msgstr "gettimeofday a échoué"
+msgstr "échec de gettimeofday()"
 
 #: sys-utils/cytune.c:350 sys-utils/cytune.c:382
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr "Impossible d'émettre CYGETMON sur %s: %s\n"
+msgstr "Ne peut émettre CYGETMON sur %s: %s\n"
 
 #: sys-utils/cytune.c:424
-#, fuzzy, c-format
-msgid ""
-"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr ""
-"%s : %lu ints, %lu cars ; fifo : seuil %lu, tempo %lu, %lu max, %lu "
-"maintenant\n"
+#, c-format
+msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu int, %lu/%lu carc; fifo: %lu seuil, %lu délai, %lu max, %lu actuel.\n"
 
 #: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
-msgstr "   %f int/sec ; %f reçus, %f envoyés (car/sec)\n"
+msgstr "   %f int/sec; %f reçu, %f trans (car/sec)\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 ints, %lu cars ; fifo : seuil %lu, tempo %lu, %lu max, %lu "
-"maintenant\n"
+msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu ints, %lu carac; fifo: %lu thresh, %lu tmout, %lu max, %lu actuel.\n"
 
 #: sys-utils/cytune.c:441
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
-msgstr "   %f int/sec ; %f reçus (car/sec)\n"
+msgstr "   %f int/sec; %f rec (caractères/sec)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr "Usage : %s [-c] [-n niveau] [-s taille-tampon]\n"
+msgstr "Usage: %s [-c] [-n niveau] [-s taille-de-tampon]\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
 msgid "invalid id: %s\n"
-msgstr "id invalide : %s\n"
+msgstr "id invalide: %s\n"
 
 #: sys-utils/ipcrm.c:84
 #, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr "Impossible de supprimer l'id %s (%s)\n"
+msgstr "ne peut enlever id %s (%s)\n"
 
 #: sys-utils/ipcrm.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
-msgstr "Usage : %s {shm | msg | sem} id...\n"
+msgstr "usage déprécié: %s {shm | msg | sem} id ...\n"
 
 #: sys-utils/ipcrm.c:126
 #, c-format
 msgid "unknown resource type: %s\n"
-msgstr "Type de ressource inconnu : %s\n"
+msgstr "type de ressource inconnue: %s\n"
 
 #: sys-utils/ipcrm.c:130
 msgid "resource(s) deleted\n"
-msgstr "Ressource(s) supprimée(s)\n"
+msgstr "ressource(s) détruites\n"
 
 #: sys-utils/ipcrm.c:140
 #, c-format
@@ -8661,67 +8402,65 @@
 "usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
+"usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
 #: sys-utils/ipcrm.c:181
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr ""
+msgstr "%s: option illégale -- %c\n"
 
 #: sys-utils/ipcrm.c:193
-#, fuzzy, c-format
+#, c-format
 msgid "%s: illegal key (%s)\n"
-msgstr "Touche non valide"
+msgstr "%s: clé illégale (%s)\n"
 
 #: sys-utils/ipcrm.c:208 sys-utils/ipcrm.c:240
-#, fuzzy
 msgid "permission denied for key"
-msgstr "mount : permission refusée."
+msgstr "permission refusée pour la clé"
 
 #: sys-utils/ipcrm.c:211 sys-utils/ipcrm.c:250
 msgid "already removed key"
-msgstr ""
+msgstr "clé déjà enlevée"
 
 #: sys-utils/ipcrm.c:214 sys-utils/ipcrm.c:245
-#, fuzzy
 msgid "invalid key"
-msgstr "id invalide : %s\n"
+msgstr "clé invalide"
 
 #: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
 msgid "unknown error in key"
-msgstr ""
+msgstr "erreur inconnue dans la clé"
 
 #: sys-utils/ipcrm.c:241
-#, fuzzy
 msgid "permission denied for id"
-msgstr "mount : permission refusée."
+msgstr "permission refusée pour l'identificateur"
 
 #: sys-utils/ipcrm.c:246
-#, fuzzy
 msgid "invalid id"
-msgstr "id invalide : %s\n"
+msgstr "identificateur invalide"
 
 #: sys-utils/ipcrm.c:251
 msgid "already removed id"
-msgstr ""
+msgstr "identificateur déjà enlevé"
 
 #: sys-utils/ipcrm.c:256
 msgid "unknown error in id"
-msgstr ""
+msgstr "erreur inconnue dans l'identificateur"
 
 #: sys-utils/ipcrm.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s (%s)\n"
-msgstr "%s sur %s\n"
+msgstr "%s: %s (%s)\n"
 
 #: sys-utils/ipcrm.c:267
-#, fuzzy, c-format
+#, c-format
 msgid "%s: unknown argument: %s\n"
-msgstr "%s : signal %s inconnu\n"
+msgstr "%s: argument inconnu: %s\n"
 
 #: sys-utils/ipcs.c:121
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
-msgstr "Usage : %s -asmq -tclup \n"
+msgstr "usage : %s -asmq -tclup \n"
 
 #: sys-utils/ipcs.c:122
 #, c-format
@@ -8731,13 +8470,12 @@
 #: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s -h for help.\n"
-msgstr "\t%s -h pour aide.\n"
+msgstr "\t%s -h pour l'aide.\n"
 
 #: sys-utils/ipcs.c:129
-#, fuzzy, c-format
-msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s fournit des informations sur les fonctions ipc auxquelles"
+#, c-format
+msgid "%s provides information on ipc facilities for which you have read access.\n"
+msgstr "%s fournits des informations sur les services pour lesquels vous avez des droits d'accès en mode lecture.\n"
 
 #: sys-utils/ipcs.c:131
 msgid ""
@@ -8745,8 +8483,8 @@
 "\t-m : shared_mem\n"
 "\t-q : messages\n"
 msgstr ""
-"Spécifications ressource :\n"
-"\t-m : mém_partagée\n"
+"Spécifications des ressources:\n"
+"\t-m : mémoire partagée (shared_mem)\n"
 "\t-q : messages\n"
 
 #: sys-utils/ipcs.c:132
@@ -8755,7 +8493,7 @@
 "\t-a : all (default)\n"
 msgstr ""
 "\t-s : sémaphores\n"
-"\t-a : tous (par défaut)\n"
+"\t-a : tout (par défaut)\n"
 
 #: sys-utils/ipcs.c:133
 msgid ""
@@ -8764,7 +8502,7 @@
 "\t-p : pid\n"
 "\t-c : creator\n"
 msgstr ""
-"Format de sortie :\n"
+"Format de sortie:\n"
 "\t-t : temps\n"
 "\t-p : pid\n"
 "\t-c : créateur\n"
@@ -8775,80 +8513,79 @@
 "\t-u : summary\n"
 msgstr ""
 "\t-l : limites\n"
-"\t-u : résumé\n"
+"\t-u : sommaire\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] : Détails sur la ressource identifiée par Id\n"
+msgstr "-i id [-s -q -m] : détails sur les ressources identifiés par id\n"
 
 #: sys-utils/ipcs.c:267
 msgid "kernel not configured for shared memory\n"
-msgstr "Kernel non configuré pour la mémoire partagée\n"
+msgstr "kernel n'est pas configuré pour traiter la mémoire partagée\n"
 
 #: sys-utils/ipcs.c:273
 msgid "------ Shared Memory Limits --------\n"
-msgstr "------ Limites de la mémoire partagée --------\n"
+msgstr "------ Limites de la mémoire partagé --------\n"
 
 #. glibc 2.1.3 and all earlier libc's have ints as fields
 #. of struct shminfo; glibc 2.1.91 has unsigned long; ach
 #: sys-utils/ipcs.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "max number of segments = %ld\n"
-msgstr "Nombre max de segments = %d\n"
+msgstr "nombre maximum de segments = %ld\n"
 
 #: sys-utils/ipcs.c:280
-#, fuzzy, c-format
+#, c-format
 msgid "max seg size (kbytes) = %ld\n"
-msgstr "Taille max de segment (kilo-octets) = %d\n"
+msgstr "taille max seg (koctets) = %ld\n"
 
 #: sys-utils/ipcs.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "max total shared memory (kbytes) = %ld\n"
-msgstr "Total max de la mémoire partagée (kilo-octets) = %d\n"
+msgstr "total max mémoire partagé (koctets) = %ld\n"
 
 #: sys-utils/ipcs.c:284
-#, fuzzy, c-format
+#, c-format
 msgid "min seg size (bytes) = %ld\n"
-msgstr "Taille min de segment (octets) = %d\n"
+msgstr "taille min seg (octets) = %ld\n"
 
 #: sys-utils/ipcs.c:289
 msgid "------ Shared Memory Status --------\n"
-msgstr "------ Statut de la mémoire partagée --------\n"
+msgstr "------ État de la mémoire partagée --------\n"
 
 #: sys-utils/ipcs.c:290
 #, c-format
 msgid "segments allocated %d\n"
-msgstr "Segments alloués %d\n"
+msgstr "segment alloués %d\n"
 
 #: sys-utils/ipcs.c:291
 #, c-format
 msgid "pages allocated %ld\n"
-msgstr "Pages allouées %ld\n"
+msgstr "pages alloués %ld\n"
 
 #: sys-utils/ipcs.c:292
 #, c-format
 msgid "pages resident  %ld\n"
-msgstr "Pages résidentes  %ld\n"
+msgstr "pages résidentes  %ld\n"
 
 #: sys-utils/ipcs.c:293
 #, c-format
 msgid "pages swapped   %ld\n"
-msgstr "Pages échangées   %ld\n"
+msgstr "pages échangées (swap) %ld\n"
 
 #: sys-utils/ipcs.c:294
 #, c-format
 msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Performances d'échange : %ld tentatives\t %ld succès\n"
+msgstr "Performance du swap: %ld tentatives\t %ld succès\n"
 
 #: sys-utils/ipcs.c:299
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
-msgstr ""
-"------ Créateurs/Propriétaires de segments en mémoire partagée --------\n"
+msgstr "------ Segment de mémoire partagé Créateurs/Propriétaires --------\n"
 
 #: sys-utils/ipcs.c:300 sys-utils/ipcs.c:420 sys-utils/ipcs.c:519
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
 
 #: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
 #: sys-utils/ipcs.c:320 sys-utils/ipcs.c:427
@@ -8878,14 +8615,12 @@
 
 #: sys-utils/ipcs.c:305
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
-msgstr ""
-"------ Heures d'attachement/détachement/modification de mémoire partagée "
-"--------\n"
+msgstr "------ Mémoire partagé Attachement/Détachement/Changement Temps --------\n"
 
 #: sys-utils/ipcs.c:306
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-20s %-20s %-20s\n"
-msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
+msgstr "%-10s %-10s %-20s %-20s %-20s\n"
 
 #: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
 #: sys-utils/ipcs.c:427 sys-utils/ipcs.c:436 sys-utils/ipcs.c:526
@@ -8903,16 +8638,16 @@
 
 #: sys-utils/ipcs.c:308
 msgid "changed"
-msgstr "changé"
+msgstr "modifié"
 
 #: sys-utils/ipcs.c:312
 msgid "------ Shared Memory Creator/Last-op --------\n"
-msgstr "------ Créateur/Dernier opérateur en mémoire partagée --------\n"
+msgstr "------ Mémoire partagé Créateur/Dernière-opération --------\n"
 
 #: sys-utils/ipcs.c:313 sys-utils/ipcs.c:531
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s %-10s %-10s %-10s\n"
 
 #: sys-utils/ipcs.c:314
 msgid "cpid"
@@ -8924,16 +8659,16 @@
 
 #: sys-utils/ipcs.c:318
 msgid "------ Shared Memory Segments --------\n"
-msgstr "------ Segments de mémoire partagée --------\n"
+msgstr "------ Segment de mémoire partagé --------\n"
 
 #: sys-utils/ipcs.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
 
 #: sys-utils/ipcs.c:320 sys-utils/ipcs.c:436 sys-utils/ipcs.c:538
 msgid "key"
-msgstr "touche"
+msgstr "clé"
 
 #: sys-utils/ipcs.c:320
 msgid "bytes"
@@ -8945,7 +8680,7 @@
 
 #: sys-utils/ipcs.c:321
 msgid "status"
-msgstr "statut"
+msgstr "états"
 
 #: 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
@@ -8953,7 +8688,7 @@
 #: 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 "Non défini"
+msgstr "Non initialisé"
 
 #: sys-utils/ipcs.c:374
 msgid "dest"
@@ -8965,7 +8700,7 @@
 
 #: sys-utils/ipcs.c:395
 msgid "kernel not configured for semaphores\n"
-msgstr "Kernel non configuré pour les sémaphores\n"
+msgstr "kernel n'est pas configuré pour traiter les sémaphores\n"
 
 #: sys-utils/ipcs.c:401
 msgid "------ Semaphore Limits --------\n"
@@ -8974,45 +8709,45 @@
 #: sys-utils/ipcs.c:405
 #, c-format
 msgid "max number of arrays = %d\n"
-msgstr "Nombre max de tables = %d\n"
+msgstr "nombre max de tableaux = %d\n"
 
 #: sys-utils/ipcs.c:406
 #, c-format
 msgid "max semaphores per array = %d\n"
-msgstr "Sémaphores max par table = %d\n"
+msgstr "nombre max de sémaphores par tableau = %d\n"
 
 #: sys-utils/ipcs.c:407
 #, c-format
 msgid "max semaphores system wide = %d\n"
-msgstr "Nombre max de sémaphores dans le système = %d\n"
+msgstr "nombre max de sémaphores système = %d\n"
 
 #: sys-utils/ipcs.c:408
 #, c-format
 msgid "max ops per semop call = %d\n"
-msgstr "Opérateurs max par appel semop = %d\n"
+msgstr "nombre max d'ops par appel semop = %d\n"
 
 #: sys-utils/ipcs.c:409
 #, c-format
 msgid "semaphore max value = %d\n"
-msgstr "Valeur max de sémaphores = %d\n"
+msgstr "valeur max de sémaphore = %d\n"
 
 #: sys-utils/ipcs.c:413
 msgid "------ Semaphore Status --------\n"
-msgstr "------ Statut des sémaphores --------\n"
+msgstr "------ États des sémaphores --------\n"
 
 #: sys-utils/ipcs.c:414
 #, c-format
 msgid "used arrays = %d\n"
-msgstr "Tables utilisées = %d\n"
+msgstr "tableaux utilisés = %d\n"
 
 #: sys-utils/ipcs.c:415
 #, c-format
 msgid "allocated semaphores = %d\n"
-msgstr "Sémaphores alloués = %d\n"
+msgstr "sémaphores alloués = %d\n"
 
 #: sys-utils/ipcs.c:419
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
-msgstr "------ Créateurs/Propriétaires de tables de sémaphores --------\n"
+msgstr "------ Tableaux des sémaphores Créateurs/Propriétaires --------\n"
 
 #: sys-utils/ipcs.c:421 sys-utils/ipcs.c:436
 msgid "semid"
@@ -9020,81 +8755,79 @@
 
 #: sys-utils/ipcs.c:425
 msgid "------ Shared Memory Operation/Change Times --------\n"
-msgstr "------ Heures d'opération/modification en mémoire partagée --------\n"
+msgstr "------ Mémoire partagé Opération/Changement Temps --------\n"
 
 #: sys-utils/ipcs.c:426
-#, fuzzy, c-format
+#, c-format
 msgid "%-8s %-10s %-26.24s %-26.24s\n"
-msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
+msgstr "%-8s %-10s %-26.24s %-26.24s\n"
 
 #: sys-utils/ipcs.c:427
 msgid "last-op"
-msgstr "Dernier opérateur"
+msgstr "last-op"
 
 #: sys-utils/ipcs.c:427
 msgid "last-changed"
-msgstr "Dernière modification"
+msgstr "last-changed"
 
 #: sys-utils/ipcs.c:434
 msgid "------ Semaphore Arrays --------\n"
-msgstr "------ Tables de sémaphores --------\n"
+msgstr "------ Tableaux de sémaphores --------\n"
 
 #: sys-utils/ipcs.c:435 sys-utils/ipcs.c:678
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
 
 #: sys-utils/ipcs.c:437
 msgid "nsems"
 msgstr "nsems"
 
 #: sys-utils/ipcs.c:496
-#, fuzzy
 msgid "kernel not configured for message queues\n"
-msgstr "Kernel non configuré pour les sémaphores\n"
+msgstr "kernel n'est pas configuré pour traiter les queues de messages\n"
 
 #: sys-utils/ipcs.c:504
 msgid "------ Messages: Limits --------\n"
-msgstr "------ Messages : Limites --------\n"
+msgstr "------ Messages: lmites --------\n"
 
 #: sys-utils/ipcs.c:505
 #, c-format
 msgid "max queues system wide = %d\n"
-msgstr "Files d'attente max dans le système = %d\n"
+msgstr "nombre max de queues système = %d\n"
 
 #: sys-utils/ipcs.c:506
 #, c-format
 msgid "max size of message (bytes) = %d\n"
-msgstr "Taille de message max (octets) = %d\n"
+msgstr "taille max des messages (octets) = %d\n"
 
 #: sys-utils/ipcs.c:507
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
-msgstr "Taille de la file max par défaut (octets) = %d\n"
+msgstr "taille max par défaut des queues (octets) = %d\n"
 
 #: sys-utils/ipcs.c:511
 msgid "------ Messages: Status --------\n"
-msgstr "------ Messages : Statut --------\n"
+msgstr "------ Messages: états --------\n"
 
 #: sys-utils/ipcs.c:512
 #, c-format
 msgid "allocated queues = %d\n"
-msgstr "Files d'attente allouées = %d\n"
+msgstr "queues allouées = %d\n"
 
 #: sys-utils/ipcs.c:513
 #, c-format
 msgid "used headers = %d\n"
-msgstr "En-têtes utilisés = %d\n"
+msgstr "en-têtes utilisées = %d\n"
 
 #: sys-utils/ipcs.c:514
 #, c-format
 msgid "used space = %d bytes\n"
-msgstr "Espace utilisé = %d octets\n"
+msgstr "espace utilisé = %d octets\n"
 
 #: sys-utils/ipcs.c:518
 msgid "------ Message Queues: Creators/Owners --------\n"
-msgstr ""
-"------ Files d'attente de messages : Créateurs/Propriétaires --------\n"
+msgstr "------ Queues de messages: Créateurs/Propriétaires --------\n"
 
 #: sys-utils/ipcs.c:520 sys-utils/ipcs.c:526 sys-utils/ipcs.c:532
 #: sys-utils/ipcs.c:538
@@ -9103,30 +8836,28 @@
 
 #: sys-utils/ipcs.c:524
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
-msgstr ""
-"------ Heures d'envoi/réception/modification des files d'attente de messages "
-"--------\n"
+msgstr "------ Queues de messages Transmis/Reçus/Changés Temps --------\n"
 
 #: sys-utils/ipcs.c:525
-#, fuzzy, c-format
+#, c-format
 msgid "%-8s %-10s %-20s %-20s %-20s\n"
-msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
+msgstr "%-8s %-10s %-20s %-20s %-20s\n"
 
 #: sys-utils/ipcs.c:526
 msgid "send"
-msgstr "envoi"
+msgstr "transmis"
 
 #: sys-utils/ipcs.c:526
 msgid "recv"
-msgstr "réception"
+msgstr "reçus"
 
 #: sys-utils/ipcs.c:526
 msgid "change"
-msgstr "modification"
+msgstr "changés"
 
 #: sys-utils/ipcs.c:530
 msgid "------ Message Queues PIDs --------\n"
-msgstr "------ PID de files d'attente de messages --------\n"
+msgstr "------ PID des queues de messages --------\n"
 
 #: sys-utils/ipcs.c:532
 msgid "lspid"
@@ -9138,16 +8869,16 @@
 
 #: sys-utils/ipcs.c:536
 msgid "------ Message Queues --------\n"
-msgstr "------ Files d'attente de messages --------\n"
+msgstr "------ Queues de messages --------\n"
 
 #: sys-utils/ipcs.c:537
-#, fuzzy, c-format
+#, c-format
 msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
 
 #: sys-utils/ipcs.c:539
 msgid "used-bytes"
-msgstr "octets utilisés"
+msgstr "octets-utilisés"
 
 #: sys-utils/ipcs.c:539
 msgid "messages"
@@ -9160,7 +8891,7 @@
 "Shared memory Segment shmid=%d\n"
 msgstr ""
 "\n"
-"shmid de segments de mémoire partagée =%d\n"
+"Mémoire partagée segment shmid=%d\n"
 
 #: sys-utils/ipcs.c:608
 #, c-format
@@ -9173,24 +8904,24 @@
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr "octets=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
+msgstr "octets=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:615
-#, fuzzy, c-format
+#, c-format
 msgid "att_time=%-26.24s\n"
-msgstr "att_time=%s"
+msgstr "att_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:617
-#, fuzzy, c-format
+#, c-format
 msgid "det_time=%-26.24s\n"
-msgstr "det_time=%s"
+msgstr "det_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:619 sys-utils/ipcs.c:650
-#, fuzzy, c-format
+#, c-format
 msgid "change_time=%-26.24s\n"
-msgstr "change_time=%s"
+msgstr "change_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:634
 #, c-format
@@ -9199,7 +8930,7 @@
 "Message Queue msqid=%d\n"
 msgstr ""
 "\n"
-"msqid de file de messages=%d\n"
+"Queue de messages msqid=%d\n"
 
 #: sys-utils/ipcs.c:635
 #, c-format
@@ -9207,19 +8938,19 @@
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:637
-#, fuzzy, c-format
+#, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
-msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
+msgstr "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 
 #: sys-utils/ipcs.c:646
-#, fuzzy, c-format
+#, c-format
 msgid "send_time=%-26.24s\n"
-msgstr "det_time=%s"
+msgstr "send_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:648
 #, c-format
 msgid "rcv_time=%-26.24s\n"
-msgstr ""
+msgstr "rcv_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:668
 #, c-format
@@ -9228,7 +8959,7 @@
 "Semaphore Array semid=%d\n"
 msgstr ""
 "\n"
-"semid de table de sémaphores=%d\n"
+"Tableaux de sémaphores semid=%d\n"
 
 #: sys-utils/ipcs.c:669
 #, c-format
@@ -9241,19 +8972,19 @@
 msgstr "mode=%#o, access_perms=%#o\n"
 
 #: sys-utils/ipcs.c:673
-#, fuzzy, c-format
+#, c-format
 msgid "nsems = %ld\n"
-msgstr "nsems = %d\n"
+msgstr "nsems = %ld\n"
 
 #: sys-utils/ipcs.c:674
-#, fuzzy, c-format
+#, c-format
 msgid "otime = %-26.24s\n"
-msgstr "otime = %s"
+msgstr "otime = %-26.24s\n"
 
 #: sys-utils/ipcs.c:676
-#, fuzzy, c-format
+#, c-format
 msgid "ctime = %-26.24s\n"
-msgstr "ctime = %s"
+msgstr "ctime = %-26.24s\n"
 
 #: sys-utils/ipcs.c:679
 msgid "semnum"
@@ -9276,74 +9007,68 @@
 msgstr "pid"
 
 #: sys-utils/rdev.c:69
-#, fuzzy
 msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"Usage : rdev [ -rsv ] [ -o DECALAGE ] [ IMAGE [ VALEUR [ DECALAGE ] ] ]"
+msgstr "usage: rdev [ -rv ] [ -o DÉCALAGE ] [ IMAGE [ VALEUR [ DÉCALAGE ] ] ]"
 
 #: sys-utils/rdev.c:70
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (ou rdev /linux, etc.) Affiche le périphérique ROOT en cours"
+msgid "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgstr "  rdev /dev/fd0  (ou rdev /linux, etc.) afficher les périphériques ROOT courants"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         Définit ROOT sur /dev/hda2"
+msgstr "  rdev /dev/fd0 /dev/hda2         initialiser 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              Définit les INDICATEURSROOT (statut "
-"lecture seule)"
+msgstr "  rdev -R /dev/fd0 1              initialiser les ROOTFLAGS (état en mode lecture seulement)"
 
 #: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            Définit la taille du disque RAM"
+msgstr "  rdev -r /dev/fd0 627            initialiser la taille du RAMDISK"
 
 #: sys-utils/rdev.c:74
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              Définit l'amorçage en MODE VIDEO"
+msgstr "  rdev -v /dev/fd0 1              initialiser le MODEVIDEO d'amorçage"
 
 #: sys-utils/rdev.c:75
 msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   Utilise le décalage d'octet N"
+msgstr "  rdev -o N ...                   utiliser une décalage de N octets"
 
 #: sys-utils/rdev.c:76
 msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   Identique à rdev -R"
+msgstr "  rootflags ...                   identique à rdev -R"
 
 #: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     Identique à rdev -r"
+msgstr "  ramsize ...                     identique à rdev -r"
 
 #: sys-utils/rdev.c:78
 msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     Identique à rdev -v"
+msgstr "  vidmode ...                     identique à rdev -v"
 
 #: sys-utils/rdev.c:79
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Remarque : les modes vidéo sont : -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
-"2=key2,..."
+msgid "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgstr "Note: modes vidéos sont: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"      Utilisez -R 1 pour monter root en lecture seule, -R 0 pour lecture/"
-"écriture."
+msgstr "      utiliser -R 1 pour monter root en mode lecture seulement, -R 0 en mode lecture-écriture."
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
-msgstr ""
+msgstr "virgule manquante"
 
-#: sys-utils/readprofile.c:60
-#, fuzzy, c-format
+#: sys-utils/readprofile.c:67
+msgid "out of memory"
+msgstr "mémoire épuisée"
+
+#: sys-utils/readprofile.c:113
+#, 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"
@@ -9353,66 +9078,61 @@
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
-"%s : Usage : \"%s [options]\n"
-"\t -m <fichier-mappe>  (par défaut = \"%s\")\n"
-"\t -p <fichier-pro> (par défaut = \"%s\")\n"
-"\t -i            Affiche seulement ce qui concerne la phase de prélèvement "
-"(sampling)\n"
-"\t -v            Affiche des données détaillées\n"
-"\t -a            Affiche tous les symboles, même si le total est 0\n"
-"\t -r            Remet tous les compteurs à zéro (root uniquement)\n"
-"\t -V            Affiche le numéro de version et quitte le programme\n"
+"%s: Usage: \"%s [options]\n"
+"\t -m <fichier-map>     (par défaut = « %s »)\n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <fichier-profile> (par défaut = « %s »)\n"
+"\t -M <MULTIPLICATEUR>  initialiser le MULTIPLICATEUR de profilage\n"
+"\t -i                   afficher seulement les informations à propos du cycle d'échantillonnage\n"
+"\t -v                   afficher en mode bavard les données\n"
+"\t -a                   afficher tous les symboles, même si le compte est à 0\n"
+"\t -b                   afficher les compteurs de chaque intervalles de l'histogramme\n"
+"\t -r                   réinitaliser tous les compteurs (root seulement)\n"
+"\t -n                   désactiver l'auto-détection de l'ordonnancement des octets\n"
+"\t -V                   afficher la version et quitter\n"
 
-#: sys-utils/readprofile.c:84
-#, fuzzy
-msgid "out of memory"
-msgstr "A court de mémoire ?\n"
-
-#: sys-utils/readprofile.c:147
+#: sys-utils/readprofile.c:186
 #, c-format
-msgid "%s Version %s\n"
+msgid "%s version %s\n"
 msgstr "%s Version %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:272
 #, c-format
 msgid "Sampling_step: %i\n"
-msgstr "Phase_prélèv : %i\n"
+msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:293 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
-msgstr "%s: %s(%i) : ligne de mappe incorrecte\n"
+msgstr "%s: %s(%i): ligne de map erronée\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:305
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
-msgstr "%s : impossible de trouver \"_stext\" dans %s\n"
+msgstr "%s: ne peut repérer « _stext » dans %s\n"
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:331
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
-msgstr ""
+msgstr "%s: adresse de profile hors gammes. Mauvais fichier map?\n"
 
-#: sys-utils/readprofile.c:323
+#: sys-utils/readprofile.c:372
 msgid "total"
 msgstr "total"
 
 #: sys-utils/renice.c:68
-msgid ""
-"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
-msgstr ""
-"usage : priorité renice[ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
-"utilisateurs ]\n"
+msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr "usage: renice priorité [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] usagers ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
 msgid "renice: %s: unknown user\n"
-msgstr "renice : %s : utilisateur inconnu\n"
+msgstr "renice: %s: usager inconnu\n"
 
 #: sys-utils/renice.c:105
 #, c-format
 msgid "renice: %s: bad value\n"
-msgstr "renice : %s : mauvaise valeur\n"
+msgstr "renice: %s: valeur erronée\n"
 
 #: sys-utils/renice.c:123 sys-utils/renice.c:135
 msgid "getpriority"
@@ -9425,12 +9145,12 @@
 #: sys-utils/renice.c:139
 #, c-format
 msgid "%d: old priority %d, new priority %d\n"
-msgstr "%d : ancienne priorité %d, nouvelle priorité %d\n"
+msgstr "%d: priorité précédente %d, nouvelle priorité %d\n"
 
 #: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr "Usage : %s programme [arg ...]\n"
+msgstr "usage: %s program [arg ...]\n"
 
 #: sys-utils/tunelp.c:75
 #, c-format
@@ -9439,29 +9159,28 @@
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"Usage : %s <périphérique> [ -i <IRQ> | -t <TEMPS> | -c <CARS> | -w <ATTENTE> "
-"| \n"
+"Usage: %s <périphérique> [ -i <IRQ> | -t <TEMPS> | -c <CARACTÈRES> | -w <ATTENTE | \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 "Erreur de malloc"
+msgstr "erreur malloc()"
 
 #: sys-utils/tunelp.c:103
 #, c-format
 msgid "%s: bad value\n"
-msgstr "%s : mauvaise valeur\n"
+msgstr "%s: valeur erronée\n"
 
 #: sys-utils/tunelp.c:242
 #, c-format
 msgid "%s: %s not an lp device.\n"
-msgstr "%s : %s n'est pas un périphérique lp.\n"
+msgstr "%s: %s n'est pas un périphérique d'impression lp.\n"
 
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
-msgstr "Le statut de %s est %d."
+msgstr "%s état est %d"
 
 #: sys-utils/tunelp.c:264
 msgid ", busy"
@@ -9473,11 +9192,11 @@
 
 #: sys-utils/tunelp.c:266
 msgid ", out of paper"
-msgstr ", plus de papier"
+msgstr ", manque de papier"
 
 #: sys-utils/tunelp.c:267
 msgid ", on-line"
-msgstr ", en ligne"
+msgstr ", en-ligne"
 
 #: sys-utils/tunelp.c:268
 msgid ", error"
@@ -9490,43 +9209,43 @@
 #: sys-utils/tunelp.c:291
 #, c-format
 msgid "%s using IRQ %d\n"
-msgstr "%s utilise l'IRQ %d.\n"
+msgstr "%s utilise IRQ %d\n"
 
 #: sys-utils/tunelp.c:293
 #, c-format
 msgid "%s using polling\n"
-msgstr "%s utilise la vérification\n"
+msgstr "%s utilisant la scrutation\n"
 
 #: text-utils/col.c:153
 #, c-format
 msgid "col: bad -l argument %s.\n"
-msgstr "col : mauvais argument pour -l %s.\n"
+msgstr "col: argument erroné pour -l %s.\n"
 
 #: text-utils/col.c:535
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr "Usage : col [-bfpx] [-l nline]\n"
+msgstr "usage: col [-bfpx] [-l n-lignes]\n"
 
 #: text-utils/col.c:541
 msgid "col: write error.\n"
-msgstr "col : erreur d'écriture.\n"
+msgstr "col: erreur d'écriture.\n"
 
 #: text-utils/col.c:548
 #, c-format
 msgid "col: warning: can't back up %s.\n"
-msgstr "col : avertissement : impossible de sauvegarder %s.\n"
+msgstr "col: AVERTISSEMENT: ne peut reculer %s.\n"
 
 #: text-utils/col.c:549
 msgid "past first line"
-msgstr "au delà de la première ligne"
+msgstr "passé la première ligne"
 
 #: text-utils/col.c:549
 msgid "-- line already flushed"
-msgstr "-- ligne déjà vidée sur disque"
+msgstr "-- ligne déjà éliminée"
 
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr "Usage : %s [ - ] [ -2 ] [ fichier ... ]\n"
+msgstr "usage: %s [ - ] [ -2 ] [ fichier ... ]\n"
 
 #: text-utils/column.c:297
 msgid "line too long"
@@ -9534,28 +9253,24 @@
 
 #: text-utils/column.c:374
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr "Usage : column [-tx] [-c colonnes] [fichier ...]\n"
+msgstr "usage: column [-tx] [-c colonnes] [fichier ...]\n"
 
 #: text-utils/hexsyntax.c:82
 msgid "hexdump: bad length value.\n"
-msgstr "hexdump : mauvaise valeur pour la longueur.\n"
+msgstr "hexdump: valeur de longueur erronée.\n"
 
 #: text-utils/hexsyntax.c:93
 msgid "hexdump: bad skip value.\n"
-msgstr "hexdump : mauvaise valeur de saut.\n"
+msgstr "hexdump: valeur de saut erronée.\n"
 
 #: text-utils/hexsyntax.c:131
-#, fuzzy
-msgid ""
-"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-msgstr ""
-"hexdump : [-bcdovx] [-e fmt] [-f fichier_fmt] [-n longueur] [-s saut] "
-"[fichier ...]\n"
+msgid "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr "hexdump: [-bcCdovx] [-e format] [-f fichier-format] [-n longueur] [-s saut] [fichier ...]\n"
 
 #: text-utils/more.c:263
-#, fuzzy, c-format
+#, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr "Usage : %s [-dfln] [+lignenum | +/motif] nom1 nom2 ...\n"
+msgstr "usage: %s [-dflpcsu] [+no-de-ligne | +/patron] nom1 nom2 ...\n"
 
 #: text-utils/more.c:521
 #, c-format
@@ -9565,7 +9280,7 @@
 "\n"
 msgstr ""
 "\n"
-"*** %s : répertoire ***\n"
+"*** %s: répertoire ***\n"
 "\n"
 
 #. simple ELF detection
@@ -9577,45 +9292,43 @@
 "\n"
 msgstr ""
 "\n"
-"******** %s : Pas un fichier texte ********\n"
+"******** %s: N'est pas un fichier texte ********\n"
 "\n"
 
 #: text-utils/more.c:667
 msgid "[Use q or Q to quit]"
-msgstr "[Utilisez q ou Q pour quitter]"
+msgstr "[Utiliser q ou Q pour quitter]"
 
 #: text-utils/more.c:847
 msgid "--More--"
-msgstr "--Encore--"
+msgstr "--Plus--"
 
 #: text-utils/more.c:849
 #, c-format
 msgid "(Next file: %s)"
-msgstr "(Fichier suivant : %s)"
+msgstr "(Prochain fichier: %s)"
 
 #: text-utils/more.c:855
 msgid "[Press space to continue, 'q' to quit.]"
-msgstr "[Appuyez sur espace pour continuer, sur 'q' pour quitter.]"
+msgstr "[Appuyer sur la barre d'espacement pour continuer, « q » pour quitter.]"
 
 #: text-utils/more.c:1269
-#, fuzzy, c-format
+#, c-format
 msgid "...back %d pages"
-msgstr "...retour à la page %d"
+msgstr "...reculé de %d pages"
 
 #: text-utils/more.c:1271
-#, fuzzy
 msgid "...back 1 page"
-msgstr "...retour à la page %d"
+msgstr "...reculé de 1 page"
 
 #: text-utils/more.c:1313
-#, fuzzy
 msgid "...skipping one line"
-msgstr "...saut de la ligne %d"
+msgstr "...escamotage d'une ligne"
 
 #: text-utils/more.c:1315
-#, fuzzy, c-format
+#, c-format
 msgid "...skipping %d lines"
-msgstr "...saut de la ligne %d"
+msgstr "...escamotage de %d ligne(s)"
 
 #: text-utils/more.c:1352
 msgid ""
@@ -9630,286 +9343,294 @@
 #: text-utils/more.c:1390
 msgid ""
 "\n"
-"Most commands optionally preceded by integer argument k.  Defaults in "
-"brackets.\n"
+"Most commands optionally preceded by integer argument k.  Defaults in brackets.\n"
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
+"\n"
+"La plupart des commandes précédées optionnellement par un argument entier k. Par défaut entre crochets.\n"
+"L'étoile \"*\" indique que l'arguement devient le nouveau défaut.\n"
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1397
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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>                  afficher les prochaines N lignes de texte\n"
+"                                [taille courante d'écran]\n"
+"z                        afficher les prochaines N lignes de texte\n"
+"                                [taille courante d'écran]*\n"
+"<return>                 afficher les prochaines N lignes de texte[1]*\n"
+"d uo ctrl-D              défiler N lignes [taille courante de défilement, initiallement 11]*\n"
+"q ou Q ou <interrupt>    quitter more\n"
+"s                        escamoter vers l'avant N lignes de texte [1]\n"
+"f                        escamoter vers l'avant N écrans pleins de texte [1]\n"
+"b ou ctrl-B              escamoter vers l'arrière N écrans pleins de texte [1]\n"
+"'                        aller à l'endroit où la recherche précédente a débuté\n"
+"=                        afficher le numéro de la ligne courante\n"
+"/<expression régulière>    chercher la Nième occurence de l'expression régulière [1]\n"
+"n                        chercher la Nième occurence de la dernière expression régulière [1]\n"
+"!<cmd> ou :!<cmd>        exécuter la « cmd » dans un sous-shell\n"
+"v                        lancer /usr/bin/vi à la ligne courante\n"
+"ctrl-L                   réafficher l'écrans\n"
+":n                       aller au Nième prochain fichier [1]\n"
+":p                       aller au Nième fichier précédant [1]\n"
+":f                       afficher le nom du fichier courantet le numéro de ligne\n"
+".                        répéter la commande précédente\n"
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1444 text-utils/more.c:1449
 msgid "[Press 'h' for instructions.]"
-msgstr "[Appuyez sur 'h' pour l'aide.]"
+msgstr "[Appuyer « h » pour obtenir les instructions.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1483
 #, c-format
 msgid "\"%s\" line %d"
-msgstr "\"%s\" ligne %d"
+msgstr "« %s » ligne %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1485
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Pas un fichier] ligne %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1569
 msgid "  Overflow\n"
-msgstr "  Dépassement\n"
+msgstr "  Débordement\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1616
 msgid "...skipping\n"
-msgstr "...saut\n"
+msgstr "...escamotage\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1646
 msgid "Regular expression botch"
-msgstr "expression régulière botch"
+msgstr "Expression régulière bâclée"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1658
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 "\n"
-"Motif introuvable\n"
+"Patron non repéré\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1661 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
-msgstr "Motif introuvable"
+msgstr "Patron non repéré"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1722
 msgid "can't fork\n"
-msgstr "Fork impossible\n"
+msgstr "ne peut établir un relais fork()\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1761
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 "\n"
-"...Saut "
+"...Escamotage en cours "
 
-#: text-utils/more.c:1767
-#, fuzzy
+#: text-utils/more.c:1766
 msgid "...Skipping to file "
-msgstr "...Saut "
+msgstr "...Escamotage vers le fichier "
 
-#: text-utils/more.c:1769
-#, fuzzy
+#: text-utils/more.c:1768
 msgid "...Skipping back to file "
-msgstr "retour au fichier "
+msgstr "...Escamotage arrière vers le fichier "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2048
 msgid "Line too long"
 msgstr "Ligne trop longue"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2091
 msgid "No previous command to substitute for"
-msgstr "Aucune commande antérieure à substituer"
+msgstr "Aucune commande précédente pour subsitution"
 
 #: text-utils/odsyntax.c:130
 msgid "od: od(1) has been deprecated for hexdump(1).\n"
-msgstr "od : od(1) a été rétrogradé pour hexdump(1).\n"
+msgstr "od: od(1) a été déprécié par hexdump(1).\n"
 
 #: text-utils/odsyntax.c:133
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr ""
-"od : la compatibilité avec hexdump(1) ne prend pas en charge le -%c option%"
-"s\n"
+msgstr "od: la compatibilité de hexdump(1)ne supporte pas l'option -%c %s\n"
 
 #: text-utils/odsyntax.c:134
 msgid "; see strings(1)."
-msgstr "; voir strings(1)."
+msgstr "; consulter strings(1)."
 
 #: text-utils/parse.c:63
 #, c-format
 msgid "hexdump: can't read %s.\n"
-msgstr "hexdump : impossible de lire %s.\n"
+msgstr "hexdump: ne peut lire %s.\n"
 
 #: text-utils/parse.c:68
 msgid "hexdump: line too long.\n"
-msgstr "hexdump : ligne trop longue.\n"
+msgstr "hexdump: ligne trop longue.\n"
 
 #: text-utils/parse.c:401
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr "hexdump: nombre d'octets incorrect pour la conversion de caractère.\n"
+msgstr "hexdump: compte d'octets erroné pour la conversion de multiples caractères.\n"
 
 #: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
-msgstr ""
-"hexdump : nombre d'octets incorrect pour la conversion de caractère %s.\n"
+msgstr "hexdump: compte d'octets erroné pour la conversion de caractères %s.\n"
 
 #: text-utils/parse.c:490
 #, c-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
-msgstr "hexdump : %%s requiert une précision ou un nombre d'octets.\n"
+msgstr "hexdump: %%s requiert une précision ou un compte d'octets.\n"
 
 #: text-utils/parse.c:496
 #, c-format
 msgid "hexdump: bad format {%s}\n"
-msgstr "hexdump : format incorrect {%s}\n"
+msgstr "hexdumpo: format erroné {%s}\n"
 
 #: text-utils/parse.c:502
 #, c-format
 msgid "hexdump: bad conversion character %%%s.\n"
-msgstr "hexdump : caractère de conversion incorrect %%%s.\n"
+msgstr "hexdump: conversion erronée de caractères %%%s.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
-msgid ""
-"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
-msgstr ""
+msgid "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr "%s: Usage: %s [-numéro] [-p chaîne] [-cefnrs] [+ligne] [+/patron/] [fichiers]\n"
 
-#: text-utils/pg.c:262
-#, fuzzy, c-format
+#: text-utils/pg.c:266
+#, c-format
 msgid "%s: option requires an argument -- %s\n"
-msgstr "l'option `%s' requiert un argument\n"
+msgstr "%s: l'option requiert un argument -- %s\n"
 
-#: text-utils/pg.c:270
-#, fuzzy, c-format
+#: text-utils/pg.c:274
+#, c-format
 msgid "%s: illegal option -- %s\n"
-msgstr "Touche non valide"
+msgstr "%s: option illégale -- %s\n"
 
-#: text-utils/pg.c:387
-#, fuzzy
+#: text-utils/pg.c:391
 msgid "...skipping forward\n"
-msgstr "...saut\n"
+msgstr "...escamotage avant\n"
 
-#: text-utils/pg.c:389
-#, fuzzy
+#: text-utils/pg.c:393
 msgid "...skipping backward\n"
-msgstr "...saut\n"
-
-#: text-utils/pg.c:411
-#, fuzzy
-msgid "No next file"
-msgstr "(Fichier suivant : %s)"
+msgstr "...escamotage arrière\n"
 
 #: text-utils/pg.c:415
-#, fuzzy
-msgid "No previous file"
-msgstr "Aucune partition définie\n"
+msgid "No next file"
+msgstr "Pas de prochain fichier"
 
-#: text-utils/pg.c:945
-#, fuzzy, c-format
+#: text-utils/pg.c:419
+msgid "No previous file"
+msgstr "Pas de fichier précédent"
+
+#: text-utils/pg.c:949
+#, c-format
 msgid "%s: Read error from %s file\n"
-msgstr "Erreur d'écriture sur %s\n"
+msgstr "%s: erreur de lecture à partir du fichier %s\n"
 
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
-msgstr ""
+msgstr "%s: EOF inattendue dans le fichier %s\n"
 
-#: text-utils/pg.c:954
-#, fuzzy, c-format
+#: text-utils/pg.c:958
+#, c-format
 msgid "%s: Unknown error in %s file\n"
-msgstr "Erreur d'écriture sur %s\n"
+msgstr "%s: erreur inconnue dans le fichier %s\n"
 
-#: text-utils/pg.c:1049
-#, fuzzy, c-format
+#: text-utils/pg.c:1053
+#, c-format
 msgid "%s: Cannot create tempfile\n"
-msgstr "%s : lecture du fichier temporaire impossible.\n"
+msgstr "%s: ne peut créer le fichier temporaire\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
-#, fuzzy
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 msgid "RE error: "
-msgstr ", erreur"
+msgstr "erreur RE: "
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
-msgstr ""
+msgstr "(EOF)"
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
-msgstr ""
+msgstr "Pas de chaîne de recherche mémorisée"
 
-#: text-utils/pg.c:1324
-#, fuzzy
+#: text-utils/pg.c:1328
 msgid "Cannot open "
-msgstr "Impossible d'ouvrir %s\n"
+msgstr "Ne peut ouvrir"
 
-#: text-utils/pg.c:1372
-#, fuzzy
+#: text-utils/pg.c:1376
 msgid "saved"
-msgstr "envoi"
+msgstr "sauvegarder"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
-msgstr ""
+msgstr ": !commande non autoirisée en mode rflag.\n"
 
-#: text-utils/pg.c:1511
-#, fuzzy
+#: text-utils/pg.c:1515
 msgid "fork() failed, try again later\n"
-msgstr "Mot de passe *NON* changé. Essayez de nouveau plus tard.\n"
+msgstr "échec du fork(), essayer à nouveau plus tard.\n"
 
-#: text-utils/pg.c:1716
-#, fuzzy
+#: text-utils/pg.c:1720
 msgid "(Next file: "
-msgstr "(Fichier suivant : %s)"
+msgstr "(Prochain fichier: "
 
 #: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
-msgstr "Impossible d'allouer de l'espace pour le tampon\n"
+msgstr "Incapable d'allouer des tampons\n"
 
 #: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
-msgstr "Usage : rev [fichier ...]\n"
+msgstr "usage: rev [fichier ...]\n"
 
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr "Usage : %s [ -i ] [ -tTerm ] fichier...\n"
+msgstr "usage: %s [ -i ] [ -tTerm ] fichier...\n"
 
 #: text-utils/ul.c:152
 msgid "trouble reading terminfo"
-msgstr "Problème lors de la lecture de terminfo"
+msgstr "problème lors de la lecture de terminfo"
 
 #: text-utils/ul.c:242
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
-msgstr "Séquence d'échappement inconnue en entrée : %o, %o\n"
+msgstr "Séquence d'échappement inconnue dans l'entrée: %o, %o\n"
 
 #: text-utils/ul.c:425
 msgid "Unable to allocate buffer.\n"
-msgstr "Impossible d'allouer le tampon.\n"
+msgstr "Incapable d'allouer un tampon.\n"
 
 #: text-utils/ul.c:586
 msgid "Input line too long.\n"
-msgstr "Ligne en entrée trop longue.\n"
+msgstr "Ligne d'entrée trop longue.\n"
 
 #: text-utils/ul.c:599
 msgid "Out of memory when growing buffer.\n"
-msgstr "Mémoire insuffisante pour accroître le tampon.\n"
+msgstr "Mémoire épuisée lors de l'accroissement du tampon.\n"
 
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
-#~ msgstr "La partition %i ne se termine pas à la limite du cylindre :\n"
+#~ msgstr "Partition %i ne se termine pas sur une frontière de cylindre:\n"
 
 #~ msgid "Can't open help file"
-#~ msgstr "Impossible d'ouvrir le fichier d'aide"
+#~ msgstr "Ne peut ouvrir le fichier d'aide"
 
 #~ msgid ""
 #~ "\n"
@@ -9918,286 +9639,85 @@
 #~ "\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Disque %s : %d têtes, %d secteurs, %d cylindres\n"
-#~ "Unités = %s sur %d * %d octets\n"
+#~ "Disque %s: %d têtes, %d secteurs, %d cylindres\n"
+#~ "Unités = %s de %d * %d octets\n"
 #~ "\n"
 
 #~ msgid "invalid number `%s'\n"
-#~ msgstr "nombre invalide `%s'\n"
+#~ msgstr "nombre invalide « %s »\n"
 
 #~ msgid "number `%s' to `%s' out of range\n"
-#~ msgstr "nombre de `%s' à `%s' hors plage\n"
+#~ msgstr "numbre « %s » à « %s » est hors gamme\n"
 
 #~ msgid "unrecognized option `%s'\n"
-#~ msgstr "option non reconnue `%s'\n"
-
-#~ msgid "option `%s' requires an argument\n"
-#~ msgstr "l'option `%s' requiert un argument\n"
+#~ msgstr "option non reconnune « %s »\n"
 
 #~ msgid "option `%s' doesn't allow an argument\n"
-#~ msgstr "l'option `%s' n'autorise pas d'argument\n"
+#~ msgstr "l'option « %s » ne permet pas d'argument\n"
 
 #~ msgid "unrecognized option `-%c'\n"
-#~ msgstr "option non reconnue `-%c'\n"
+#~ msgstr "option non reconnue « -%c »\n"
 
-#, fuzzy
 #~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-#~ msgstr "%-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."
+#~ msgstr "umount: seul %s peut démonter %s de %s"
+
+#~ msgid "'."
+#~ msgstr "'."
+
+#~ msgid "'\n"
+#~ msgstr "'\n"
 
 #~ msgid "Block %d in file `"
 #~ msgstr "Bloc %d dans le fichier `"
 
-#, fuzzy
 #~ msgid "The directory '"
-#~ msgstr "Aucun répertoire %s !\n"
+#~ msgstr "Le répertoire '"
 
 #~ msgid "not "
-#~ msgstr "non "
-
-#~ msgid "BSD/386"
-#~ msgstr "BSD/386"
-
-#~ msgid "cannot open %s %s\n"
-#~ msgstr "Impossible d'ouvrir %s %s\n"
-
-#~ msgid "read-write"
-#~ msgstr "Lecture-écriture"
-
-#~ msgid "for reading"
-#~ msgstr "pour lecture"
-
-#~ msgid "new "
-#~ msgstr "nouveau"
-
-#~ msgid "The password must contain characters out of two of the following\n"
-#~ msgstr "Le mot de passe doit contenir des caractères de deux des classes\n"
-
-#~ msgid ""
-#~ "classes:  upper and lower case letters, digits and non alphanumeric\n"
-#~ msgstr ""
-#~ "classes : lettres minuscules et majuscules, chiffres et caractères non\n"
-
-#~ msgid "characters. See passwd(1) for more information.\n"
-#~ msgstr "alphanumériques. Voir passwd(1) pour plus d'informations.\n"
-
-#~ msgid "rebooted"
-#~ msgstr "réamorcé"
-
-#~ msgid "halted"
-#~ msgstr "interrompu"
-
-#~ msgid "current"
-#~ msgstr "en cours"
-
-#~ msgid "default"
-#~ msgstr "par défaut"
-
-#~ msgid "%s: %lu ints, %lu/%lu chars; "
-#~ msgstr "%s : %lu ints, %lu/%lu cars; "
-
-#~ msgid "fifo: %lu thresh, %lu tmout, "
-#~ msgstr "fifo : seuil %lu, tempo %lu, "
-
-#~ msgid "%lu max, %lu now\n"
-#~ msgstr "%lu max, %lu maintenant\n"
-
-#~ msgid " which you have read access.\n"
-#~ msgstr " vous avez accès en lecture.\n"
-
-#~ msgid "to file "
-#~ msgstr "vers le fichier "
-
-#~ msgid "usage: banner [-w width]\n"
-#~ msgstr "usage : bannière [-w width]\n"
-
-#~ msgid "Message: "
-#~ msgstr "Message : "
-
-#~ msgid "The character '%c' is not in my character set"
-#~ msgstr "Le caractère '%c' ne fait pas partie de mon jeu de caractères."
-
-#~ msgid "Message '%s' is OK\n"
-#~ msgstr "Le message '%s' est OK\n"
-
-#~ msgid "ioctl() to open /dev/tty1 failed"
-#~ msgstr "ioctl() pour ouvrir /dev/tty1 a échoué."
-
-#~ msgid ": bad directory: size<32"
-#~ msgstr ": mauvais répertoire: taille<32"
-
-#~ msgid "Warning: partition %d has an odd number of sectors.\n"
-#~ msgstr ""
-#~ "Avertissement : la partition %d contient un nombre impair de secteurs.\n"
+#~ msgstr "pas "
 
 #~ msgid ""
 #~ "Re-read table failed with error %d: %s.\n"
 #~ "Reboot your system to ensure the partition table is updated.\n"
 #~ msgstr ""
-#~ "La relecture de la table a échoué. Erreur  %d : %s.\n"
-#~ "Réamorcez le système pour être sûr que la table de partition a été mise à "
-#~ "jour.\n"
+#~ "Échec de la relecture de la table avec l'erreur %d: %s.\n"
+#~ "Ré-amorcer votre système pour vous assurer que la table de partitions a été mise à jour.\n"
 
-#~ msgid "SGI rxlvol"
-#~ msgstr "SGI rxlvol"
+#~ msgid "BSD/386"
+#~ msgstr "BSD/386"
 
-#~ msgid "AST Windows swapfile"
-#~ msgstr "Fichier d'échange AST Windows"
+#~ msgid "cannot open %s %s\n"
+#~ msgstr "ne peut ouvrir %s %s\n"
 
-#~ msgid "Warning: partition %s contains part of "
-#~ msgstr "Avertissement : la partition %s contient une partie de"
+#~ msgid "read-write"
+#~ msgstr "lecture-écriture"
 
-#~ msgid "the partition table (sector %lu),\n"
-#~ msgstr "la table de partition (secteur %lu),\n"
+#~ msgid "for reading"
+#~ msgstr "pour lecture"
 
-#~ msgid "and will destroy it when filled\n"
-#~ msgstr "et sera détruite une fois remplie.\n"
+#~ msgid "usage: banner [-w width]\n"
+#~ msgstr "usage: banner [-w largeur]\n"
 
-#~ msgid " (although this is not a problem under Linux)\n"
-#~ msgstr " (bien que cela ne soit pas problématique sous Linux.)\n"
+#~ msgid "Message: "
+#~ msgstr "Message: "
 
-#~ msgid "(For listing purposes only. Do not change its contents.)\n"
-#~ msgstr ""
-#~ "(Pour des besoins de listage seulement. Ne change pas le contenu.)\n"
+#~ msgid "The character '%c' is not in my character set"
+#~ msgstr "Le caractère '%c' n'est pas dans l'ensemble du jeu de caractères"
 
-#~ msgid "DOS and Linux will interpret the contents differently.\n"
-#~ msgstr "DOS et Linux interprèteront le contenu differemment.\n"
+#~ msgid "Message '%s' is OK\n"
+#~ msgstr "Message '%s' est OK\n"
 
-#~ msgid "%s: open for update: %m"
-#~ msgstr "%s : ouvert pour mise à jour : %m"
+#~ msgid "new "
+#~ msgstr "nouveau "
 
-#~ msgid "%s: no utmp entry"
-#~ msgstr "%s : aucune entrée utmp"
+#~ msgid "The password must contain characters out of two of the following\n"
+#~ msgstr "Le mot de passe doit contenir au moins 2 caractères parmi les suivants\n"
 
-#~ msgid "badlogin: %s\n"
-#~ msgstr "Connexion incorrecte : %s\n"
+#~ msgid "classes:  upper and lower case letters, digits and non alphanumeric\n"
+#~ msgstr "classes:  les lettres minuscules et majuscules, chiffres et les caractères\n"
 
-#~ msgid "sleepexit %d\n"
-#~ msgstr "sleepexit %d\n"
-
-#~ msgid "Usage: %s [ -s shell ] "
-#~ msgstr "Usage : %s [ -s shell ] "
-
-#~ msgid "       [ username ]\n"
-#~ msgstr "       [ nom-utilisateur ]\n"
-
-#~ msgid "Warning: no Kerberos tickets issued\n"
-#~ msgstr "Avertissement : aucun ticket Kerberos émis.\n"
-
-#~ msgid "Sorry -- your password has expired.\n"
-#~ msgstr "Désolé -- votre mot de passe a expiré.\n"
-
-#~ msgid "Warning: your password expires on %d %s %d.\n"
-#~ msgstr "Avertissement : votre mot de passe expire le %d %s %d.\n"
-
-#~ msgid "Sorry -- your account has expired.\n"
-#~ msgstr "Désolé --votre compte a expiré.\n"
-
-#~ msgid "Warning: your account expires on %d %s %d.\n"
-#~ msgstr "Avertissement : votre compte expire le %d %s %d.\n"
-
-#~ msgid "s"
-#~ msgstr "s"
-
-#~ msgid "snow.on"
-#~ msgstr "snow.on"
-
-#~ msgid "snow.off"
-#~ msgstr "snow.off"
-
-#~ msgid "softscroll.on"
-#~ msgstr "softscroll.on"
-
-#~ msgid "softscroll.off"
-#~ msgstr "softscroll.off"
-
-#~ msgid "mount: warning: cannot change mounted device with a remount\n"
-#~ msgstr ""
-#~ "mount : avertissement : impossible de modifier le périphérique monté par "
-#~ "un remontage\n"
-
-#~ msgid "mount: warning: cannot change filesystem type with a remount\n"
-#~ msgstr ""
-#~ "mount : avertissement : impossible de modifier le type d'un système de "
-#~ "fichiers par un remontage\n"
-
-#~ msgid "mount: %s has wrong major or minor number"
-#~ msgstr "mount : %s a un nombre majeur ou un nombre mineur incorrect."
-
-#~ msgid "not mounted anything"
-#~ msgstr "Pas de montage"
-
-#~ msgid "send_time=%srcv_time=%schange_time=%s"
-#~ msgstr "send_time=%srcv_time=%schange_time=%s"
-
-#~ msgid "Not Set\n"
-#~ msgstr "Non défini\n"
-
-#~ msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
-#~ msgstr "  rdev -s /dev/fd0 /dev/hda2      Définit le périphérique D'ECHANGE"
-
-#~ msgid "  swapdev ...                     same as rdev -s"
-#~ msgstr "  swapdev ...                     Identique à rdev -s"
-
-#~ msgid "anything\n"
-#~ msgstr "n'importe quoi\n"
-
-#~ msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
-#~ msgstr "Taux Typematic défini sur %.1f cps (délai = %d ms)\n"
-
-#~ msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
-#~ msgstr "Usage : kbdrate [-V] [-s] [-r taux] [-d délai]\n"
-
-#~ msgid "Cannot open /dev/port"
-#~ msgstr "Impossible d'ouvrir /dev/port"
-
-#~ msgid "Writing disklabel to %s%d.\n"
-#~ msgstr "Ecriture du libellé de disque dans %s%d.\n"
-
-#~ msgid "%s%d contains no disklabel.\n"
-#~ msgstr "%s%d ne contient aucun libellé de disque.\n"
-
-#~ msgid "Bootstrap installed on %s%d.\n"
-#~ msgstr "Amorce installée sur %s%d.\n"
-
-#~ msgid "%s: unknown geometry\n"
-#~ msgstr "%s : géométrie inconnue\n"
-
-#~ msgid "exec rc failed\n"
-#~ msgstr "Échec de exec rc\n"
-
-#~ msgid "fork of rc shell failed\n"
-#~ msgstr "Échec de fork du shell rc.\n"
-
-#~ msgid "Cannot get loop info"
-#~ msgstr "Impossible d'obtenir les infos loop"
-
-#~ msgid "mount: block device %s is not permitted on its filesystem"
-#~ msgstr ""
-#~ "mount : le périphérique de bloc %s n'est pas autorisé sur son système de "
-#~ "fichiers."
-
-#~ msgid ""
-#~ "Usage: mount [-hV]\n"
-#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
-#~ "       mount [-nfrsvw] [-o options] special | node\n"
-#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-#~ "       A special device can be indicated by  -L label  or  -U uuid .\n"
-#~ msgstr ""
-#~ "Usage : mount [-hV]\n"
-#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
-#~ "       mount [-nfrsvw] [-o options] special | node\n"
-#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-#~ "       Un périphérique spécial peut être indiqué par un libellé -L ou -U "
-#~ "uuid .\n"
-
-#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
-#~ msgstr "mount : échec de %s:%s. Raison donnée par le serveur : %s\n"
-
-#~ msgid "usage: %s [-shm | -msg | -sem] id\n"
-#~ msgstr "Usage : %s [-shm | -msg | -sem] id\n"
-
-#~ msgid "sscanf error"
-#~ msgstr "Erreur de sscanf"
+#~ msgid "characters. See passwd(1) for more information.\n"
+#~ msgstr "non-alphanumériques. Consulter passwd(1) pour plus d'informations.\n"
diff --git a/po/fr.po-README b/po/fr.po-README
deleted file mode 100644
index abf30d7..0000000
--- a/po/fr.po-README
+++ /dev/null
@@ -1,2 +0,0 @@
-Here you find an ancient fr.po file.
-Up-to-date translations exist, but do not allow redistribution.
diff --git a/po/it.po b/po/it.po
index dd67ebe..e92cab1 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: 2002-11-25 00:47+0100\n"
+"POT-Creation-Date: 2003-06-13 00:50+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"
@@ -148,7 +148,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -749,7 +749,7 @@
 msgid "not enough space, need at least %lu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2166
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -829,8 +829,8 @@
 msgstr ""
 " Utilizzo: mkfs [-V] [-t tipofs] [opzioni-fs] dispositivo [dimensione]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: memoria esaurita!\n"
@@ -840,7 +840,7 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "versione mkfs %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
+#: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
 "usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
@@ -858,72 +858,72 @@
 " outfile    output file\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:328
+#: 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 ""
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:507
+#: disk-utils/mkfs.cramfs.c:514
 msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
 msgstr ""
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:812
+#: 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 ""
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, fuzzy, c-format
 msgid "Including: %s\n"
 msgstr "Numero non valido: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, fuzzy, c-format
 msgid "Super block: %d bytes\n"
 msgstr "spazio utilizzato = %d byte\n"
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
@@ -932,33 +932,33 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 #, fuzzy
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "Attenzione: conteggio inode troppo grande.\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:926
+#: disk-utils/mkfs.cramfs.c:933
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -1110,8 +1110,8 @@
 msgid "too many bad pages"
 msgstr "troppe pagine danneggiate"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: 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 "Memoria esaurita"
 
@@ -1232,11 +1232,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "       %s [ -c | -y | -n ] dev\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
 msgid "Unusable"
 msgstr "Inutilizzabile"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
 msgid "Free Space"
 msgstr "Spazio disponibile"
 
@@ -1376,149 +1376,149 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu senza direzione. È predefinita quella orizzontale."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Tasto non valido"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Premere un tasto per continuare"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2512
 msgid "Primary"
 msgstr "Primaria"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Creare una nuova partizione primaria"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2512
 msgid "Logical"
 msgstr "Logica"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Creare una nuova partizione logica"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
 msgid "Cancel"
 msgstr "Annulla"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Non creare una partizione"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Errore interno !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Dimensione (in MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Inizio"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Aggiungere la partizione all'inizio dello spazio disponibile"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Fine"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Aggiungere la partizione alla fine dello spazio disponibile"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "Non c'è spazio per creare una partizione estesa"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1527
 #, fuzzy
 msgid "No partition table or unknown signature on partition table"
 msgstr "Firma danneggiata sulla tabella delle partizioni"
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1529
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1576
+#: fdisk/cfdisk.c:1581
 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:1606
+#: fdisk/cfdisk.c:1611
 msgid "Cannot open disk drive"
 msgstr "Impossibile aprire l'unità disco"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disco aperto in sola lettura - scrittura non autorizzata"
 
-#: fdisk/cfdisk.c:1629
+#: fdisk/cfdisk.c:1634
 msgid "Cannot get disk size"
 msgstr "Impossibile ottenere la dimensione del disco"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1659
 msgid "Bad primary partition"
 msgstr "Partizione primaria danneggiata"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1689
 msgid "Bad logical partition"
 msgstr "Partizione logica danneggiata"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1804
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Attenzione!!  I dati sul disco potrebbero venire eliminati!"
 
-#: fdisk/cfdisk.c:1803
+#: fdisk/cfdisk.c:1808
 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:1809
+#: fdisk/cfdisk.c:1814
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1815
 msgid "Did not write partition table to disk"
 msgstr "Scrittura tabella delle partizioni su disco non effettuata"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1817
 msgid "yes"
 msgstr "si"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1820
 msgid "Please enter `yes' or `no'"
 msgstr "Inserire `si' (senza accento) o `no'"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1824
 msgid "Writing partition table to disk..."
 msgstr "Scrittura tabella delle partizioni su disco in corso..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
 msgid "Wrote partition table to disk"
 msgstr "Eseguita l'operazione di scrittura tabella delle partizioni su disco"
 
-#: fdisk/cfdisk.c:1846
+#: fdisk/cfdisk.c:1851
 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:1856
+#: fdisk/cfdisk.c:1861
 #, 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:1858
+#: fdisk/cfdisk.c:1863
 #, fuzzy
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
@@ -1526,87 +1526,87 @@
 "Non è possibile avviare in modo preciso una partizione primaria. DOS MBR non "
 "può avviarla."
 
-#: fdisk/cfdisk.c:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
 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:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Impossibile aprire il file '%s'"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1941
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unità disco: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1943
 msgid "Sector 0:\n"
 msgstr "Settore 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1950
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Settore %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1970
 msgid "   None   "
 msgstr "   Nessuno   "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1972
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1974
 msgid "   Primary"
 msgstr "   Primario"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1976
 msgid "   Logical"
 msgstr "   Logico"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2020
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Avvio (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Sconosciuto (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2024
 #, c-format
 msgid "None (%02X)"
 msgstr "Nessuno (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabella delle partizioni per %s\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2061
 msgid "            First    Last\n"
 msgstr "           Primo    Ultimo\n"
 
-#: fdisk/cfdisk.c:2057
+#: fdisk/cfdisk.c:2062
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Tipo     settore   settore   offset  lunghezza   tipo di filesystem  "
 "(ID)   flag\n"
 
-#: fdisk/cfdisk.c:2058
+#: fdisk/cfdisk.c:2063
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1615,481 +1615,481 @@
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2146
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         ---Avvio---      ----Chiusura----    Numero avvio di\n"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2147
 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:2143
+#: fdisk/cfdisk.c:2148
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Raw"
 msgstr "Grezzo"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Print the table using raw data format"
 msgstr "Stampare la tabella utilizzando il formato dati grezzi"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
 msgid "Sectors"
 msgstr "Settori"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2182
 msgid "Print the table ordered by sectors"
 msgstr "Stampare la tabella ordinata per settori"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Table"
 msgstr "Tabella"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Just print the partition table"
 msgstr "Stampare la tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2184
 msgid "Don't print the table"
 msgstr "Non stampare la tabella"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2212
 msgid "Help Screen for cfdisk"
 msgstr "Schermata Guida per cfdisk"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2214
 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:2210
+#: fdisk/cfdisk.c:2215
 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:2211
+#: fdisk/cfdisk.c:2216
 msgid "disk drive."
 msgstr "unità disco."
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2218
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2220
 msgid "Command      Meaning"
 msgstr "Comando     significato"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2221
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2222
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr " b          Cambia flag avviabile per la partizione corrente"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2223
 msgid "  d          Delete the current partition"
 msgstr " d          Elimina la partizione corrente"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2224
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr " g          cambio cilindri, testine, parametri settori-per-traccia"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2225
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 "            ATTENZIONE: questa opzione dovrebbe essere utilizzata solo da "
 "persone"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2226
 msgid "             know what they are doing."
 msgstr "            esperte."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2227
 msgid "  h          Print this screen"
 msgstr " h          Stampare questa schermata"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2228
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 " m          Massimizzare l'utilizzo del disco della partizione corrente"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2229
 msgid "             Note: This may make the partition incompatible with"
 msgstr "            Nota: questo può rendere la partizione incompatibile con"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2230
 msgid "             DOS, OS/2, ..."
 msgstr "            DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2231
 msgid "  n          Create new partition from free space"
 msgstr " n          Creazione di una nuova partizione nello spazio disponibile"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2232
 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:2228
+#: fdisk/cfdisk.c:2233
 msgid "             There are several different formats for the partition"
 msgstr "            Vi sono diversi altri formati per la partizione"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2234
 msgid "             that you can choose from:"
 msgstr "            tra i quali scegliere:"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2235
 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:2231
+#: fdisk/cfdisk.c:2236
 msgid "                s - Table ordered by sectors"
 msgstr "               s - Tabella ordinata per settori"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2237
 msgid "                t - Table in raw format"
 msgstr "               t - Tabella in formato grezzo"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2238
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Esce dal programma senza scrivere nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2239
 msgid "  t          Change the filesystem type"
 msgstr " t          Cambia il tipo di filesystem"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2240
 msgid "  u          Change units of the partition size display"
 msgstr ""
 " u          Modifica l'unità di visualizzazione della dimensione della "
 "partizione"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2241
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "            Ruota attraverso MB, settori e cilindri"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2242
 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:2238
+#: fdisk/cfdisk.c:2243
 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:2239
+#: fdisk/cfdisk.c:2244
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "            confermare o negare la scrittura inserendo `sì' o"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2245
 msgid "             `no'"
 msgstr "             `no'"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2246
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Freccia Su      sposta il cursore alla partizione precedente"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2247
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Freccia Giù   sposta il cursore alla partizione successiva"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2248
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Ridisegna lo schermo"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2249
 msgid "  ?          Print this screen"
 msgstr "  ?          Stampa questa schermata"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2251
 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:2247
+#: fdisk/cfdisk.c:2252
 msgid "case letters (except for Writes)."
 msgstr "lettere maiuscole/minuscole (fatta eccezione per Writes)."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
-#: fdisk/fdisksunlabel.c:324
+#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cilindri"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2282
 msgid "Change cylinder geometry"
 msgstr "Modifica la geometria dei cilindri"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Testine"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2283
 msgid "Change head geometry"
 msgstr "Modifica la geometria delle testine"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2284
 msgid "Change sector geometry"
 msgstr "Modifica la geometria dei settori"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done"
 msgstr "Fine"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done with changing geometry"
 msgstr "Modifica della geometria eseguita"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2298
 msgid "Enter the number of cylinders: "
 msgstr "Immettere il numero di cilindri: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
 msgid "Illegal cylinders value"
 msgstr "Valore cilindri non valido"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2316
 msgid "Enter the number of heads: "
 msgstr "Immettere il numero delle testine: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
 msgid "Illegal heads value"
 msgstr "Valore testine non valido"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2329
 msgid "Enter the number of sectors per track: "
 msgstr "Immettere il numero dei settori per traccia: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
 msgid "Illegal sectors value"
 msgstr "Valore settori non valido"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2439
 msgid "Enter filesystem type: "
 msgstr "Immettere il tipo di filesystem: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2457
 msgid "Cannot change FS Type to empty"
 msgstr "Impossibile cambiare il tipo FS in vuoto"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2459
 msgid "Cannot change FS Type to extended"
 msgstr "Impossibile cambiare il tipo FS in espanso"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Avvio"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2489
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
 msgid ", NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2511
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2587
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unità disco: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2593
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "Dimensione: %lld byte"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2596
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "Dimensione: %lld byte"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2600
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Testine: %d   settori per traccia: %d   cilindri: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2604
 msgid "Name"
 msgstr "Nome"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2605
 msgid "Flags"
 msgstr "Flag"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2606
 msgid "Part Type"
 msgstr "Tipo di partiz."
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2607
 msgid "FS Type"
 msgstr "Tipo FS"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2608
 msgid "[Label]"
 msgstr "[Etichetta]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2610
 msgid "  Sectors"
 msgstr "  Settori"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2614
 msgid "Size (MB)"
 msgstr "Dimensione (MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2616
 msgid "Size (GB)"
 msgstr "Dimensione (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Bootable"
 msgstr "Avviabile"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Toggle bootable flag of the current partition"
 msgstr " Cambia flag avviabile per la partizione corrente "
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete"
 msgstr "Elimina"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete the current partition"
 msgstr "Elimina la partizione corrente"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Change disk geometry (experts only)"
 msgstr "Modifica della geometria del disco (solo per esperti)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Help"
 msgstr "Guida"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Print help screen"
 msgstr "Stampa della schermata della guida"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize"
 msgstr "Massimi."
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 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:2671
+#: fdisk/cfdisk.c:2676
 msgid "New"
 msgstr "Nuova"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "Create new partition from free space"
 msgstr "Creazione di una nuova partizione nello spazio disponibile"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print"
 msgstr "Stampa"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 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:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit"
 msgstr "Esci"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit program without writing partition table"
 msgstr "Esce dal programma senza scrivere nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 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:2675
+#: fdisk/cfdisk.c:2680
 msgid "Units"
 msgstr "Unità"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 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:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write"
 msgstr "Scrivi"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 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:2722
+#: fdisk/cfdisk.c:2727
 msgid "Cannot make this partition bootable"
 msgstr "Impossibile rendere questa partizione avviabile"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2737
 msgid "Cannot delete an empty partition"
 msgstr "Impossibile cancellare una partizione vuota"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
 msgid "Cannot maximize this partition"
 msgstr "Impossibile massimizzare questa partizione"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2767
 msgid "This partition is unusable"
 msgstr "Questa partizione è utilizzabile"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2769
 msgid "This partition is already in use"
 msgstr "Questa partizione è già in uso"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2786
 msgid "Cannot change the type of an empty partition"
 msgstr "Impossibile modificare il tipo di una partizione vuota"
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
 msgid "No more partitions"
 msgstr "Nessun'altra partizione"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2826
 msgid "Illegal command"
 msgstr "Comando non valido"
 
-#: fdisk/cfdisk.c:2831
+#: fdisk/cfdisk.c:2836
 #, 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:2838
+#: fdisk/cfdisk.c:2843
 #, c-format
 msgid ""
 "\n"
@@ -2373,11 +2373,11 @@
 msgid "heads"
 msgstr "testine"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "settori"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470
+#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cilindri"
@@ -2498,74 +2498,74 @@
 msgstr "Codice esadecimale (digitare L per elencare i codici): "
 
 #: fdisk/fdisk.c:1069
-#, c-format
-msgid "%s (%d-%d, default %d): "
+#, fuzzy, c-format
+msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, predefinito %d): "
 
-#: fdisk/fdisk.c:1134
-#, c-format
-msgid "Using default value %d\n"
+#: fdisk/fdisk.c:1136
+#, fuzzy, c-format
+msgid "Using default value %u\n"
 msgstr "Utilizzo del valore predefinito %d\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1140
 msgid "Value out of range.\n"
 msgstr "Valore fuori intervallo.\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1150
 msgid "Partition number"
 msgstr "Numero della partizione"
 
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1161
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Attenzione: la partizione %d ha tipo vuoto\n"
 
-#: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207
+#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "La partizione estesa supplementare viene ignorata %d\n"
 
-#: fdisk/fdisk.c:1184
+#: fdisk/fdisk.c:1186
 #, fuzzy
 msgid "No partition is defined yet!\n"
 msgstr "Nessuna partizione definita\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1212
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "sector"
 msgstr "settore"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1231
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Modifica delle unità di visualizzazione/immissione su %s\n"
 
-#: fdisk/fdisk.c:1240
+#: fdisk/fdisk.c:1242
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ATTENZIONE: la partizione %d è una partizione estesa\n"
 
-#: fdisk/fdisk.c:1251
+#: fdisk/fdisk.c:1253
 msgid "DOS Compatibility flag is set\n"
 msgstr "Impostato il flag compatibile con DOS\n"
 
-#: fdisk/fdisk.c:1255
+#: fdisk/fdisk.c:1257
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Il flag compatibile con DOS non è impostato\n"
 
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1357
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partizione %d non esiste ancora!\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1362
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2577,7 +2577,7 @@
 "tipo 0 probabilmente non è consigliabile. È possibile eliminare\n"
 "una partizione utilizzando il comando `d'.\n"
 
-#: fdisk/fdisk.c:1361
+#: fdisk/fdisk.c:1371
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2585,7 +2585,7 @@
 "Non è possibile trasformare una partizione in una estesa o viceversa\n"
 "Prima bisogna eliminarla.\n"
 
-#: fdisk/fdisk.c:1370
+#: fdisk/fdisk.c:1380
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2595,7 +2595,7 @@
 "poiché SunOS/Solaris lo prevede e ciò è gradito anche a Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1376
+#: fdisk/fdisk.c:1386
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2605,60 +2605,60 @@
 "e la partizione 11 come volume intero (6) poiché IRIX lo prevede.\n"
 "\n"
 
-#: fdisk/fdisk.c:1389
+#: fdisk/fdisk.c:1399
 #, 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:1443
+#: fdisk/fdisk.c:1453
 #, 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:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "    phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logico=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1451
+#: fdisk/fdisk.c:1461
 #, 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:1460
+#: fdisk/fdisk.c:1470
 #, 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:1463
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "dovrebbe essere (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1469
+#: fdisk/fdisk.c:1479
 #, 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:1473
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "dovrebbe essere (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1485
+#: fdisk/fdisk.c:1495
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1498
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2668,7 +2668,7 @@
 "Disco %s: %d testine, %d settori, %d cilindri\n"
 "\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1500
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -2676,41 +2676,41 @@
 "Disco %s: %d testine, %d settori, %d cilindri\n"
 "\n"
 
-#: fdisk/fdisk.c:1493
+#: fdisk/fdisk.c:1503
 #, c-format
 msgid ", total %lu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1496
+#: fdisk/fdisk.c:1506
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1604
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1678
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Avvio    Inizio    Fine   Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisk.c:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1716
 #, 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:1716
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
@@ -2721,92 +2721,92 @@
 "Disco %s: %d testine, %d settori, %d cilindri\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: 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     Size ID\n"
 
-#: fdisk/fdisk.c:1762
+#: fdisk/fdisk.c:1772
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Attenzione: la partizione %d contiene il settore 0\n"
 
-#: fdisk/fdisk.c:1765
+#: fdisk/fdisk.c:1775
 #, 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:1768
+#: fdisk/fdisk.c:1778
 #, 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:1771
+#: fdisk/fdisk.c:1781
 #, 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:1775
+#: fdisk/fdisk.c:1785
 #, 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:1807
+#: fdisk/fdisk.c:1817
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Attenzione: inizio dati danneggiato nella partizione %d\n"
 
-#: fdisk/fdisk.c:1815
+#: fdisk/fdisk.c:1825
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Attenzione: la partizione %d si sovrappone alla partizione %d.\n"
 
-#: fdisk/fdisk.c:1835
+#: fdisk/fdisk.c:1845
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Attenzione: la partizione %d è vuota\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1850
 #, 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:1846
+#: fdisk/fdisk.c:1856
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "Numero %d totale dei settori allocati superiore al massimo %d\n"
 
-#: fdisk/fdisk.c:1849
+#: fdisk/fdisk.c:1859
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d settori non allocati\n"
 
-#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
+#: fdisk/fdisk.c:1872 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:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
-#: fdisk/fdisksunlabel.c:522
+#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Primo %s"
 
-#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
+#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Il settore %d è già allocato\n"
 
-#: fdisk/fdisk.c:1937
+#: fdisk/fdisk.c:1947
 msgid "No free sectors available\n"
 msgstr "Non ci sono settori liberi disponibili\n"
 
-#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
+#: fdisk/fdisk.c:1956 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:2011
+#: fdisk/fdisk.c:2021
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2814,17 +2814,17 @@
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2033 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:2031
+#: fdisk/fdisk.c:2041
 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:2036
+#: fdisk/fdisk.c:2046
 #, c-format
 msgid ""
 "Command action\n"
@@ -2835,20 +2835,20 @@
 "   %s\n"
 "   p   partizione primaria (1-4)\n"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "l   logical (5 or over)"
 msgstr "l   logica (5 od oltre)"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "e   extended"
 msgstr " e   estesa"
 
-#: fdisk/fdisk.c:2057
+#: fdisk/fdisk.c:2067
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Numero di partizioni non valido per il tipo `%c'\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2103
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2856,11 +2856,11 @@
 "La tabella delle partizioni è stata alterata!\n"
 "\n"
 
-#: fdisk/fdisk.c:2102
+#: fdisk/fdisk.c:2112
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chiamata di ioctl() per rileggere la tabella delle partizioni.\n"
 
-#: fdisk/fdisk.c:2118
+#: fdisk/fdisk.c:2128
 #, c-format
 msgid ""
 "\n"
@@ -2869,7 +2869,7 @@
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2138
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2881,68 +2881,68 @@
 "consultare la pagina del manuale fdisk per ulteriori\n"
 "informazioni.\n"
 
-#: fdisk/fdisk.c:2135
+#: fdisk/fdisk.c:2145
 msgid "Syncing disks.\n"
 msgstr "Sincronizzazione dei dischi in corso.\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partizione %d non ha area dati\n"
 
-#: fdisk/fdisk.c:2187
+#: fdisk/fdisk.c:2197
 msgid "New beginning of data"
 msgstr "Nuovo inizio dati"
 
-#: fdisk/fdisk.c:2203
+#: fdisk/fdisk.c:2213
 msgid "Expert command (m for help): "
 msgstr "Comando per esperti (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:2216
+#: fdisk/fdisk.c:2226
 msgid "Number of cylinders"
 msgstr "Numero di cilindri"
 
-#: fdisk/fdisk.c:2243
+#: fdisk/fdisk.c:2253
 msgid "Number of heads"
 msgstr "Numero di testine"
 
-#: fdisk/fdisk.c:2268
+#: fdisk/fdisk.c:2278
 msgid "Number of sectors"
 msgstr "Numero di settori"
 
-#: fdisk/fdisk.c:2271
+#: fdisk/fdisk.c:2281
 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:2346
+#: fdisk/fdisk.c:2356
 #, 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:2360
+#: fdisk/fdisk.c:2370
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
 msgstr "impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2408
 #, fuzzy, c-format
 msgid "%c: unknown command\n"
 msgstr "%s: comando sconosciuto: %s\n"
 
-#: fdisk/fdisk.c:2466
+#: fdisk/fdisk.c:2476
 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:2470
+#: fdisk/fdisk.c:2480
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2951,16 +2951,16 @@
 "dovrebbe utilizzare con un dispositivo specificato\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2529
+#: fdisk/fdisk.c:2539
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2539
+#: fdisk/fdisk.c:2549
 msgid "Command (m for help): "
 msgstr "Comando (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:2555
+#: fdisk/fdisk.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -2969,15 +2969,15 @@
 "\n"
 "Il file d'avvio corrente è: %s\n"
 
-#: fdisk/fdisk.c:2557
+#: fdisk/fdisk.c:2567
 msgid "Please enter the name of the new boot file: "
 msgstr "Immettere il nome del nuovo file d'avvio:"
 
-#: fdisk/fdisk.c:2559
+#: fdisk/fdisk.c:2569
 msgid "Boot file unchanged\n"
 msgstr "File d'avvio immutato\n"
 
-#: fdisk/fdisk.c:2624
+#: fdisk/fdisk.c:2642
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3294,85 +3294,85 @@
 "\n"
 "Sincronizzazione dei dischi.\n"
 
-#: fdisk/fdisksgilabel.c:78
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
 msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:91
 #, fuzzy
 msgid "SGI xfslog"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:92
 #, fuzzy
 msgid "SGI xlv"
 msgstr "SGI xlvol"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:93
 #, fuzzy
 msgid "SGI xvm"
 msgstr "SGI xlvol"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
 msgstr "Linux nativo"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 #, fuzzy
 msgid "Linux LVM"
 msgstr "Linux"
 
-#: fdisk/fdisksgilabel.c:95
+#: fdisk/fdisksgilabel.c:97
 #, fuzzy
 msgid "Linux RAID"
 msgstr "Linux"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:163
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3380,7 +3380,7 @@
 "Secondo la ditta MIPS Computer Systems, Inc l'etichetta non deve contenere "
 "più di512 byte\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Rilevato un disklabel sgi con checksum errato.\n"
 
@@ -3436,12 +3436,13 @@
 "File di avvio: %s\n"
 "----- Voci directory -----\n"
 
-#: fdisk/fdisksgilabel.c:250
+#: fdisk/fdisksgilabel.c:248
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s settore%5u dimensione%8u\n"
 
-#: fdisk/fdisksgilabel.c:304
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3453,7 +3454,7 @@
 "\tIl file di avvio deve essere un path assoluto non nullo,\n"
 "\tes. \"/unix\" o \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:311
+#: fdisk/fdisksgilabel.c:308
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3461,7 +3462,7 @@
 "\n"
 "\tNome del file di avvio troppo lungo:  deve essere di 16 byte al massimo.\n"
 
-#: fdisk/fdisksgilabel.c:316
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3469,7 +3470,7 @@
 "\n"
 "\tIl file di avvio deve avere un path completo.\n"
 
-#: fdisk/fdisksgilabel.c:321
+#: fdisk/fdisksgilabel.c:320
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3481,7 +3482,7 @@
 "\tL'impostazione predefinita di SGI è \"/unix\" e per il backup \"/unix.save"
 "\".\n"
 
-#: fdisk/fdisksgilabel.c:349
+#: fdisk/fdisksgilabel.c:346
 #, c-format
 msgid ""
 "\n"
@@ -3490,19 +3491,19 @@
 "\n"
 "\tFile di avvio cambiato in \"%s\".\n"
 
-#: fdisk/fdisksgilabel.c:447
+#: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
 msgstr "Presente più di una voce disco intero.\n"
 
-#: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
 msgstr "Nessuna partizione definita\n"
 
-#: fdisk/fdisksgilabel.c:462
+#: fdisk/fdisksgilabel.c:449
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "IRIX gradisce che la partizione 11 comprenda l'intero disco.\n"
 
-#: fdisk/fdisksgilabel.c:464
+#: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3511,7 +3512,7 @@
 "La partizione dell'intero disco dovrebbe iniziare al blocco 0,\n"
 "non al blocco %d.\n"
 
-#: fdisk/fdisksgilabel.c:468
+#: fdisk/fdisksgilabel.c:457
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3520,31 +3521,31 @@
 "La partizione del disco intero è solamente di %d blocchi,\n"
 "ma il disco è di %d blocchi.\n"
 
-#: fdisk/fdisksgilabel.c:475
+#: fdisk/fdisksgilabel.c:463
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "Una partizione (#11) dovrebbe comprendere il disco intero.\n"
 
-#: fdisk/fdisksgilabel.c:487
+#: fdisk/fdisksgilabel.c:473
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "La partizione %d non inizia al limite del cilindro.\n"
 
-#: fdisk/fdisksgilabel.c:494
+#: fdisk/fdisksgilabel.c:479
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "La partizione %d non termina al limite del cilindro.\n"
 
-#: fdisk/fdisksgilabel.c:502
+#: fdisk/fdisksgilabel.c:486
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Le partizioni %d e %d si sovrappongono di %d settori.\n"
 
-#: fdisk/fdisksgilabel.c:511 fdisk/fdisksgilabel.c:531
-#, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, fuzzy, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
 msgstr "Intervallo di %8d settori non utilizzato - settori %8d-%d\n"
 
-#: fdisk/fdisksgilabel.c:544
+#: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
@@ -3552,7 +3553,7 @@
 "\n"
 "la partizione di avvio non esiste.\n"
 
-#: fdisk/fdisksgilabel.c:548
+#: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
@@ -3560,7 +3561,7 @@
 "\n"
 "La partizione swap non esiste.\n"
 
-#: fdisk/fdisksgilabel.c:553
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
@@ -3568,15 +3569,16 @@
 "\n"
 "La partizione swap non ha tipo swap.\n"
 
-#: fdisk/fdisksgilabel.c:557
+#: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tSi è selezionato un nome file di avvio non comune.\n"
 
-#: fdisk/fdisksgilabel.c:568
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr "È possibile modificare solamente il tag delle partizioni non vuote.\n"
 
-#: fdisk/fdisksgilabel.c:575
+#: 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"
@@ -3591,34 +3593,34 @@
 "Digitare YES (sì) se si è certi di voler codificare questa partizione in "
 "modo differente.\n"
 
-#: fdisk/fdisksgilabel.c:580 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
 msgid "YES\n"
 msgstr ""
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:606
+#: fdisk/fdisksgilabel.c:577
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr ""
 "Si è a conoscenza del fatto che sul disco esiste una sovrapposizione di "
 "partizioni?\n"
 
-#: fdisk/fdisksgilabel.c:668
+#: fdisk/fdisksgilabel.c:637
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr ""
 "Tentativo di generare automaticamente l'immissione dell'intero disco in "
 "corso.\n"
 
-#: fdisk/fdisksgilabel.c:675
+#: fdisk/fdisksgilabel.c:642
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "L'intero disco è già coperto da partizioni.\n"
 
-#: fdisk/fdisksgilabel.c:680
+#: fdisk/fdisksgilabel.c:646
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Sovrapposizione di partizioni sul disco. Risolvere anzitutto questo "
 "problema.\n"
 
-#: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
+#: 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"
@@ -3626,18 +3628,18 @@
 "Si raccomanda che l'undicesima partizione\n"
 "copra l'intero disco e sia di tipo `SGI volume'\n"
 
-#: fdisk/fdisksgilabel.c:705
+#: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Si avrà una sovrapposizione di partizioni sul disco. Risolvere anzitutto "
 "questo problema.\n"
 
-#: fdisk/fdisksgilabel.c:710
+#: fdisk/fdisksgilabel.c:676
 #, c-format
 msgid " Last %s"
 msgstr " Ultimo %s"
 
-#: fdisk/fdisksgilabel.c:732
+#: fdisk/fdisksgilabel.c:706
 #, fuzzy
 msgid ""
 "Building a new SGI disklabel. Changes will remain in memory only,\n"
@@ -3650,12 +3652,20 @@
 "contenuto precedente sarà definitivamente perso.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:758
+#: 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 ""
+
+#: fdisk/fdisksgilabel.c:738
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Tentativo di mantenere i parametri della partizione %d in corso.\n"
 
-#: fdisk/fdisksgilabel.c:760
+#: fdisk/fdisksgilabel.c:740
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tINIZIO=%d\tLUNGHEZZA=%d\n"
@@ -3743,63 +3753,63 @@
 msgid "Autoconfigure failed.\n"
 msgstr "Autoconfigurazione non riuscita.\n"
 
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Settori/traccia"
 
-#: fdisk/fdisksunlabel.c:327
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Cilindri alternativi"
 
-#: fdisk/fdisksunlabel.c:330
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Cilindri fisici"
 
-#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
 msgid "Rotation speed (rpm)"
 msgstr "Velocità di rotazione (rpm)"
 
-#: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
 msgid "Interleave factor"
 msgstr "Fattore di interleave"
 
-#: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
 msgid "Extra sectors per cylinder"
 msgstr "Settori supplementari per cilindro"
 
-#: fdisk/fdisksunlabel.c:352
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "È possibile modificare tutti i parametri disco dal menu x"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "floppy da 3,5\""
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:446
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partizione %d non finisce al limite del cilindro\n"
 
-#: fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:462
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "La partizione %d si sovrappone ad altre nei settori %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:488
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervallo inutilizzato - settori 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervallo inutilizzato - settori %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3807,7 +3817,7 @@
 "Altre partizioni coprono già il disco intero.\n"
 "Eliminarne alcune/rimpicciolirle prima di riprovare.\n"
 
-#: fdisk/fdisksunlabel.c:593
+#: fdisk/fdisksunlabel.c:589
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3818,7 +3828,7 @@
 "%d %s copre alcune altre partizioni. La voce immessa è stata cambiata\n"
 "in %d %s\n"
 
-#: fdisk/fdisksunlabel.c:613
+#: fdisk/fdisksunlabel.c:609
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3828,7 +3838,7 @@
 "in considerazione di lasciare questa partizione come disco intero (5), "
 "partendo da 0, con %u settori\n"
 
-#: fdisk/fdisksunlabel.c:626
+#: fdisk/fdisksunlabel.c:622
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3844,7 +3854,7 @@
 "Digitare YES  (sì) se si è certi di volere che quella partizione\n"
 "venga codificata con 82 (swap Linux ): "
 
-#: fdisk/fdisksunlabel.c:657
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid ""
 "\n"
@@ -3863,7 +3873,7 @@
 "Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:671
+#: fdisk/fdisksunlabel.c:667
 #, c-format
 msgid ""
 "\n"
@@ -3876,16 +3886,16 @@
 "Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:676
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Inizio       Fine    Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:701
+#: fdisk/fdisksunlabel.c:697
 msgid "Number of alternate cylinders"
 msgstr "Numero di cilindri alternativi"
 
-#: fdisk/fdisksunlabel.c:734
+#: fdisk/fdisksunlabel.c:730
 msgid "Number of physical cylinders"
 msgstr "Numero dei cilindri fisici"
 
@@ -4499,9 +4509,9 @@
 msgstr "   Boot Dispositivo   Inizio       Fine  #blocchi  Id  Sistema\n"
 
 #: fdisk/sfdisk.c:885
-#, c-format
+#, fuzzy, 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 ""
 "Unità = megabyte da 1048576 byte, blocchi da 1024 byte, conteggiando da %d\n"
@@ -4509,7 +4519,7 @@
 
 #: fdisk/sfdisk.c:887
 #, fuzzy
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
+msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Inizio Boot Dispositivo   Fine    MB   #blocchi  Id  Sistema\n"
 
 #: fdisk/sfdisk.c:1047
@@ -4649,6 +4659,11 @@
 "(attiva)\n"
 "Questo non ha importanza per LILO, ma MBR DOS non avvierà questo disco.\n"
 
+#: fdisk/sfdisk.c:1272
+#, fuzzy
+msgid "start"
+msgstr "stato"
+
 #: fdisk/sfdisk.c:1275
 #, c-format
 msgid ""
@@ -4656,6 +4671,11 @@
 msgstr ""
 "partizione %s: inizio: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
+#: fdisk/sfdisk.c:1281
+#, fuzzy
+msgid "end"
+msgstr "invio"
+
 #: fdisk/sfdisk.c:1284
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4715,98 +4735,98 @@
 msgid "-n flag was given: Nothing changed\n"
 msgstr "flag -n dato: nessuna modifica\n"
 
-#: fdisk/sfdisk.c:1577
+#: fdisk/sfdisk.c:1579
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Salvataggio dei vecchi settori non riuscito - interruzione in corso\n"
 
-#: fdisk/sfdisk.c:1582
+#: fdisk/sfdisk.c:1584
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1661
 msgid "long or incomplete input line - quitting\n"
 msgstr "linea di input lunga o incompleta - uscita in corso\n"
 
-#: fdisk/sfdisk.c:1695
+#: fdisk/sfdisk.c:1697
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "errore di input: `=' previsto dopo il campo %s\n"
 
-#: fdisk/sfdisk.c:1702
+#: fdisk/sfdisk.c:1704
 #, 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:1708
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "input non riconosciuto: %s\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
 msgstr "numero troppo grande\n"
 
-#: fdisk/sfdisk.c:1754
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
 msgstr "segni strani dopo il numero\n"
 
-#: fdisk/sfdisk.c:1875
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
 msgstr "non c'è spazio per il descrittore di partizione\n"
 
-#: fdisk/sfdisk.c:1908
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
 msgstr "impossibile costituire una partizione estesa adiacente\n"
 
-#: fdisk/sfdisk.c:1959
+#: fdisk/sfdisk.c:1961
 msgid "too many input fields\n"
 msgstr "troppi campi di input\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1993
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
 msgstr "Non c'è spazio per altri\n"
 
-#: fdisk/sfdisk.c:2012
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
 msgstr "Tipo non valido\n"
 
-#: fdisk/sfdisk.c:2044
+#: fdisk/sfdisk.c:2046
 #, 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:2050
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
 msgstr "Attenzione: partizione vuota\n"
 
-#: fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2066
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Attenzione: inizio partizione non valido (%lu troppo anticipato)\n"
 
-#: fdisk/sfdisk.c:2077
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "flag avviabile non riconosciuto - scegliere - o *\n"
 
-#: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
 msgstr "Specificazione c,h,s parziale?\n"
 
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
 msgstr "partizione estesa in posizione non prevista\n"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
 msgstr "input non valido\n"
 
-#: fdisk/sfdisk.c:2172
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
 msgstr "troppe partizioni\n"
 
-#: fdisk/sfdisk.c:2205
+#: 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"
@@ -4819,47 +4839,47 @@
 "Solitamente è necessario specificare solamente <inizio> e <dimensione> ( e "
 "forse <tipo>).\n"
 
-#: fdisk/sfdisk.c:2225
+#: fdisk/sfdisk.c:2227
 msgid "version"
 msgstr "versione"
 
-#: fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Utilizzo: %s [opzioni] dispositivo...\n"
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: qualcosa come /dev/hda o /dev/sda"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
 msgstr "opzioni utili:"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2236
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]: elenco dimensioni di una partizione"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2237
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [o --id]:        stampa o modifica dell'Id della partizione"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2238
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:      elenco delle partizioni di ciascun dispositivo"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2239
 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:2238
+#: fdisk/sfdisk.c:2240
 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:2239
+#: fdisk/sfdisk.c:2241
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4867,56 +4887,56 @@
 "    -uS, -uB, -uC, -uM:  accetta/riporta in unità di settori/blocchi/"
 "cilindri/MB"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2242
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]:elenca i tipi di partizione conosciuti"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2243
 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:2242
+#: fdisk/sfdisk.c:2244
 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:2243
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                modifica solamente la partizione con numero #"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 non scrive realmente sul disco"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2247
 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:2246
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            ripristina questi settori nuovamente"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:   stampa versione"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:     stampa questo messaggio"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
 msgstr "opzioni pericolose:"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2252
 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:2251
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4924,117 +4944,117 @@
 "    -x [o --show-extended]: elenca anche le partizioni estese in output\n"
 "                             o prevede i rispettivi descrittori in input"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2255
 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:2254
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:      elimina i messaggi di avvertimento"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
 msgstr "    È possibile non usare la geometria rilevata utilizzando:"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2258
 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:2257
+#: fdisk/sfdisk.c:2259
 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:2258
+#: fdisk/sfdisk.c:2260
 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:2259
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
 msgstr "È possibile disattivare tutte le verifiche di coerenza con:"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2262
 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:2266
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
 msgstr "Utilizzo:"
 
-#: fdisk/sfdisk.c:2267
+#: fdisk/sfdisk.c:2269
 #, 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:2268
+#: fdisk/sfdisk.c:2270
 #, 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:2269
+#: fdisk/sfdisk.c:2271
 #, 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:2421
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
 msgstr "nessun comando?\n"
 
-#: fdisk/sfdisk.c:2539
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "totale: %d blocchi\n"
 
-#: fdisk/sfdisk.c:2576
+#: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "utilizzo: sfdisk --print-id numero partizione dispositivo\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2580
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr " utilizzo: sfdisk --change-id numero partizione dispositivo Id\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2582
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "utilizzo: sfdisk --id numero partizione dispositivo [Id]\n"
 
-#: fdisk/sfdisk.c:2587
+#: fdisk/sfdisk.c:2589
 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:2613
+#: fdisk/sfdisk.c:2615
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "impossibile aprire %s\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2617
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "impossibile aprire %s in lettura"
 
-#: fdisk/sfdisk.c:2640
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2657
+#: fdisk/sfdisk.c:2659
 #, 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:2674
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE ioctl non riuscito per %s\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2754
 #, 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:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
@@ -5042,7 +5062,7 @@
 "Fine\n"
 "\n"
 
-#: fdisk/sfdisk.c:2777
+#: fdisk/sfdisk.c:2781
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5051,37 +5071,37 @@
 "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:2791
+#: fdisk/sfdisk.c:2795
 #, 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:2848
+#: fdisk/sfdisk.c:2852
 #, fuzzy, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id non valido %x\n"
 
-#: fdisk/sfdisk.c:2863
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
 msgstr "Questo disco è attualmente in uso.\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Errore irreversibile: impossibile trovare %s\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2887
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Attenzione: %s non è un dispositivo di blocchi\n"
 
-#: fdisk/sfdisk.c:2889
+#: fdisk/sfdisk.c:2893
 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:2891
+#: fdisk/sfdisk.c:2895
 #, fuzzy
 msgid ""
 "\n"
@@ -5095,29 +5115,29 @@
 "swapoff di tutte le partizioni swap su questo disco. Utilizzare il flag--no-"
 "reread per eliminare questo controllo.\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2899
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilizzare il flag -force per oltrepassare tutti i controlli.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2903
 #, fuzzy
 msgid "OK\n"
 msgstr "OK"
 
-#: fdisk/sfdisk.c:2908
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
 msgstr "Vecchia situazione:\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2916
 #, 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:2920
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
 msgstr "Nuova situazione:\n"
 
-#: fdisk/sfdisk.c:2925
+#: fdisk/sfdisk.c:2929
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5125,19 +5145,19 @@
 "Queste partizioni non mi piacciono - nessuna modifica\n"
 "(se questo è quanto si desidera, utilizzare l'opzione --force.)\n"
 
-#: fdisk/sfdisk.c:2928
+#: fdisk/sfdisk.c:2932
 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:2933
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Soddisfatti di questo? [ynq] "
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Scrivere questo su disco? [ynq] "
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5145,15 +5165,15 @@
 "\n"
 "sfdisk: fine prematura dell'input\n"
 
-#: fdisk/sfdisk.c:2942
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
 msgstr "Uscita in corso - nessuna modifica\n"
 
-#: fdisk/sfdisk.c:2948
+#: fdisk/sfdisk.c:2952
 msgid "Please answer one of y,n,q\n"
 msgstr "Scegliere un'opzione per la risposta tra y,n,q\n"
 
-#: fdisk/sfdisk.c:2956
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5161,7 +5181,7 @@
 "La nuova tabella delle partizioni è stata scritta con successo\n"
 "\n"
 
-#: fdisk/sfdisk.c:2962
+#: 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"
@@ -5172,96 +5192,96 @@
 " per azzerare i primi 512 byte: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Consultare fdisk(8).)\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Provare con `getopt --help' per ulteriori informazioni.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "opzione lunga vuota dopo parametro -l o --long"
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "shell sconosciuta dopo parametro -s o --shell"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Utilizzo: getopt optstring parametri\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "      getopt [opzioni] [--] optstring parametri\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "      getopt [opzioni] -o|--options optstring [opzioni] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "             parametri\n"
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Consente le opzioni lunghe che iniziano con "
 "un singolo -\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Questa piccola guida all'utilizzo\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=longopts   Opzioni lunghe da riconoscere\n"
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 "  -n, --name=progname          Il nome con il quale vengono riportati gli "
 "errori\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=optstring      Opzioni brevi da riconoscere\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 "  -q, --quiet                  Disattiva errore riportato da getopt(3)\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Nessun output normale\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=shell            Imposta la shell \n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Prova della versione getopt(1)\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 #, fuzzy
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -Q, --quiet-output           Nessun output normale\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                informazioni sulla versione di output\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr "argomento optstring mancante"
 
-#: getopt-1.1.2/getopt.c:441
+#: getopt/getopt.c:444
 #, fuzzy
-msgid "getopt (enhanced) 1.1.2\n"
+msgid "getopt (enhanced) 1.1.3\n"
 msgstr "getopt (avanzato) 1.0.3\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "errore interno, contattare l'autore."
 
@@ -5791,7 +5811,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "Lettura dell'orario con KDGHWCLK ioctl non riuscita"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr "Tempo d'attesa per il cambio ora esaurito.\n"
 
@@ -5818,61 +5838,61 @@
 msgid "KDGHWCLK ioctl failed"
 msgstr " KDGHWCLK ioctl non riuscito"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "open() di %s fallita"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, 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:171
+#: hwclock/rtc.c:170
 #, 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:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s non ha funzioni di interrupt. "
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, 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:244
+#: hwclock/rtc.c:243
 #, 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:247
+#: hwclock/rtc.c:246
 #, 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:306
+#: hwclock/rtc.c:305
 #, 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:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr " ioctl(%s) ha funzionato.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "Non riuscita l'apertura di %s"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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' "
@@ -5883,17 +5903,17 @@
 "periferica 'rtc' di Linux attraverso il file speciale della periferica %s.  "
 "Questo file non esiste su questo sistema.\n"
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr "Impossibile aprire %s"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr " Non riuscito ioctl(RTC_EPOCH_READ) su %s"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, 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"
@@ -5901,24 +5921,24 @@
 #. 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:397
+#: hwclock/rtc.c:396
 #, 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:415
+#: hwclock/rtc.c:414
 #, 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:420
+#: hwclock/rtc.c:419
 #, 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:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "Non riuscito ioctl(RTC_EPOCH_SET) su %s"
@@ -6119,9 +6139,8 @@
 msgid "Password error."
 msgstr "Errore password."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249
-#: mount/lomount.c:254
+#: 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
 msgid "Password: "
 msgstr "Password: "
 
@@ -6339,29 +6358,29 @@
 "\n"
 "interrotto %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, fuzzy, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "mount: impossibile aprire %s: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h solamente per super-user.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "utilizzo: login [-fp] [nomeutente]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "logine: errore PAM, interruzione in corso: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Impossibile inizializzare PAM: %s"
@@ -6372,16 +6391,16 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FALLITA LOGIN %d DA %s PER %s, %s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -6389,17 +6408,17 @@
 "Login non corretto\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TROPPI TENTATIVI DI LOGIN (%d) DA %s PER %s, %s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "FALLITA SESSIONE DI LOGIN DA %s PER %s, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -6407,51 +6426,51 @@
 "\n"
 "Login  non corretto\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 #, fuzzy
 msgid "login: Out of memory\n"
 msgstr "%s: memoria esaurita!\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Nome utente non valido"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login rifiutato su questo terminale.\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s RIFIUTATO DA %s SU TTY %s"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s RIFIUTATO SU TTY %s"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Login non corretto\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -6459,84 +6478,84 @@
 "Troppi utenti già collegati.\n"
 "Riprovare successivamente.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
 msgstr "Ci sono troppi processi in esecuzione.\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr " CONNESSIONE DI ACCESSO REMOTO A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN DI ROOT A %s DA %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN DI ROOT A %s"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN A %s ATTRAVERSO %s DA %s"
 
-#: login-utils/login.c:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 #, fuzzy
 msgid "You have new mail.\n"
 msgstr "C'è %sposta.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 #, fuzzy
 msgid "You have mail.\n"
 msgstr "C'è %sposta.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: errore in esecuzione forking: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr "setuid() non riuscito"
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Nessuna directory %s!\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr "Connessione con home = \"/\".\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
 msgstr "login: nessuna memoria per lo script shell.\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: exec dello script shell impossibile: %s.\n"
 
-#: login-utils/login.c:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: nessuna shell: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6545,62 +6564,62 @@
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "il nome di login è troppo lungo.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "NOME troppo lungo"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
 msgstr "I nomi di login non possono iniziare con'-'.\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "troppi linefeed vuoti.\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "Linefeed ECCESSIVI"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login scaduto dopo %d secondi\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Ultimo login: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "da %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "su %.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ERRORE DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ERRORE DI LOGIN SU %s, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ERRORI DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ERRORI DI LOGIN SU %s, %s"
@@ -6967,7 +6986,7 @@
 msgid "fork failed\n"
 msgstr "fork non riuscito\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
 msgstr "exec fallita\n"
 
@@ -7269,12 +7288,12 @@
 msgid "Script started, file is %s\n"
 msgstr "Script iniziato, il file è %s\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniziato su %s"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
@@ -7283,210 +7302,210 @@
 "\n"
 "Script effettuato su %s"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script effettuato, il file è %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr "openpty non riuscita\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr "esauriti tutti i pty disponibili\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:744
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: argomento errato, utilizzo\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_name ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -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 "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLE] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumpfilename ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr " impossibile (dis)impostare la modalità risparmio energetico\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "errore klogctl : %s\n"
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Errore durante la lettura di %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr "Errore in scrittura screendump\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "impossibile leggere %s  e impossibile eseguire ioctl sul dump\n"
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM non è definito.\n"
@@ -7542,17 +7561,17 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Messaggio da %s@%s su %s a %s ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "attenzione: errore durante la lettura di %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 "attenzione: impossibile aprire %s: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: impossibile aprire %s - si sta utilizzando al suo posto %s\n"
@@ -7561,42 +7580,42 @@
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:415
 #, 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:399
+#: mount/fstab.c:427
 #, 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:411
+#: mount/fstab.c:439
 #, 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:426
+#: mount/fstab.c:454
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Impossibile bloccare il file di blocco %s: %s\n"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:467
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Impossibile bloccare il file di blocco %s: %s"
 
-#: mount/fstab.c:441
+#: mount/fstab.c:469
 msgid "timed out"
 msgstr "scaduto"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:476
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7605,46 +7624,46 @@
 "Impossibile creare il collegamento %s\n"
 "Forse c'è un vecchio file di blocco?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:525 mount/fstab.c:561
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "impossibile aprire %s (%s) - mtab non aggiornato"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:569
 #, c-format
 msgid "error writing %s: %s"
 msgstr "errore durante la scrittura di %s: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:577
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:595
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "impossibile rinominare %s in %s: %s\n"
 
-#: mount/lomount.c:80
+#: mount/lomount.c:173
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: impossibile aprire il device %s: %s\n"
 
-#: mount/lomount.c:86
+#: mount/lomount.c:179
 #, 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:91
-#, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\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:177
+#: 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:181
+#: mount/lomount.c:249
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -7652,7 +7671,7 @@
 "mount: impossibile trovare qualsiasi loop device.\n"
 "       Forse /dev/loop# ha un major number errato?"
 
-#: mount/lomount.c:185
+#: mount/lomount.c:253
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -7663,7 +7682,7 @@
 "       questo kernel non è a conoscenza del loop device\n"
 "       (se è questo il caso, ricompilare o `insmod loop.o'.)"
 
-#: mount/lomount.c:191
+#: 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"
@@ -7673,248 +7692,294 @@
 "       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:195
+#: 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:225
-#, c-format
-msgid "Unsupported encryption type %s\n"
-msgstr "Tipo di criptazione non supportata %s\n"
+#: mount/lomount.c:359
+#, fuzzy, c-format
+msgid "Error: unable to open %s for reading\n"
+msgstr "impossibile aprire %s in lettura"
 
-#: mount/lomount.c:239
+#: mount/lomount.c:444 mount/lomount.c:478
+#, fuzzy
+msgid "Retype password: "
+msgstr "Ridigitare la nuova password: "
+
+#: mount/lomount.c:456
+#, fuzzy
+msgid "Error: gpg key file decryption failed\n"
+msgstr "apertura file rc non riuscita\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:472
+#, 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"
+msgstr ""
+
+#: mount/lomount.c:611
+#, 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:258
+#: mount/lomount.c:654
 msgid "Init (up to 16 hex digits): "
 msgstr "Init (fino a 16 cifre esadecimali): "
 
-#: mount/lomount.c:265
+#: mount/lomount.c:661
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Cifra non esadec. '%c'.\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:764
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr "Non so come ottenere la chiave del sistema di criptazione %d\n"
 
-#: mount/lomount.c:288
+#: 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:299
-#, c-format
-msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: impossibile cancellare il device %s: %s\n"
-
-#: mount/lomount.c:309
-#, c-format
-msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s): riuscito\n"
-
-#: mount/lomount.c:317
-msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr "Questo montaggio è stato compilato senza supporto loop. Ricompilare.\n"
-
-#: mount/lomount.c:354
+#: mount/lomount.c:831
 #, 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"
+"  %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 ""
-"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:372 mount/sundries.c:30 mount/sundries.c:45
-#: mount/sundries.c:244
+#: 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:443
-msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr ""
-"Nessun supporto loop disponibile al momento della compilazione. "
-"Ricompilare.\n"
+#: mount/lomount.c:945
+#, fuzzy
+msgid "Error: unable to open /etc/fstab for reading\n"
+msgstr "impossibile aprire %s in lettura"
 
-#: mount/mntent.c:165
+#: 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/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
 "[mntent]: attenzione: non c'e' un 'codice di interruzione linea' alla fine "
 "di %s\n"
 
-#: mount/mntent.c:216
+#: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: la linea %d in %s non è valida%s\n"
 
-#: mount/mntent.c:219
+#: mount/mntent.c:222
 msgid "; rest of file ignored"
 msgstr "; ignorato resto del file"
 
-#: mount/mount.c:385
+#: mount/mount.c:396
 #, 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:389
+#: mount/mount.c:400
 #, 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:410
+#: mount/mount.c:421
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: impossibile aprire %s in scrittura: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:436 mount/mount.c:660
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: errore durante la scrittura di %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:443
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: errore durante il cambio di modalità di %s: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:494
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s assomigla a swapspace - non montato"
 
-#: mount/mount.c:538
+#: mount/mount.c:554
 msgid "mount failed"
 msgstr "mount non riuscito"
 
-#: mount/mount.c:540
+#: mount/mount.c:556
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: solamente root può montare %s su %s"
 
-#: mount/mount.c:568
+#: mount/mount.c:584
 msgid "mount: loop device specified twice"
 msgstr "mount: loop device specificato due volte"
 
-#: mount/mount.c:573
+#: mount/mount.c:589
 msgid "mount: type specified twice"
 msgstr "mount: tipo specificato due volte"
 
-#: mount/mount.c:585
+#: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: si ignora l'impostazione di un loop device\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: si intende utilizzare il loop device %s\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:614
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: mancata impostazione del loop device\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:618
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: impostazione del loop device riuscita\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:655
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: impossibile aprire %s: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:678
 #, fuzzy, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: impossibile aprire %s in scrittura: %s"
 
-#: mount/mount.c:665
+#: mount/mount.c:681
 #, fuzzy, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: impossibile aprire %s: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:735 mount/mount.c:1309
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: impossibile effettuare il fork: %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:815
 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:845
+#: mount/mount.c:854
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:856
+#: mount/mount.c:865
 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:859
+#: mount/mount.c:868
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: si deve specificare il tipo di filesystem"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:871
 msgid "mount: mount failed"
 msgstr "mount: mount non riuscito"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:877 mount/mount.c:912
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: il mount point di %s non è una directory"
 
-#: mount/mount.c:870
+#: mount/mount.c:879
 msgid "mount: permission denied"
 msgstr "mount: autorizzazione negata"
 
-#: mount/mount.c:872
+#: mount/mount.c:881
 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:876 mount/mount.c:880
+#: mount/mount.c:885 mount/mount.c:889
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s è occupato"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:891
 msgid "mount: proc already mounted"
 msgstr "mount: proc già montato"
 
-#: mount/mount.c:884
+#: mount/mount.c:893
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s già montato o %s occupato"
 
-#: mount/mount.c:890
+#: mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: il mount point %s non esiste"
 
-#: mount/mount.c:892
+#: mount/mount.c:901
 #, 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:895
+#: mount/mount.c:904
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: il device speciale %s non esiste"
 
-#: mount/mount.c:905
+#: mount/mount.c:914
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7923,12 +7988,12 @@
 "mount: il device speciale %s non esiste\n"
 "       (un prefisso di percorso non è una directory)\n"
 
-#: mount/mount.c:918
+#: mount/mount.c:927
 #, 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:920
+#: mount/mount.c:929
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7937,47 +8002,47 @@
 "mount: tipo fs errato, opzione non valida, superblocco su %s danneggiato,\n"
 "       o troppi file system montati"
 
-#: mount/mount.c:954
+#: mount/mount.c:963
 msgid "mount table full"
 msgstr "mount table piena"
 
-#: mount/mount.c:956
+#: mount/mount.c:965
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: impossibile leggere il superblocco"
 
-#: mount/mount.c:960
+#: mount/mount.c:969
 #, fuzzy, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: dispositivo di blocchi non valido"
 
-#: mount/mount.c:965
+#: mount/mount.c:974
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: fs di tipo %s non supportato dal kernel"
 
-#: mount/mount.c:977
+#: mount/mount.c:986
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probabilmente si intende %s"
 
-#: mount/mount.c:979
+#: mount/mount.c:988
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: forse si intendeva iso9660 ?"
 
-#: mount/mount.c:982
+#: mount/mount.c:991
 #, 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:988
+#: mount/mount.c:997
 #, 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:990
+#: mount/mount.c:999
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7986,101 +8051,100 @@
 "mount: il kernel non riconosce %s come un dispositivo di blocchi\n"
 "       (forse `insmod driver'?)"
 
-#: mount/mount.c:993
+#: mount/mount.c:1002
 #, 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:996
+#: mount/mount.c:1005
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s non è un dispositivo di blocchi"
 
-#: mount/mount.c:999
+#: mount/mount.c:1008
 #, 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:1002
+#: mount/mount.c:1011
 msgid "block device "
 msgstr " dispositivo di blocchi"
 
-#: mount/mount.c:1004
+#: mount/mount.c:1013
 #, fuzzy, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "umount: impossibile rimontare %s di sola lettura\n"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1017
 #, 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:1024
+#: mount/mount.c:1033
 #, 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:1111
+#: mount/mount.c:1120
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s\n"
 msgstr ""
 
-#: mount/mount.c:1115
+#: mount/mount.c:1124
 #, fuzzy, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr "umount: %s: non montato"
 
-#: mount/mount.c:1125
+#: 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:1126
+#: mount/mount.c:1135
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "label"
 msgstr "etichetta"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: mount/mount.c:1137 mount/mount.c:1587
 msgid "mount: no such partition found"
 msgstr "mount: non si è trovata tale partizione"
 
-#: mount/mount.c:1136
+#: mount/mount.c:1145
 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:1141
+#: mount/mount.c:1150
 #, fuzzy
-msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
-msgstr ""
-"mount: non è stato dato il tipo - Si presume nfs perché ci sono i due punti\n"
+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"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1166
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: esecuzione in background di \"%s\"\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1177
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: termina \"%s\"\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1254
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s già montato su %s\n"
 
-#: mount/mount.c:1376
+#: mount/mount.c:1386
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8101,78 +8165,78 @@
 "       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 fd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:1549
+#: mount/mount.c:1563
 msgid "mount: only root can do that"
 msgstr "mount: è possibile solo per root"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1568
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nessun %s trovato - creazione in corso..\n"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1582
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
 msgstr ""
 
-#: mount/mount.c:1575
+#: mount/mount.c:1589
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: mount di %s in corso\n"
 
-#: mount/mount.c:1584
+#: mount/mount.c:1598
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1599
+#: mount/mount.c:1613
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: impossibile trovare %s in %s"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1628
 #, 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:259
+#: mount/mount_by_label.c:189
 #, 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:378
+#: mount/mount_by_label.c:309
 msgid "mount: bad UUID"
 msgstr "mount: UUID non valido"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:483
 #, fuzzy
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: si deve specificare il tipo di filesystem"
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:492
 #, 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:496
+#: mount/mount_guess_fstype.c:495
 #, 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:499
+#: mount/mount_guess_fstype.c:498
 msgid "       and it looks like this is swapspace\n"
 msgstr "      e sembra che questo sia swapspace\n"
 
-#: mount/mount_guess_fstype.c:501
+#: mount/mount_guess_fstype.c:500
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "      Proverò il tipo %s\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:588
 #, c-format
 msgid "Trying %s\n"
 msgstr "Prova di %s in corso\n"
@@ -8266,7 +8330,7 @@
 msgid "bug in xstrndup call"
 msgstr "bug in chiamata xstrndup"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:74
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8279,7 +8343,7 @@
 "       %s [-v] [-p priority] special ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:84
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8291,34 +8355,102 @@
 "       %s [-v] [-p priority] special ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:178 mount/swapon.c:242
+#: 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
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s su %s\n"
 
-#: mount/swapon.c:182
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: impossibile effettuare stat di %s: %s\n"
 
-#: mount/swapon.c:193
+#: mount/swapon.c:216
 #, 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:205
+#: mount/swapon.c:228
 #, 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:248
+#: mount/swapon.c:271
 #, fuzzy
 msgid "Not superuser.\n"
 msgstr "Non impostato\n"
 
-#: mount/swapon.c:312 mount/swapon.c:401
+#: 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
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: impossibile aprire %s: %s\n"
@@ -8449,17 +8581,17 @@
 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:564
+#: mount/umount.c:566
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount non coerente con fstab"
 
-#: mount/umount.c:598
+#: mount/umount.c:602
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: solamente root può smontare %s da %s"
 
-#: mount/umount.c:669
+#: mount/umount.c:671
 msgid "umount: only root can do that"
 msgstr " umount: è possibile solo per root"
 
@@ -8599,7 +8731,7 @@
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec; %f rec (car/sec)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr " Utilizzo: %s [-c] [-n level] [-s bufsize]\n"
@@ -9304,12 +9436,13 @@
 msgid "missing comma"
 msgstr ""
 
-#: sys-utils/readprofile.c:60
+#: sys-utils/readprofile.c:115
 #, fuzzy, 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"
@@ -9329,37 +9462,32 @@
 "\t -r            reimposta tutti i counter (solamente utente root)\n"
 "\t -V            stampa versione ed esci\n"
 
-#: sys-utils/readprofile.c:84
-#, fuzzy
-msgid "out of memory"
-msgstr "memoria insufficiente?\n"
-
-#: sys-utils/readprofile.c:147
-#, c-format
-msgid "%s Version %s\n"
+#: sys-utils/readprofile.c:188
+#, fuzzy, c-format
+msgid "%s version %s\n"
 msgstr "%s Versione %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): linea mappa errata\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:308
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: impossibile trovare \"_stext\" in %s\n"
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:334
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:323
+#: sys-utils/readprofile.c:375
 msgid "total"
 msgstr "totale"
 
@@ -9571,17 +9699,17 @@
 msgid "...back 1 page"
 msgstr "...indietro %d pagine"
 
-#: text-utils/more.c:1313
+#: text-utils/more.c:1314
 #, fuzzy
 msgid "...skipping one line"
 msgstr "...sto saltando %d righe"
 
-#: text-utils/more.c:1315
+#: text-utils/more.c:1316
 #, fuzzy, c-format
 msgid "...skipping %d lines"
 msgstr "...sto saltando %d righe"
 
-#: text-utils/more.c:1352
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
@@ -9591,7 +9719,7 @@
 "***Indietro***\n"
 "\n"
 
-#: text-utils/more.c:1390
+#: text-utils/more.c:1391
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9599,56 +9727,56 @@
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1398
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
 msgstr "[Premere 'h' per visualizzare le istruzioni.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" linea %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Non un file] linea %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
 msgstr "  Overflow\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1642
 msgid "...skipping\n"
 msgstr "...ignora\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
 msgstr "Errore nell'espressione regolare"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9656,15 +9784,15 @@
 "\n"
 "Pattern non trovato\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr "Pattern non trovato"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1748
 msgid "can't fork\n"
 msgstr "impossibile effettuare fork\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
@@ -9672,21 +9800,21 @@
 "\n"
 "...sto ignorando"
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1792
 #, fuzzy
 msgid "...Skipping to file "
 msgstr "...Sto ignorando"
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1794
 #, fuzzy
 msgid "...Skipping back to file "
 msgstr "ritorna al file"
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2074
 msgid "Line too long"
 msgstr "Linea troppo lunga"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
 msgstr "Nessun comando precedente da sostituire"
 
@@ -9737,43 +9865,43 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: carattere di conversione non valido %%%s.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "l'opzione `%s' richiede un argomento\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "Tasto non valido"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...ignora\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...ignora\n"
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 #, fuzzy
 msgid "No next file"
 msgstr "(File successivo: %s)"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 #, fuzzy
 msgid "No previous file"
 msgstr "Nessuna partizione definita\n"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "errore di scrittura su %s\n"
@@ -9781,54 +9909,54 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "errore di scrittura su %s\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: impossibile leggere il file temporaneo.\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 #, fuzzy
 msgid "RE error: "
 msgstr ", errore"
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 #, fuzzy
 msgid "Cannot open "
 msgstr "Impossibile aprire %s\n"
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 #, fuzzy
 msgid "saved"
 msgstr "invio"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "Password *NON* modificata. Riprovare successivamente.\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 #, fuzzy
 msgid "(Next file: "
 msgstr "(File successivo: %s)"
@@ -9867,6 +9995,32 @@
 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 "del_loop(%s): success\n"
+#~ msgstr "del_loop(%s): riuscito\n"
+
+#~ msgid "This mount was compiled without loop support. Please recompile.\n"
+#~ msgstr ""
+#~ "Questo montaggio è stato compilato senza supporto loop. Ricompilare.\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 ""
+#~ "utilizzo:\n"
+#~ "  %s loop_device                                      # da informazioni\n"
+#~ "  %s -d loop_device                                   # elimina\n"
+#~ "  %s [ -e encryption ] [ -o offset ] loop_device file # imposta\n"
+
+#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ msgstr ""
+#~ "Nessun supporto loop disponibile al momento della compilazione. "
+#~ "Ricompilare.\n"
+
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "La partizione %i non termina al limite del cilindro:\n"
 
diff --git a/po/ja.po b/po/ja.po
index ff0cfc0..4899e2a 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: 2002-11-25 00:47+0100\n"
+"POT-Creation-Date: 2003-06-13 00:50+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"
@@ -147,7 +147,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -749,7 +749,7 @@
 msgid "not enough space, need at least %lu blocks"
 msgstr "Îΰ褬ÉÔ½½Ê¬¤Ç¤¹¡£ºÇÄã¤Ç¤â %lu ¥Ö¥í¥Ã¥¯É¬ÍפǤ¹"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2166
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
 #, c-format
 msgid "Device: %s\n"
 msgstr "¥Ç¥Ð¥¤¥¹: %s\n"
@@ -823,8 +823,8 @@
 msgstr ""
 "»È¤¤Êý: mkfs [-V] [-t ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à·¿] [fs ¥ª¥×¥·¥ç¥ó] ¥Ç¥Ð¥¤¥¹ [¥µ¥¤¥º]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: ¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó¡ª\n"
@@ -834,7 +834,7 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs ¥Ð¡¼¥¸¥ç¥ó %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
+#: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
 "usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
@@ -852,72 +852,72 @@
 " outfile    output file\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:328
+#: 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 ""
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:507
+#: disk-utils/mkfs.cramfs.c:514
 msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
 msgstr ""
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:812
+#: 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 ""
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, fuzzy, c-format
 msgid "Including: %s\n"
 msgstr "ÉÔÀµ¤Ê id: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, fuzzy, c-format
 msgid "Super block: %d bytes\n"
 msgstr "»ÈÍѺѶõ´Ö = %d ¥Ð¥¤¥È\n"
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
@@ -926,33 +926,33 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 #, fuzzy
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "·Ù¹ð: inode ¿ô¤¬Â礭¤¹¤®¤Þ¤¹¡£\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:926
+#: disk-utils/mkfs.cramfs.c:933
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -1102,8 +1102,8 @@
 msgid "too many bad pages"
 msgstr "ÉÔÀµ¥Ú¡¼¥¸¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: 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 "¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó"
 
@@ -1221,11 +1221,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] ¥Ç¥Ð¥¤¥¹\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
 msgid "Unusable"
 msgstr "»ÈÍÑÉÔ²Ä"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
 msgid "Free Space"
 msgstr "¶õ¤­Îΰè"
 
@@ -1358,229 +1358,229 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "¥á¥Ë¥å¡¼¤ËÊý¸þ¤¬¤¢¤ê¤Þ¤»¤ó¡£¿åÊ¿Êý¸þ¤ò½é´üÃͤȤ·¤Þ¤¹¡£"
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "ÉÔÀµ¤Ê¥­¡¼"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "³¤±¤ë¤Ë¤Ï²¿¤«¥­¡¼¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2512
 msgid "Primary"
 msgstr "´ðËÜÎΰè"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "¿·µ¬¤Ë´ðËÜÎΰè¤òºîÀ®¤·¤Þ¤¹"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2512
 msgid "Logical"
 msgstr "ÏÀÍýÎΰè"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "¿·µ¬¤ËÏÀÍýÎΰè¤òºîÀ®¤·¤Þ¤¹"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
 msgid "Cancel"
 msgstr "̾ȧ"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Îΰè¤òºîÀ®¤·¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! ÆâÉô¥¨¥é¡¼ !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "¥µ¥¤¥º (MB ñ°Ì): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "ºÇ½é¤«¤é"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "¶õ¤­Îΰè¤ÎºÇ½é¤ËÎΰè¤òÄɲÃ"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "ºÇ¸å¤«¤é"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "¶õ¤­Îΰè¤ÎºÇ¸å¤ËÎΰè¤òÄɲÃ"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "³ÈÄ¥Îΰè¤òºîÀ®¤¹¤ë¤¿¤á¤Î¾ì½ê¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1527
 msgid "No partition table or unknown signature on partition table"
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤¬Ìµ¤¤¤«Îΰè¥Æ¡¼¥Ö¥ë¤Î½ð̾¤¬ÉÔÀµ¤Ç¤¹"
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1529
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "¥¼¥í¥Æ¡¼¥Ö¥ë¤Ç³«»Ï¤·¤Þ¤·¤ç¤¦¤« [y/N] ?"
 
-#: fdisk/cfdisk.c:1576
+#: fdisk/cfdisk.c:1581
 msgid "You specified more cylinders than fit on disk"
 msgstr "¥Ç¥£¥¹¥¯¤Ë¤È¤Ã¤ÆŬÀڤʿô¤è¤ê¤â¿¤¯¤Î¥·¥ê¥ó¥À¿ô¤ò»ØÄꤵ¤ì¤Þ¤·¤¿"
 
-#: fdisk/cfdisk.c:1606
+#: fdisk/cfdisk.c:1611
 msgid "Cannot open disk drive"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤ò³«¤±¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "¥Ç¥£¥¹¥¯¤òÆɹþ¤ßÀìÍѤdz«¤­¤Þ¤·¤¿ -- ¤¢¤Ê¤¿¤Ë¤Ï½ñ¹þ¤ß¸¢¸Â¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1629
+#: fdisk/cfdisk.c:1634
 msgid "Cannot get disk size"
 msgstr "¥Ç¥£¥¹¥¯¥µ¥¤¥º¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1659
 msgid "Bad primary partition"
 msgstr "ÉÔÀµ¤Ê´ðËÜÎΰè"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1689
 msgid "Bad logical partition"
 msgstr "ÉÔÀµ¤ÊÏÀÍýÎΰè"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1804
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "·Ù¹ð¡ª ¤³¤ì¤Ï¤¢¤Ê¤¿¤Î¥Ç¥£¥¹¥¯¤Ë¤¢¤ë¥Ç¡¼¥¿¤òÇ˲õ¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1803
+#: fdisk/cfdisk.c:1808
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Îΰè¾ðÊó¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ó¤Ç¤â¤è¤í¤·¤¤¤Ç¤¹¤«¡©(yes ¤Þ¤¿¤Ï no): "
 
-#: fdisk/cfdisk.c:1809
+#: fdisk/cfdisk.c:1814
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1815
 msgid "Did not write partition table to disk"
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ß¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1817
 msgid "yes"
 msgstr "yes"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1820
 msgid "Please enter `yes' or `no'"
 msgstr "`yes' ¤« `no' ¤Î¤¤¤º¤ì¤«¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1824
 msgid "Writing partition table to disk..."
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤ò½ñ¤­¹þ¤ßÃæ..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
 msgid "Wrote partition table to disk"
 msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ß¤Þ¤·¤¿"
 
-#: fdisk/cfdisk.c:1846
+#: fdisk/cfdisk.c:1851
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Îΰè¥Æ¡¼¥Ö¥ë¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¤¬¡¢ºÆÆɹþ¤ß¤Ë¼ºÇÔ¡£ºÆµ¯Æ°¤·¤Æ¹¹¿·¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: fdisk/cfdisk.c:1856
+#: fdisk/cfdisk.c:1861
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "¥Ö¡¼¥È²Äǽ¥Þ¡¼¥¯ÉÕ¤­´ðËÜÎΰ褬¤¢¤ê¤Þ¤»¤ó¡£DOS MBR ¤Ï¤³¤ì¤ò¥Ö¡¼¥È¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: fdisk/cfdisk.c:1858
+#: fdisk/cfdisk.c:1863
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "¥Ö¡¼¥È²Äǽ¥Þ¡¼¥¯ÉÕ¤­´ðËÜÎΰ褬ʣ¿ô¤¢¤ê¤Þ¤¹¡£DOS MBR ¤Ï¤³¤ì¤ò¥Ö¡¼¥È¤Ç¤­¤Þ¤»"
 "¤ó¡£"
 
-#: fdisk/cfdisk.c:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "¥Õ¥¡¥¤¥ë̾¤òÆþÎÏ¡¢²èÌ̤Ëɽ¼¨¤¹¤ë¾ì¹ç¤Ï¥ê¥¿¡¼¥ó¥­¡¼: "
 
-#: fdisk/cfdisk.c:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "¥Õ¥¡¥¤¥ë '%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1941
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1943
 msgid "Sector 0:\n"
 msgstr "¥»¥¯¥¿ 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1950
 #, c-format
 msgid "Sector %d:\n"
 msgstr "¥»¥¯¥¿ %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1970
 msgid "   None   "
 msgstr "   ̵¤·   "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1972
 msgid "   Pri/Log"
 msgstr "   ´ðËÜ/ÏÀÍý"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1974
 msgid "   Primary"
 msgstr "   ´ðËÜÎΰè"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1976
 msgid "   Logical"
 msgstr "   ÏÀÍýÎΰè"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "ÉÔÌÀ"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2020
 #, c-format
 msgid "Boot (%02X)"
 msgstr "¥Ö¡¼¥È (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "ÉÔÌÀ (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2024
 #, c-format
 msgid "None (%02X)"
 msgstr "¤Ê¤· (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2061
 msgid "            First    Last\n"
 msgstr "            ºÇ½é¤Î   ºÇ¸å¤Î\n"
 
-#: fdisk/cfdisk.c:2057
+#: fdisk/cfdisk.c:2062
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " #  Î롏    ¥»¥¯¥¿   ¥»¥¯¥¿ ¥ª¥Õ¥»¥Ã¥È Â礭¤µ  Filesystem¥¿¥¤¥×(ID)   ¥Õ¥é"
 "¥°\n"
 
-#: fdisk/cfdisk.c:2058
+#: fdisk/cfdisk.c:2063
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1589,460 +1589,460 @@
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2146
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         ---ºÇ½é¤Î-----      ----ºÇ¸å¤Î---- ½é¤á¤Î¥»  \n"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2147
 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:2143
+#: fdisk/cfdisk.c:2148
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Raw"
 msgstr "À¸¥Ç¡¼¥¿"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Print the table using raw data format"
 msgstr "À¸¥Ç¡¼¥¿¤Î·Á¼°¤Ç¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó¤ò½ÐÎÏ"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
 msgid "Sectors"
 msgstr "¥»¥¯¥¿"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2182
 msgid "Print the table ordered by sectors"
 msgstr "¥»¥¯¥¿½ç¤Ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó¤ò½ÐÎÏ"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Table"
 msgstr "¥Æ¡¼¥Ö¥ë"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Just print the partition table"
 msgstr "ñ¤ËÎΰè¾ðÊó¤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2184
 msgid "Don't print the table"
 msgstr "Îΰè¾ðÊó¤ò½ÐÎϤ·¤Ê¤¤"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2212
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk ¤Î¥Ø¥ë¥×²èÌÌ"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2214
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk ¤ÏüËö·¿¥Ç¥£¥¹¥¯ÎΰèºîÀ®¥×¥í¥°¥é¥à¤Ç¤¹¡£"
 
-#: fdisk/cfdisk.c:2210
+#: fdisk/cfdisk.c:2215
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "¥Ï¡¼¥É¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤ÎÎΰè¤òºîÀ®¡¢ºï½ü¡¢Êѹ¹"
 
-#: fdisk/cfdisk.c:2211
+#: fdisk/cfdisk.c:2216
 msgid "disk drive."
 msgstr "¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2218
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2220
 msgid "Command      Meaning"
 msgstr "¥³¥Þ¥ó¥É      ÀâÌÀ"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2221
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2222
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          ¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ö¡¼¥È¥Õ¥é¥°¤ÎÀÚÂØ"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2223
 msgid "  d          Delete the current partition"
 msgstr "  d          ¥«¡¼¥½¥ë¾å¤ÎÎΰè¤òºï½ü"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2224
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          ¥·¥ê¥ó¥À, ¥Ø¥Ã¥À, ¥È¥é¥Ã¥¯Åö¤¿¤ê¤Î¥»¥¯¥¿¿ô¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2225
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ·Ù¹ð: ¤³¤Î¥ª¥×¥·¥ç¥ó¤¬²¿¤ò¤¹¤ë¤â¤Î¤«Íý²ò¤·¤Æ¤¤¤Ê¤¤¿Í"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2226
 msgid "             know what they are doing."
 msgstr "             ¤Ï»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Ê¤¤¡£"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2227
 msgid "  h          Print this screen"
 msgstr "  h          ¤³¤Î²èÌ̤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2228
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          ¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ç¥£¥¹¥¯»ÈÍÑÎ̤òºÇÂç¤Ë¤¹¤ë¡£"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2229
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Ãí°Õ: ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢DOS, OS/2 Åù¤È¸ß´¹À­¤Î¤Ê¤¤"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2230
 msgid "             DOS, OS/2, ..."
 msgstr "             Îΰè¤òºîÀ®¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£"
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2231
 msgid "  n          Create new partition from free space"
 msgstr "  n          ¶õ¤­Îΰ褫¤é¿·µ¬¤ËÎΰè¤òºîÀ®"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2232
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Îΰè¾ðÊó¤ò²èÌ̤ޤ¿¤Ï¥Ç¥£¥¹¥¯¤Ë½ÐÎϤ¹¤ë"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2233
 msgid "             There are several different formats for the partition"
 msgstr "             Îΰè¤Î½ÐÎϤˤϼ¡¤Î¤è¤¦¤ÊÊ£¿ô¤Î·Á¼°¤«¤éÁªÂò"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2234
 msgid "             that you can choose from:"
 msgstr "             ¤Ç¤­¤ë:"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2235
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - À¸¥Ç¡¼¥¿(¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤Þ¤ì¤ë¾ðÊ󤽤Τâ¤Î)"
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2236
 msgid "                s - Table ordered by sectors"
 msgstr "                s - ¥»¥¯¥¿½ç¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2237
 msgid "                t - Table in raw format"
 msgstr "                t - À¸¤Î·Á¼°¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾ðÊó"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2238
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Îΰè¾ðÊó¤ò½ñ¤­¹þ¤Þ¤º¤Ë¥×¥í¥°¥é¥à¤ò½ªÎ»"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2239
 msgid "  t          Change the filesystem type"
 msgstr "  t          ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2240
 msgid "  u          Change units of the partition size display"
 msgstr "  u          ɽ¼¨¤¹¤ëÎΰ襵¥¤¥º¤Îñ°Ì¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2241
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, ¥»¥¯¥¿, ¥·¥ê¥ó¥À¤Î½ç¤Ë½Û´Ä¤¹¤ë"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2242
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Îΰè¾ðÊó¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤à(Âçʸ»ú W ¤ò"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2243
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             ÆþÎϤ·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤)¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥Ç¥£¥¹¥¯¾å¤Î"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2244
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             ¥Ç¡¼¥¿¤òÇ˲õ¤¹¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¡¢'yes'¤Þ¤¿¤Ï'no'¤ÎÆþ"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2245
 msgid "             `no'"
 msgstr "             ÎϤˤè¤ê¡¢½ñ¤­¹þ¤ß¤ò¹Ô¤¦¤«¤É¤¦¤«¤ò³Îǧ¤¹¤ë¡£"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2246
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "¾åÌð°õ¥­¡¼   ¾å¤ÎÎΰè¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2247
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "²¼Ìð°õ¥­¡¼   ²¼¤ÎÎΰè¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2248
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       ²èÌ̤òºÆÉÁ²è"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2249
 msgid "  ?          Print this screen"
 msgstr "  ?          ¤³¤Î²èÌ̤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2251
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Ãí°Õ: ¥³¥Þ¥ó¥É¤Ï¤¹¤Ù¤ÆÂçʸ»ú¡¢¾®Ê¸»ú¤É¤Á¤é¤Ç¤â»ÈÍѤǤ­¤Þ¤¹"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2252
 msgid "case letters (except for Writes)."
 msgstr "(½ñ¤­¹þ¤ß¤ò½ü¤¯)¡£"
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
-#: fdisk/fdisksunlabel.c:324
+#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "¥·¥ê¥ó¥À"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2282
 msgid "Change cylinder geometry"
 msgstr "¥·¥ê¥ó¥À¤Î¥¸¥ª¥á¥È¥ê¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "¥Ø¥Ã¥É¿ô"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2283
 msgid "Change head geometry"
 msgstr "¥Ø¥Ã¥É¤Î¥¸¥ª¥á¥È¥ê¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2284
 msgid "Change sector geometry"
 msgstr "¥»¥¯¥¿¤Î¥¸¥ª¥á¥È¥ê¤òÊѹ¹"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done"
 msgstr "½ªÎ»"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done with changing geometry"
 msgstr "¥¸¥ª¥á¥È¥ê¤òÊѹ¹¤·¤Æ½ªÎ»"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2298
 msgid "Enter the number of cylinders: "
 msgstr "¥·¥ê¥ó¥À¿ô¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
 msgid "Illegal cylinders value"
 msgstr "ÉÔÀµ¤Ê¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2316
 msgid "Enter the number of heads: "
 msgstr "¥Ø¥Ã¥À¿ô¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
 msgid "Illegal heads value"
 msgstr "ÉÔÀµ¤Ê¥Ø¥Ã¥É¿ô"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2329
 msgid "Enter the number of sectors per track: "
 msgstr "¥È¥é¥Ã¥¯Åö¤¿¤ê¤Î¥»¥¯¥¿¿ô¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
 msgid "Illegal sectors value"
 msgstr "ÉÔÀµ¤Ê¥»¥¯¥¿¿ô"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2439
 msgid "Enter filesystem type: "
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2457
 msgid "Cannot change FS Type to empty"
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò¶õ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2459
 msgid "Cannot change FS Type to extended"
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò³ÈÄ¥¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "¥Ö¡¼¥È"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2489
 #, c-format
 msgid "Unk(%02X)"
 msgstr "ÉÔÌÀ(%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2511
 msgid "Pri/Log"
 msgstr "´ðËÜ/ÏÀÍý"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2587
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2593
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "¥µ¥¤¥º: %lld ¥Ð¥¤¥È"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2596
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "¥µ¥¤¥º: %lld ¥Ð¥¤¥È"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2600
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "¥Ø¥Ã¥É: %d   ¥È¥é¥Ã¥¯Åö¤¿¤ê¤Î¥»¥¯¥¿: %d   ¥·¥ê¥ó¥À: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2604
 msgid "Name"
 msgstr "̾Á°"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2605
 msgid "Flags"
 msgstr "¥Õ¥é¥°"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2606
 msgid "Part Type"
 msgstr "Îΰ西¥¤¥×"
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2607
 msgid "FS Type"
 msgstr "FS¥¿¥¤¥×"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2608
 msgid "[Label]"
 msgstr "[¥é¥Ù¥ë]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2610
 msgid "  Sectors"
 msgstr "  ¥»¥¯¥¿"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2614
 msgid "Size (MB)"
 msgstr "¥µ¥¤¥º (MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2616
 msgid "Size (GB)"
 msgstr "¥µ¥¤¥º (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Bootable"
 msgstr "¥Ö¡¼¥È²Ä"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Toggle bootable flag of the current partition"
 msgstr "¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ö¡¼¥È¥Õ¥é¥°¤òÀÚ¤êÂؤ¨¤ë"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete"
 msgstr "ºï½ü"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete the current partition"
 msgstr "¥«¡¼¥½¥ë¾å¤ÎÎΰè¤òºï½ü"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Geometry"
 msgstr "¥¸¥ª¥á¥È¥ê"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Change disk geometry (experts only)"
 msgstr "¥Ç¥£¥¹¥¯¥¸¥ª¥á¥È¥ê¤òÊѹ¹¤¹¤ë(¥¨¥­¥¹¥Ñ¡¼¥ÈÍÑ)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Print help screen"
 msgstr "¥Ø¥ë¥×²èÌ̤òɽ¼¨"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize"
 msgstr "ºÇÂç²½"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "¥«¡¼¥½¥ë¾å¤ÎÎΰè¤Î¥Ç¥£¥¹¥¯»ÈÍÑÎ̤òºÇÂç²½(¥¨¥­¥¹¥Ñ¡¼¥ÈÍÑ)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "New"
 msgstr "¿·µ¬ºîÀ®"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "Create new partition from free space"
 msgstr "¶õ¤­Îΰ褫¤é¿·¤·¤¯Îΰè¤òºîÀ®"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print"
 msgstr "ɽ¼¨"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print partition table to the screen or to a file"
 msgstr "Îΰè¾ðÊó¤ò²èÌ̤ޤ¿¤Ï¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit"
 msgstr "½ªÎ»"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit program without writing partition table"
 msgstr "Îΰè¾ðÊó¤ò½ñ¤­¹þ¤Þ¤º¤Ë¥×¥í¥°¥é¥à¤ò½ªÎ»"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Type"
 msgstr "FS¥¿¥¤¥×"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥¿¥¤¥×¤òÊѹ¹¤¹¤ë(DOS, Linux, OS/2 ¤Ê¤É)"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 msgid "Units"
 msgstr "ñ°Ì"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "ɽ¼¨¤¹¤ëÎΰ襵¥¤¥º¤Îñ°Ì(MB, ¥»¥¯¥¿, ¥·¥ê¥ó¥À)¤òÊѹ¹¤¹¤ë"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write"
 msgstr "½ñ¤­¹þ¤ß"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Îΰè¾ðÊó¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤à(¥Ç¡¼¥¿¤òÇ˲õ¤¹¤ë²ÄǽÀ­¤¢¤ê)"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2727
 msgid "Cannot make this partition bootable"
 msgstr "¤³¤ÎÎΰè¤ò¥Ö¡¼¥È²Äǽ¤Ë¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2737
 msgid "Cannot delete an empty partition"
 msgstr "¶õ¤ÎÎΰè¤òºï½ü¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
 msgid "Cannot maximize this partition"
 msgstr "¤³¤ÎÎΰè¤òºÇÂç²½¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2767
 msgid "This partition is unusable"
 msgstr "¤³¤ÎÎΰè¤Ï»ÈÍѤǤ­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2769
 msgid "This partition is already in use"
 msgstr "¤³¤Î¥Ç¥£¥¹¥¯¤Ï¸½ºß»ÈÍÑÃæ¤Ç¤¹¡£"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2786
 msgid "Cannot change the type of an empty partition"
 msgstr "¶õ¤ÎÎΰè¤Î¥¿¥¤¥×¤òÊѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
 msgid "No more partitions"
 msgstr "¤³¤ì°Ê¾å¤ÎÎΰè¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2826
 msgid "Illegal command"
 msgstr "ÉÔÀµ¤Ê¥³¥Þ¥ó¥É"
 
-#: fdisk/cfdisk.c:2831
+#: fdisk/cfdisk.c:2836
 #, 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:2838
+#: fdisk/cfdisk.c:2843
 #, c-format
 msgid ""
 "\n"
@@ -2319,11 +2319,11 @@
 msgid "heads"
 msgstr "¥Ø¥Ã¥É¿ô"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "¥»¥¯¥¿¿ô"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470
+#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "¥·¥ê¥ó¥À¿ô"
@@ -2444,74 +2444,74 @@
 msgstr "16¿Ê¿ô¥³¡¼¥É (L ¥³¥Þ¥ó¥É¤Ç¥³¡¼¥É¥ê¥¹¥Èɽ¼¨): "
 
 #: fdisk/fdisk.c:1069
-#, c-format
-msgid "%s (%d-%d, default %d): "
+#, fuzzy, c-format
+msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, ½é´üÃÍ %d): "
 
-#: fdisk/fdisk.c:1134
-#, c-format
-msgid "Using default value %d\n"
+#: fdisk/fdisk.c:1136
+#, fuzzy, c-format
+msgid "Using default value %u\n"
 msgstr "½é´üÃÍ %d ¤ò»È¤¤¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1140
 msgid "Value out of range.\n"
 msgstr "Èϰϳ°¤ÎÃͤǤ¹¡£\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1150
 msgid "Partition number"
 msgstr "ÎΰèÈÖ¹æ"
 
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1161
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¶õ¤Î¥¿¥¤¥×¤Ç¤¹¡£\n"
 
-#: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207
+#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "ÆÃÊ̤ʳÈÄ¥Îΰè %d ¤ò̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1184
+#: fdisk/fdisk.c:1186
 #, fuzzy
 msgid "No partition is defined yet!\n"
 msgstr "Îΰ褬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1212
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "cylinder"
 msgstr "¥·¥ê¥ó¥À"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "sector"
 msgstr "¥»¥¯¥¿"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1231
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "%s ¤Îɽ¼¨/¹àÌÜ¥æ¥Ë¥Ã¥È¤òÊѹ¹¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1240
+#: fdisk/fdisk.c:1242
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï³ÈÄ¥Îΰè¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1251
+#: fdisk/fdisk.c:1253
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS ¸ß´¹¥Õ¥é¥°¤¬ÀßÄꤵ¤ì¤Þ¤·¤¿\n"
 
-#: fdisk/fdisk.c:1255
+#: fdisk/fdisk.c:1257
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS ¸ß´¹¥Õ¥é¥°¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1357
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Îΰè %d ¤Ï¤Þ¤À¸ºß¤·¤Þ¤»¤ó¡ª\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1362
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2523,7 +2523,7 @@
 "¿ʬÀõ¤Ï¤«¤Ê¤³¤È¤Ç¤¹¡£¤¢¤Ê¤¿¤Ï `d' ¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤³¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò\n"
 "ºï½ü¤Ç¤­¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:1361
+#: fdisk/fdisk.c:1371
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2531,7 +2531,7 @@
 "¤¢¤Ê¤¿¤ÏÎΰè¤ò³ÈÄ¥Îΰè¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó¤·¡¢¤½¤ÎµÕ¤â¤Þ¤¿\n"
 "¤Ç¤­¤Þ¤»¤ó¡£¤Þ¤ººï½ü¤ò¹Ô¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/fdisk.c:1370
+#: fdisk/fdisk.c:1380
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2540,7 +2540,7 @@
 "Îΰè 3 ¤ò Whole disk (5) ¤È¤·¤Æ»Ä¤·¤Æ¤ª¤¯¤³¤È¤ò¹Íθ¤·¤Æ¤¯¤À¤µ¤¤¡¢\n"
 "SunOS/Solaris ¤Ï¤³¤ì¤ò´üÂÔ¤·¤Þ¤¹¤·¡¢Linux ¤Ç¤µ¤¨¤½¤ì¤¬Ë¾¤Þ¤·¤¤¤Ç¤¹¡£\n"
 
-#: fdisk/fdisk.c:1376
+#: fdisk/fdisk.c:1386
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2549,59 +2549,59 @@
 "Îΰè 9 ¤ò volume header (0) ¤È¤·¤Æ¡¢µÚ¤ÓÎΰè 11 ¤ò entire volume (6)\n"
 "¤È¤·¤Æ»Ä¤·¤Æ¤ª¤¯¤³¤È¤ò¹Íθ¤·¤Æ¤¯¤À¤µ¤¤¡£IRIX ¤Ï¤³¤ì¤òÁÛÄꤷ¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:1389
+#: fdisk/fdisk.c:1399
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Îΰè¤Î¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò %d ¤«¤é %x (%s) ¤ËÊѹ¹¤·¤Þ¤·¤¿\n"
 
-#: fdisk/fdisk.c:1443
+#: fdisk/fdisk.c:1453
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "Îΰè %d ¤Ï°Û¤Ê¤Ã¤¿ÊªÍý/ÏÀÍý³«»Ï°ÌÃ֤ˤʤäƤ¤¤Þ¤¹(Linux ¤Ç¤Ï̵¤¤?):\n"
 
-#: fdisk/fdisk.c:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     ʪÍý=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "ÏÀÍý=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1451
+#: fdisk/fdisk.c:1461
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Îΰè %d ¤Ï°Û¤Ê¤Ã¤¿ÊªÍý/ÏÀÍý½ªÅÀ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹:\n"
 
-#: fdisk/fdisk.c:1460
+#: fdisk/fdisk.c:1470
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Îΰè %i ¤Ï¥·¥ê¥ó¥À¶­³¦¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó:\n"
 
-#: fdisk/fdisk.c:1463
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "(%d, %d, 1) ¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1469
+#: fdisk/fdisk.c:1479
 #, fuzzy, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %d ¤Ï¡¢¥·¥ê¥ó¥À¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "(%d, %d, %d) ¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1485
+#: fdisk/fdisk.c:1495
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1498
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2611,7 +2611,7 @@
 "¥Ç¥£¥¹¥¯ %s: ¥Ø¥Ã¥É %d, ¥»¥¯¥¿ %d, ¥·¥ê¥ó¥À %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1500
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -2619,19 +2619,19 @@
 "¥Ç¥£¥¹¥¯ %s: ¥Ø¥Ã¥É %d, ¥»¥¯¥¿ %d, ¥·¥ê¥ó¥À %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1493
+#: fdisk/fdisk.c:1503
 #, c-format
 msgid ", total %lu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1496
+#: fdisk/fdisk.c:1506
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1604
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2639,16 +2639,16 @@
 "¹Ô¤¦¤Ù¤­¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£´û¤ËÀµ¾ï¤Ê½ç½ø¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 "\n"
 
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1678
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s ¥Ö¡¼¥È   »ÏÅÀ      ½ªÅÀ  ¥Ö¥í¥Ã¥¯   ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/fdisk.c:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
 msgid "Device"
 msgstr "¥Ç¥Ð¥¤¥¹"
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1716
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2656,7 +2656,7 @@
 "\n"
 "Îΰè¥Æ¡¼¥Ö¥ë¹àÌܤ¬¥Ç¥£¥¹¥¯¤Î½ç½ø¤È°ìÃפ·¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
@@ -2667,91 +2667,91 @@
 "¥Ç¥£¥¹¥¯ %s: ¥Ø¥Ã¥É %d, ¥»¥¯¥¿ %d, ¥·¥ê¥ó¥À %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: 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    ³«»Ï    ¥µ¥¤¥º ID\n"
 
-#: fdisk/fdisk.c:1762
+#: fdisk/fdisk.c:1772
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¥»¥¯¥¿ 0 ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1765
+#: fdisk/fdisk.c:1775
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Îΰè %d: ¥Ø¥Ã¥É %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1768
+#: fdisk/fdisk.c:1778
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Îΰè %d: ¥»¥¯¥¿ %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1781
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Îΰè %d: ¥·¥ê¥ó¥À %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1775
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Îΰè %d: Á°¤Î¥»¥¯¥¿ %d ¤Ï¹ç·× %d ¤È°ìÃפ·¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1807
+#: fdisk/fdisk.c:1817
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "·Ù¹ð: Îΰè %d ¤ËÉÔÀµ¤Ê¥Ç¡¼¥¿³«»Ï°ÌÃÖ¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1815
+#: fdisk/fdisk.c:1825
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¡¢Îΰè %d ¤È½Å¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:1835
+#: fdisk/fdisk.c:1845
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "·Ù¹ð: Îΰè %d ¤Ï¶õ¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1850
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "ÏÀÍýÎΰè %d ¤ÏÎΰè %d Á´ÂΤˤʤäƤ¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1846
+#: fdisk/fdisk.c:1856
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "¹ç·×³ÎÊÝ¥»¥¯¥¿ %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:1849
+#: fdisk/fdisk.c:1859
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "³ÎÊݤµ¤ì¤Æ¤¤¤Ê¤¤¥»¥¯¥¿¤¬ %d ¤¢¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
+#: fdisk/fdisk.c:1872 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:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
-#: fdisk/fdisksunlabel.c:522
+#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "ºÇ½é %s"
 
-#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
+#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "¥»¥¯¥¿ %d ¤Ï´û¤Ë³ÎÊݺѤߤǤ¹\n"
 
-#: fdisk/fdisk.c:1937
+#: fdisk/fdisk.c:1947
 msgid "No free sectors available\n"
 msgstr "ÍøÍѲÄǽ¥Õ¥ê¡¼¥»¥¯¥¿¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
+#: fdisk/fdisk.c:1956 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:2011
+#: fdisk/fdisk.c:2021
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2763,15 +2763,15 @@
 "\t¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£(o ¤ò»È¤¦)\n"
 "\t·Ù¹ð: ¤³¤ì¤Ï¸½ºß¤Î¥Ç¥£¥¹¥¯ÆâÍƤòÇ˲õ¤·¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2033 fdisk/fdiskbsdlabel.c:618
 msgid "The maximum number of partitions has been created\n"
 msgstr "ºÇÂçÎΰè¿ô¤ÏºîÀ®ºÑ¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:2031
+#: fdisk/fdisk.c:2041
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "³ÈÄ¥Îΰè¤òÄɲ乤ëÁ°¤Ë¡¢¤Þ¤ºÎΰè¤òºï½ü¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:2036
+#: fdisk/fdisk.c:2046
 #, c-format
 msgid ""
 "Command action\n"
@@ -2782,20 +2782,20 @@
 "   %s\n"
 "   p   ´ðËÜÎΰè (1-4)\n"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "l   logical (5 or over)"
 msgstr "l   ÏÀÍý (5 °Ê¾å)"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "e   extended"
 msgstr "e   ³ÈÄ¥"
 
-#: fdisk/fdisk.c:2057
+#: fdisk/fdisk.c:2067
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "¥¿¥¤¥× `%c' ¤Ë¤È¤Ã¤Æ¤ÏÉÔÀµ¤ÊÎΰèÈÖ¹æ¤Ç¤¹\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2103
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2803,11 +2803,11 @@
 "Îΰè¥Æ¡¼¥Ö¥ë¤Ï¸ò´¹¤µ¤ì¤Þ¤·¤¿¡ª\n"
 "\n"
 
-#: fdisk/fdisk.c:2102
+#: fdisk/fdisk.c:2112
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "ioctl() ¤ò¸Æ¤Ó½Ð¤·¤ÆÎΰè¥Æ¡¼¥Ö¥ë¤òºÆÆɹþ¤ß¤·¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:2118
+#: fdisk/fdisk.c:2128
 #, c-format
 msgid ""
 "\n"
@@ -2820,7 +2820,7 @@
 "¥«¡¼¥Í¥ë¤Ï¤Þ¤À¸Å¤¤¥Æ¡¼¥Ö¥ë¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 "¿·¤·¤¤¥Æ¡¼¥Ö¥ë¤Ï¼¡²ó¥ê¥Ö¡¼¥È»þ¤Ë»È¤¨¤ë¤è¤¦¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2138
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2831,65 +2831,65 @@
 "·Ù¹ð: DOS 6.x Îΰè¤òºîÀ®¡¢¤Þ¤¿¤ÏÊѹ¹¤·¤Æ¤·¤Þ¤Ã¤¿¾ì¹ç¤Ï¡¢\n"
 "fdisk ¥Þ¥Ë¥å¥¢¥ë¤ÎÄɲþðÊó¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/fdisk.c:2135
+#: fdisk/fdisk.c:2145
 msgid "Syncing disks.\n"
 msgstr "¥Ç¥£¥¹¥¯¤òƱ´ü¤µ¤»¤Þ¤¹¡£\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Îΰè %d ¤Ë¥Ç¡¼¥¿Îΰ褬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2187
+#: fdisk/fdisk.c:2197
 msgid "New beginning of data"
 msgstr "¿·µ¬¥Ç¡¼¥¿³«»Ï°ÌÃÖ"
 
-#: fdisk/fdisk.c:2203
+#: fdisk/fdisk.c:2213
 msgid "Expert command (m for help): "
 msgstr "¾åµé¼Ô¥³¥Þ¥ó¥É (m ¤Ç¥Ø¥ë¥×): "
 
-#: fdisk/fdisk.c:2216
+#: fdisk/fdisk.c:2226
 msgid "Number of cylinders"
 msgstr "¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisk.c:2243
+#: fdisk/fdisk.c:2253
 msgid "Number of heads"
 msgstr "¥Ø¥Ã¥É¿ô"
 
-#: fdisk/fdisk.c:2268
+#: fdisk/fdisk.c:2278
 msgid "Number of sectors"
 msgstr "¥»¥¯¥¿¿ô"
 
-#: fdisk/fdisk.c:2271
+#: fdisk/fdisk.c:2281
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "·Ù¹ð: DOS ¸ß´¹¤Î¤¿¤á¤Î¥»¥¯¥¿¥ª¥Õ¥»¥Ã¥È¤òÀßÄꤷ¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:2346
+#: fdisk/fdisk.c:2356
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "¥Ç¥£¥¹¥¯ %s ¤ÏÀµ¾ï¤ÊÎΰè¥Æ¡¼¥Ö¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2360
+#: fdisk/fdisk.c:2370
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2408
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ÉÔÌÀ¤Ê¥³¥Þ¥ó¥É\n"
 
-#: fdisk/fdisk.c:2466
+#: fdisk/fdisk.c:2476
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "¤³¤Î¥«¡¼¥Í¥ë¤Ï¥»¥¯¥¿¥µ¥¤¥º¤ò¼«Ê¬Ç§¼±¤·¤Þ¤¹ -- -b ¥ª¥×¥·¥ç¥ó¤Ï̵»ë¤·¤Þ¤¹\n"
 
-#: fdisk/fdisk.c:2470
+#: fdisk/fdisk.c:2480
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2898,18 +2898,18 @@
 "»ÈÍѤµ¤ì¤ë¤Ù¤­¤Ç¤¹\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2529
+#: fdisk/fdisk.c:2539
 #, 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:2539
+#: fdisk/fdisk.c:2549
 msgid "Command (m for help): "
 msgstr "¥³¥Þ¥ó¥É (m ¤Ç¥Ø¥ë¥×): "
 
-#: fdisk/fdisk.c:2555
+#: fdisk/fdisk.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -2918,15 +2918,15 @@
 "\n"
 "¸½ºß¤Î¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤Ï: %s\n"
 
-#: fdisk/fdisk.c:2557
+#: fdisk/fdisk.c:2567
 msgid "Please enter the name of the new boot file: "
 msgstr "¿·¤¿¤Ê¥Ö¡¼¥È¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/fdisk.c:2559
+#: fdisk/fdisk.c:2569
 msgid "Boot file unchanged\n"
 msgstr "¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: fdisk/fdisk.c:2624
+#: fdisk/fdisk.c:2642
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3241,80 +3241,80 @@
 "\n"
 "¥Ç¥£¥¹¥¯¤ÈƱ´ü¤µ¤»¤Þ¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:78
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
 msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI xfslog"
 msgstr "SGI xfslog"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:92
 msgid "SGI xlv"
 msgstr "SGI xlv"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:93
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux ¥¹¥ï¥Ã¥×"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:95
+#: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:163
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3322,7 +3322,7 @@
 "MIPS Computer Systems, Inc ¤Ë¤è¤ë¤È¡¢¤½¤Î¥é¥Ù¥ë¤Ï 512 ¥Ð¥¤¥È°Ê¾å¤Ç¤Ê¤±¤ì¤Ð\n"
 "¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "´Ö°ã¤Ã¤¿¥Á¥§¥Ã¥¯¥µ¥àÃͤΠsgi ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤ò¸¡½Ð¤·¤Þ¤·¤¿¡£\n"
 
@@ -3378,12 +3378,13 @@
 "¥Ö¡¼¥È¥Õ¥¡¥¤¥ë: %s\n"
 "----- ¥Ç¥£¥ì¥¯¥È¥ê¹àÌÜ -----\n"
 
-#: fdisk/fdisksgilabel.c:250
+#: fdisk/fdisksgilabel.c:248
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s ¥»¥¯¥¿%5u ¥µ¥¤¥º%8u\n"
 
-#: fdisk/fdisksgilabel.c:304
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3395,7 +3396,7 @@
 "\t¤½¤Î¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤ÏÀäÂÐÈó¥¼¥í¥Ñ¥¹Ì¾¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 "\tÎã. \"/unix\" ¤Þ¤¿¤Ï \"/unix.save\"\n"
 
-#: fdisk/fdisksgilabel.c:311
+#: fdisk/fdisksgilabel.c:308
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3403,7 +3404,7 @@
 "\n"
 "\t¥Ö¡¼¥È¥Õ¥¡¥¤¥ë̾¤¬Ä¹¤¹¤®¤Þ¤¹ -- ºÇÂç 16 ¥Ð¥¤¥È¡£\n"
 
-#: fdisk/fdisksgilabel.c:316
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3411,7 +3412,7 @@
 "\n"
 "\t¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤Ï¥Õ¥ë¥Ñ¥¹¤Ç»ØÄꤵ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisksgilabel.c:321
+#: fdisk/fdisksgilabel.c:320
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3421,7 +3422,7 @@
 "\t¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤Ï¤½¤Î¸ºß¤ò¥Á¥§¥Ã¥¯¤µ¤ì¤Ê¤¤¤³¤È¤Ëµ¤¤Å¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\tSGI ¤Î½é´üÃÍ¤Ï \"/unix\" ¤Ç¡¢¥Ð¥Ã¥¯¥¢¥Ã¥×ÍÑ¤Ë¤Ï \"/unix.save\" ¤Ç¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:349
+#: fdisk/fdisksgilabel.c:346
 #, c-format
 msgid ""
 "\n"
@@ -3430,19 +3431,19 @@
 "\n"
 "\t¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤Ï \"%s\" ¤ËÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: fdisk/fdisksgilabel.c:447
+#: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
 msgstr "Ê£¿ô¤Î entire disk ¤Î¹àÌܤ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
 msgstr "Îΰ褬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisksgilabel.c:462
+#: fdisk/fdisksgilabel.c:449
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "IRIX ¤Ï¥Ñ¡¼¥Æ¥£¥·¥ç¥ó 11 ¤¬ entire disk ¤òʤ¤¦¤Î¤ò˾¤ß¤Þ¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:464
+#: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3451,7 +3452,7 @@
 "entire disk ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¡¢¥Ö¥í¥Ã¥¯ 0 ¤«¤é»Ï¤Þ¤ë¤Ù¤­¤Ç¤¹¤¬¡¢\n"
 "¥Ç¥£¥¹¥¯¥Ö¥í¥Ã¥¯ %d ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:468
+#: fdisk/fdisksgilabel.c:457
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3460,31 +3461,31 @@
 "entire disk ¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë %d ¥Ç¥£¥¹¥¯¥Ö¥í¥Ã¥¯¤ÎÂ礭¤µ¤·¤«¤Ê¤¤¤Ç¤¹¤¬¡¢\n"
 "¤½¤Î¥Ç¥£¥¹¥¯¤ÎÂ礭¤µ¤Ï %d ¥Ç¥£¥¹¥¯¥Ö¥í¥Ã¥¯¤Ç¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:475
+#: fdisk/fdisksgilabel.c:463
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó (#11) ¤Ï entire disk ¤òʤ¤¦¤Ù¤­¤Ç¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:487
+#: fdisk/fdisksgilabel.c:473
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %d ¤Ï¡¢¥·¥ê¥ó¥À¶­³¦¤«¤é»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisksgilabel.c:494
+#: fdisk/fdisksgilabel.c:479
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %d ¤Ï¡¢¥·¥ê¥ó¥À¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisksgilabel.c:502
+#: 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:511 fdisk/fdisksgilabel.c:531
-#, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, fuzzy, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
 msgstr "%8d ¥»¥¯¥¿¤Î̤»ÈÍÑ¥®¥ã¥Ã¥× -- ¥»¥¯¥¿ %8d-%d\n"
 
-#: fdisk/fdisksgilabel.c:544
+#: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
@@ -3492,7 +3493,7 @@
 "\n"
 "¥Ö¡¼¥È¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬Â¸ºß¤·¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisksgilabel.c:548
+#: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
@@ -3500,7 +3501,7 @@
 "\n"
 "¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬Â¸ºß¤·¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisksgilabel.c:553
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
@@ -3508,15 +3509,16 @@
 "\n"
 "¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬¥¹¥ï¥Ã¥×¥¿¥¤¥×¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/fdisksgilabel.c:557
+#: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\t¤¢¤Ê¤¿¤Ï¡¢¥Ö¡¼¥È¥Õ¥¡¥¤¥ë̾¤È¤·¤ÆÄ̾ï¤È°Û¤Ê¤ë̾Á°¤òÁª¤Ó¤Þ¤·¤¿¡£\n"
 
-#: fdisk/fdisksgilabel.c:568
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr "»ÄÇ°¤Ê¤¬¤é¡¢¶õ¤Ç¤Ï¤Ê¤¤Îΰè¤Î¥¿¥°¤òÊѹ¹¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:575
+#: 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"
@@ -3530,28 +3532,28 @@
 "¤À¤±¤¬¡¢¤³¤Î¤³¤È¤òÌȤì¤Þ¤¹¡£\n"
 "¤³¤ÎÎΰè¤Ë°Û¤Ê¤ë¥¿¥°ÉÕ¤±¤Ë¤Ä¤¤¤Æ¡¢¤è¤¯²ò¤Ã¤Æ¤¤¤ë¤Ê¤é YES ¤ÈÆþÎϤ·¤Æ²¼¤µ¤¤¡£\n"
 
-#: fdisk/fdisksgilabel.c:580 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
 msgid "YES\n"
 msgstr "YES\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:606
+#: fdisk/fdisksgilabel.c:577
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "¥Ç¥£¥¹¥¯¤ÎÎΰèƱ»Î¤¬½ÅÊ£¤·¤Æ¤¤¤ë¤³¤È¤òÃΤäƤޤ¹¤«¡©\n"
 
-#: fdisk/fdisksgilabel.c:668
+#: fdisk/fdisksgilabel.c:637
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "entire disk ¹àÌܤμ«Æ°À¸À®¤ò»î¤ß¤Þ¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:675
+#: fdisk/fdisksgilabel.c:642
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "entire disk ¤¬´û¤ËÎΰè¤òʤ¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:680
+#: fdisk/fdisksgilabel.c:646
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr "¥Ç¥£¥¹¥¯¤ÎÎΰ褬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤º¤³¤ì¤ò²¿¤È¤«¤·¤Þ¤·¤ç¤¦¡ª\n"
 
-#: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
+#: 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"
@@ -3559,16 +3561,16 @@
 "11 ÈÖÌܤÎÎΰè¤Ï entire disk ¤òʤ¤¤¡¢`SGI volume' ·¿¤Ç¤¢¤ë¤³¤È¤ò\n"
 "¶¯¤¯¿ä¾©¤·¤Þ¤¹\n"
 
-#: fdisk/fdisksgilabel.c:705
+#: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr "¥Ç¥£¥¹¥¯¤ÎÎΰ褬½ÅÊ£¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£¤Þ¤º¤³¤ì¤ò²¿¤È¤«¤·¤Þ¤·¤ç¤¦¡ª\n"
 
-#: fdisk/fdisksgilabel.c:710
+#: fdisk/fdisksgilabel.c:676
 #, c-format
 msgid " Last %s"
 msgstr " ºÇ¸å¤Î %s"
 
-#: fdisk/fdisksgilabel.c:732
+#: 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"
@@ -3579,12 +3581,20 @@
 "¥á¥â¥êÆâ¤Ë¤Î¤ßÈ¿±Ç¤µ¤ì¤Þ¤¹¡£¤½¤Î¸å¤Ï¤â¤Á¤í¤ó¡¢°ÊÁ°¤ÎÆâÍƤϼº¤ï¤ì¡¢\n"
 "Éü¸µ¤ÏÉÔ²Äǽ¤È¤Ê¤ê¤Þ¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:758
+#: 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 ""
+
+#: fdisk/fdisksgilabel.c:738
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Îΰè %d ¤ÎÃͤÎÊݸ¤ò»î¤ß¤Þ¤¹¡£\n"
 
-#: fdisk/fdisksgilabel.c:760
+#: fdisk/fdisksgilabel.c:740
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\t³«»Ï=%d\tŤµ=%d\n"
@@ -3671,63 +3681,63 @@
 msgid "Autoconfigure failed.\n"
 msgstr "¼«Æ°ÀßÄ꤬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "¥»¥¯¥¿/¥È¥é¥Ã¥¯"
 
-#: fdisk/fdisksunlabel.c:327
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "ÂåÂØ¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisksunlabel.c:330
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "ʪÍý¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
 msgid "Rotation speed (rpm)"
 msgstr "²óž¿ô (rpm)"
 
-#: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
 msgid "Interleave factor"
 msgstr "¥¤¥ó¥¿¡¼¥ê¡¼¥Ö"
 
-#: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
 msgid "Extra sectors per cylinder"
 msgstr "¥·¥ê¥ó¥ÀËè¤ÎÆÃÊ̤ʥ»¥¯¥¿"
 
-#: fdisk/fdisksunlabel.c:352
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "Á´¤Æ¤Î¥Ç¥£¥¹¥¯¥Ñ¥é¥á¡¼¥¿¤ò x ¥á¥Ë¥å¡¼¤«¤éÊѹ¹¤Ç¤­¤Þ¤¹"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "3,5\" ¥Õ¥í¥Ã¥Ô¡¼"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:446
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %d ¤Ï¥·¥ê¥ó¥À¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/fdisksunlabel.c:466
+#: 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:488
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "̤»ÈÍÑ¥®¥ã¥Ã¥× -- 0-%d ¥»¥¯¥¿\n"
 
-#: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "̤»ÈÍÑ¥®¥ã¥Ã¥× -- %d-%d ¥»¥¯¥¿\n"
 
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3735,7 +3745,7 @@
 "¾¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬´û¤Ë¥Ç¥£¥¹¥¯Á´ÂΤòʤ¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 "¤Þ¤º¤½¤ì¤òºï½ü¤·¤Æ¤«¤é¤â¤¦°ìÅٻ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/fdisksunlabel.c:593
+#: fdisk/fdisksunlabel.c:589
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3746,7 +3756,7 @@
 "¾¤Î¤¤¤¯¤Ä¤«¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òʤ¤Ã¤Æ¤¤¤Þ¤¹¡£¤¢¤Ê¤¿¤Î¹àÌÜ¤Ï %d %s ¤Ë\n"
 "Êѹ¹¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: fdisk/fdisksunlabel.c:613
+#: fdisk/fdisksunlabel.c:609
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3756,7 +3766,7 @@
 "Whole disk (5) ¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¯¤³¤È¤ò¹Íθ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "0 ¤«¤é»Ï¤Þ¤ë %u ¥»¥¯¥¿Ê¬¤Ç¤¹\n"
 
-#: fdisk/fdisksunlabel.c:626
+#: fdisk/fdisksunlabel.c:622
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3770,7 +3780,7 @@
 "¤â¤·¡¢¤¢¤Ê¤¿¤¬ËÜÅö¤Ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ËÉä¹ç 82 (Linux swap) ¤ò¤Ä¤±¤¿¤±¤ì¤Ð\n"
 "YES ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤: "
 
-#: fdisk/fdisksunlabel.c:657
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid ""
 "\n"
@@ -3789,7 +3799,7 @@
 "¥æ¥Ë¥Ã¥È = %s of %d * 512 ¥Ð¥¤¥È\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:671
+#: fdisk/fdisksunlabel.c:667
 #, c-format
 msgid ""
 "\n"
@@ -3802,16 +3812,16 @@
 "¥æ¥Ë¥Ã¥È = %s of %d * 512 ¥Ð¥¤¥È\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:676
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s ¥Õ¥é¥°  »ÏÅÀ        ½ªÅÀ   ¥Ö¥í¥Ã¥¯ ID  ¥·¥¹¥Æ¥à\n"
 
-#: fdisk/fdisksunlabel.c:701
+#: fdisk/fdisksunlabel.c:697
 msgid "Number of alternate cylinders"
 msgstr "ÂåÂØ¥·¥ê¥ó¥À¿ô"
 
-#: fdisk/fdisksunlabel.c:734
+#: fdisk/fdisksunlabel.c:730
 msgid "Number of physical cylinders"
 msgstr "ʪÍý¥·¥ê¥ó¥À¿ô"
 
@@ -4420,9 +4430,9 @@
 msgstr " ¥Ç¥Ð¥¤¥¹ ¥Ö¡¼¥È »ÏÅÀ        ½ªÅÀ  #¥Ö¥í¥Ã¥¯ ID  ¥·¥¹¥Æ¥à\n"
 
 #: fdisk/sfdisk.c:885
-#, c-format
+#, fuzzy, 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 ""
 "Units = 1048576 ¥Ð¥¤¥È¤ò¥á¥¬¥Ð¥¤¥È¡¢1024 ¥Ð¥¤¥È¤Î¥Ö¥í¥Ã¥¯¡¢%d ¤«¤é¿ô¤¨¤Þ¤¹\n"
@@ -4430,7 +4440,7 @@
 
 #: fdisk/sfdisk.c:887
 #, fuzzy
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
+msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "¥Ç¥Ð¥¤¥¹ ¥Ö¡¼¥È »ÏÅÀ   ½ªÅÀ    MB   #¥Ö¥í¥Ã¥¯ ID  ¥·¥¹¥Æ¥à\n"
 
 #: fdisk/sfdisk.c:1047
@@ -4571,6 +4581,11 @@
 "LILO ¤Ë¤È¤Ã¤Æ¤ÏÌäÂꤢ¤ê¤Þ¤»¤ó¤¬¡¢DOS MBR ¤Ï¤³¤Î¥Ç¥£¥¹¥¯¤ò¥Ö¡¼¥È¤Ç¤­¤Ê¤¯\n"
 "¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£\n"
 
+#: fdisk/sfdisk.c:1272
+#, fuzzy
+msgid "start"
+msgstr "¾õÂÖ"
+
 #: fdisk/sfdisk.c:1275
 #, c-format
 msgid ""
@@ -4578,6 +4593,11 @@
 msgstr ""
 "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s: »ÏÅÀ: (c,h,s) ´üÂÔÃÍ (%ld,%ld,%ld)  (%ld,%ld,%ld) ¤òȯ¸«\n"
 
+#: fdisk/sfdisk.c:1281
+#, fuzzy
+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"
@@ -4642,99 +4662,99 @@
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n ¥Õ¥é¥°¤¬Í¿¤¨¤é¤ì¤Þ¤·¤¿: ²¿¤âÊѹ¹¤·¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: fdisk/sfdisk.c:1577
+#: fdisk/sfdisk.c:1579
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "¸Å¤¤¥»¥¯¥¿¤ÎÊݸ¤Ë¼ºÇÔ -- ÃæÃǤ·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1582
+#: fdisk/sfdisk.c:1584
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "%s ¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó½ñ¤­¹þ¤ß¤Ë¼ºÇÔ\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1661
 msgid "long or incomplete input line - quitting\n"
 msgstr "Ť¤¤«ÉÔ´°Á´¤Ê¹Ô¤ÎÆþÎÏ -- Ãæ»ß¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1695
+#: fdisk/sfdisk.c:1697
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "ÆþÎÏ¥¨¥é¡¼: `=' ¤Ï %s ¥Õ¥£¡¼¥ë¥É¤Î¸å¤Ë¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: fdisk/sfdisk.c:1702
+#: fdisk/sfdisk.c:1704
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "ÆþÎÏ¥¨¥é¡¼: %2$s ¥Õ¥£¡¼¥ë¥É¤Î¸å¤Îͽ´ü¤·¤Ê¤¤Ê¸»ú `%1$c'\n"
 
-#: fdisk/sfdisk.c:1708
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤ÆþÎÏ: %s\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
 msgstr "¿ô»ú¤¬Â礭¤¹¤®¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1754
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
 msgstr "¿ô»ú¤Î¸å¤í¤Ë¥´¥ß¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:1875
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥óµ­½Ò»Ò¤Î¶õ¤­¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1908
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
 msgstr "³ÈÄ¥¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î°Ï¤¤¤ò¹½ÃۤǤ­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:1959
+#: fdisk/sfdisk.c:1961
 msgid "too many input fields\n"
 msgstr "ÆþÎÏ¥Õ¥£¡¼¥ë¥É¤¬Â¿¤¹¤®¤Þ¤¹\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1993
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
 msgstr "¤³¤ì°Ê¾å¤Î¶õ¤­¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2012
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
 msgstr "ÉÔÀµ¤Ê¥¿¥¤¥×\n"
 
-#: fdisk/sfdisk.c:2044
+#: fdisk/sfdisk.c:2046
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "·Ù¹ð: Í¿¤¨¤é¤ì¤¿¥µ¥¤¥º (%lu) ¤Ï¡¢µöÍƤǤ­¤ëºÇÂ祵¥¤¥º (%lu) ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2050
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
 msgstr "·Ù¹ð: ¶õ¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó\n"
 
-#: fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2066
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "·Ù¹ð: ÉÔÀµ¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹ (°ìÈֺǽé %lu)\n"
 
-#: fdisk/sfdisk.c:2077
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥Ö¡¼¥È²Äǽ¥Õ¥é¥° -- - ¤« * ¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤\n"
 
-#: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s ¤Î°ìÉô¤ò»ØÄê¡©\n"
 
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
 msgstr "³ÈÄ¥¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬Í½´ü¤·¤¿¾ì½ê¤Ë¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
 msgstr "ÉÔÀµ¤ÊÆþÎÏ\n"
 
-#: fdisk/sfdisk.c:2172
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬Â¿¤¹¤®¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2205
+#: 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"
@@ -4745,96 +4765,96 @@
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "ÉáÄÌ¤Ï <start> ¤È <size> (¤½¤·¤Æ¶²¤é¤¯ <type>)¤ò»ØÄꤹ¤ë¤À¤±¤Ç¹½¤¤¤Þ¤»¤ó¡£\n"
 
-#: fdisk/sfdisk.c:2225
+#: fdisk/sfdisk.c:2227
 msgid "version"
 msgstr "¥Ð¡¼¥¸¥ç¥ó"
 
-#: fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó] ¥Ç¥Ð¥¤¥¹Ì¾...\n"
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "¥Ç¥Ð¥¤¥¹: /dev/hda ¤ä /dev/sda ¤ÎÍͤʲ¿¤«"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
 msgstr "Í­±×¤Ê¥ª¥×¥·¥ç¥ó:"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2236
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [or --show-size]: Îΰ襵¥¤¥º¤Î¥ê¥¹¥È"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2237
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [or --id]:        Îΰè ID ¤Îɽ¼¨¤Þ¤¿¤ÏÊѹ¹"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2238
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [or --list]:      ¥Ç¥Ð¥¤¥¹Ëè¤ÎÎΰè¥ê¥¹¥È"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2239
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr "    -d [or --dump]:      Á°¤ËƱ¤¸¤À¤¬¡¢¸å¤ÎÆþÎϽñ¼°¤Ë±è¤¦¤è¤¦¤Ë¤¹¤ë"
 
-#: fdisk/sfdisk.c:2238
+#: fdisk/sfdisk.c:2240
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [or --increment]: ¥·¥ê¥ó¥À¿ô¤Ê¤É¡£0 ¤Ç¤Ï¤Ê¤¯ 1 ¤«¤é"
 
-#: fdisk/sfdisk.c:2239
+#: fdisk/sfdisk.c:2241
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:  ¥»¥¯¥¿/¥Ö¥í¥Ã¥¯/¥·¥ê¥ó¥À/MB ¤Î¥æ¥Ë¥Ã¥È¤Î¼õÍý/Êó¹ð"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2242
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [or --list-types]:´ûÃΤÎÎΰ西¥¤¥×¤Î¥ê¥¹¥È"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2243
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [or --DOS]:       DOS ¸ß´¹¥â¡¼¥É -- ¶õ´Ö¤¬¾¯¤·ÌµÂ̤ˤʤê¤Þ¤¹"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2244
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [or --re-read]:   ¥«¡¼¥Í¥ë¤ËÎΰè¥Æ¡¼¥Ö¥ë¤òºÆÆɹþ¤ß¤µ¤»¤ë"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                »ØÄêÈÖ¹æ# ¤ÎÎΰè¤Î¤ßÊѹ¹¤¹¤ë"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ¥Ç¥£¥¹¥¯¤Ø¤Î¼ÂºÝ¤Î½ñ¹þ¤ß¤ò¹Ô¤ï¤Ê¤¤"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2247
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O file :            ¾å½ñ¤­¤µ¤ì¤ë¥»¥¯¥¿¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ë"
 
-#: fdisk/sfdisk.c:2246
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            ¥»¥¯¥¿¤ò¥Õ¥¡¥¤¥ë¤«¤éÉü¸µ¤¹¤ë"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [or --version]:   ¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [or --help]:      ¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
 msgstr "´í¸±¤Ê¥ª¥×¥·¥ç¥ó:"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2252
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [or --show-geometry]: ¥«¡¼¥Í¥ë¤Î¥¸¥ª¥á¥È¥ê¾ðÊó¤òɽ¼¨¤¹¤ë"
 
-#: fdisk/sfdisk.c:2251
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4842,115 +4862,115 @@
 "    -x [or --show-extended]: ³ÈÄ¥Îΰè¥ê¥¹¥È¤âɽ¼¨¤¹¤ë\n"
 "                             ¤Þ¤¿¤Ï¤½¤ì¤é¤Îµ­½Ò»Ò¤ÎÆþÎϤòÆÀ¤ë"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2255
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [or --Linux]:      Linux ¤Ë¤½¤°¤ï¤Ê¤¯¤Æ¤âʸ¶ç¤ò±¾¤ï¤Ê¤¤"
 
-#: fdisk/sfdisk.c:2254
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [or --quiet]:      ·Ù¹ð¥á¥Ã¥»¡¼¥¸¤òÍÞÀ©¤¹¤ë"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
 msgstr "    ¥¸¥ª¥á¥È¥ê¸¡½Ð¤ò¶¯À©»ØÄê¤Ç¤­¤Þ¤¹:"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2258
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [or --cylinders #]:»ÈÍѤ¹¤ë¥·¥ê¥ó¥À¿ô¤òÀßÄꤹ¤ë"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2259
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [or --heads #]:    »ÈÍѤ¹¤ë¥Ø¥Ã¥É¿ô¤òÀßÄꤹ¤ë"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2260
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [or --sectors #]:  »ÈÍѤ¹¤ë¥»¥¯¥¿¿ô¤òÀßÄꤹ¤ë"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
 msgstr "Ì·½â¤Î¥Á¥§¥Ã¥¯¤ò¹Ô¤ï¤Ê¤¤¤è¤¦¤Ë¤Ç¤­¤Þ¤¹:"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2262
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [or --force]:      ¤ª¤«¤·¤Ê»ØÄê¤ò¹Ô¤Ã¤Æ¤â¡¢¤½¤Î¤Þ¤Þ¼Â¹Ô¤·¤Þ¤¹"
 
-#: fdisk/sfdisk.c:2266
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
 msgstr "»È¤¤Êý:"
 
-#: fdisk/sfdisk.c:2267
+#: fdisk/sfdisk.c:2269
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s ¥Ç¥Ð¥¤¥¹\t\t ¥Ç¥Ð¥¤¥¹¾å¤Î¥¢¥¯¥Æ¥£¥ôÎΰè¤ò¥ê¥¹¥È¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2268
+#: fdisk/sfdisk.c:2270
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s ¥Ç¥Ð¥¤¥¹ n1 n2 ... n1 ¤ò¥¢¥¯¥Æ¥£¥ô¤Ë¤·¤Æ..., »Ä¤ê¤òÈó¥¢¥¯¥Æ¥£¥ô¤Ë¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2269
+#: fdisk/sfdisk.c:2271
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An ¥Ç¥Ð¥¤¥¹\t n ¤ò¥¢¥¯¥Æ¥£¥ô¤Ë¤·¡¢¤½¤ì°Ê³°¤òÈó¥¢¥¯¥Æ¥£¥ô¤Ë¤·¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2421
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
 msgstr "¥³¥Þ¥ó¥É¤Ê¤·¡©\n"
 
-#: fdisk/sfdisk.c:2539
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "¹ç·×: %d ¥Ö¥í¥Ã¥¯\n"
 
-#: fdisk/sfdisk.c:2576
+#: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "»È¤¤Êý: sfdisk --print-id ¥Ç¥Ð¥¤¥¹ ¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2580
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "»È¤¤Êý: sfdisk --change-id ¥Ç¥Ð¥¤¥¹ ¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ ID\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2582
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "»È¤¤Êý: sfdisk --id ¥Ç¥Ð¥¤¥¹ ¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ [ID]\n"
 
-#: fdisk/sfdisk.c:2587
+#: fdisk/sfdisk.c:2589
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "°ì¤Ä¤Î¥Ç¥Ð¥¤¥¹¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹ (-l ¤ä -s ¤ò½ü¤¯)\n"
 
-#: fdisk/sfdisk.c:2613
+#: fdisk/sfdisk.c:2615
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2617
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s ¤òÆɹþ¤ßÍѤ˳«¤±¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2640
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2657
+#: fdisk/sfdisk.c:2659
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: ¥·¥ê¥ó¥À¿ô %ld¡¢¥Ø¥Ã¥É¿ô %ld¡¢%ld ¥»¥¯¥¿/¥È¥é¥Ã¥¯\n"
 
-#: fdisk/sfdisk.c:2674
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "%s ¤Ø¤Î BLKGETSIZE ioctl ¤Ë¼ºÇÔ\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2754
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "ÉÔÀµ¤Ê¥Ö¡¼¥È¥Õ¥é¥°: 0x80 ¤Ç¤Ê¤¯ 0x%x ¤Ç¤¹\n"
 
-#: fdisk/sfdisk.c:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
@@ -4958,7 +4978,7 @@
 "½ªÎ»\n"
 "\n"
 
-#: fdisk/sfdisk.c:2777
+#: fdisk/sfdisk.c:2781
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -4968,35 +4988,35 @@
 "LILO ¤Ç¤ÏÌäÂꤢ¤ê¤Þ¤»¤ó¤¬¡¢DOS MBR ¤Ï 1 ¤Ä¤Î¥¢¥¯¥Æ¥£¥Ö¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤·¤«\n"
 "¥Ö¡¼¥È¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: fdisk/sfdisk.c:2791
+#: fdisk/sfdisk.c:2795
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %s ¤Ë¤Ï ID %x ¤¬¤¢¤ê¡¢±£¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2848
+#: fdisk/sfdisk.c:2852
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "ÉÔÀµ¤Ê ID %lx\n"
 
-#: fdisk/sfdisk.c:2863
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
 msgstr "¤³¤Î¥Ç¥£¥¹¥¯¤Ï¸½ºß»ÈÍÑÃæ¤Ç¤¹¡£\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼: %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2887
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "·Ù¹ð: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2889
+#: fdisk/sfdisk.c:2893
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "¸½ºß¡¢Ã¯¤â¤³¤Î¥Ç¥£¥¹¥¯¤ò»È¤Ã¤Æ¤¤¤Ê¤¤¤«¤òÄ´¤Ù¤Þ¤¹...\n"
 
-#: fdisk/sfdisk.c:2891
+#: fdisk/sfdisk.c:2895
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5010,28 +5030,28 @@
 "   ¤¬¤¢¤ì¤Ð swapoff ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 "   ¤Á¤Ê¤ß¤Ë --no-reread ¥Õ¥é¥°¤Ç¤³¤Î¥Á¥§¥Ã¥¯¤òÍÞÀ©¤Ç¤­¤Þ¤¹¡£\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2899
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Á´¤Æ¤Î¥Á¥§¥Ã¥¯¤òĶ±Û¤µ¤»¤ë¤Ë¤Ï --force ¥Õ¥é¥°¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2903
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2908
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
 msgstr "¸Å¤¤¾ìÌÌ:\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2916
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "¥Ñ¡¼¥Æ¥£¥·¥ç¥ó %d ¤Ï¸ºß¤·¤Þ¤»¤ó¤Î¤Ç¡¢Êѹ¹¤Ç¤­¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2920
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
 msgstr "¿·¤¿¤Ê¾ìÌÌ:\n"
 
-#: fdisk/sfdisk.c:2925
+#: fdisk/sfdisk.c:2929
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5039,19 +5059,19 @@
 "»ä¤Ï¤³¤ì¤é¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë´ØÍ¿¤·¤¿¤¯¤¢¤ê¤Þ¤»¤ó -- Êѹ¹¤·¤Þ¤»¤ó¡£\n"
 "(ËÜÅö¤Ë¤³¤ì¤ò¹Ô¤Ê¤¤¤¿¤±¤ì¤Ð¡¢--force ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤)\n"
 
-#: fdisk/sfdisk.c:2928
+#: fdisk/sfdisk.c:2932
 msgid "I don't like this - probably you should answer No\n"
 msgstr "»ä¤Ï¤³¤ì¤Ë´ØÍ¿¤·¤¿¤¯¤¢¤ê¤Þ¤»¤ó -- ¶²¤é¤¯ No ¤ÈÅú¤¨¤ë¤Ù¤­¤Ç¤·¤ç¤¦\n"
 
-#: fdisk/sfdisk.c:2933
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
 msgstr "¤³¤ì¤Ç¤¢¤Ê¤¿¤ÎÍ×µá¤ÏËþ¤¿¤µ¤ì¤Þ¤¹¤«¡© [ynq] "
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "¥Ç¥£¥¹¥¯¤Ø¤Î½ñ¤­¹þ¤ß¤ò¹Ô¤Ê¤¤¤Þ¤¹¤«¡© [ynq] "
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5059,15 +5079,15 @@
 "\n"
 "sfdisk: ÆþÎϤ¬Ã»¤¹¤®¤Þ¤¹\n"
 
-#: fdisk/sfdisk.c:2942
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
 msgstr "ÃæÃÇ -- ²¿¤âÊѹ¹¤·¤Þ¤»¤ó\n"
 
-#: fdisk/sfdisk.c:2948
+#: fdisk/sfdisk.c:2952
 msgid "Please answer one of y,n,q\n"
 msgstr "y,n,q ¤Î¤¤¤º¤ì¤«¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤\n"
 
-#: fdisk/sfdisk.c:2956
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5075,7 +5095,7 @@
 "¿·¤¿¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î½ñ¤­¹þ¤ß¤ËÀ®¸ù\n"
 "\n"
 
-#: fdisk/sfdisk.c:2962
+#: 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"
@@ -5086,91 +5106,92 @@
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(¾ÜºÙ¤Ï fdisk(8)¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£)\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "`getopt --help' ¤Ç¾ÜºÙ¾ðÊó¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "-l ¤ä --long °ú¿ô¤Î¸å¤Î¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹"
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "-s ¤« --shell °ú¿ô¤Î¸å¤Î¥·¥§¥ë¤òÃΤê¤Þ¤»¤ó"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "»È¤¤Êý: getopt ¥ª¥×¥·¥ç¥óʸ»úÎó ÃÍ\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [¥ª¥×¥·¥ç¥ó] [--] ¥ª¥×¥·¥ç¥óʸ»úÎó ÃÍ\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
 "       getopt [¥ª¥×¥·¥ç¥ó] -o|--options ¥ª¥×¥·¥ç¥óʸ»úÎó [¥ª¥×¥·¥ç¥ó] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "              ÃÍ\n"
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            ¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤¬ - °ì¤Ä¤Ç»Ï¤Þ¤ë¤Î¤òµö¤¹\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   ¤³¤Î¤Á¤ç¤Ã¤È¤·¤¿»È¤¤Êý¤òɽ¼¨¤¹¤ë\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=longopts   ¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤òÍý²ò¤µ¤»¤ë\n"
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr "  -n, --name=progname          ¥¨¥é¡¼Êó¹ð¤ÎºÝ¤Î̾Á°\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=optstring      ¥·¥ç¡¼¤È¥ª¥×¥·¥ç¥ó¤òÍý²ò¤µ¤»¤ë\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr "  -q, --quiet                  getopt(3) ¤Î¥¨¥é¡¼Êó¹ð¤ò¹Ô¤ï¤Ê¤¤\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Ä̾ï¤Î½ÐÎϤò¹Ô¤ï¤Ê¤¤\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=shell            ¥·¥§¥ë¤Î°úÍѼè¤ê·è¤á¤òÀßÄꤹ¤ë\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   getopt(1) ¥Ð¡¼¥¸¥ç¥ó¤ò¥Æ¥¹¥È¤¹¤ë\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -u, --unqote                 ½ÐÎϤò°úÍѤ·¤Ê¤¤\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ¹¤ë\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr "¥ª¥×¥·¥ç¥óʸ»úÎó°ú¿ô¤¬Â­¤ê¤Þ¤»¤ó"
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
+#: getopt/getopt.c:444
+#, fuzzy
+msgid "getopt (enhanced) 1.1.3\n"
 msgstr "getopt (enhanced) 1.1.2\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "ÆâÉô¥¨¥é¡¼¡¢ºî¼Ô¤ËÏ¢Íí¤ò¡£"
 
@@ -5675,7 +5696,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK ¤Î»þ¹ïÆɤ߼è¤ê¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr "»þ¹ïÊѹ¹ÂÔ¤Á¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿¡£\n"
 
@@ -5700,58 +5721,58 @@
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK ioctl ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "%s ¤Ø¤Î open() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr "»þ¹ïÆɤ߹þ¤ß¤Î¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: hwclock/rtc.c:171
+#: hwclock/rtc.c:170
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "%s ¤«¤é»þ¹ï¤òÊѹ¹¤¹¤ë¤¿¤á¤Î¥ë¡¼¥×Ãæ¤Ç¤¹\n"
 
-#: hwclock/rtc.c:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s ¤Ï³ä¤ê¹þ¤ßµ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó¡£ "
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "¥¯¥í¥Ã¥¯¥Á¥Ã¥¯¤òÂԤĤ¿¤á¤Î %s ¤Ø¤Î read() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:244
+#: hwclock/rtc.c:243
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "³ä¤ê¹þ¤ß¹¹¿·¤ò¥ª¥Õ¤Ë¤¹¤ë¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:247
+#: hwclock/rtc.c:246
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 "³ä¤ê¹þ¤ß¹¹¿·¤ò¥ª¥ó¤Ë¤¹¤ë¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤¬Í½´ü¤»¤Ì¼ºÇԤ˽ª¤ï¤ê¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:305
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "»þ¹ïÀßÄê¤Î¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 
-#: hwclock/rtc.c:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) ¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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' "
@@ -5762,17 +5783,17 @@
 "Linux ¤Î 'rtc' ¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤Ë¥¢¥¯¥»¥¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤·¤«¤·¡¢¤³¤Î\n"
 "¥Õ¥¡¥¤¥ë¤¬¥·¥¹¥Æ¥à¤Ë¸ºß¤·¤Þ¤»¤ó¡£\n"
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "%s ¤Ø¤Î ioctl(RTC_EPOCH_READ) ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
@@ -5781,25 +5802,25 @@
 #. 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:397
+#: hwclock/rtc.c:396
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr ""
 "¥¨¥Ý¥Ã¥¯ÃÍ¤Ï 1900 ǯ°ÊÁ°¤Ç¤Ï¤¢¤êÆÀ¤Þ¤»¤ó¡£¤¢¤Ê¤¿¤Ï %ld ¤òÍ׵ᤷ¤Þ¤·¤¿\n"
 
-#: hwclock/rtc.c:415
+#: hwclock/rtc.c:414
 #, 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:420
+#: hwclock/rtc.c:419
 #, 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:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "%s ¤Ø¤Î ioctl(RTC_EPOCH_SET) ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
@@ -6000,9 +6021,8 @@
 msgid "Password error."
 msgstr "¥Ñ¥¹¥ï¡¼¥É¥¨¥é¡¼¡£"
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249
-#: mount/lomount.c:254
+#: 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
 msgid "Password: "
 msgstr "¥Ñ¥¹¥ï¡¼¥É: "
 
@@ -6222,29 +6242,29 @@
 "\n"
 "³ä¤ê¹þ¤ß¤¬Æþ¤ê¤Þ¤·¤¿ %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, fuzzy, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "mount: %s ¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h ¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶ÀìÍѤǤ¹¡£\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "»È¤¤Êý: login [-fp] [¥æ¡¼¥¶Ì¾]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM ¼ºÇÔ¡£ÃæÃǤ·¤Þ¤¹: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM ¤Î½é´ü²½¤¬¤Ç¤­¤Þ¤»¤ó: %s"
@@ -6255,16 +6275,16 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "¥í¥°¥¤¥ó: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -6272,17 +6292,17 @@
 "Login ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹\n"
 "\n"
 
-#: login-utils/login.c:616
+#: 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:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "¼ºÇÔ¤·¤¿¥í¥°¥¤¥ó¥»¥Ã¥·¥ç¥ó %s ¤«¤é %s ¤Ø, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -6290,7 +6310,7 @@
 "\n"
 "Login ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
@@ -6298,44 +6318,44 @@
 "\n"
 "¥»¥Ã¥·¥ç¥ó¥»¥Ã¥È¥¢¥Ã¥×¤ËÌäÂê¡£ÃæÃǤ·¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "NULL ¥æ¡¼¥¶Ì¾¤¬ %s:%d ¤Ë¤¢¤ê¤Þ¤¹¡£ÃæÃǤ·¤Þ¤¹¡£"
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "̵¸ú¤Ê¥æ¡¼¥¶Ì¾ \"%s\" ¤¬ %s:%d ¤Ë¤¢¤ê¤Þ¤¹¡£ÃæÃǤ·¤Þ¤¹"
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
 msgstr "login: ¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "ÉÔÀµ¤Ê¥æ¡¼¥¶Ì¾"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s ¤Î¥í¥°¥¤¥ó¤Ï¤³¤ÎüËö¤Ç¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡£\n"
 
-#: login-utils/login.c:763
+#: 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:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "¥í¥°¥¤¥ó %s ¤òµñÀä¡¢TTY %s ¾å¤Ç"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Login ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -6343,82 +6363,82 @@
 "´û¤Ë¥í¥°¥¤¥ó¤·¤Æ¤¤¤ë¥æ¡¼¥¶¡¼¿ô¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
 "¤Þ¤¿¸å¤Ç»î¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
 msgstr "¤¢¤Ê¤¿¤¬¼Â¹Ô¤·¤Æ¤¤¤ë¥×¥í¥»¥¹¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "¥À¥¤¥¢¥ë¥¢¥Ã¥×¤Ç %s ¤Ë¡¢%s ¤Ë¤è¤ë"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "%s ¤Ë ROOT ¤¬¥í¥°¥¤¥ó¡¢%s ¤«¤é"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "%s ¤Ë ROOT ¤¬¥í¥°¥¤¥ó"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "%s ¤Ë %s ¤¬¥í¥°¥¤¥ó¡¢%s ¤«¤é"
 
-#: login-utils/login.c:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "%s ¤Ë %s ¤¬¥í¥°¥¤¥ó"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
 msgstr "¿·¤·¤¤¥á¥¤¥ë¤¬ÆϤ¤¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
 msgstr "¥á¥¤¥ë¤¬ÆϤ¤¤Æ¤¤¤Þ¤¹¡£\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: fork ¤Ë¼ºÇÔ: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr "setuid() ¤Ë¼ºÇÔ"
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤¬¤¢¤ê¤Þ¤»¤ó¡ª\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr "¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê \"/\" ¤Ç¥í¥°¥¤¥ó¤·¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
 msgstr "login: ¥·¥§¥ë¥¹¥¯¥ê¥×¥ÈÍѤΥá¥â¥ê¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: ¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
 
-#: login-utils/login.c:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ¥·¥§¥ë¤¬¤¢¤ê¤Þ¤»¤ó: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6427,62 +6447,62 @@
 "\n"
 "%s ¥í¥°¥¤¥ó: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "¥í¥°¥¤¥ó̾¤¬Ä¹¤¹¤®¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "̾Á°¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
 msgstr "¥í¥°¥¤¥ó̾¤Ï '-' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "¹ÔÁ÷¤ê(linefeed) ¤¬Â¿¤¹¤®¤Þ¤¹¡£\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "²áÂç¤Ê¹ÔÁ÷¤ê(linefeed)"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "%d Éøå¤Ë¥í¥°¥¤¥ó¤Î»þ´ÖÀÚ¤ì\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "ºÇ½ª¥í¥°¥¤¥ó: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr " %.*s ¤«¤é\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr " %.*s ¾å\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s ¤«¤é¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s ¤Ç¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ²ó %s ¤«¤é¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ²ó %s ¤Ç¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ, %s"
@@ -6845,7 +6865,7 @@
 msgid "fork failed\n"
 msgstr "fork ¤¬¼ºÇÔ\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
 msgstr "¼Â¹Ô¤Ë¼ºÇÔ\n"
 
@@ -7146,12 +7166,12 @@
 msgid "Script started, file is %s\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤ò³«»Ï¤·¤Þ¤·¤¿¡¢¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr "¥¹¥¯¥ê¥×¥È¤Ï %s ¤Ë³«»Ï¤·¤Þ¤·¤¿"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
@@ -7160,210 +7180,210 @@
 "\n"
 "¥¹¥¯¥ê¥×¥È¤Ï %s ¤Ë½ªÎ»¤·¤Þ¤·¤¿"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤ò½ªÎ»¤·¤Þ¤·¤¿¡¢¥Õ¥¡¥¤¥ë¤Ï %s ¤Ç¤¹\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr "openpty ¤¬¼ºÇÔ\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 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 "%s: °ú¿ô¥¨¥é¡¼¡¢»È¤¤Êý¤Ï\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term üËö̾ ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -tabs [ ¥¿¥Ö1 ¥¿¥Ö2 ¥¿¥Ö3 ... ] ]      (¥¿¥Ö¿ô = 1-160)\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:783
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ ¥¿¥Ö1 ¥¿¥Ö2 ¥¿¥Ö3 ... ] ]   (¥¿¥Ö¿ô = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file ¥À¥ó¥×¥Õ¥¡¥¤¥ë̾ ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr "¥Ñ¥ï¡¼¥»¡¼¥Ö¥â¡¼¥É¤ËÀßÄê(Ëô¤Ï²ò½ü)¤Ç¤­¤Þ¤»¤ó\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: 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:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "%s ¤ÎÆɹþ¤ß¥¨¥é¡¼\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr "¥¹¥¯¥ê¡¼¥ó¥À¥ó¥×½ñ¤­¹þ¤ß¥¨¥é¡¼\n"
 
-#: misc-utils/setterm.c:1163
+#: 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:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM ¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
@@ -7419,17 +7439,17 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "¥á¥Ã¥»¡¼¥¸ from %s@%s on %s at %s ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 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 "·Ù¹ð: %s ¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿ -- Âå¤ê¤Ë %s ¤ò»È¤¤¤Þ¤¹\n"
@@ -7438,36 +7458,36 @@
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:415
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s (-n ¥Õ¥é¥°¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤)"
 
-#: mount/fstab.c:399
+#: mount/fstab.c:427
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤ò¥ê¥ó¥¯¤Ç¤­¤Þ¤»¤ó: %s (-n ¥Õ¥é¥°¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤)"
 
-#: mount/fstab.c:411
+#: mount/fstab.c:439
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤ò³«¤±¤Þ¤»¤ó: %s (-n ¥Õ¥é¥°¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤)"
 
-#: mount/fstab.c:426
+#: mount/fstab.c:454
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:467
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/fstab.c:441
+#: mount/fstab.c:469
 msgid "timed out"
 msgstr "¥¿¥¤¥à¥¢¥¦¥È"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:476
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7476,46 +7496,46 @@
 "¥ê¥ó¥¯ %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó\n"
 "¿ʬ¡¢¥´¥ß¤È²½¤·¤¿¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤Î¤Ç¤Ï ?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:525 mount/fstab.c:561
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó (%s) -- mtab ¤Ï¹¹¿·¤µ¤ì¤Þ¤»¤ó"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:569
 #, c-format
 msgid "error writing %s: %s"
 msgstr "%s ¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:577
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "%s ¤Î¥â¡¼¥ÉÊѹ¹¥¨¥é¡¼: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:595
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s ¤Î̾Á°¤ò %s ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/lomount.c:80
+#: mount/lomount.c:173
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: ¥Ç¥Ð¥¤¥¹ %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/lomount.c:86
+#: mount/lomount.c:179
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: ¥Ç¥Ð¥¤¥¹ %s ¤Î¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/lomount.c:91
-#, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\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:177
+#: mount/lomount.c:245
 msgid "mount: could not find any device /dev/loop#"
 msgstr "mount: /dev/loop# ¤¬Á´¤¯¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: mount/lomount.c:181
+#: mount/lomount.c:249
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -7523,7 +7543,7 @@
 "mount: /dev/loop# ¤¬Á´¤¯¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 "       ¿ʬ /dev/loop# ¤Î¥á¥¸¥ã¡¼Èֹ椬´Ö°ã¤Ã¤Æ¤¤¤ë¤Î¤Ç¤Ï¡©"
 
-#: mount/lomount.c:185
+#: mount/lomount.c:253
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -7534,7 +7554,7 @@
 "       ¤Ç¤¹¤«¤é¡¢¤³¤Î¥«¡¼¥Í¥ë¤Ï loop ¥Ç¥Ð¥¤¥¹¤ò°·¤¨¤Þ¤»¤ó¡£\n"
 "       (¤½¤¦¤À¤È¤¹¤ì¤Ð¡¢ºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤« `insmod loop.o' ¤·¤Æ²¼¤µ¤¤¡£)"
 
-#: mount/lomount.c:191
+#: 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"
@@ -7546,246 +7566,290 @@
 "       ¤¯¤À¤µ¤¤)¡£¤¢¤ë¤¤¤Ï¡¢/dev/loop# ¤Î¥á¥¸¥ã¡¼Èֹ椬´Ö°ã¤Ã¤Æ¤¤¤ë¤Î¤«¤â\n"
 "       ÃΤì¤Þ¤»¤ó¡£"
 
-#: mount/lomount.c:195
+#: mount/lomount.c:263
 msgid "mount: could not find any free loop device"
 msgstr "mount: ¶õ¤¤¤Æ¤¤¤ë loop ¥Ç¥Ð¥¤¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: mount/lomount.c:225
-#, c-format
-msgid "Unsupported encryption type %s\n"
-msgstr "%s ¥¿¥¤¥×¤Î°Å¹æ²½¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
+#: mount/lomount.c:359
+#, fuzzy, c-format
+msgid "Error: unable to open %s for reading\n"
+msgstr "%s ¤òÆɹþ¤ßÍѤ˳«¤±¤Þ¤»¤ó\n"
 
-#: mount/lomount.c:239
+#: mount/lomount.c:444 mount/lomount.c:478
+#, fuzzy
+msgid "Retype password: "
+msgstr "¿·¥Ñ¥¹¥ï¡¼¥É¤ò¤â¤¦°ìÅÙÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
+
+#: mount/lomount.c:456
+#, fuzzy
+msgid "Error: gpg key file decryption failed\n"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ª¡¼¥×¥ó¤¬¼ºÇÔ¤·¤Þ¤·¤¿\n"
+
+#: mount/lomount.c:463
+#, fuzzy, c-format
+msgid "Error: Password must be at least %d characters.\n"
+msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏºÇÄã 6 ʸ»úɬÍפǤ¹¡£¤â¤¦°ìÅÙ¤ä¤êľ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#: mount/lomount.c:472
+#, 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"
+msgstr ""
+
+#: mount/lomount.c:611
+#, 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 "¥á¥â¥ê¤Ë³ÊǼ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¤Î¤Ç¡¢½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: mount/lomount.c:258
+#: mount/lomount.c:654
 msgid "Init (up to 16 hex digits): "
 msgstr "½é´ü²½ (16 ¿Ê¿ô¤ÇºÇÂç 16 ʸ»ú¤Þ¤Ç): "
 
-#: mount/lomount.c:265
+#: mount/lomount.c:661
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "16 ¿Ê¿ô¤Ç¤Ï¤Ê¤¤Ê¸»ú '%c'¡£\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:764
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr "°Å¹æ²½¥·¥¹¥Æ¥à %d ¤Î¸°¼èÆÀÊýË¡¤¬²ò¤ê¤Þ¤»¤ó\n"
 
-#: mount/lomount.c:288
+#: mount/lomount.c:802
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr "set_loop(%s,%s,%d): À®¸ù\n"
 
-#: mount/lomount.c:299
-#, c-format
-msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: ¥Ç¥Ð¥¤¥¹ %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó: %s\n"
-
-#: mount/lomount.c:309
-#, c-format
-msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s): À®¸ù\n"
-
-#: mount/lomount.c:317
-msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr ""
-"¤³¤Î mount ¤Ï loop ¤Î¥µ¥Ý¡¼¥È¤Ê¤·¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿¡£\n"
-"ºÆ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
-
-#: mount/lomount.c:354
+#: mount/lomount.c:831
 #, 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"
+"  %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 ""
-"»È¤¤Êý:\n"
-"  %s loop¥Ç¥Ð¥¤¥¹                                          # ¾ðÊó¤ò¤ß¤ë\n"
-"  %s -d loop¥Ç¥Ð¥¤¥¹                                       # ºï½ü\n"
-"  %s [ -e °Å¹æ²½ ] [ -o ¥ª¥Õ¥»¥Ã¥È ] loop¥Ç¥Ð¥¤¥¹ ¥Õ¥¡¥¤¥ë # ÀßÄê\n"
 
-#: mount/lomount.c:372 mount/sundries.c:30 mount/sundries.c:45
-#: mount/sundries.c:244
+#: 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:443
-msgid "No loop support was available at compile time. Please recompile.\n"
-msgstr ""
-"¥³¥ó¥Ñ¥¤¥ë»þ¤Ë loop ¥µ¥Ý¡¼¥È¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó¡£ºÆ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ"
-"¤¤¡£\n"
+#: mount/lomount.c:945
+#, fuzzy
+msgid "Error: unable to open /etc/fstab for reading\n"
+msgstr "%s ¤òÆɹþ¤ßÍѤ˳«¤±¤Þ¤»¤ó\n"
 
-#: mount/mntent.c:165
+#: 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/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: ·Ù¹ð: %s ¤ÎºÇ¸å¤Ë²þ¹Ô¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: mount/mntent.c:216
+#: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: %2$s ¤Î %1$d ¹ÔÌܤÏÉÔÀµ¤Ç¤¹%3$s\n"
 
-#: mount/mntent.c:219
+#: mount/mntent.c:222
 msgid "; rest of file ignored"
 msgstr "-- ̵»ë¤·¤Þ¤¹"
 
-#: mount/mount.c:385
+#: mount/mount.c:396
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: mtab ¤Ë¤è¤ë¤È¡¢%s ¤Ï %s ¤Ë¥Þ¥¦¥ó¥ÈºÑ¤Ç¤¹"
 
-#: mount/mount.c:389
+#: mount/mount.c:400
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: mtab ¤Ë¤è¤ë¤È¡¢%s ¤Ï %s ¤Ë¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: mount/mount.c:410
+#: mount/mount.c:421
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s ¤ò½ñ¤­¹þ¤ßÍѤ˥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:436 mount/mount.c:660
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: %s ¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:443
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: %s ¤Î¥â¡¼¥ÉÊѹ¹¥¨¥é¡¼: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:494
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ¤Ï¥¹¥ï¥Ã¥×¶õ´Ö¤Î¤è¤¦¤Ç¤¹¤Í -- ¥Þ¥¦¥ó¥È¤·¤Þ¤»¤ó"
 
-#: mount/mount.c:538
+#: mount/mount.c:554
 msgid "mount failed"
 msgstr "¥Þ¥¦¥ó¥È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: mount/mount.c:540
+#: mount/mount.c:556
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: root ¤À¤±¤¬ %s ¤ò %s ¤Ë¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤¹"
 
-#: mount/mount.c:568
+#: mount/mount.c:584
 msgid "mount: loop device specified twice"
 msgstr "mount: loop ¥Ç¥Ð¥¤¥¹¤¬ 2 ²ó»ØÄꤵ¤ì¤Þ¤·¤¿"
 
-#: mount/mount.c:573
+#: mount/mount.c:589
 msgid "mount: type specified twice"
 msgstr "mount: ¥¿¥¤¥×¤¬ 2 ²ó»ØÄꤵ¤ì¤Þ¤·¤¿"
 
-#: mount/mount.c:585
+#: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: loop ¥Ç¥Ð¥¤¥¹¤ÎÀßÄê¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: loop ¥Ç¥Ð¥¤¥¹ %s ¤ò»È¤¤¤Þ¤¹\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:614
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop ¥Ç¥Ð¥¤¥¹¤ÎÀßÄê¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:618
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop ¥Ç¥Ð¥¤¥¹¤ÎÀßÄê¤ËÀ®¸ù¤·¤Þ¤·¤¿\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:655
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s ¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:678
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: %s ¤ò®ÅÙÀßÄêÍѤ˥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
 
-#: mount/mount.c:665
+#: mount/mount.c:681
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ®ÅÙ¤ÎÀßÄ꤬¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:735 mount/mount.c:1309
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: fork ¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:815
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr ""
 "mount: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï 'nfs' ¥¿¥¤¥×¤Î¥µ¥Ý¡¼¥È¤Ê¤·¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: mount/mount.c:845
+#: mount/mount.c:854
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr "mount: nfs mount version 4 ¤Ç¤Ï¼ºÇÔ¤·¤Þ¤·¤¿¡£3 ¤ò»î¤·¤Þ¤¹..\n"
 
-#: mount/mount.c:856
+#: mount/mount.c:865
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: none ¤¬»ØÄꤵ¤ì¤Þ¤·¤¿¤¬¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò·èÄê¤Ç¤­¤Þ¤»¤ó"
 
-#: mount/mount.c:859
+#: mount/mount.c:868
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:871
 msgid "mount: mount failed"
 msgstr "mount: ¥Þ¥¦¥ó¥È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:877 mount/mount.c:912
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:870
+#: mount/mount.c:879
 msgid "mount: permission denied"
 msgstr "mount: µö²Ä¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:872
+#: mount/mount.c:881
 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:876 mount/mount.c:880
+#: mount/mount.c:885 mount/mount.c:889
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s ¤Ï»ÈÍÑÃæ¤Ç¤¹"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:891
 msgid "mount: proc already mounted"
 msgstr "mount: proc ¤Ï¥Þ¥¦¥ó¥ÈºÑ¤Ç¤¹"
 
-#: mount/mount.c:884
+#: mount/mount.c:893
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ¤Ï ¥Þ¥¦¥ó¥ÈºÑ¤« %s ¤¬»ÈÍÑÃæ¤Ç¤¹"
 
-#: mount/mount.c:890
+#: mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤¬Â¸ºß¤·¤Þ¤»¤ó"
 
-#: mount/mount.c:892
+#: mount/mount.c:901
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤Ï¤É¤³¤â¤µ¤·¤Æ¤¤¤Ê¤¤¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤Ç¤¹"
 
-#: mount/mount.c:895
+#: mount/mount.c:904
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: ¥¹¥Ú¥·¥ã¥ë¥Ç¥Ð¥¤¥¹ %s ¤¬Â¸ºß¤·¤Þ¤»¤ó"
 
-#: mount/mount.c:905
+#: mount/mount.c:914
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7794,12 +7858,12 @@
 "mount: ¥¹¥Ú¥·¥ã¥ë¥Ç¥Ð¥¤¥¹ %s ¤¬Â¸ºß¤·¤Þ¤»¤ó\n"
 "       (¥Ñ¥¹¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó)\n"
 
-#: mount/mount.c:918
+#: mount/mount.c:927
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ¤Ï¤Þ¤À¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹"
 
-#: mount/mount.c:920
+#: mount/mount.c:929
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7809,35 +7873,35 @@
 "       %s ¤Î¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤¬ÉÔÀµ¡¢°¿¤¤¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Þ¥¦¥ó¥È\n"
 "       ¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: mount/mount.c:954
+#: mount/mount.c:963
 msgid "mount table full"
 msgstr "¥Þ¥¦¥ó¥È¥Æ¡¼¥Ö¥ë¤¬¤¤¤Ã¤Ñ¤¤¤Ç¤¹"
 
-#: mount/mount.c:956
+#: mount/mount.c:965
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: ¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤òÆɤá¤Þ¤»¤ó"
 
-#: mount/mount.c:960
+#: mount/mount.c:969
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ÉÔÌÀ¤Ê¥Ç¥Ð¥¤¥¹¤Ç¤¹"
 
-#: mount/mount.c:965
+#: mount/mount.c:974
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥× %s ¤Ï¥«¡¼¥Í¥ë¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
 
-#: mount/mount.c:977
+#: mount/mount.c:986
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: ¤ª¤½¤é¤¯¤¢¤Ê¤¿¤Ï %s ¤ò»ØÄꤷ¤¿¤«¤Ã¤¿¤Î¤Ç¤·¤ç¤¦"
 
-#: mount/mount.c:979
+#: mount/mount.c:988
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: ¿ʬ¤¢¤Ê¤¿¤Ï iso9660 ¤ò»ØÄꤷ¤¿¤«¤Ã¤¿¤Î¤Ç¤Ï¡©"
 
-#: mount/mount.c:982
+#: mount/mount.c:991
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -7845,12 +7909,12 @@
 "       %s ¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:997
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¢¤À¤«¤é stat ¤¬¼ºÇÔ¡©"
 
-#: mount/mount.c:990
+#: mount/mount.c:999
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7859,98 +7923,99 @@
 "mount: ¤³¤Î¥«¡¼¥Í¥ë¤Ï %s ¤ò¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤È¤·¤Æǧ¼±¤·¤Þ¤»¤ó\n"
 "       (¿ʬ¡¢`insmod ¥É¥é¥¤¥Ð' ¤·¤Ê¤¤¤È¤¤¤±¤Ê¤¤¤Î¤Ç¤Ï¡©)"
 
-#: mount/mount.c:993
+#: mount/mount.c:1002
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó (¿ʬ `-o loop' ¤È¤ä¤Ã¤Æ¤ß¤¿¤é¡©)"
 
-#: mount/mount.c:996
+#: mount/mount.c:1005
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:999
+#: mount/mount.c:1008
 #, 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:1002
+#: mount/mount.c:1011
 msgid "block device "
 msgstr "¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹ "
 
-#: mount/mount.c:1004
+#: mount/mount.c:1013
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s ¤òÆɹþ¤ßÀìÍѤǥޥ¦¥ó¥È¤Ç¤­¤Þ¤»¤ó"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1017
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s ¤Ï½ñ¤­¹þ¤ß¶Ø»ß¤Ç¤¹¤¬¡¢`-w' ¥Õ¥é¥°¤¬ÌÀ¼¨Åª¤ËÍ¿¤¨¤é¤ì¤Þ¤·¤¿"
 
-#: mount/mount.c:1024
+#: mount/mount.c:1033
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s ¤Ï½ñ¤­¹þ¤ß¶Ø»ß¤Ç¤¹¡¢Æɹþ¤ßÀìÍѤǥޥ¦¥ó¥È¤·¤Þ¤¹"
 
-#: mount/mount.c:1111
+#: mount/mount.c:1120
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s\n"
 msgstr ""
 
-#: mount/mount.c:1115
+#: mount/mount.c:1124
 #, fuzzy, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr "umount: %s: ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: mount/mount.c:1125
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: going to mount %s by %s\n"
 msgstr "mount: %s ¤ò %s ¤Ç¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "label"
 msgstr "¥é¥Ù¥ë"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: mount/mount.c:1137 mount/mount.c:1587
 msgid "mount: no such partition found"
 msgstr "mount: ¤½¤Î¤è¤¦¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: mount/mount.c:1136
+#: mount/mount.c:1145
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: ¥¿¥¤¥×¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó -- ¥³¥í¥ó¤¬¤¢¤ë¤Î¤Ç nfs ¤ÎÍͤǤ¹¤¬\n"
 
-#: mount/mount.c:1141
+#: mount/mount.c:1150
 #, fuzzy
-msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
-msgstr "mount: ¥¿¥¤¥×¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó -- ¥³¥í¥ó¤¬¤¢¤ë¤Î¤Ç nfs ¤ÎÍͤǤ¹¤¬\n"
+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:1157
+#: mount/mount.c:1166
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É \"%s\"\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1177
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: Äü¤á¤Þ¤·¤¿ \"%s\"\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1254
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ¤Ï %s ¤Ë¥Þ¥¦¥ó¥ÈºÑ¤Ç¤¹\n"
 
-#: mount/mount.c:1376
+#: mount/mount.c:1386
 #, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -7972,7 +8037,7 @@
 "       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 fd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "»È¤¤Êý: mount -V                : ¥Ð¡¼¥¸¥ç¥ó¤Îɽ¼¨\n"
@@ -7995,74 +8060,74 @@
 "¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó: [-nfFrsvw] [-o ¥ª¥×¥·¥ç¥ó]\n"
 "¤â¤Ã¤È¾Ü¤·¤¤¤³¤È¤òÃΤꤿ¤±¤ì¤Ð¡¢man 8 mount ¤È¾§¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£\n"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1563
 msgid "mount: only root can do that"
 msgstr "mount: root ¤À¤±¤¬¤½¤ì¤ò¹Ô¤Ê¤¨¤Þ¤¹"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1568
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó -- ºîÀ®¤·¤Þ¤¹..\n"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1582
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
 msgstr ""
 
-#: mount/mount.c:1575
+#: mount/mount.c:1589
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: %s ¤ò¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
 
-#: mount/mount.c:1584
+#: mount/mount.c:1598
 msgid "nothing was mounted"
 msgstr "²¿¤â¥Þ¥¦¥ó¥È¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: mount/mount.c:1599
+#: mount/mount.c:1613
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %2$s Æâ¤Ë %1$s ¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1628
 #, 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:259
+#: mount/mount_by_label.c:189
 #, 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:378
+#: mount/mount_by_label.c:309
 msgid "mount: bad UUID"
 msgstr "mount: ÉÔÀµ¤Ê UUID"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:483
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à·¿¿äÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸\n"
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:492
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: %s ¤Ø¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤Î»ØÄ꤬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:495
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       %s Ëô¤Ï %s ¤Î¥¿¥¤¥×¤ò»î¤·¤Æ¤ß¤Þ¤¹\n"
 
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:498
 msgid "       and it looks like this is swapspace\n"
 msgstr "       ¤½¤·¤Æ¡¢¤½¤ì¤Ï¥¹¥ï¥Ã¥×¶õ´Ö¤ÎÍͤǤ¹¡£\n"
 
-#: mount/mount_guess_fstype.c:501
+#: mount/mount_guess_fstype.c:500
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       ¥¿¥¤¥× %s ¤ò»î¤·¤Æ¤ß¤Þ¤¹\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:588
 #, c-format
 msgid "Trying %s\n"
 msgstr "%s ¤ò»î¤·¤Þ¤¹\n"
@@ -8157,7 +8222,7 @@
 msgid "bug in xstrndup call"
 msgstr "xstrndup ¸Æ¤Ó½Ð¤·¤Î¥Ð¥°"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:74
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8170,7 +8235,7 @@
 "        %s [-v] [-p Í¥ÀèÅÙ] ¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:84
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8182,33 +8247,100 @@
 "        %s [-v] [-p Í¥ÀèÅÙ] ¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë ...\n"
 "        %s [-s]\n"
 
-#: mount/swapon.c:178 mount/swapon.c:242
+#: mount/swapon.c:120 sys-utils/readprofile.c:69
+msgid "out of memory"
+msgstr "¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó"
+
+#: mount/swapon.c:201 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%2$s ¤Ë %1$s\n"
 
-#: mount/swapon.c:182
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: %s ¤Î¾õÂÖ¼èÆÀ¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: mount/swapon.c:193
+#: mount/swapon.c:216
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: ·Ù¹ð: %s ¤Ï°ÂÁ´¤Ç¤Ê¤¤¸¢¸Â %04o ¤ò»ý¤Á¤Þ¤¹¡£ %04o ¤¬¤ª´«¤á¤Ç¤¹\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:228
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: ¥Õ¥¡¥¤¥ë %s ¤ò¥¹¥­¥Ã¥× -- ¥Û¡¼¥ë¤ò¸¡½Ð¡£\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:271
 #, fuzzy
 msgid "Not superuser.\n"
 msgstr "¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: mount/swapon.c:312 mount/swapon.c:401
+#: 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
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
@@ -8338,17 +8470,17 @@
 msgstr ""
 "umount: %s ¤Ï fstab ¤Ë¤¢¤ê¤Þ¤»¤ó (¤µ¤é¤Ë¡¢¤¢¤Ê¤¿¤Ï root ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)"
 
-#: mount/umount.c:564
+#: mount/umount.c:566
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s ¤Ï fstab ¤È°ìÃפ·¤Ê¤¤¥Þ¥¦¥ó¥È¤Ç¤¹"
 
-#: mount/umount.c:598
+#: mount/umount.c:602
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: root ¤À¤±¤¬ %s ¤ò %s ¤«¤é¥¢¥ó¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤¹"
 
-#: mount/umount.c:669
+#: mount/umount.c:671
 msgid "umount: only root can do that"
 msgstr "umount: root ¤À¤±¤¬¤½¤ì¤ò¹Ô¤Ê¤¨¤Þ¤¹"
 
@@ -8489,7 +8621,7 @@
 msgid "   %f int/sec; %f rec (char/sec)\n"
 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 "»È¤¤Êý: %s [-c] [-n ¥ì¥Ù¥ë] [-s ¥Ð¥Ã¥Õ¥¡¥µ¥¤¥º]\n"
@@ -9189,12 +9321,13 @@
 msgid "missing comma"
 msgstr "¥«¥ó¥Þ¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: sys-utils/readprofile.c:60
+#: sys-utils/readprofile.c:115
 #, fuzzy, 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"
@@ -9215,36 +9348,32 @@
 "\t -n                   ¥Ð¥¤¥È¥ª¡¼¥À¤Î¼«Æ°¸¡ÃΤò̵¸ú²½¤¹¤ë\n"
 "\t -V                   ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë\n"
 
-#: sys-utils/readprofile.c:84
-msgid "out of memory"
-msgstr "¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó"
-
-#: sys-utils/readprofile.c:147
-#, c-format
-msgid "%s Version %s\n"
+#: sys-utils/readprofile.c:188
+#, fuzzy, c-format
+msgid "%s version %s\n"
 msgstr "%s ¥Ð¡¼¥¸¥ç¥ó %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "¥µ¥ó¥×¥ê¥ó¥°¥¹¥Æ¥Ã¥×: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): ´Ö°ã¤Ã¤¿¥Þ¥Ã¥×¹Ô\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:308
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: %s ¤Ë \"_stext\" ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:334
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: ¥×¥í¥Õ¥¡¥¤¥ë¥¢¥É¥ì¥¹¤¬Èϰϳ°¤Ç¤¹¡£´Ö°ã¤Ã¤¿ map ¥Õ¥¡¥¤¥ë?\n"
 
-#: sys-utils/readprofile.c:323
+#: sys-utils/readprofile.c:375
 msgid "total"
 msgstr "¹ç·×"
 
@@ -9455,17 +9584,17 @@
 msgid "...back 1 page"
 msgstr "... 1 ¥Ú¡¼¥¸Ìá¤ê¤Þ¤¹"
 
-#: text-utils/more.c:1313
+#: text-utils/more.c:1314
 #, fuzzy
 msgid "...skipping one line"
 msgstr "...%d ¹ÔÈô¤Ð¤·¤Þ¤¹"
 
-#: text-utils/more.c:1315
+#: text-utils/more.c:1316
 #, fuzzy, c-format
 msgid "...skipping %d lines"
 msgstr "...%d ¹ÔÈô¤Ð¤·¤Þ¤¹"
 
-#: text-utils/more.c:1352
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
@@ -9475,7 +9604,7 @@
 "***Ìá¤ë***\n"
 "\n"
 
-#: text-utils/more.c:1390
+#: text-utils/more.c:1391
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9487,27 +9616,28 @@
 "¤¹¡£\n"
 "À±°õ(*)¤Ï¥Ç¥Õ¥©¥ë¥È¤¬Êѹ¹¤µ¤ì¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£\n"
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1398
+#, fuzzy
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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>\t\t\t¼¡¤Î k ¹Ô¤òɽ¼¨¤¹¤ë [¸½ºß¤Î²èÌÌ¥µ¥¤¥º]\n"
 "z\t\t\t¼¡¤Î k ¹Ô¤òɽ¼¨¤¹¤ë [¸½ºß¤Î²èÌÌ¥µ¥¤¥º]*\n"
@@ -9529,33 +9659,33 @@
 ":f\t\t\t¸½ºß¤Î¥Õ¥¡¥¤¥ë̾¤È¹ÔÈÖ¹æ¤òɽ¼¨¤¹¤ë\n"
 ".\t\t\tľÁ°¤Î¥³¥Þ¥ó¥É¤ò·«¤êÊÖ¤¹\n"
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
 msgstr "['h' ¥­¡¼¤ÇÁàºîÊýË¡]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" %d ¹Ô"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Èó¥Õ¥¡¥¤¥ë] %d ¹Ô"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
 msgstr "  Â礭¤¹¤®\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1642
 msgid "...skipping\n"
 msgstr "...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
 msgstr "Àµµ¬É½¸½¤¬¥Þ¥º¤¤"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9563,15 +9693,15 @@
 "\n"
 "¥Ñ¥¿¡¼¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr "¥Ñ¥¿¡¼¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1748
 msgid "can't fork\n"
 msgstr "»Ò¥×¥í¥»¥¹¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
@@ -9579,19 +9709,19 @@
 "\n"
 "...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹ "
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1792
 msgid "...Skipping to file "
 msgstr "...¥Õ¥¡¥¤¥ë¤òÈô¤Ð¤·¤Þ¤¹ "
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1794
 msgid "...Skipping back to file "
 msgstr "...¥Õ¥¡¥¤¥ë¤ËÌá¤ê¤Þ¤¹ "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2074
 msgid "Line too long"
 msgstr "¹Ô¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
 msgstr "ÂçÂΤΤ¿¤á¤Î°ÊÁ°¤Î¥³¥Þ¥ó¥É¤¬¤¢¤ê¤Þ¤»¤ó"
 
@@ -9642,43 +9772,43 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: ÉÔÀµ¤ÊÊÑ´¹¥­¥ã¥é¥¯¥¿ %%%s¡£\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "ÉÔÀµ¤Ê¥­¡¼"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 #, fuzzy
 msgid "No next file"
 msgstr "(¼¡¤Î¥Õ¥¡¥¤¥ë: %s)"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 #, fuzzy
 msgid "No previous file"
 msgstr "Îΰ褬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: %s ¤Ç read ¥¨¥é¡¼\n"
@@ -9686,54 +9816,54 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: %s ¤Ç seek ¥¨¥é¡¼\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: °ì»þ¥Õ¥¡¥¤¥ë¤òÆɤá¤Þ¤»¤ó¡£\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 #, fuzzy
 msgid "RE error: "
 msgstr ", ¥¨¥é¡¼"
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 #, fuzzy
 msgid "Cannot open "
 msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 #, fuzzy
 msgid "saved"
 msgstr "Á÷¿®"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏÊѹ¹ *¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿*¡£¸å¤Ç¤â¤¦°ìÅٻ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 #, fuzzy
 msgid "(Next file: "
 msgstr "(¼¡¤Î¥Õ¥¡¥¤¥ë: %s)"
@@ -9772,6 +9902,33 @@
 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 "del_loop(%s): success\n"
+#~ msgstr "del_loop(%s): À®¸ù\n"
+
+#~ msgid "This mount was compiled without loop support. Please recompile.\n"
+#~ msgstr ""
+#~ "¤³¤Î mount ¤Ï loop ¤Î¥µ¥Ý¡¼¥È¤Ê¤·¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿¡£\n"
+#~ "ºÆ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£\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 ""
+#~ "»È¤¤Êý:\n"
+#~ "  %s loop¥Ç¥Ð¥¤¥¹                                          # ¾ðÊó¤ò¤ß¤ë\n"
+#~ "  %s -d loop¥Ç¥Ð¥¤¥¹                                       # ºï½ü\n"
+#~ "  %s [ -e °Å¹æ²½ ] [ -o ¥ª¥Õ¥»¥Ã¥È ] loop¥Ç¥Ð¥¤¥¹ ¥Õ¥¡¥¤¥ë # ÀßÄê\n"
+
+#~ msgid "No loop support was available at compile time. Please recompile.\n"
+#~ msgstr ""
+#~ "¥³¥ó¥Ñ¥¤¥ë»þ¤Ë loop ¥µ¥Ý¡¼¥È¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó¡£ºÆ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ"
+#~ "¤¤¡£\n"
+
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Îΰè %i ¤Ï¥·¥ê¥ó¥À¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó:\n"
 
diff --git a/po/nl.po b/po/nl.po
index 7cb22ca..54f9da0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,13 +14,13 @@
 # inode: niet vertaald
 # volume: niet vertaald
 #
-# fuzzy: alternate cylinders, trackskew, cylinderskew, shell
+# fuzzy: trackskew, cylinderskew
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11w\n"
-"POT-Creation-Date: 2002-11-25 00:47+0100\n"
-"PO-Revision-Date: 2002-10-29 22:26+02\n"
+"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"
 "Last-Translator: Taco Witte <T.C.Witte@phys.uu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
 "MIME-Version: 1.0\n"
@@ -159,7 +159,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -767,7 +767,7 @@
 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:2166
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
 #, c-format
 msgid "Device: %s\n"
 msgstr "Apparaat: %s\n"
@@ -839,11 +839,11 @@
 #: disk-utils/mkfs.c:76
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
-"Gebruik: mkfs [-V] [-t soort bestandssysteem] \n"
-"         [opties bestandssysteem] apparaat [grootte]\n"
+"Gebruik: mkfs [-V] [-t soort bestandssysteem] [opties bestandssysteem] "
+"apparaat [grootte]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Geheugentekort!\n"
@@ -853,8 +853,8 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versie %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
-#, fuzzy, c-format
+#: 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"
@@ -870,11 +870,12 @@
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"gebruik: %s [-h] [-v] [-e editie] [-i bestand] [-n naam] mapnaam "
+"gebruik: %s [-v] [-b blokgrootte] [-e editie] [-i bestand] [-n naam] mapnaam "
 "uitvoerbestand\n"
 " -h         deze hulp weergeven\n"
 " -v         meer informatie weergeven\n"
 " -E         van alle waarschuwingen fouten maken (niet-nul afsluitstatus)\n"
+" -b         gebruik deze blokgrootte; moet gelijk zijn aan paginagrootte\n"
 " -e editie  editienummer instellen (deel van bestandssysteem id)\n"
 " -i bestand een bestandsafbeelding invoegen in het bestandssysteem (>= 2.4.0 "
 "nodig)\n"
@@ -885,7 +886,7 @@
 " mapnaam    root van het in te pakken bestandssysteem\n"
 " uitvoerbestand uitvoerbestand\n"
 
-#: disk-utils/mkfs.cramfs.c:328
+#: disk-utils/mkfs.cramfs.c:335
 #, c-format
 msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
@@ -895,11 +896,11 @@
 " Verhoog alstublieft MAX_INPUT_NAMELEN in mkcramfs.c en hercompileer.  "
 "Afsluiten.\n"
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr "bestandssysteem te groot.  Afsluiten.\n"
 
-#: disk-utils/mkfs.cramfs.c:507
+#: disk-utils/mkfs.cramfs.c:514
 msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
@@ -908,17 +909,17 @@
 "hercompileer.  Afsluiten.\n"
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr "OEPS: blok \"ingepakt\" tot > 2*bloklengte (%ld)\n"
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr "%6.2f%% (%+d bytes)\t%s\n"
 
-#: disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.cramfs.c:819
 #, c-format
 msgid ""
 "warning: guestimate of required size (upper bound) is %LdMB, but maximum "
@@ -927,39 +928,39 @@
 "waarschuwing: de geschatte benodigde grootte (bovengrens) is %LdMB, maar "
 "maximale afbeeldingsgrootte is %uMB.  Dit gaat misschien niet lukken.\n"
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
 msgstr "Inclusief: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr "Mapgegevens: %d bytes\n"
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr "Alles: %d kilobytes\n"
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, c-format
 msgid "Super block: %d bytes\n"
 msgstr "Superblok: %d bytes\n"
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr "CRC: %x\n"
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
 "niet genoeg ruimte gereserveerd voor ROM afbeelding (%Ld gereserveerd, %d "
 "gebruikt)\n"
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr "Schrijven ROM afbeelding mislukt (%d %d)\n"
@@ -968,20 +969,20 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "waarschuwing: bestandsnamen afkappen tot 255 bytes.\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr "waarschuwing: bestanden zijn overgeslagen vanwege fouten.\n"
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr "waarschuwing: bestandsgroottes afgekapt tot %luMB (min 1 byte).\n"
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
@@ -989,7 +990,7 @@
 "waarschuwing: uids afgekapt tot %u bits.  (Dit kan een veiligheidsprobleem "
 "zijn.)\n"
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
@@ -997,7 +998,7 @@
 "waarschuwing: gids afgekapt tot %u bits.  (Dit kan een veiligheidsprobleem "
 "zijn.)\n"
 
-#: disk-utils/mkfs.cramfs.c:926
+#: disk-utils/mkfs.cramfs.c:933
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -1150,8 +1151,8 @@
 msgid "too many bad pages"
 msgstr "teveel slechte pagina's"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: 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 "Geheugentekort"
 
@@ -1271,11 +1272,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] apparaat\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
 msgid "Unusable"
 msgstr "Onbruikbaar"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
 msgid "Free Space"
 msgstr "Vrije ruimte"
 
@@ -1375,7 +1376,7 @@
 
 #: fdisk/cfdisk.c:910
 msgid "Partition ends in the final partial cylinder"
-msgstr ""
+msgstr "Partitie eindigt in de laatste gedeeltelijke cylinder"
 
 #: fdisk/cfdisk.c:934
 msgid "logical partitions not in disk order"
@@ -1409,235 +1410,235 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu zonder richting. Gebruik standaard: horizontaal."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Onjuiste toets"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Druk op een toets om door te gaan"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2512
 msgid "Primary"
 msgstr "Primair"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Een nieuwe primaire partitie maken"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2512
 msgid "Logical"
 msgstr "Logisch"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Een nieuwe logische partitie maken"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Geen partitie maken"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Interne fout !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Grootte (in MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Begin"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Partitie toevoegen aan begin vrije ruimte"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Einde"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Partitie toevoegen aan einde vrije ruimte"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "Geen ruimte om de uitgebreide partitie te maken"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1527
 msgid "No partition table or unknown signature on partition table"
 msgstr "Geen partitietabel of onbekende ondertekening op partitietabel"
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1529
 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:1576
+#: fdisk/cfdisk.c:1581
 msgid "You specified more cylinders than fit on disk"
 msgstr "U heeft meer cylinders aangegeven dan er op de schijf passen"
 
-#: fdisk/cfdisk.c:1606
+#: fdisk/cfdisk.c:1611
 msgid "Cannot open disk drive"
 msgstr "Kan schijf niet openen"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
 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:1629
+#: fdisk/cfdisk.c:1634
 msgid "Cannot get disk size"
 msgstr "Kan schijfgrootte niet opvragen"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1659
 msgid "Bad primary partition"
 msgstr "Slechte primaire partitie"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1689
 msgid "Bad logical partition"
 msgstr "Slechte logische partitie"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1804
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Waarschuwing!!  Dit kan gegevens op uw schijf wissen!"
 
-#: fdisk/cfdisk.c:1803
+#: fdisk/cfdisk.c:1808
 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:1809
+#: fdisk/cfdisk.c:1814
 msgid "no"
 msgstr "nee"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1815
 msgid "Did not write partition table to disk"
 msgstr "Partitietabel niet naar schijf geschreven"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1817
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1820
 msgid "Please enter `yes' or `no'"
 msgstr "Antwoord alstublieft `ja' of `nee'"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1824
 msgid "Writing partition table to disk..."
 msgstr "Schrijven partitietabel naar schijf..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
 msgid "Wrote partition table to disk"
 msgstr "De partitietabel is weggeschreven naar de schijf"
 
-#: fdisk/cfdisk.c:1846
+#: fdisk/cfdisk.c:1851
 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:1856
+#: fdisk/cfdisk.c:1861
 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:1858
+#: fdisk/cfdisk.c:1863
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Meer dan één primaire partitie is aangegeven als opstartbaar. DOS MBR kan "
 "dit niet opstarten."
 
-#: fdisk/cfdisk.c:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
 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:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan bestand '%s' niet openen"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1941
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Schijf: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1943
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1950
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1970
 msgid "   None   "
 msgstr "   Geen   "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1972
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1974
 msgid "   Primary"
 msgstr "   Primair"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1976
 msgid "   Logical"
 msgstr "   Logisch"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2020
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Opstartbaar (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Onbekend (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2024
 #, c-format
 msgid "None (%02X)"
 msgstr "Geen (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitietabel voor %s\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2061
 msgid "            First    Last\n"
 msgstr "            Eerste   Laatste\n"
 
-#: fdisk/cfdisk.c:2057
+#: fdisk/cfdisk.c:2062
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Soort    Sector   Sector   Plaats  Lengte   Soort bestandssysteem  "
 "Opties\n"
 
-#: fdisk/cfdisk.c:2058
+#: fdisk/cfdisk.c:2063
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1646,463 +1647,462 @@
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2146
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         ---Start---         ----Einde----     Startnummer van\n"
 
-#: fdisk/cfdisk.c:2142
+#: 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:2143
+#: fdisk/cfdisk.c:2148
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Raw"
 msgstr "Ruw"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Print the table using raw data format"
 msgstr "Deze tabel weergeven met ruwe gegevens formaat"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
 msgid "Sectors"
 msgstr "Sectoren"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2182
 msgid "Print the table ordered by sectors"
 msgstr "Deze tabel weergeven, geordend op sectoren"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Just print the partition table"
 msgstr "Gewoon de partitietabel weergeven"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2184
 msgid "Don't print the table"
 msgstr "Tabel niet weergeven"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2212
 msgid "Help Screen for cfdisk"
 msgstr "Hulpscherm voor cfdisk"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2214
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dit is cfdisk, een schijfpartitioneringsprogramma gebaseerd op"
 
-#: fdisk/cfdisk.c:2210
+#: fdisk/cfdisk.c:2215
 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:2211
+#: fdisk/cfdisk.c:2216
 msgid "disk drive."
 msgstr "op uw harde schijf."
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2218
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2220
 msgid "Command      Meaning"
 msgstr "Opdracht     Betekenis"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2221
 msgid "-------      -------"
 msgstr "--------     -------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2222
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          `Opstartbaar'-optie voor huidige partitie aan/uitzetten"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2223
 msgid "  d          Delete the current partition"
 msgstr "  d          Huidige partitie verwijderen"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2224
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Cylinders, koppen, sectoren-per-spoor wijzigen"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2225
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             WAARSCHUWING: Deze optie dient alleen te worden gebruikt"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2226
 msgid "             know what they are doing."
 msgstr "             door mensen die weten wat ze doen."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2227
 msgid "  h          Print this screen"
 msgstr "  h          Dit scherm weergeven"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2228
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Schijf gebruik maximaliseren voor huidige partitie"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2229
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Let op: Dit kan een partitie incompatibel maken met"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2230
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2231
 msgid "  n          Create new partition from free space"
 msgstr "  n          Nieuwe partitie maken van vrije ruimte"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2232
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Partitietabel weergeven op scherm of naar bestand"
 
-#: fdisk/cfdisk.c:2228
+#: fdisk/cfdisk.c:2233
 msgid "             There are several different formats for the partition"
 msgstr "             Er zijn verschillende formaten voor de partitie"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2234
 msgid "             that you can choose from:"
 msgstr "             waaruit u kunt kiezen:"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2235
 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:2231
+#: fdisk/cfdisk.c:2236
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabel geordend op sectoren"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2237
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel in ruw formaat"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2238
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Programma afsluiten zonder partitietabel te schrijven"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2239
 msgid "  t          Change the filesystem type"
 msgstr "  t          Soort bestandssysteem wijzigen"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2240
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Eenheden partitiegrootte weergave wijzigen"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2241
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Roteert door MB, sectoren en cylinders"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2242
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Partitietabel naar schijf wegschrijven (moet met hoofdletter)"
 
-#: fdisk/cfdisk.c:2238
+#: fdisk/cfdisk.c:2243
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Omdat dit mogelijk gegevens op de schijf wist, moet"
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2244
 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:2240
+#: fdisk/cfdisk.c:2245
 msgid "             `no'"
 msgstr "             `nee'"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2246
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pijl omhoog  Aanwijzer naar vorige partitie verplaatsen"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2247
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pijl omlaag  Aanwijzer naar volgende partitie verplaatsen"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2248
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Het scherm opnieuw tekenen"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2249
 msgid "  ?          Print this screen"
 msgstr "  ?          Dit scherm weergeven"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2251
 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:2247
+#: fdisk/cfdisk.c:2252
 msgid "case letters (except for Writes)."
 msgstr "worden ingevoerd (behalve W)."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
-#: fdisk/fdisksunlabel.c:324
+#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cylinders"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2282
 msgid "Change cylinder geometry"
 msgstr "Cylinder geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Koppen"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2283
 msgid "Change head geometry"
 msgstr "Koppen geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2284
 msgid "Change sector geometry"
 msgstr "Sector geometrie wijzigen"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done"
 msgstr "Klaar"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done with changing geometry"
 msgstr "Klaar met wijzigen geometrie"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2298
 msgid "Enter the number of cylinders: "
 msgstr "Geef het aantal cylinders: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
 msgid "Illegal cylinders value"
 msgstr "Onjuiste waarde cylinders"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2316
 msgid "Enter the number of heads: "
 msgstr "Geef het aantal koppen: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
 msgid "Illegal heads value"
 msgstr "Onjuiste waarde koppen"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2329
 msgid "Enter the number of sectors per track: "
 msgstr "Geef het aantal sectoren per spoor: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
 msgid "Illegal sectors value"
 msgstr "Onjuiste waarde sectoren"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2439
 msgid "Enter filesystem type: "
 msgstr "Geef het soort bestandssysteem: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2457
 msgid "Cannot change FS Type to empty"
 msgstr "Kan bestandsysteem soort niet veranderen tot leeg"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2459
 msgid "Cannot change FS Type to extended"
 msgstr "Kan bestandssysteem soort niet veranderen tot uitgebreid"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Opstartbaar"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2489
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Onbekend(%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2511
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2587
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Schijf: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2593
 #, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "Grootte: %lld bytes, %ld MB"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2596
 #, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "Grootte: %lld bytes, %ld.%ld GB"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2600
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Koppen: %d   Sectoren per spoor: %d   Cylinders: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2604
 msgid "Name"
 msgstr "Naam"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2605
 msgid "Flags"
 msgstr "Opties"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2606
 msgid "Part Type"
 msgstr "Part soort"
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2607
 msgid "FS Type"
 msgstr "Bestandssysteem"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2608
 msgid "[Label]"
 msgstr "[Label]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2610
 msgid "  Sectors"
 msgstr "  Sectoren"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2614
 msgid "Size (MB)"
 msgstr "Grootte (MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2616
 msgid "Size (GB)"
 msgstr "Grootte (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Bootable"
 msgstr "Opstartbaar"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Toggle bootable flag of the current partition"
 msgstr "Huidige partitie wel/niet op opstartbaar zetten"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete the current partition"
 msgstr "De huidige partitie verwijderen"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Change disk geometry (experts only)"
 msgstr "Schijf geometrie wijzigen (alleen experts)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Help"
 msgstr "Hulp"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Print help screen"
 msgstr "Hulpscherm weergeven"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize"
 msgstr "Maximaliseren"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Schijfgebruik maximaliseren voor huidige partitie (alleen experts)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "New"
 msgstr "Nieuw"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "Create new partition from free space"
 msgstr "Nieuwe partitie maken van vrije ruimte"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print"
 msgstr "Weergeven"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print partition table to the screen or to a file"
 msgstr "Partitietabel weergeven op scherm of naar een bestand"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit program without writing partition table"
 msgstr "Programma afsluiten zonder partitietabel te schrijven"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Type"
 msgstr "Soort"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Bestandssysteem soort wijzigen (DOS, Linux, OS/2 enz.)"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 msgid "Units"
 msgstr "Eenheden"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "De gebruikte eenheden in weergave wijzigen (MB, sect, cyl)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write"
 msgstr "Schrijven"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Partitietabel naar schijf schrijven (kan gegevens wissen)"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2727
 msgid "Cannot make this partition bootable"
 msgstr "Kan deze partitie niet opstartbaar maken"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2737
 msgid "Cannot delete an empty partition"
 msgstr "Kan geen lege partitie verwijderen"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
 msgid "Cannot maximize this partition"
 msgstr "Kan deze partitie niet maximaliseren"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2767
 msgid "This partition is unusable"
 msgstr "Deze partitie is onbruikbaar"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2769
 msgid "This partition is already in use"
 msgstr "Deze partitie is al in gebruik"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2786
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan niet de soort van een lege partitie wijzigen"
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
 msgid "No more partitions"
 msgstr "Niet meer partities"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2826
 msgid "Illegal command"
 msgstr "Onjuiste opdracht"
 
-#: fdisk/cfdisk.c:2831
-#, fuzzy
+#: fdisk/cfdisk.c:2836
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-2000 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:2838
+#: fdisk/cfdisk.c:2843
 #, c-format
 msgid ""
 "\n"
@@ -2312,9 +2312,8 @@
 msgstr "   c   wel/niet dos compatibel instellen"
 
 #: fdisk/fdisk.c:393
-#, fuzzy
 msgid "   a   change number of alternate cylinders"
-msgstr "   a   aantal afwisselende cylinders wijzigen"
+msgstr "   a   aantal alternatieve cylinders wijzigen"
 
 #. sun
 #: fdisk/fdisk.c:394 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
@@ -2382,11 +2381,11 @@
 msgid "heads"
 msgstr "koppen"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "sectoren"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470
+#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cylinders"
@@ -2508,73 +2507,73 @@
 msgstr "Hex code (typ L om codes op te sommen): "
 
 #: fdisk/fdisk.c:1069
-#, c-format
-msgid "%s (%d-%d, default %d): "
+#, fuzzy, c-format
+msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, standaard %d): "
 
-#: fdisk/fdisk.c:1134
-#, c-format
-msgid "Using default value %d\n"
+#: fdisk/fdisk.c:1136
+#, fuzzy, c-format
+msgid "Using default value %u\n"
 msgstr "Standaardwaarde %d wordt gebruikt\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1140
 msgid "Value out of range.\n"
 msgstr "Waarde buiten bereik.\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1150
 msgid "Partition number"
 msgstr "Partitienummer"
 
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1161
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Waarschuwing: partitie %d heeft lege soortaanduiding\n"
 
-#: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207
+#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Geselecteerde partitie %d\n"
 
-#: fdisk/fdisk.c:1184
+#: fdisk/fdisk.c:1186
 msgid "No partition is defined yet!\n"
 msgstr "Er zijn nog geen partities gedefinieerd!\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1212
 msgid "All primary partitions have been defined already!\n"
-msgstr ""
+msgstr "Alle primaire partities zijn al gedefinieerd!\n"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1231
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Weergave/invoer eenheden worden veranderd naar %s\n"
 
-#: fdisk/fdisk.c:1240
+#: fdisk/fdisk.c:1242
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "WAARSCHUWING: Partitie %d is een uitgebreide partitie\n"
 
-#: fdisk/fdisk.c:1251
+#: fdisk/fdisk.c:1253
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS compatibaliteit is aan gezet\n"
 
-#: fdisk/fdisk.c:1255
+#: fdisk/fdisk.c:1257
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS compatibaliteit is uit gezet\n"
 
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1357
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partitie %d bestaat nog niet!\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1362
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2586,7 +2585,7 @@
 "om partities te hebben van soort 0. U kunt een par-\n"
 "titie verwijderen met de `-d' opdracht.\n"
 
-#: fdisk/fdisk.c:1361
+#: fdisk/fdisk.c:1371
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2594,7 +2593,7 @@
 "U kunt een partitie niet veranderen in een uitgebreide of andersom.\n"
 "Verwijder de partitie eerst.\n"
 
-#: fdisk/fdisk.c:1370
+#: fdisk/fdisk.c:1380
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2604,7 +2603,7 @@
 "SunOS/Solaris het verwacht en zelfs Linux het liefst heeft.\n"
 "\n"
 
-#: fdisk/fdisk.c:1376
+#: fdisk/fdisk.c:1386
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2614,53 +2613,53 @@
 "partitie 11 als geheel volume (6) zoals IRIX het verwacht.\n"
 "\n"
 
-#: fdisk/fdisk.c:1389
+#: fdisk/fdisk.c:1399
 #, 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:1443
+#: fdisk/fdisk.c:1453
 #, 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:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisch=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1451
+#: fdisk/fdisk.c:1461
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partitie %d heeft verschillende fysieke/logische eindpunten:\n"
 
-#: fdisk/fdisk.c:1460
+#: fdisk/fdisk.c:1470
 #, 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:1463
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "moet zijn (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1469
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1479
+#, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr "Partitie %d eindigt niet op een cylinder grens.\n"
+msgstr "Partitie %i eindigt niet op een cylinder grens.\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "moet zijn (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1485
+#: fdisk/fdisk.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -2669,7 +2668,7 @@
 "\n"
 "Schijf %s: %ld MB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid ""
 "\n"
@@ -2678,24 +2677,26 @@
 "\n"
 "Schijf %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d koppen, %d sectoren/spoor, %d cylinders"
 
-#: fdisk/fdisk.c:1493
+#: fdisk/fdisk.c:1503
 #, c-format
 msgid ", total %lu sectors"
-msgstr ""
+msgstr ", totaal %lu sectoren"
 
-#: fdisk/fdisk.c:1496
+#: fdisk/fdisk.c:1506
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
+"Eenheden = %s van %d * %d = %d bytes\n"
+"\n"
 
-#: fdisk/fdisk.c:1604
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2703,16 +2704,16 @@
 "Niets te doen. De ordening is al goed.\n"
 "\n"
 
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1678
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Opstart Start       Einde  Blokken  Id  Systeem\n"
 
-#: fdisk/fdisk.c:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
 msgid "Device"
 msgstr "Apparaat"
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1716
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2720,7 +2721,7 @@
 "\n"
 "Partitietabel ingangen zijn niet in schijfvolgorde\n"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
@@ -2731,93 +2732,93 @@
 "Schijf %s: %d koppen, %d sectoren, %d cylinders\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: 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:1762
+#: fdisk/fdisk.c:1772
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Waarschuwing: partitie %d bevat sector 0\n"
 
-#: fdisk/fdisk.c:1765
+#: fdisk/fdisk.c:1775
 #, 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:1768
+#: fdisk/fdisk.c:1778
 #, 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:1771
+#: fdisk/fdisk.c:1781
 #, 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:1775
+#: fdisk/fdisk.c:1785
 #, 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:1807
+#: fdisk/fdisk.c:1817
 #, 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:1815
+#: fdisk/fdisk.c:1825
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Waarschuwing: partitie %d overlapt partitie %d.\n"
 
-#: fdisk/fdisk.c:1835
+#: fdisk/fdisk.c:1845
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Waarschuwing: partitie %d is leeg\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1850
 #, 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:1846
+#: fdisk/fdisk.c:1856
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "Totaal gereserveerde sectoren %d groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:1849
+#: fdisk/fdisk.c:1859
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d niet-gereserveerde sectoren\n"
 
-#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
+#: fdisk/fdisk.c:1872 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:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
-#: fdisk/fdisksunlabel.c:522
+#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Eerste %s"
 
-#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
+#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sector %d is al gereserveerd\n"
 
-#: fdisk/fdisk.c:1937
+#: fdisk/fdisk.c:1947
 msgid "No free sectors available\n"
 msgstr "Geen vrije sectoren beschikbaar\n"
 
-#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
+#: fdisk/fdisk.c:1956 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:2011
+#: fdisk/fdisk.c:2021
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2829,16 +2830,16 @@
 "\tnieuwe, lege DOS partitietabel. (Gebruik o.)\n"
 "\tWAARSCHUWING: Dit zal de huidige schijfinhoud wissen.\n"
 
-#: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2033 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:2031
+#: fdisk/fdisk.c:2041
 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:2036
+#: fdisk/fdisk.c:2046
 #, c-format
 msgid ""
 "Command action\n"
@@ -2849,20 +2850,20 @@
 "   %s\n"
 "   p   primaire partitie (1-4)\n"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "l   logical (5 or over)"
 msgstr "l   logische (5 of hoger)"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "e   extended"
 msgstr "e   uitgebreid"
 
-#: fdisk/fdisk.c:2057
+#: fdisk/fdisk.c:2067
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Onjuist partitienummer voor soort `%c'\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2103
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2870,11 +2871,11 @@
 "De partitietabel is gewijzigd!\n"
 "\n"
 
-#: fdisk/fdisk.c:2102
+#: fdisk/fdisk.c:2112
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Aanroepen ioctl() om partitietabel opnieuw in te lezen.\n"
 
-#: fdisk/fdisk.c:2118
+#: fdisk/fdisk.c:2128
 #, c-format
 msgid ""
 "\n"
@@ -2887,7 +2888,7 @@
 "De kernel gebruikt nog de oude tabel.\n"
 "De nieuwe tabel wordt na opnieuw opstarten gebruikt.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2138
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2899,64 +2900,64 @@
 "of gewijzigd, kunt u het best meer informatie opzoeken\n"
 "in het fdisk handboek.\n"
 
-#: fdisk/fdisk.c:2135
+#: fdisk/fdisk.c:2145
 msgid "Syncing disks.\n"
 msgstr "Synchroniseren schijven.\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitie %d heeft geen gegevens-plaats\n"
 
-#: fdisk/fdisk.c:2187
+#: fdisk/fdisk.c:2197
 msgid "New beginning of data"
 msgstr "Nieuw begin van gegevens"
 
-#: fdisk/fdisk.c:2203
+#: fdisk/fdisk.c:2213
 msgid "Expert command (m for help): "
 msgstr "Expert opdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:2216
+#: fdisk/fdisk.c:2226
 msgid "Number of cylinders"
 msgstr "Aantal cylinders"
 
-#: fdisk/fdisk.c:2243
+#: fdisk/fdisk.c:2253
 msgid "Number of heads"
 msgstr "Aantal koppen"
 
-#: fdisk/fdisk.c:2268
+#: fdisk/fdisk.c:2278
 msgid "Number of sectors"
 msgstr "Aantal sectoren"
 
-#: fdisk/fdisk.c:2271
+#: fdisk/fdisk.c:2281
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Waarschuwing: sector plaats wordt ingesteld voor DOS compatibaliteit\n"
 
-#: fdisk/fdisk.c:2346
+#: fdisk/fdisk.c:2356
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Schijf %s bevat geen geldige partitietabel\n"
 
-#: fdisk/fdisk.c:2360
+#: fdisk/fdisk.c:2370
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2408
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: onbekende opdracht\n"
 
-#: fdisk/fdisk.c:2466
+#: fdisk/fdisk.c:2476
 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:2470
+#: fdisk/fdisk.c:2480
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2965,16 +2966,16 @@
 "apparaat worden gebruikt\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2529
+#: fdisk/fdisk.c:2539
 #, 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:2539
+#: fdisk/fdisk.c:2549
 msgid "Command (m for help): "
 msgstr "Opdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:2555
+#: fdisk/fdisk.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -2983,15 +2984,15 @@
 "\n"
 "Het huidige opstartbestand is: %s\n"
 
-#: fdisk/fdisk.c:2557
+#: fdisk/fdisk.c:2567
 msgid "Please enter the name of the new boot file: "
 msgstr "Geef alstublieft de naam van het nieuwe opstartbestand: "
 
-#: fdisk/fdisk.c:2559
+#: fdisk/fdisk.c:2569
 msgid "Boot file unchanged\n"
 msgstr "Opstartbestand ongewijzigd\n"
 
-#: fdisk/fdisk.c:2624
+#: fdisk/fdisk.c:2642
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3308,80 +3309,80 @@
 "\n"
 "Synchroniseren schijven.\n"
 
-#: fdisk/fdisksgilabel.c:78
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
 msgstr "SGI ruw"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
 msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI xfslog"
 msgstr "SGI xfslog"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:92
 msgid "SGI xlv"
 msgstr "SGI xlv"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:93
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux wisselgeheugen"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
 msgstr "Linux eigen systeem"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:95
+#: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:163
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3389,7 +3390,7 @@
 "Volgens MIPS Computer Systems, Inc mag het Label niet meer dan 512 bytes "
 "bevatten\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Gevonden: sgi schijflabel met foutieve controle-som.\n"
 
@@ -3445,12 +3446,13 @@
 "Opstartbestand: %s\n"
 "----- Mapingangen -----\n"
 
-#: fdisk/fdisksgilabel.c:250
+#: fdisk/fdisksgilabel.c:248
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sector%5u grootte%8u\n"
 
-#: fdisk/fdisksgilabel.c:304
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3462,7 +3464,7 @@
 "\tHet opstartbestand moet een absolute, niet-nul padnaam zijn,\n"
 "\tzoals \"/unix\" of \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:311
+#: fdisk/fdisksgilabel.c:308
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3470,7 +3472,7 @@
 "\n"
 "\tNaam van opstartbestand te lang:  16 bytes maximaal.\n"
 
-#: fdisk/fdisksgilabel.c:316
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3478,7 +3480,7 @@
 "\n"
 "\tOpstartbestand moet een volledig aangegeven padnaam hebben.\n"
 
-#: fdisk/fdisksgilabel.c:321
+#: fdisk/fdisksgilabel.c:320
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3489,7 +3491,7 @@
 "\topstartbestand bestaat.\n"
 "\tSGI's standaard is \"/unix\" en voor backup \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:349
+#: fdisk/fdisksgilabel.c:346
 #, c-format
 msgid ""
 "\n"
@@ -3498,19 +3500,19 @@
 "\n"
 "\tOpstartbestand is veranderd naar \"%s\".\n"
 
-#: fdisk/fdisksgilabel.c:447
+#: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
 msgstr "Er is meer dan één schijfingang aanwezig.\n"
 
-#: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
 msgstr "Geen partities gedefinieerd\n"
 
-#: fdisk/fdisksgilabel.c:462
+#: fdisk/fdisksgilabel.c:449
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "IRIX houdt ervan dat partitie 11 de hele schijf beslaat.\n"
 
-#: fdisk/fdisksgilabel.c:464
+#: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3519,7 +3521,7 @@
 "De gehele schijfpartitie moet starten bij blok 0,\n"
 "niet bij schijfblok %d.\n"
 
-#: fdisk/fdisksgilabel.c:468
+#: fdisk/fdisksgilabel.c:457
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3528,31 +3530,31 @@
 "De gehele schijfpartitie is slechts %d schijfblokken groot,\n"
 "maar de schijf is %d schijfblokken lang.\n"
 
-#: fdisk/fdisksgilabel.c:475
+#: fdisk/fdisksgilabel.c:463
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "Eén partitie (#11) moet de gehele schijf beslaan.\n"
 
-#: fdisk/fdisksgilabel.c:487
+#: fdisk/fdisksgilabel.c:473
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "Partitie %d start niet op een cylinder grens.\n"
 
-#: fdisk/fdisksgilabel.c:494
+#: fdisk/fdisksgilabel.c:479
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "Partitie %d eindigt niet op een cylinder grens.\n"
 
-#: fdisk/fdisksgilabel.c:502
+#: fdisk/fdisksgilabel.c:486
 #, c-format
 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:511 fdisk/fdisksgilabel.c:531
-#, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, fuzzy, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
 msgstr "Ongebruikt gat van %8d sectoren - sectoren %8d-%d\n"
 
-#: fdisk/fdisksgilabel.c:544
+#: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
@@ -3560,7 +3562,7 @@
 "\n"
 "De opstartpartitie bestaat niet.\n"
 
-#: fdisk/fdisksgilabel.c:548
+#: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
@@ -3568,7 +3570,7 @@
 "\n"
 "De wisselgeheugen-partitie bestaat niet.\n"
 
-#: fdisk/fdisksgilabel.c:553
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
@@ -3576,15 +3578,17 @@
 "\n"
 "De wisselgeheugen-partitie heeft geen soortaanduiding.\n"
 
-#: fdisk/fdisksgilabel.c:557
+#: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tU heeft een ongebruikelijke naam gekozen voor het opstartbestand.\n"
 
-#: fdisk/fdisksgilabel.c:568
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
+#, fuzzy
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr ""
+msgstr "Sorry, u kunt de tag van niet-lege partities wijzigen.\n"
 
-#: fdisk/fdisksgilabel.c:575
+#: 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"
@@ -3598,28 +3602,28 @@
 "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:580 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
 msgid "YES\n"
 msgstr "JA\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:606
+#: fdisk/fdisksgilabel.c:577
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "Weet u dat u overlap heeft bij een partitie op de schijf?\n"
 
-#: fdisk/fdisksgilabel.c:668
+#: fdisk/fdisksgilabel.c:637
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "Proberen automatisch een gehele schijf ingang aan te maken.\n"
 
-#: fdisk/fdisksgilabel.c:675
+#: fdisk/fdisksgilabel.c:642
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "De gehele schijf is al ingedeeld in partities.\n"
 
-#: fdisk/fdisksgilabel.c:680
+#: fdisk/fdisksgilabel.c:646
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr "U heeft een partitie overlap op de schijf. Los dat eerst op!\n"
 
-#: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
+#: 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"
@@ -3627,16 +3631,16 @@
 "Het wordt sterk aangeraden om de elfde partitie de gehele schijf\n"
 "te laten beslaan en van soort `SGI volume' te laten zijn\n"
 
-#: fdisk/fdisksgilabel.c:705
+#: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr "U zult een partitie-overlap krijgen op de schijf. Los die eerst op!\n"
 
-#: fdisk/fdisksgilabel.c:710
+#: fdisk/fdisksgilabel.c:676
 #, c-format
 msgid " Last %s"
 msgstr " Laatste %s"
 
-#: fdisk/fdisksgilabel.c:732
+#: 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"
@@ -3648,12 +3652,20 @@
 "inhoud uiteraard definitief verloren zijn.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:758
+#: 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 ""
+
+#: fdisk/fdisksgilabel.c:738
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Proberen om parameters te houden van partitie %d.\n"
 
-#: fdisk/fdisksgilabel.c:760
+#: fdisk/fdisksgilabel.c:740
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tSTART=%d\tLENGTE=%d\n"
@@ -3742,63 +3754,63 @@
 msgid "Autoconfigure failed.\n"
 msgstr "Auto-instellen mislukt.\n"
 
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Sectoren/spoor"
 
-#: fdisk/fdisksunlabel.c:327
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Afwisselende cylinders"
 
-#: fdisk/fdisksunlabel.c:330
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Fysieke cylinders"
 
-#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
 msgid "Rotation speed (rpm)"
 msgstr "Rotatiesnelheid (rpm)"
 
-#: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
 msgid "Interleave factor"
 msgstr "Tussenruimte factor"
 
-#: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
 msgid "Extra sectors per cylinder"
 msgstr "Extra sectoren per cylinder"
 
-#: fdisk/fdisksunlabel.c:352
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "U kunt alle schijfparameters wijzigen vanuit het x menu"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "3,5\" diskette"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "Linux aangepast"
 
-#: fdisk/fdisksunlabel.c:446
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partitie %d eindigt niet op een cylinder grens\n"
 
-#: fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:462
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partitie %d overlapt met andere in sectoren %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:488
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Ongebruikt gat - sectoren 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Ongebruikt gat - sectoren %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3806,7 +3818,7 @@
 "Andere partities beslaan al de gehele schijf.\n"
 "Verwijder/verklein ze alvorens het opnieuw te proberen.\n"
 
-#: fdisk/fdisksunlabel.c:593
+#: fdisk/fdisksunlabel.c:589
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3817,7 +3829,7 @@
 "waarde %d %s bedekt al een andere partitie. Uw invoer is gewijzigd\n"
 "tot %d %s\n"
 
-#: fdisk/fdisksunlabel.c:613
+#: fdisk/fdisksunlabel.c:609
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3826,7 +3838,7 @@
 "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:626
+#: fdisk/fdisksunlabel.c:622
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3841,7 +3853,7 @@
 "Typ JA als u erg zeker bent dat u die partitie van soort 82\n"
 "(Linux wisselgeheugen) wilt laten zijn: "
 
-#: fdisk/fdisksunlabel.c:657
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid ""
 "\n"
@@ -3854,13 +3866,13 @@
 msgstr ""
 "\n"
 "Schijf %s (Sun schijflabel): %d koppen, %d sectoren, %d rpm\n"
-"%d cylinders, %d afwisselende cylinders, %d fysieke cylinders\n"
+"%d cylinders, %d alternatieve cylinders, %d fysieke cylinders\n"
 "%d extra sect/cyl, tussenruimte %d:1\n"
 "%s\n"
 "Eenheden = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:671
+#: fdisk/fdisksunlabel.c:667
 #, c-format
 msgid ""
 "\n"
@@ -3873,16 +3885,16 @@
 "Eenheden = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:676
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Optie   Start       Eind   Blokken  Id  Systeem\n"
 
-#: fdisk/fdisksunlabel.c:701
+#: fdisk/fdisksunlabel.c:697
 msgid "Number of alternate cylinders"
-msgstr "Aantal afwisselende cylinders"
+msgstr "Aantal alternatieve cylinders"
 
-#: fdisk/fdisksunlabel.c:734
+#: fdisk/fdisksunlabel.c:730
 msgid "Number of physical cylinders"
 msgstr "Aantal fysieke cylinders"
 
@@ -4489,16 +4501,16 @@
 #: 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 ""
-"Eenheden = megabytes van 1048576 bytes, blokken van 1024 bytes, te tellen "
+"Eenheden = mebibytes van 1048576 bytes, blokken van 1024 bytes, te tellen "
 "vanaf %d\n"
 "\n"
 
 #: fdisk/sfdisk.c:887
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
-msgstr "   Apparaat Opstart Start Eind MB    #blokken  Id  Systeem\n"
+msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
+msgstr "   Apparaat Opstart Start Eind MiB   #blokken  Id  Systeem\n"
 
 #: fdisk/sfdisk.c:1047
 #, c-format
@@ -4640,6 +4652,10 @@
 "Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf "
 "opstarten.\n"
 
+#: fdisk/sfdisk.c:1272
+msgid "start"
+msgstr "start"
+
 #: fdisk/sfdisk.c:1275
 #, c-format
 msgid ""
@@ -4647,6 +4663,10 @@
 msgstr ""
 "partitie %s: start: (c,h,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
+#: fdisk/sfdisk.c:1281
+msgid "end"
+msgstr "eind"
+
 #: fdisk/sfdisk.c:1284
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4709,100 +4729,100 @@
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n optie is gegeven: Niets gewijzigd\n"
 
-#: fdisk/sfdisk.c:1577
+#: fdisk/sfdisk.c:1579
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Opslaan oude sectoren mislukt - afbreken\n"
 
-#: fdisk/sfdisk.c:1582
+#: fdisk/sfdisk.c:1584
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Partitie schrijven op %s mislukt\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1661
 msgid "long or incomplete input line - quitting\n"
 msgstr "lange of incomplete invoerregel - afsluiten\n"
 
-#: fdisk/sfdisk.c:1695
+#: fdisk/sfdisk.c:1697
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "invoerfout: `=' verwacht na %s veld\n"
 
-#: fdisk/sfdisk.c:1702
+#: fdisk/sfdisk.c:1704
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "invoerfout: onverwacht teken %c na %s veld\n"
 
-#: fdisk/sfdisk.c:1708
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "invoer niet herkend: %s\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
 msgstr "getal te groot\n"
 
-#: fdisk/sfdisk.c:1754
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
 msgstr "rotzooi na getal\n"
 
-#: fdisk/sfdisk.c:1875
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
 msgstr "geen ruimte voor partitie beschrijver\n"
 
-#: fdisk/sfdisk.c:1908
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan omgevende uitgebreide partitie niet maken\n"
 
-#: fdisk/sfdisk.c:1959
+#: fdisk/sfdisk.c:1961
 msgid "too many input fields\n"
 msgstr "teveel invoervelden\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1993
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
 msgstr "Geen ruimte voor meer\n"
 
-#: fdisk/sfdisk.c:2012
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
 msgstr "Onjuiste soort\n"
 
-#: fdisk/sfdisk.c:2044
+#: fdisk/sfdisk.c:2046
 #, 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:2050
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
 msgstr "Waarschuwing: lege partitie\n"
 
-#: fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2066
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Waarschuwing: slechte partitie start (eerste %lu)\n"
 
-#: fdisk/sfdisk.c:2077
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "opstartbaar optie niet herkend - kies - of *\n"
 
-#: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
 msgstr "gedeeltelijke c,h,s specificatie?\n"
 
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
 msgstr "Uitgebreide partitie niet waar die verwacht was\n"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
 msgstr "slechte invoer\n"
 
-#: fdisk/sfdisk.c:2172
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
 msgstr "teveel partities\n"
 
-#: fdisk/sfdisk.c:2205
+#: 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"
@@ -4814,46 +4834,46 @@
 "Meestal hoeft u alleen <start> en <grootte> te gebruiken (en mogelijk "
 "<soort>).\n"
 
-#: fdisk/sfdisk.c:2225
+#: fdisk/sfdisk.c:2227
 msgid "version"
 msgstr "versie"
 
-#: fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Gebruik: %s [opties] apparaat ...\n"
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "apparaat: zoiets als /dev/hda of /dev/sda"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
 msgstr "nuttige opties:"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2236
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [of --show-size]: grootte van een partitie weergeven"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2237
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [of --id]:        partitie Id weergeven of wijzigen"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2238
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [of --list]:      partities van elk apparaat opsommen"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2239
 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:2238
+#: fdisk/sfdisk.c:2240
 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:2239
+#: fdisk/sfdisk.c:2241
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4861,57 +4881,57 @@
 "    -uS, -uB, -uC, -uM:  accepteren/weergeven in eenheden van sectoren/"
 "blokken/cylinders/MB"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2242
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [of --list-types]:bekende partitiesoorten opsommen"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2243
 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:2242
+#: fdisk/sfdisk.c:2244
 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:2243
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                alleen partitie met nummer # wijzigen"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 niet echt naar de schijf schrijven"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2247
 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:2246
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I bestand :         deze sectoren weer herstellen"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [of --version]:   versienummer weergeven"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [of --help]:      dit bericht weergeven"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
 msgstr "gevaarlijke opties:"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2252
 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:2251
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4919,117 +4939,117 @@
 "    -x [of --show-extended]: ook uitgebreide partities opnemen in uitvoer\n"
 "                             of, verwacht beschrijvers voor ze in invoer"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2255
 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:2254
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [of --quiet]:      waarschuwingen onderdrukken"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
 msgstr "    U kunt zo een andere geometrie dan de gevonden forceren:"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2258
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [of --cylinders #]:het aantal te gebruiken cylinders instellen"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2259
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [of --heads #]:    het aantal te gebruiken koppen instellen"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2260
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [of --sectors #]:  het aantal te gebruiken sectoren instellen"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
 msgstr "U kunt alle consistentie controles uit zetten met:"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2262
 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:2266
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: fdisk/sfdisk.c:2267
+#: fdisk/sfdisk.c:2269
 #, 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:2268
+#: fdisk/sfdisk.c:2270
 #, 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:2269
+#: fdisk/sfdisk.c:2271
 #, 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:2421
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
 msgstr "geen opdracht?\n"
 
-#: fdisk/sfdisk.c:2539
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "totaal: %d blokken\n"
 
-#: fdisk/sfdisk.c:2576
+#: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "gebruik: sfdisk --print-id apparaat partitie-nummer\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2580
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "gebruik: sfdisk --change-id apparaat partitie-nummer Id\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2582
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "gebruik: sfdisk --id apparaat partitie-nummer [Id]\n"
 
-#: fdisk/sfdisk.c:2587
+#: fdisk/sfdisk.c:2589
 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:2613
+#: fdisk/sfdisk.c:2615
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan %s niet lezen-schrijven openen\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2617
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan %s niet openen om te lezen\n"
 
-#: fdisk/sfdisk.c:2640
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2657
+#: fdisk/sfdisk.c:2659
 #, 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:2674
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE ioctl mislukt voor %s\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2754
 #, 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:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
@@ -5037,7 +5057,7 @@
 "Klaar\n"
 "\n"
 
-#: fdisk/sfdisk.c:2777
+#: fdisk/sfdisk.c:2781
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5046,35 +5066,35 @@
 "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:2791
+#: fdisk/sfdisk.c:2795
 #, 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:2848
+#: fdisk/sfdisk.c:2852
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Slechte Id %lx\n"
 
-#: fdisk/sfdisk.c:2863
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
 msgstr "Deze schijf is op dit moment in gebruik.\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatale fout: kan %s niet vinden\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2887
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Waarschuwing: %s is geen blok-apparaat\n"
 
-#: fdisk/sfdisk.c:2889
+#: fdisk/sfdisk.c:2893
 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:2891
+#: fdisk/sfdisk.c:2895
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5088,28 +5108,28 @@
 "deze schijf uit.\n"
 "Gebruik --no-reread om deze controle te onderdrukken.\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2899
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Gebruik --force om alle controles te negeren.\n"
 
-#: fdisk/sfdisk.c:2899
+#: fdisk/sfdisk.c:2903
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2908
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
 msgstr "Oude situatie:\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2916
 #, 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:2920
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
 msgstr "Nieuwe situatie:\n"
 
-#: fdisk/sfdisk.c:2925
+#: fdisk/sfdisk.c:2929
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5117,19 +5137,19 @@
 "Deze partities bevallen mij niet echt - er is niets veranderd.\n"
 "(Als u dit echt wilt, kunt u --force gebruiken.)\n"
 
-#: fdisk/sfdisk.c:2928
+#: fdisk/sfdisk.c:2932
 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:2933
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bent u hiermee tevreden? [ynq] "
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Wilt u dit naar de schijf schrijven? [ynq] "
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5137,15 +5157,15 @@
 "\n"
 "sfdisk: vroegtijdig einde van invoer\n"
 
-#: fdisk/sfdisk.c:2942
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
 msgstr "Afsluiten - niets veranderd\n"
 
-#: fdisk/sfdisk.c:2948
+#: fdisk/sfdisk.c:2952
 msgid "Please answer one of y,n,q\n"
 msgstr "Antwoord alstublieft een van y,n,q\n"
 
-#: fdisk/sfdisk.c:2956
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5153,7 +5173,7 @@
 "Nieuwe partitietabel succesvol weggeschreven\n"
 "\n"
 
-#: fdisk/sfdisk.c:2962
+#: 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"
@@ -5165,98 +5185,97 @@
 "bs=512 count=1\n"
 "(Zie fdisk(8).)\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Probeer `getopt --help' voor meer informatie.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "lege, lange optie na -l of --long argument"
 
-#: getopt-1.1.2/getopt.c:319
-#, fuzzy
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "onbekende shell na -s of --shell argument"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Gebruik: getopt opttekst paramters\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [opties] [--] opttekst parameters\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [opties] -o|--options opttekst [opties] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "              parameters\n"
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Lange opties toestaan beginnend met een "
 "enkele -\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr ""
 "  -h, --help                   Deze kleine gebruikersaanwijzing weergeven\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr ""
 "  -l, --longoptions=langeopts  Lange opties die moeten worden herkend\n"
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 "  -n, --name=prognaam          De naam waaronder fouten worden "
 "gerapporteerd\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr ""
 "  -o, --options=opttekst       Korte opties die moeten worden herkend\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 "  -q, --quiet                  Foutrapportage van getopt(3) uit zetten\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Geen gewone uitvoer\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=shell            Shell aanhalingsconventies instellen\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Test getopt(1) versie\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -u, --unqote                 Uitvoer niet aanhalen\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Versie-informatie weergeven\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr "opttekst argument ontbreekt"
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
-msgstr "getopt (uitgebreid) 1.1.2\n"
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (uitgebreid) 1.1.3\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "interne fout, neem contact op met de auteur"
 
@@ -5530,20 +5549,25 @@
 "of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
+"Klok %.1f seconden verschoven in de laatste %d seconden ondanks een "
+"verschuivingsfactor van %f seconden/dag.\n"
+"De verschuivingsfactor wordt %f seconden/dag aangepast\n"
 
 #: hwclock/hwclock.c:859
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
-msgstr ""
+msgstr "Tijd sinds laatste aanpassing is %d seconden\n"
 
 #: hwclock/hwclock.c:861
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
+"Er moeten %d seconden worden ingevoegd, en er moet worden gekeken naar de "
+"tijd %.6f seconden geleden\n"
 
 #: hwclock/hwclock.c:890
 msgid "Not updating adjtime file because of testing mode.\n"
-msgstr ""
+msgstr "Het adjtime bestand wordt niet aangepast - in testmodus.\n"
 
 #: hwclock/hwclock.c:891
 #, c-format
@@ -5551,32 +5575,38 @@
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
+"Er zou het volgende worden geschreven naar %s:\n"
+"%s"
 
 #: hwclock/hwclock.c:915
 msgid "Drift adjustment parameters not updated.\n"
-msgstr ""
+msgstr "Verschuivingsaanpassing parameters niet bijgewerkt.\n"
 
 #: hwclock/hwclock.c:956
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
+"De hardware klok bevat geen geldige tijd, zodat we die niet kunnen "
+"aanpassen.\n"
 
 #: hwclock/hwclock.c:988
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
+"Benodigde aanpassing is minder dan een seconden - de klok wordt niet "
+"ingesteld.\n"
 
 #: hwclock/hwclock.c:1014
 #, c-format
 msgid "Using %s.\n"
-msgstr ""
+msgstr "%s wordt gebruikt.\n"
 
 #: hwclock/hwclock.c:1016
 msgid "No usable clock interface found.\n"
-msgstr ""
+msgstr "Geen bruikbare klok-interface gevonden.\n"
 
 #: hwclock/hwclock.c:1112
 msgid "Unable to set system clock.\n"
-msgstr ""
+msgstr "Instellen systeemklok mislukt.\n"
 
 #: hwclock/hwclock.c:1142
 msgid ""
@@ -5585,30 +5615,36 @@
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
+"De kernel bewaart alleen bij Alpha's een tijdperk-waarde voor de hardware "
+"klok.\n"
+"Deze versie van hwclock is gemaakt voor een ander systeem dan de Alpha\n"
+"(en werkt nu dus waarschijnlijk niet op een Alpha).  Geen actie genomen.\n"
 
 #: hwclock/hwclock.c:1151
 msgid "Unable to get the epoch value from the kernel.\n"
-msgstr ""
+msgstr "Verkrijgen tijdperk-waarde van de kernel mislukt.\n"
 
 #: hwclock/hwclock.c:1153
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
-msgstr ""
+msgstr "Kernel neemt een tijdperk-waarde aan van %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 ""
+"Om de tijdperk-waarde in te stellen, dient u de 'epoch' optie te gebruiken "
+"om door te geven welke waarde moet worden gebruikt.\n"
 
 #: hwclock/hwclock.c:1159
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
-msgstr ""
+msgstr "Tijdperk niet instellen op %d - alleen testen.\n"
 
 #: hwclock/hwclock.c:1162
 msgid "Unable to set the epoch value in the kernel.\n"
-msgstr ""
+msgstr "Instellen tijdperk-waarde in kernel mislukt.\n"
 
 #: hwclock/hwclock.c:1196
 #, c-format
@@ -5641,23 +5677,58 @@
 "  --noadjfile   do not access /etc/adjtime. Requires the use of\n"
 "                either --utc or --localtime\n"
 msgstr ""
+"hwclock - hardware klok (RTC) instellen en waarden weergeven\n"
+"\n"
+"Gebruik: hwclock [functie] [opties...]\n"
+"\n"
+"Functies:\n"
+"  --help        deze hulp weergeven\n"
+"  --show        hardware klok lezen en resultaat weergeven\n"
+"  --set         de rtc instellen op de tijd, gegeven met --date\n"
+"  --hctosys     systeemklok instellen aan de hand van hardware klok\n"
+"  --systohc     hardware klok instellen op huidige systeemtijd\n"
+"  --adjust      de rtc aanpassen, om rekening te houden met systematische\n"
+"                verschuiving sinds de laatste instelling/aanpassing\n"
+"  --getepoch    tijdperk-waarde van hardware klok van kernel weergeven\n"
+"  --setepoch    tijdperk-waarde van hardware klok van kernel instellen op\n"
+"                waarde gegeven met --epoch optie\n"
+"  --version     versienummer weergeven\n"
+"\n"
+"Opties: \n"
+"  --utc         de hardware klok wordt gehouden op gecoördineerde universele "
+"tijd\n"
+"  --localtime   de hardware klok wordt op lokale tijd gehouden\n"
+"  --directisa   directe toegang tot ISA bus in plaats van %s\n"
+"  --badyear     negeer jaartal van rtc, omdat de BIOS stuk is\n"
+"  --date        geeft de tijd aan waarop de hardware klok moet worden "
+"ingesteld\n"
+"  --epoch=jaar  geeft het jaartal aan dat het begin is van de tijdperk-"
+"waarde van\n"
+"                de hardware klok\n"
+"  --noadjfile   gebruik niet /etc/adjtime. Het gebruik van --utc of --"
+"localtime\n"
+"                is hiervoor nodig\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"
+"                vertel welke soort Alpha u gebruikt (zie hwclock(8))\n"
 
 #: hwclock/hwclock.c:1397
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
-msgstr ""
+msgstr "%s heeft geen argumenten zonder opties.  U gaf %d.\n"
 
 #: hwclock/hwclock.c:1403
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
+"U heeft verschillende functies aangegeven.\n"
+"Er kan slechts één functie tegelijkertijd worden gebruikt.\n"
 
 #: hwclock/hwclock.c:1410
 #, c-format
@@ -5665,6 +5736,8 @@
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
+"%s: De --utc en --localtime opties sluiten elkaar uit.  U heeft beide "
+"aangegeven.\n"
 
 #: hwclock/hwclock.c:1417
 #, c-format
@@ -5672,298 +5745,310 @@
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
+"%s: De --adjust en --noadjfile opties sluiten elkaar uit.  U heeft beide "
+"aangegeven.\n"
 
 #: hwclock/hwclock.c:1424
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
-msgstr ""
+msgstr "%s: Met --noadjfile moet u --utc of --localtime aangeven\n"
 
 #: hwclock/hwclock.c:1438
 msgid "No usable set-to time.  Cannot set clock.\n"
-msgstr ""
+msgstr "Geen bruikbare insteltijd.  Kan klok niet instellen.\n"
 
 #: hwclock/hwclock.c:1454
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr ""
+msgstr "Sorry, alleen de supergebruiker kan de hardware klok instellen.\n"
 
 #: hwclock/hwclock.c:1459
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr ""
+msgstr "Sorry, alleen de supergebruiker kan de systeem klok instellen.\n"
 
 #: hwclock/hwclock.c:1464
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
+"Sorry, alleen de supergebruiker kan de tijdperk-waarde van de hardware klok "
+"in de kernel instellen.\n"
 
 #: hwclock/hwclock.c:1484
 msgid "Cannot access the Hardware Clock via any known method.\n"
-msgstr ""
+msgstr "Kan geen toegang krijgen tot hardware klok op een bekende manier.\n"
 
 #: hwclock/hwclock.c:1488
 msgid ""
 "Use the --debug option to see the details of our search for an access "
 "method.\n"
 msgstr ""
+"Gebruik de --debug optie om de details te zien over onze zoektocht naar een "
+"toegangsmethode.\n"
 
 #: hwclock/kd.c:43
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
-msgstr ""
+msgstr "Wachten in lus totdat de tijd van KDGHWCLK verandert\n"
 
 #: hwclock/kd.c:46
 msgid "KDGHWCLK ioctl to read time failed"
-msgstr ""
+msgstr "KDGHWCLK ioctl om tijd te lezen, mislukt"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
-msgstr ""
+msgstr "Time-out bij wachten totdat tijd verandert.\n"
 
 #: hwclock/kd.c:71
 msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr ""
+msgstr "KDGHWCLK ioctl om tijd te lezen, mislukt in lus"
 
 #: hwclock/kd.c:93
 #, c-format
 msgid "ioctl() failed to read time from %s"
-msgstr ""
+msgstr "ioctl() mislukt om tijd te lezen van %s"
 
 #: hwclock/kd.c:129
 msgid "ioctl KDSHWCLK failed"
-msgstr ""
+msgstr "ioctl KDSHWCLK mislukt"
 
 #: hwclock/kd.c:166
 msgid "Can't open /dev/tty1 or /dev/vc/1"
-msgstr ""
+msgstr "Openen /dev/tty1 of /dev/vc/1 mislukt"
 
 #: hwclock/kd.c:171
 msgid "KDGHWCLK ioctl failed"
-msgstr ""
+msgstr "KDGHWCLK ioctl mislukt"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
-msgstr ""
+msgstr "open() van %s mislukt"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
-msgstr ""
+msgstr "ioctl() naar %s om tijd te lezen, mislukt.\n"
 
-#: hwclock/rtc.c:171
+#: hwclock/rtc.c:170
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
-msgstr ""
+msgstr "Wachten in lus totdat de tijd van %s verandert\n"
 
-#: hwclock/rtc.c:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
-msgstr ""
+msgstr "%s heeft geen onderbrekingsfuncties. "
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
-msgstr ""
+msgstr "read() naar %s om te wachten op kloktik, mislukt"
 
-#: hwclock/rtc.c:244
+#: hwclock/rtc.c:243
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
-msgstr ""
+msgstr "ioctl() naar %s om bijwerkingsonderbrekingen uit te zetten, mislukt"
 
-#: hwclock/rtc.c:247
+#: hwclock/rtc.c:246
 #, 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:306
+#: hwclock/rtc.c:305
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
-msgstr ""
+msgstr "ioctl() naar %s om tijd in te stellen, mislukt.\n"
 
-#: hwclock/rtc.c:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
-msgstr ""
+msgstr "ioctl(%s) succesvol.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
-msgstr ""
+msgstr "Openen van %s mislukt"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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 ""
+"Om de tijdperk-waarde in de kernel aan te passen, is toegang tot het 'rtc' "
+"stuurprogramma van Linux nodig via het speciale apparaatbestand %s.  Dit "
+"bestand bestaat niet op dit systeem.\n"
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
-msgstr ""
+msgstr "Openen %s mislukt"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr ""
+msgstr "ioctl(RTC_EPOCH_READ) naar %s mislukt"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr ""
+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:397
+#: hwclock/rtc.c:396
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr ""
+msgstr "De tijdperk-waarde mag niet minder zijn dan 1900.  U vroeg om %ld\n"
 
-#: hwclock/rtc.c:415
+#: hwclock/rtc.c:414
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
-msgstr ""
+msgstr "tijdperk instellen op %ld met RTC_EPOCH_SET ioctl naar %s.\n"
 
-#: hwclock/rtc.c:420
+#: hwclock/rtc.c:419
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
-msgstr ""
+msgstr "Het kernel stuurprogramma voor %s heeft geen RTC_EPOCH_SET ioctl.\n"
 
-#: hwclock/rtc.c:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
-msgstr ""
+msgstr "ioctl(RTC_EPOCH_SET) naar %s mislukt"
 
 #: login-utils/agetty.c:312
 msgid "calling open_tty\n"
-msgstr ""
+msgstr "aanroepen open_tty\n"
 
 #. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:325
 msgid "calling termio_init\n"
-msgstr ""
+msgstr "aanroepen termio_init\n"
 
 #: login-utils/agetty.c:330
 msgid "writing init string\n"
-msgstr ""
+msgstr "schrijven init string\n"
 
 #. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:340
 msgid "before autobaud\n"
-msgstr ""
+msgstr "voor autobaud\n"
 
 #: login-utils/agetty.c:352
 msgid "waiting for cr-lf\n"
-msgstr ""
+msgstr "wachten op cr-lf\n"
 
 #: login-utils/agetty.c:356
 #, c-format
 msgid "read %c\n"
-msgstr ""
+msgstr "gelezen %c\n"
 
 #. Read the login name.
 #: login-utils/agetty.c:365
 msgid "reading login name\n"
-msgstr ""
+msgstr "lezen inlognaam\n"
 
 #: login-utils/agetty.c:386
 #, c-format
 msgid "%s: can't exec %s: %m"
-msgstr ""
+msgstr "%s: kan niet uitvoeren %s: %m"
 
 #: login-utils/agetty.c:406
 msgid "can't malloc initstring"
-msgstr ""
+msgstr "malloc initstring kan niet"
 
 #: login-utils/agetty.c:471
 #, c-format
 msgid "bad timeout value: %s"
-msgstr ""
+msgstr "slechte time-out waarde: %s"
 
 #: login-utils/agetty.c:480
 msgid "after getopt loop\n"
-msgstr ""
+msgstr "na getopt lus\n"
 
 #: login-utils/agetty.c:530
 msgid "exiting parseargs\n"
-msgstr ""
+msgstr "bestaande parseargs\n"
 
 #: login-utils/agetty.c:542
 msgid "entered parse_speeds\n"
-msgstr ""
+msgstr "ingevoerde parse_speeds\n"
 
 #: login-utils/agetty.c:545
 #, c-format
 msgid "bad speed: %s"
-msgstr ""
+msgstr "slechte snelheid: %s"
 
 #: login-utils/agetty.c:547
 msgid "too many alternate speeds"
-msgstr ""
+msgstr "teveel alternatieve snelheden"
 
 #: login-utils/agetty.c:549
 msgid "exiting parsespeeds\n"
-msgstr ""
+msgstr "bestaande parsespeeds\n"
 
 #: login-utils/agetty.c:649
 #, c-format
 msgid "/dev: chdir() failed: %m"
-msgstr ""
+msgstr "/dev: chdir() mislukt: %m"
 
 #: login-utils/agetty.c:653
 #, c-format
 msgid "/dev/%s: not a character device"
-msgstr ""
+msgstr "/dev/%s: geen teken-apparaat"
 
 #. ignore close(2) errors
 #: login-utils/agetty.c:660
 msgid "open(2)\n"
-msgstr ""
+msgstr "open(2)\n"
 
 #: login-utils/agetty.c:662
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
-msgstr ""
+msgstr "/dev/%s: kan niet openen als standaardinvoer: %m"
 
 #: login-utils/agetty.c:672
 #, c-format
 msgid "%s: not open for read/write"
-msgstr ""
+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 ""
+msgstr "dubbel instellen\n"
 
 #. set up stdout and stderr
 #: login-utils/agetty.c:678
 #, c-format
 msgid "%s: dup problem: %m"
-msgstr ""
+msgstr "%s: dubbel ingesteld probleem: %m"
 
 #: login-utils/agetty.c:752
 msgid "term_io 2\n"
-msgstr ""
+msgstr "term_io 2\n"
 
 #: login-utils/agetty.c:937
 msgid "user"
-msgstr ""
+msgstr "gebruiker"
 
 #: login-utils/agetty.c:937
 msgid "users"
-msgstr ""
+msgstr "gebruikers"
 
 #: login-utils/agetty.c:1025
 #, c-format
 msgid "%s: read: %m"
-msgstr ""
+msgstr "%s: gelezen: %m"
 
 #: login-utils/agetty.c:1071
 #, c-format
 msgid "%s: input overrun"
-msgstr ""
+msgstr "%s: invoer overloop"
 
 #: login-utils/agetty.c:1195
 #, c-format
@@ -5973,24 +6058,28 @@
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
+"Gebruik: %s [-hiLmw] [-l inlog_programma] [-t time-out] [-I initstring] [-H "
+"inlog_host] baud_rate,... lijn [soort terminal]\n"
+"of\t[-hiLmw] [-l inlog_programma] [-t time-out] [-I initstring] [-H "
+"inlog_host] lijn baud_rate,... [soort terminal]\n"
 
 #: login-utils/checktty.c:104 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
-msgstr ""
+msgstr "login: weinig geheugen, inloggen mislukt mogelijk\n"
 
 #: login-utils/checktty.c:105
 msgid "can't malloc for ttyclass"
-msgstr ""
+msgstr "malloc voor ttyclass mislukt"
 
 #: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
-msgstr ""
+msgstr "malloc voor grplist mislukt"
 
 #. 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 "Inloggen op %s van %s standaard geweigerd.\n"
 
 #. if we get here, /etc/usertty exists, there's a line
 #. matching our username, but it doesn't contain the
@@ -5999,119 +6088,122 @@
 #: login-utils/checktty.c:433
 #, c-format
 msgid "Login on %s from %s denied.\n"
-msgstr ""
+msgstr "Inloggen op %s van %s geweigerd.\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: u (gebruiker %d) bestaat niet.\n"
 
 #: login-utils/chfn.c:129 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr ""
+msgstr "%s: gebruiker \"%s\" bestaat niet.\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: kan alleen lokale ingangen wijzigen; gebruik yp%s in plaats.\n"
 
 #: login-utils/chfn.c:146
 #, c-format
 msgid "Changing finger information for %s.\n"
-msgstr ""
+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
 msgid "Password error."
-msgstr ""
+msgstr "Wachtwoord fout."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249
-#: mount/lomount.c:254
+#: 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
 msgid "Password: "
-msgstr ""
+msgstr "Wachtwoord: "
 
 #: login-utils/chfn.c:179 login-utils/chsh.c:170
 msgid "Incorrect password."
-msgstr ""
+msgstr "Onjuist wachtwoord."
 
 #: login-utils/chfn.c:190
 msgid "Finger information not changed.\n"
-msgstr ""
+msgstr "Finger informatie niet gewijzigd.\n"
 
 #: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr ""
+msgstr "Gebruik: %s [ -f volledige-naam ] [ -o kantoor ] "
 
 #: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
+"[ -p kantoor-telefoon ]\n"
+"\t[ -h thuis-telefoon ] "
 
 #: 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"
+"Afgebroken.\n"
 
 #: login-utils/chfn.c:398
 msgid "field is too long.\n"
-msgstr ""
+msgstr "veld is te lang.\n"
 
 #: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr ""
+msgstr "'%c' is niet toegestaan.\n"
 
 #: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
-msgstr ""
+msgstr "Stuurtekens zijn niet toegestaan.\n"
 
 #: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
-msgstr ""
+msgstr "Finger informatie *NIET* gewijzigd.  Probeer het later opnieuw.\n"
 
 #: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
-msgstr ""
+msgstr "Finger informatie gewijzigd.\n"
 
 #: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:327
 msgid "malloc failed"
-msgstr ""
+msgstr "malloc mislukt"
 
 #: login-utils/chsh.c:130
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr ""
+msgstr "%s: Uw shell is niet in /etc/shells, shellwijziging geweigerd\n"
 
 #: login-utils/chsh.c:137
 #, c-format
 msgid "Changing shell for %s.\n"
-msgstr ""
+msgstr "Wijzigen shell voor %s.\n"
 
 #: login-utils/chsh.c:178
 msgid "New shell"
-msgstr ""
+msgstr "Nieuwe shell"
 
 #: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
-msgstr ""
+msgstr "Shell niet gewijzigd.\n"
 
 #: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr ""
+msgstr "Shell *NIET* gewijzigd.  Probeer het later opnieuw.\n"
 
 #: login-utils/chsh.c:195
 msgid "Shell changed.\n"
-msgstr ""
+msgstr "Shell gewijzigd.\n"
 
 #: login-utils/chsh.c:260
 #, c-format
@@ -6119,101 +6211,104 @@
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr ""
+"Gebruik: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ gebruikersnaam ]\n"
 
 #: login-utils/chsh.c:303
 #, c-format
 msgid "%s: shell must be a full path name.\n"
-msgstr ""
+msgstr "%s: shell moet de volledige padnaam zijn.\n"
 
 #: login-utils/chsh.c:307
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
-msgstr ""
+msgstr "%s: \"%s\" bestaat niet.\n"
 
 #: login-utils/chsh.c:311
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
-msgstr ""
+msgstr "%s: \"%s\" is niet uitvoerbaar.\n"
 
 #: login-utils/chsh.c:318
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr ""
+msgstr "%s: '%c' is niet toegestaan.\n"
 
 #: login-utils/chsh.c:322
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
-msgstr ""
+msgstr "%s: Stuurtekens zijn niet toegestaan.\n"
 
 #: login-utils/chsh.c:329
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
-msgstr ""
+msgstr "Waarschuwing: \"%s\" staat niet in /etc/shells\n"
 
 #: login-utils/chsh.c:331
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
-msgstr ""
+msgstr "%s: \"%s\" staat niet in /etc/shells.\n"
 
 #: login-utils/chsh.c:333
 #, c-format
 msgid "%s: use -l option to see list\n"
-msgstr ""
+msgstr "%s: gebruik -l om de lijst te zien\n"
 
 #: login-utils/chsh.c:339
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
-msgstr ""
+msgstr "Waarschuwing: \"%s\" staat niet in /etc/shells.\n"
 
 #: login-utils/chsh.c:340
 #, c-format
 msgid "Use %s -l to see list.\n"
-msgstr ""
+msgstr "Gebruik %s -l om de lijst te zien.\n"
 
 #: login-utils/chsh.c:360
 msgid "No known shells.\n"
-msgstr ""
+msgstr "Geen bekende shells.\n"
 
 #: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
-msgstr ""
+msgstr "kon /dev/urandom niet openen"
 
 #: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
-msgstr ""
+msgstr "kon geen willekeurige gegevens lezen van /dev/urandom"
 
 #: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
-msgstr ""
+msgstr "kon %s niet openen om te lezen"
 
 #: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
-msgstr ""
+msgstr "kan %s niet vinden"
 
 #: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
-msgstr ""
+msgstr "%s heeft niet de juiste bestandsinstellingen"
 
 #: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
-msgstr ""
+msgstr "kan geen gegevens lezen van %s"
 
 #: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
-msgstr ""
+msgstr "Kan %s niet lezen, afsluiten."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
+"gebruik: last [-#] [-f bestand] [-t tty] [-h hostnaam] [gebruiker ...]\n"
 
 #: login-utils/last.c:312
 msgid "  still logged in"
-msgstr ""
+msgstr "  nog ingelogd"
 
 #: login-utils/last.c:340
 #, c-format
@@ -6221,14 +6316,16 @@
 "\n"
 "wtmp begins %s"
 msgstr ""
+"\n"
+"wtmp begint %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 fout.\n"
 
 #: login-utils/last.c:441
 msgid "last: gethostname"
-msgstr ""
+msgstr "last: gethostname"
 
 #: login-utils/last.c:490
 #, c-format
@@ -6236,33 +6333,35 @@
 "\n"
 "interrupted %10.10s %5.5s \n"
 msgstr ""
+"\n"
+"onderbroken %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
-msgstr ""
+msgstr "FATAAL: kan tty niet opnieuw openen: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
-msgstr ""
+msgstr "FATAAL: slechte tty"
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
-msgstr ""
+msgstr "login: -h alleen voor supergebruiker.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
-msgstr ""
+msgstr "gebruik: login [-fp] [gebruikersnaam]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
-msgstr ""
+msgstr "login: PAM fout, afbreken: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
-msgstr ""
+msgstr "Kon PAM niet initialiseren: %s"
 
 #.
 #. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
@@ -6270,267 +6369,277 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
-msgstr ""
+msgstr "inlognaam: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr ""
+msgstr "INLOGGEN %d MISLUKT VAN %s VOOR %s, %s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
+"Inloggegevens onjuist\n"
+"\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
-msgstr ""
+msgstr "TEVEEL INLOGPOGINGEN (%d) VAN %s VOOR %s, %s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr ""
+msgstr "INLOGSESSIE MISLUKT VAN %s VOOR %s, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
+"\n"
+"Inloggegevens onjuist\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
+"\n"
+"Sessie instelprobleem, afbreken.\n"
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
-msgstr ""
+msgstr "NULL gebruikersnaam in %s:%d. Afbreken."
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr ""
+msgstr "Onjuiste gebruikersnaam \"%s\" in %s:%d. Afbreken."
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
-msgstr ""
+msgstr "login: Geheugentekort\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
-msgstr ""
+msgstr "Onjuiste gebruikersnaam"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
-msgstr ""
+msgstr "%s inloggen geweigerd vanaf deze terminal.\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr ""
+msgstr "INLOGGEN %s GEWEIGERD VAN %s OP TTY %s"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr ""
+msgstr "INLOGGEN %s GEWEIGERD OP TTY %s"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
-msgstr ""
+msgstr "Inloggegevens onjuist\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
 msgstr ""
+"Er zijn al teveel gebruikers ingelogd.\n"
+"Probeer het later opnieuw.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
-msgstr ""
+msgstr "U heeft teveel processen draaien.\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
-msgstr ""
+msgstr "INBELLEN BIJ %s DOOR %s"
+
+#: login-utils/login.c:1071
+#, c-format
+msgid "ROOT LOGIN ON %s FROM %s"
+msgstr "ROOT LOGIN OP %s VAN %s"
+
+#: login-utils/login.c:1074
+#, c-format
+msgid "ROOT LOGIN ON %s"
+msgstr "ROOT LOGIN OP %s"
 
 #: login-utils/login.c:1077
 #, c-format
-msgid "ROOT LOGIN ON %s FROM %s"
-msgstr ""
+msgid "LOGIN ON %s BY %s FROM %s"
+msgstr "LOGIN OP %s DOOR %s VAN %s"
 
 #: login-utils/login.c:1080
 #, c-format
-msgid "ROOT LOGIN ON %s"
-msgstr ""
-
-#: login-utils/login.c:1083
-#, c-format
-msgid "LOGIN ON %s BY %s FROM %s"
-msgstr ""
-
-#: login-utils/login.c:1086
-#, c-format
 msgid "LOGIN ON %s BY %s"
-msgstr ""
+msgstr "LOGIN OP %s DOOR %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
-msgstr ""
+msgstr "U heeft nieuwe e-mail.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
-msgstr ""
+msgstr "U heeft e-mail.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
-msgstr ""
+msgstr "login: fork() mislukt: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
-msgstr ""
+msgstr "TIOCSCTTY mislukt: %m"
+
+#: login-utils/login.c:1155
+msgid "setuid() failed"
+msgstr "setuid() mislukt"
 
 #: login-utils/login.c:1161
-msgid "setuid() failed"
-msgstr ""
-
-#: login-utils/login.c:1167
 #, c-format
 msgid "No directory %s!\n"
-msgstr ""
+msgstr "Geen map %s!\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
-msgstr ""
+msgstr "Inloggen met home = \"/\".\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
-msgstr ""
+msgstr "login: geen geheugen voor shell script.\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
-msgstr ""
+msgstr "login: kon shell script niet uitvoeren: %s.\n"
 
-#: login-utils/login.c:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
-msgstr ""
+msgstr "login: geen shell: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
+"\n"
+"%s inlognaam: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
-msgstr ""
+msgstr "inlognaam veel te lang.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
-msgstr ""
+msgstr "NAAM te lang"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
-msgstr ""
+msgstr "inlognamen mogen niet beginnen met '-'.\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
-msgstr ""
+msgstr "teveel losse witregels.\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
-msgstr ""
+msgstr "EXCESSIEVE witregels"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
-msgstr ""
+msgstr "Inloggen is na %d seconden afgebroken vanwege een time-out\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
-msgstr ""
+msgstr "Laatste keer inloggen: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
-msgstr ""
+msgstr "van %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
-msgstr ""
+msgstr "op %.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
-msgstr ""
+msgstr "INLOGGEN MISLUKT VAN %s, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
-msgstr ""
+msgstr "INLOGGEN MISLUKT OP %s, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr ""
+msgstr "%d INLOG MISLUKKINGEN VAN %s, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr ""
+msgstr "%d INLOG MISLUKKINGEN OP %s, %s"
 
 #: login-utils/mesg.c:89
 msgid "is y\n"
-msgstr ""
+msgstr "is j\n"
 
 #: login-utils/mesg.c:92
 msgid "is n\n"
-msgstr ""
+msgstr "is n\n"
 
 #: login-utils/mesg.c:112
 msgid "usage: mesg [y | n]\n"
-msgstr ""
+msgstr "gebruik: mesg [j | n]\n"
 
 #: login-utils/newgrp.c:68
 msgid "newgrp: Who are you?"
-msgstr ""
+msgstr "newgrp: Wie bent u?"
 
 #: 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: Die groep bestaat niet."
 
 #: login-utils/newgrp.c:90
 msgid "newgrp: Permission denied"
-msgstr ""
+msgstr "newgrp: Toegang geweigerd"
 
 #: login-utils/newgrp.c:97
 msgid "newgrp: setuid"
-msgstr ""
+msgstr "newgrp: setuid"
 
 #: login-utils/newgrp.c:103
 msgid "No shell"
-msgstr ""
+msgstr "Geen shell"
 
 #: login-utils/passwd.c:161
 msgid "The password must have at least 6 characters, try again.\n"
-msgstr ""
+msgstr "Het wachtwoord moet tenminste 6 tekens lang zijn. Probeer opnieuw.\n"
 
 #: login-utils/passwd.c:174
 msgid ""
@@ -6538,159 +6647,168 @@
 "classes:  upper and lower case letters, digits and non alphanumeric\n"
 "characters. See passwd(1) for more information.\n"
 msgstr ""
+"Het wachtwoord moet uit de volgende categorieen tekens bevatten:\n"
+"hoofd- en kleine letters, cijfers en niet-alfanumerieke tekens.\n"
+"Zie passwd(1) voor meer informatie.\n"
 
 #: login-utils/passwd.c:183
 msgid "You cannot reuse the old password.\n"
-msgstr ""
+msgstr "U kunt niet het oude wachtwoord gebruiken.\n"
 
 #: login-utils/passwd.c:188
 msgid "Please don't use something like your username as password!\n"
 msgstr ""
+"Gebruik alstublieft niet iets wat lijkt op uw gebruikersnaam als "
+"wachtwoord!\n"
 
 #: login-utils/passwd.c:199 login-utils/passwd.c:206
 msgid "Please don't use something like your realname as password!\n"
 msgstr ""
+"Gebruik alstublieft niet iets wat lijkt op uw echte naam als wachtwoord!\n"
 
 #: login-utils/passwd.c:224
 msgid "Usage: passwd [username [password]]\n"
-msgstr ""
+msgstr "Gebruik: passwd [gebruikersnaam [wachtwoord]]\n"
 
 #: login-utils/passwd.c:225
 msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
+msgstr "Alleen root mag de een- en twee-argumentsvormen gebruiken.\n"
 
 #: login-utils/passwd.c:280
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr ""
+msgstr "Gebruik: passwd [-foqsvV] [gebruiker [wachtwoord]]\n"
 
 #: login-utils/passwd.c:301
 #, c-format
 msgid "Can't exec %s: %s\n"
-msgstr ""
+msgstr "Kan niet uitvoeren %s: %s\n"
 
 #: login-utils/passwd.c:312
 msgid "Cannot find login name"
-msgstr ""
+msgstr "Kan inlognaam niet vinden"
 
 #: login-utils/passwd.c:319 login-utils/passwd.c:326
 msgid "Only root can change the password for others.\n"
-msgstr ""
+msgstr "Alleen root kan het wachtwoord van anderen wijzigen.\n"
 
 #: login-utils/passwd.c:334
 msgid "Too many arguments.\n"
-msgstr ""
+msgstr "Teveel argumenten.\n"
 
 #: login-utils/passwd.c:339
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
+msgstr "Kan de gebruikersnaam nergens vinden. Is `%s' echt een gebruiker?"
 
 #: login-utils/passwd.c:343
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 msgstr ""
+"Sorry, ik kan alleen lokale wachtwoorden wijzigen. Gebruik yppasswd in "
+"plaats hiervan."
 
 #: login-utils/passwd.c:349
 msgid "UID and username does not match, imposter!"
-msgstr ""
+msgstr "UID en gebruikersnaam komen niet overeen, bedrieger!"
 
 #: login-utils/passwd.c:354
 #, c-format
 msgid "Changing password for %s\n"
-msgstr ""
+msgstr "Het wachtwoord van %s wordt gewijzigd\n"
 
 #: login-utils/passwd.c:358
 msgid "Enter old password: "
-msgstr ""
+msgstr "Geef het oude wachtwoord: "
 
 #: login-utils/passwd.c:360
 msgid "Illegal password, imposter."
-msgstr ""
+msgstr "Onjuist wachtwoord, bedrieger."
 
 #: login-utils/passwd.c:372
 msgid "Enter new password: "
-msgstr ""
+msgstr "Geef het nieuwe wachtwoord: "
 
 #: login-utils/passwd.c:374
 msgid "Password not changed."
-msgstr ""
+msgstr "Wachtwoord niet gewijzigd."
 
 #: login-utils/passwd.c:383
 msgid "Re-type new password: "
-msgstr ""
+msgstr "Geef opnieuw het nieuwe wachtwoord: "
 
 #: login-utils/passwd.c:386
 msgid "You misspelled it. Password not changed."
-msgstr ""
+msgstr "U heeft het verkeerd ingevoerd. Wachtwoord niet gewijzigd."
 
 #: login-utils/passwd.c:401
 #, c-format
 msgid "password changed, user %s"
-msgstr ""
+msgstr "wachtwoord gewijzigd, gebruiker %s"
 
 #: login-utils/passwd.c:404
 msgid "ROOT PASSWORD CHANGED"
-msgstr ""
+msgstr "ROOT WACHTWOORD GEWIJZIGD"
 
 #: login-utils/passwd.c:406
 #, c-format
 msgid "password changed by root, user %s"
-msgstr ""
+msgstr "wachtwoord gewijzigd door root, gebruiker %s"
 
 #: login-utils/passwd.c:413
 msgid "calling setpwnam to set password.\n"
-msgstr ""
+msgstr "setpwnam aanroepen om wachtwoord in te stellen.\n"
 
 #: login-utils/passwd.c:417
 msgid "Password *NOT* changed.  Try again later.\n"
-msgstr ""
+msgstr "Wachtwoord *NIET* gewijzigd.  Probeer het later opnieuw.\n"
 
 #: login-utils/passwd.c:423
 msgid "Password changed.\n"
-msgstr ""
+msgstr "Wachtwoord gewijzigd.\n"
 
 #: login-utils/shutdown.c:113
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr ""
+msgstr "Gebruik: shutdown [-h|-r] [-fqs] [now|uu:ss|+minuten]\n"
 
 #: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
-msgstr ""
+msgstr "Afsluitproces afgebroken"
 
 #: login-utils/shutdown.c:162
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr ""
+msgstr "%s: Alleen root kan een systeem afsluiten.\n"
 
 #: login-utils/shutdown.c:256
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr ""
+msgstr "Dat moet morgen zijn; kunt u niet tot dan wachten?\n"
 
 #: login-utils/shutdown.c:307
+#, fuzzy
 msgid "for maintenance; bounce, bounce"
-msgstr ""
+msgstr "voor onderhoud; bounce, bounce"
 
 #: login-utils/shutdown.c:311
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
-msgstr ""
+msgstr "time-out = %d, stil = %d, opnieuw starten = %d\n"
 
 #: login-utils/shutdown.c:336
 msgid "The system is being shut down within 5 minutes"
-msgstr ""
+msgstr "Het systeem wordt over 5 minuten afgesloten"
 
 #: login-utils/shutdown.c:340
 msgid "Login is therefore prohibited."
-msgstr ""
+msgstr "Inloggen is dus verboden."
 
 #: login-utils/shutdown.c:362
 #, c-format
 msgid "rebooted by %s: %s"
-msgstr ""
+msgstr "opnieuw gestart door %s: %s"
 
 #: login-utils/shutdown.c:365
 #, c-format
 msgid "halted by %s: %s"
-msgstr ""
+msgstr "afgesloten door %s: %s"
 
 #. RB_AUTOBOOT
 #: login-utils/shutdown.c:429
@@ -6698,281 +6816,287 @@
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
+"\n"
+"Waarom leef ik nog na opnieuw opstarten?"
 
 #: login-utils/shutdown.c:431
 msgid ""
 "\n"
 "Now you can turn off the power..."
 msgstr ""
+"\n"
+"U kunt nu de computer uitschakelen..."
 
 #: login-utils/shutdown.c:447
 msgid "Calling kernel power-off facility...\n"
-msgstr ""
+msgstr "De uitschakel-voorziening van de kernel wordt aangeroepen...\n"
 
 #: login-utils/shutdown.c:450
 #, c-format
 msgid "Error powering off\t%s\n"
-msgstr ""
+msgstr "Fout bij uitschakelen\t%s\n"
 
 #: login-utils/shutdown.c:458
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
-msgstr ""
+msgstr "Het programma \"%s\" wordt uitgevoerd ...\n"
 
 #: login-utils/shutdown.c:461
 #, c-format
 msgid "Error executing\t%s\n"
-msgstr ""
+msgstr "Fout bij uitvoeren\t%s\n"
 
 #. gettext crashes on \a
 #: login-utils/shutdown.c:488
 #, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr ""
+msgstr "BELANGRIJK: bericht van %s:"
 
 #: login-utils/shutdown.c:494
 #, c-format
 msgid "System going down in %d hours %d minutes"
-msgstr ""
+msgstr "Het systeem wordt afgesloten over %d uren en %d minuten"
 
 #: login-utils/shutdown.c:497
 #, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr ""
+msgstr "Het systeem wordt afgesloten over 1 uur en %d minuten"
 
 #: login-utils/shutdown.c:500
 #, c-format
 msgid "System going down in %d minutes\n"
-msgstr ""
+msgstr "Het systeem wordt afgesloten over %d minuten\n"
 
 #: login-utils/shutdown.c:503
 msgid "System going down in 1 minute\n"
-msgstr ""
+msgstr "Het systeem wordt afgesloten over 1 minuut\n"
 
 #: login-utils/shutdown.c:505
 msgid "System going down IMMEDIATELY!\n"
-msgstr ""
+msgstr "Het systeem wordt NU afgesloten!\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 "fork() mislukt voor swapoff. Help!"
 
 #: login-utils/shutdown.c:575
 msgid "Cannot exec swapoff, hoping umount will do the trick."
-msgstr ""
+msgstr "Uitvoeren swapoff mislukt, hopelijk lost umount het op."
 
 #: login-utils/shutdown.c:594
 msgid "Cannot fork for umount, trying manually."
-msgstr ""
+msgstr "fork() mislukt voor umount, ik probeer het nu handmatig."
 
 #: login-utils/shutdown.c:603
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr ""
+msgstr "Uitvoeren %s mislukt, proberen umount.\n"
 
 #: login-utils/shutdown.c:607
 msgid "Cannot exec umount, giving up on umount."
-msgstr ""
+msgstr "Uitvoeren umount mislukt, dit geef ik op."
 
 #: login-utils/shutdown.c:612
 msgid "Unmounting any remaining filesystems..."
-msgstr ""
+msgstr "Ontkoppelen resterende bestandssystemen..."
 
 #: login-utils/shutdown.c:648
 #, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
-msgstr ""
+msgstr "shutdown: Kon %s niet ontkoppelen: %s\n"
 
 #: login-utils/simpleinit.c:130
 msgid "Booting to single user mode.\n"
-msgstr ""
+msgstr "Opstarten in enkele-gebruikersmodus.\n"
 
 #: login-utils/simpleinit.c:134
 msgid "exec of single user shell failed\n"
-msgstr ""
+msgstr "Uitvoeren van enkele-gebruikersshell mislukt\n"
 
 #: login-utils/simpleinit.c:138
 msgid "fork of single user shell failed\n"
-msgstr ""
+msgstr "fork() van enkele-gebruikersshell mislukt\n"
 
 #: login-utils/simpleinit.c:206
 msgid "error opening fifo\n"
-msgstr ""
+msgstr "fout bij openen fifo\n"
 
 #: login-utils/simpleinit.c:210
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr ""
+msgstr "fout bij instellen sluiten-bij-uitvoeren op /dev/initctl"
 
 #: login-utils/simpleinit.c:257
 msgid "error running finalprog\n"
-msgstr ""
+msgstr "fout bij uitvoeren finalprog\n"
 
 #. Error
 #: login-utils/simpleinit.c:261
 msgid "error forking finalprog\n"
-msgstr ""
+msgstr "fout bij fork() finalprog\n"
 
 #: login-utils/simpleinit.c:343
 msgid ""
 "\n"
 "Wrong password.\n"
 msgstr ""
+"\n"
+"Verkeerd wachtwoord.\n"
 
 #: login-utils/simpleinit.c:416
 msgid "lstat of path failed\n"
-msgstr ""
+msgstr "lstat van pad mislukt\n"
 
 #: login-utils/simpleinit.c:424
 msgid "stat of path failed\n"
-msgstr ""
+msgstr "stat van pad mislukt\n"
 
 #: login-utils/simpleinit.c:432
 msgid "open of directory failed\n"
-msgstr ""
+msgstr "openen van map mislukt\n"
 
 #: login-utils/simpleinit.c:506
 msgid "fork failed\n"
-msgstr ""
+msgstr "fork() mislukt\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
-msgstr ""
+msgstr "uitvoeren mislukt\n"
 
 #: login-utils/simpleinit.c:561
 msgid "cannot open inittab\n"
-msgstr ""
+msgstr "kan inittab niet openen\n"
 
 #: login-utils/simpleinit.c:628
 msgid "no TERM or cannot stat tty\n"
-msgstr ""
+msgstr "geen TERM, of kan tty niet vinden\n"
 
 #: login-utils/simpleinit.c:934
 #, c-format
 msgid "error stopping service: \"%s\""
-msgstr ""
+msgstr "fout bij stoppen apparaat: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr ""
+msgstr "teveel iov's (verander de code in wall/ttymsg.c)"
 
 #: login-utils/ttymsg.c:85
 msgid "excessively long line arg"
-msgstr ""
+msgstr "excessief lange lijn argument"
 
 #: login-utils/ttymsg.c:139
 msgid "cannot fork"
-msgstr ""
+msgstr "kan niet fork()"
 
 #: login-utils/ttymsg.c:143
 #, c-format
 msgid "fork: %s"
-msgstr ""
+msgstr "fork: %s"
 
 #: login-utils/ttymsg.c:171
 #, c-format
 msgid "%s: BAD ERROR"
-msgstr ""
+msgstr "%s: SLECHTE FOUT"
 
 #: login-utils/vipw.c:139
 #, c-format
 msgid "%s: the password file is busy.\n"
-msgstr ""
+msgstr "%s: het bestand passwd is bezig.\n"
 
 #: login-utils/vipw.c:142
 #, c-format
 msgid "%s: the group file is busy.\n"
-msgstr ""
+msgstr "%s: het bestand group is bezig.\n"
 
 #: login-utils/vipw.c:158
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
-msgstr ""
+msgstr "%s: het bestand %s is bezig (%s aanwezig)\n"
 
 #: login-utils/vipw.c:164
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr ""
+msgstr "%s: kan %s niet koppelen: %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: kan %s niet de-blokkeren: %s (uw wijzigingen zijn nog in %s)\n"
 
 #: login-utils/vipw.c:218
 #, c-format
 msgid "%s: Cannot fork\n"
-msgstr ""
+msgstr "%s: Kan niet fork()\n"
 
 #: login-utils/vipw.c:254
 #, c-format
 msgid "%s: %s unchanged\n"
-msgstr ""
+msgstr "%s: %s ongewijzigd\n"
 
 #: login-utils/vipw.c:273
 #, c-format
 msgid "%s: no changes made\n"
-msgstr ""
+msgstr "%s: geen wijzigingen gemaakt\n"
 
 #: login-utils/vipw.c:328
 msgid "You are using shadow groups on this system.\n"
-msgstr ""
+msgstr "U gebruik schaduwgroepen op dit systeem.\n"
 
 #: login-utils/vipw.c:329
 msgid "You are using shadow passwords on this system.\n"
-msgstr ""
+msgstr "U gebruik schaduwwachtwoorden op dit systeem.\n"
 
 #: login-utils/vipw.c:330
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
-msgstr ""
+msgstr "Wilt u nu %s bewerken [j/n]? "
 
 #: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr ""
+msgstr "gebruik: %s [bestand]\n"
 
 #: login-utils/wall.c:159
 #, c-format
 msgid "%s: can't open temporary file.\n"
-msgstr ""
+msgstr "%s: kan tijdelijke bestand niet openen.\n"
 
 #: login-utils/wall.c:186
 #, c-format
 msgid "Broadcast Message from %s@%s"
-msgstr ""
+msgstr "Bericht van %s@%s"
 
 #: login-utils/wall.c:204
 #, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr ""
+msgstr "%s: zal %s niet lezen - gebruik stdin.\n"
 
 #: login-utils/wall.c:209
 #, c-format
 msgid "%s: can't read %s.\n"
-msgstr ""
+msgstr "%s: kan %s niet lezen.\n"
 
 #: login-utils/wall.c:231
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr ""
+msgstr "%s: kan tijdelijke bestand niet vinden.\n"
 
 #: login-utils/wall.c:241
 #, c-format
 msgid "%s: can't read temporary file.\n"
-msgstr ""
+msgstr "%s: kan tijdelijke bestand niet lezen.\n"
 
 #: misc-utils/cal.c:262
 msgid "illegal month value: use 1-12"
-msgstr ""
+msgstr "onjuiste maandwaarde: gebruik 1-12"
 
 #: misc-utils/cal.c:266
 msgid "illegal year value: use 1-9999"
-msgstr ""
+msgstr "onjuiste jaarwaarde: gebruik 1-9999"
 
 #. %s is the month name, %d the year number.
 #. * you can change the order and/or add something here; eg for
@@ -6982,140 +7106,142 @@
 #: misc-utils/cal.c:373
 #, c-format
 msgid "%s %d"
-msgstr ""
+msgstr "%s %d"
 
 #: misc-utils/cal.c:676
 msgid "usage: cal [-13smjyV] [[month] year]\n"
-msgstr ""
+msgstr "gebruik: cal [-13smjyV] [[maand] jaar]\n"
 
 #: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr ""
+msgstr "gebruik: %s [+formaat] [dag maand jaar]\n"
 
 #. handle St. Tib's Day
 #: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
-msgstr ""
+msgstr "St. Tibs Dag"
 
 #: misc-utils/kill.c:206
 #, c-format
 msgid "%s: unknown signal %s\n"
-msgstr ""
+msgstr "%s: onbekend signaal %s\n"
 
 #: misc-utils/kill.c:269
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr ""
+msgstr "%s: kan proces \"%s\" niet vinden\n"
 
 #: misc-utils/kill.c:313
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
-msgstr ""
+msgstr "%s: onbekend signaal %s; geldige signalen:\n"
 
 #: misc-utils/kill.c:353
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr ""
+msgstr "gebruik: %s [ -s signaal | -p ] [ -a ] pid ...\n"
 
 #: misc-utils/kill.c:354
 #, c-format
 msgid "       %s -l [ signal ]\n"
-msgstr ""
+msgstr "       %s -l [ signaal ]\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: onbekende voorzieningsnaam: %s.\n"
 
 #: misc-utils/logger.c:259
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
-msgstr ""
+msgstr "logger: onbekende prioriteitsnaam: %s.\n"
 
 #: misc-utils/logger.c:286
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
+"gebruik: logger [-is] [-f bestand] [-p pri] [-t tag] [-u socket] "
+"[ bericht ... ]\n"
 
 #: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr ""
+msgstr "gebruik: look [-dfa] [-t teken] tekst [bestand]\n"
 
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
 msgid "Could not open %s\n"
-msgstr ""
+msgstr "Kan %s niet openen\n"
 
 #: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
 #, c-format
 msgid "Got %d bytes from %s\n"
-msgstr ""
+msgstr "%d bytes ontvangen van %s\n"
 
 #: misc-utils/namei.c:102
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
-msgstr ""
+msgstr "namei: verkrijgen huidige map mislukt - %s\n"
 
 #: misc-utils/namei.c:115
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
-msgstr ""
+msgstr "namei: gaan naar map %s mislukt - %s (%d)\n"
 
 #: misc-utils/namei.c:125
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr ""
+msgstr "gebruik: namei [-mx] padnaam [padnaam ...]\n"
 
 #: misc-utils/namei.c:150
 msgid "namei: could not chdir to root!\n"
-msgstr ""
+msgstr "namei: kon niet gaan naar root!\n"
 
 #: misc-utils/namei.c:157
 msgid "namei: could not stat root!\n"
-msgstr ""
+msgstr "namei: kon root niet vinden!\n"
 
 #: misc-utils/namei.c:171
 msgid "namei: buf overflow\n"
-msgstr ""
+msgstr "namei: buffer overloop\n"
 
 #: misc-utils/namei.c:217
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
-msgstr ""
+msgstr " ? gaan naar map %s mislukt - %s (%d)\n"
 
 #: misc-utils/namei.c:246
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
-msgstr ""
+msgstr " ? problemen bij lezen symbolische koppeling %s - %s (%d)\n"
 
 #: misc-utils/namei.c:256
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
-msgstr ""
+msgstr "  *** UNIX GRENS AANTAL SYMBOLISCHE KOPPELINGEN OVERSCHREDEN ***\n"
 
 #: misc-utils/namei.c:293
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
-msgstr ""
+msgstr "namei: onbekende bestandssoort 0%06o bij bestand %s\n"
 
 #: misc-utils/rename.c:38
 #, c-format
 msgid "%s: out of memory\n"
-msgstr ""
+msgstr "%s: geheugentekort\n"
 
 #: misc-utils/rename.c:56
 #, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr ""
+msgstr "%s: hernoemen %s tot %s mislukt: %s\n"
 
 #: misc-utils/rename.c:86
 #, c-format
 msgid "call: %s from to files...\n"
-msgstr ""
+msgstr "gebruik: %s van naar bestanden...\n"
 
 #: misc-utils/script.c:106
 #, c-format
@@ -7124,787 +7250,871 @@
 "Use `%s [options] %s' if you really want to use it.\n"
 "Script not started.\n"
 msgstr ""
+"Waarschuwing: `%s' is een koppeling.\n"
+"Gebruik `%s [opties] %s' als u het echt wilt gebruiken.\n"
+"Script niet gestart.\n"
 
 #: misc-utils/script.c:155
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr ""
+msgstr "gebruik: script [-a] [-f] [-q] [-t] [bestand]\n"
 
 #: misc-utils/script.c:178
 #, c-format
 msgid "Script started, file is %s\n"
-msgstr ""
+msgstr "Script gestart, bestand is %s\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
-msgstr ""
+msgstr "Script gestart op %s"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
+"\n"
+"Script gedaan op %s"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
-msgstr ""
+msgstr "Script gedaan, bestand is %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
-msgstr ""
+msgstr "openpty mislukt\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
-msgstr ""
+msgstr "Tekort aan pty's\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 ""
-
-#: misc-utils/setterm.c:746
-msgid "  [ -term terminal_name ]\n"
-msgstr ""
+msgstr "%s: Argument fout, gebruik\n"
 
 #: misc-utils/setterm.c:747
-msgid "  [ -reset ]\n"
-msgstr ""
+msgid "  [ -term terminal_name ]\n"
+msgstr "  [ -term terminal_naam ]\n"
 
 #: misc-utils/setterm.c:748
-msgid "  [ -initialize ]\n"
-msgstr ""
+msgid "  [ -reset ]\n"
+msgstr "  [ -reset ]\n"
 
 #: misc-utils/setterm.c:749
-msgid "  [ -cursor [on|off] ]\n"
-msgstr ""
+msgid "  [ -initialize ]\n"
+msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:751
-msgid "  [ -snow [on|off] ]\n"
-msgstr ""
+#: misc-utils/setterm.c:750
+msgid "  [ -cursor [on|off] ]\n"
+msgstr "  [ -cursor [on|off] ]\n"
 
 #: misc-utils/setterm.c:752
-msgid "  [ -softscroll [on|off] ]\n"
-msgstr ""
+msgid "  [ -snow [on|off] ]\n"
+msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
-msgid "  [ -repeat [on|off] ]\n"
-msgstr ""
+#: misc-utils/setterm.c:753
+msgid "  [ -softscroll [on|off] ]\n"
+msgstr "  [ -softscroll [on|off] ]\n"
 
 #: misc-utils/setterm.c:755
-msgid "  [ -appcursorkeys [on|off] ]\n"
-msgstr ""
+msgid "  [ -repeat [on|off] ]\n"
+msgstr "  [ -repeat [on|off] ]\n"
 
 #: misc-utils/setterm.c:756
-msgid "  [ -linewrap [on|off] ]\n"
-msgstr ""
+msgid "  [ -appcursorkeys [on|off] ]\n"
+msgstr "  [ -appcursorkeys [on|off] ]\n"
 
 #: misc-utils/setterm.c:757
-msgid "  [ -default ]\n"
-msgstr ""
+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 ""
+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 ""
-
-#: misc-utils/setterm.c:773
-msgid "  [ -inversescreen [on|off] ]\n"
-msgstr ""
+msgstr "  [ -standout [ attr ] ]\n"
 
 #: misc-utils/setterm.c:774
-msgid "  [ -bold [on|off] ]\n"
-msgstr ""
+msgid "  [ -inversescreen [on|off] ]\n"
+msgstr "  [ -inversescreen [on|off] ]\n"
 
 #: misc-utils/setterm.c:775
-msgid "  [ -half-bright [on|off] ]\n"
-msgstr ""
+msgid "  [ -bold [on|off] ]\n"
+msgstr "  [ -bold [on|off] ]\n"
 
 #: misc-utils/setterm.c:776
-msgid "  [ -blink [on|off] ]\n"
-msgstr ""
+msgid "  [ -half-bright [on|off] ]\n"
+msgstr "  [ -half-bright [on|off] ]\n"
 
 #: misc-utils/setterm.c:777
-msgid "  [ -reverse [on|off] ]\n"
-msgstr ""
+msgid "  [ -blink [on|off] ]\n"
+msgstr "  [ -blink [on|off] ]\n"
 
 #: misc-utils/setterm.c:778
-msgid "  [ -underline [on|off] ]\n"
-msgstr ""
+msgid "  [ -reverse [on|off] ]\n"
+msgstr "  [ -reverse [on|off] ]\n"
 
 #: misc-utils/setterm.c:779
-msgid "  [ -store ]\n"
-msgstr ""
+msgid "  [ -underline [on|off] ]\n"
+msgstr "  [ -underline [on|off] ]\n"
 
 #: misc-utils/setterm.c:780
-msgid "  [ -clear [all|rest] ]\n"
-msgstr ""
+msgid "  [ -store ]\n"
+msgstr "  [ -store ]\n"
 
 #: misc-utils/setterm.c:781
-msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-msgstr ""
+msgid "  [ -clear [all|rest] ]\n"
+msgstr "  [ -clear [all|rest] ]\n"
 
 #: misc-utils/setterm.c:782
-msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-msgstr ""
+msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
+msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
 #: misc-utils/setterm.c:783
-msgid "  [ -regtabs [1-160] ]\n"
-msgstr ""
+msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
+msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
 #: misc-utils/setterm.c:784
-msgid "  [ -blank [0-60] ]\n"
-msgstr ""
+msgid "  [ -regtabs [1-160] ]\n"
+msgstr "  [ -regtabs [1-160] ]\n"
 
 #: misc-utils/setterm.c:785
-msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
-msgstr ""
+msgid "  [ -blank [0-60] ]\n"
+msgstr "  [ -blank [0-60] ]\n"
 
 #: misc-utils/setterm.c:786
-msgid "  [ -append [1-NR_CONSOLES] ]\n"
-msgstr ""
+msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
+msgstr "  [ -dump   [1-AANTAL_CONSOLES] ]\n"
 
 #: misc-utils/setterm.c:787
-msgid "  [ -file dumpfilename ]\n"
-msgstr ""
+msgid "  [ -append [1-NR_CONSOLES] ]\n"
+msgstr "  [ -append [1-AANTAL_CONSOLES] ]\n"
 
 #: misc-utils/setterm.c:788
-msgid "  [ -msg [on|off] ]\n"
-msgstr ""
+msgid "  [ -file dumpfilename ]\n"
+msgstr "  [ -file dump_bestandsnaam ]\n"
 
 #: misc-utils/setterm.c:789
-msgid "  [ -msglevel [0-8] ]\n"
-msgstr ""
+msgid "  [ -msg [on|off] ]\n"
+msgstr "  [ -msg [on|off] ]\n"
 
 #: misc-utils/setterm.c:790
-msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-msgstr ""
+msgid "  [ -msglevel [0-8] ]\n"
+msgstr "  [ -msglevel [0-8] ]\n"
 
 #: misc-utils/setterm.c:791
-msgid "  [ -powerdown [0-60] ]\n"
-msgstr ""
+msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
+msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
 #: misc-utils/setterm.c:792
-msgid "  [ -blength [0-2000] ]\n"
-msgstr ""
+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 ""
+msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
-msgstr ""
+msgstr "kan stroombesparingsmodus niet instellen\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
-msgstr ""
-
-#: misc-utils/setterm.c:1134
-#, c-format
-msgid "Error reading %s\n"
-msgstr ""
+msgstr "klogctl fout: %s\n"
 
 #: misc-utils/setterm.c:1149
-msgid "Error writing screendump\n"
-msgstr ""
+#, c-format
+msgid "Error reading %s\n"
+msgstr "Fout bij lezen %s\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1164
+msgid "Error writing screendump\n"
+msgstr "Fout bij schrijven schermafdruk\n"
+
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
-msgstr ""
+msgstr "kon %s niet lezen, en ioctl() mislukt voor meer informatie\n"
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
-msgstr ""
+msgstr "%s: $TERM is niet gedefinieerd.\n"
 
 #: misc-utils/whereis.c:157
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
-msgstr ""
+msgstr "whereis [ -sbmu ] [ -SBM map ... -f ] naam...\n"
 
 #: misc-utils/write.c:99
 msgid "write: can't find your tty's name\n"
-msgstr ""
+msgstr "write: kan de naam van uw tty niet vinden\n"
 
 #: misc-utils/write.c:110
 msgid "write: you have write permission turned off.\n"
-msgstr ""
+msgstr "write: u heeft schrijftoegang uit gezet.\n"
 
 #: misc-utils/write.c:131
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
-msgstr ""
+msgstr "write: %s is niet ingelogd op %s.\n"
 
 #: misc-utils/write.c:139
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
-msgstr ""
+msgstr "write: %s heeft berichten uit gezet op %s\n"
 
 #: misc-utils/write.c:146
 msgid "usage: write user [tty]\n"
-msgstr ""
+msgstr "gebruik: write gebruiker [tty]\n"
 
 #: misc-utils/write.c:234
 #, c-format
 msgid "write: %s is not logged in\n"
-msgstr ""
+msgstr "write: %s is niet ingelogd\n"
 
 #: misc-utils/write.c:243
 #, c-format
 msgid "write: %s has messages disabled\n"
-msgstr ""
+msgstr "write: %s heeft berichten uit gezet\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 is meerdere keren ingelogd; er wordt geschreven naar %s\n"
 
 #: misc-utils/write.c:313
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
-msgstr ""
+msgstr "Bericht van %s@%s (als %s) op %s bij %s ..."
 
 #: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
-msgstr ""
+msgstr "Bericht van %s@%s op %s bij %s ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
-msgstr ""
+msgstr "waarschuwing: fout bij lezen %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 "waarschuwing: kan %s niet openen: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
-msgstr ""
+msgstr "mount: kon %s niet openen - gebruik %s in plaats daarvan\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:387
+#: mount/fstab.c:415
 #, 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:399
+#: mount/fstab.c:427
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
-
-#: mount/fstab.c:411
-#, c-format
-msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr ""
-
-#: mount/fstab.c:426
-#, c-format
-msgid "Can't lock lock file %s: %s\n"
-msgstr ""
+"kan blokkeerbestand %s niet koppelen: %s (gebruik -n optie om te forceren)"
 
 #: mount/fstab.c:439
 #, 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
+#, c-format
+msgid "Can't lock lock file %s: %s\n"
+msgstr "Kan blokkeerbestand %s niet blokkeren: %s\n"
+
+#: mount/fstab.c:467
+#, c-format
 msgid "can't lock lock file %s: %s"
-msgstr ""
+msgstr "kan blokkeerbestand %s niet blokkeren: %s"
 
-#: mount/fstab.c:441
+#: mount/fstab.c:469
 msgid "timed out"
-msgstr ""
+msgstr "time-out"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:476
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
+"Kan koppeling %s niet maken\n"
+"Mogelijk is er een oud blokkeerbestand?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:525 mount/fstab.c:561
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
-msgstr ""
+msgstr "kan %s niet openen (%s) - mtab niet bijgewerkt"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:569
 #, c-format
 msgid "error writing %s: %s"
-msgstr ""
+msgstr "fout bij schrijven %s: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:577
 #, c-format
 msgid "error changing mode of %s: %s\n"
-msgstr ""
+msgstr "fout bij wijzigen modus van %s: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:595
 #, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr ""
+msgstr "kan %s niet hernoemen tot %s: %s\n"
 
-#: mount/lomount.c:80
+#: mount/lomount.c:173
 #, c-format
 msgid "loop: can't open device %s: %s\n"
-msgstr ""
+msgstr "loop: kan apparaat %s niet openen: %s\n"
 
-#: mount/lomount.c:86
+#: mount/lomount.c:179
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
-msgstr ""
+msgstr "loop: kan geen informatie verkrijgen over apparaat %s: %s\n"
 
-#: mount/lomount.c:91
-#, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
-msgstr ""
+#: 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:177
+#: mount/lomount.c:245
 msgid "mount: could not find any device /dev/loop#"
-msgstr ""
+msgstr "mount: kon geen /dev/loop# apparaat vinden"
 
-#: mount/lomount.c:181
+#: 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:185
+#: mount/lomount.c:253
 #, 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'.)"
 
-#: mount/lomount.c:191
+#: 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: 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/lomount.c:195
+#: mount/lomount.c:263
 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:225
+#: mount/lomount.c:490
 #, c-format
-msgid "Unsupported encryption type %s\n"
+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:239
+#: mount/lomount.c:611
+#, 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 ""
+msgstr "Kan niet blokkeren in geheugen, afsluiten.\n"
 
-#: mount/lomount.c:258
+#: mount/lomount.c:654
 msgid "Init (up to 16 hex digits): "
-msgstr ""
+msgstr "Init (tot 16 hex cijfers): "
 
-#: mount/lomount.c:265
+#: mount/lomount.c:661
 #, c-format
 msgid "Non-hex digit '%c'.\n"
-msgstr ""
+msgstr "Niet-hex cijfer '%c'.\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:764
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
-msgstr ""
+msgstr "Weet niet hoe sleutel te verkrijgen voor coderingssysteem %d\n"
 
-#: mount/lomount.c:288
+#: mount/lomount.c:802
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
-msgstr ""
+msgstr "set_loop(%s,%s,%d): succes\n"
 
-#: mount/lomount.c:299
-#, c-format
-msgid "loop: can't delete device %s: %s\n"
-msgstr ""
-
-#: mount/lomount.c:309
-#, c-format
-msgid "del_loop(%s): success\n"
-msgstr ""
-
-#: mount/lomount.c:317
-msgid "This mount was compiled without loop support. Please recompile.\n"
-msgstr ""
-
-#: mount/lomount.c:354
+#: mount/lomount.c:831
 #, 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"
+"  %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:372 mount/sundries.c:30 mount/sundries.c:45
-#: mount/sundries.c:244
+#: 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"
 msgstr ""
 
-#: mount/lomount.c:443
-msgid "No loop support was available at compile time. Please recompile.\n"
+#: mount/lomount.c:977
+#, c-format
+msgid "using %s%s from /etc/fstab\n"
 msgstr ""
 
-#: mount/mntent.c:165
+#: mount/lomount.c:985
+#, c-format
+msgid "Error: loop=%s option not found in /etc/fstab\n"
+msgstr ""
+
+#: mount/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
-msgstr ""
-
-#: mount/mntent.c:216
-#, c-format
-msgid "[mntent]: line %d in %s is bad%s\n"
-msgstr ""
+msgstr "[mntent]: waarschuwing: geen afsluitend einde-regel teken bij %s\n"
 
 #: mount/mntent.c:219
-msgid "; rest of file ignored"
-msgstr ""
+#, c-format
+msgid "[mntent]: line %d in %s is bad%s\n"
+msgstr "[mntent]: regel %d in %s is slecht%s\n"
 
-#: mount/mount.c:385
+#: mount/mntent.c:222
+msgid "; rest of file ignored"
+msgstr "; rest van bestand genegeerd"
+
+#: mount/mount.c:396
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr ""
+msgstr "mount: volgens mtab, is %s al aangekoppeld op %s"
 
-#: mount/mount.c:389
+#: mount/mount.c:400
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
-msgstr ""
+msgstr "mount: volgens mtab, is %s al aangekoppeld op %s"
 
-#: mount/mount.c:410
+#: mount/mount.c:421
 #, c-format
 msgid "mount: can't open %s for writing: %s"
-msgstr ""
+msgstr "mount: kan %s niet openen om te schrijven: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:436 mount/mount.c:660
 #, c-format
 msgid "mount: error writing %s: %s"
-msgstr ""
+msgstr "mount: fout bij schrijven %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:443
 #, c-format
 msgid "mount: error changing mode of %s: %s"
-msgstr ""
+msgstr "mount: fout bij wijzigen modus van %s: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:494
 #, c-format
 msgid "%s looks like swapspace - not mounted"
-msgstr ""
+msgstr "%s ziet er uit al wisselgeheugen - niet aangekoppeld"
 
-#: mount/mount.c:538
+#: mount/mount.c:554
 msgid "mount failed"
-msgstr ""
+msgstr "aankoppelen mislukt"
 
-#: mount/mount.c:540
+#: mount/mount.c:556
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr ""
+msgstr "mount: alleen root kan %s aankoppelen op %s"
 
-#: mount/mount.c:568
+#: mount/mount.c:584
 msgid "mount: loop device specified twice"
-msgstr ""
+msgstr "mount: lus-apparaat twee keer aangegeven"
 
-#: mount/mount.c:573
+#: mount/mount.c:589
 msgid "mount: type specified twice"
-msgstr ""
+msgstr "mount: soort twee keer aangegeven"
 
-#: mount/mount.c:585
+#: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
-msgstr ""
+msgstr "mount: instellen van lus-apparaat wordt overgeslagen\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
-msgstr ""
+msgstr "mount: het lus-apparaat %s wordt gebruikt\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:614
 msgid "mount: failed setting up loop device\n"
-msgstr ""
+msgstr "mount: instellen lus-apparaat mislukt\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:618
 msgid "mount: setup loop device successfully\n"
-msgstr ""
+msgstr "mount: instellen lus-apparaat succesvol\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:655
 #, c-format
 msgid "mount: can't open %s: %s"
-msgstr ""
+msgstr "mount: kan %s niet openen: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:678
 #, c-format
 msgid "mount: cannot open %s for setting speed"
-msgstr ""
+msgstr "mount: kan %s niet openen om snelheid in te stellen"
 
-#: mount/mount.c:665
+#: mount/mount.c:681
 #, c-format
 msgid "mount: cannot set speed: %s"
-msgstr ""
+msgstr "mount: kan snelheid niet instellen: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:735 mount/mount.c:1309
 #, c-format
 msgid "mount: cannot fork: %s"
-msgstr ""
+msgstr "mount: fork() mislukt: %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:815
 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:845
+#: mount/mount.c:854
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
-msgstr ""
+msgstr "mount: mislukt met nfs mount versie 4, probeer nu 3..\n"
 
-#: mount/mount.c:856
+#: mount/mount.c:865
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
-msgstr ""
+msgstr "mount: Kon bestandssysteemsoort niet bepalen, en geen aangegeven"
 
-#: mount/mount.c:859
+#: mount/mount.c:868
 msgid "mount: you must specify the filesystem type"
-msgstr ""
+msgstr "mount: u moet de bestandssysteem soort aangeven"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:871
 msgid "mount: mount failed"
-msgstr ""
+msgstr "mount: aankoppelen mislukt"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:877 mount/mount.c:912
 #, c-format
 msgid "mount: mount point %s is not a directory"
-msgstr ""
+msgstr "mount: aankoppelingspunt %s is geen map"
 
-#: mount/mount.c:870
+#: mount/mount.c:879
 msgid "mount: permission denied"
-msgstr ""
+msgstr "mount: toegang geweigerd"
 
-#: mount/mount.c:872
+#: mount/mount.c:881
 msgid "mount: must be superuser to use mount"
-msgstr ""
+msgstr "mount: moet supergebruiker zijn om mount te gebruiken"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:876 mount/mount.c:880
+#: mount/mount.c:885 mount/mount.c:889
 #, c-format
 msgid "mount: %s is busy"
-msgstr ""
+msgstr "mount: %s is bezig"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:891
 msgid "mount: proc already mounted"
-msgstr ""
+msgstr "mount: proc al aangekoppeld"
 
-#: mount/mount.c:884
+#: mount/mount.c:893
 #, c-format
 msgid "mount: %s already mounted or %s busy"
-msgstr ""
+msgstr "mount: %s al aangekoppeld of %s bezig"
 
-#: mount/mount.c:890
+#: mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s does not exist"
-msgstr ""
+msgstr "mount: aankoppelingspunt %s bestaat niet"
 
-#: mount/mount.c:892
+#: mount/mount.c:901
 #, 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:895
+#: mount/mount.c:904
 #, c-format
 msgid "mount: special device %s does not exist"
-msgstr ""
+msgstr "mount: speciale apparaat %s bestaat niet"
 
-#: mount/mount.c:905
+#: mount/mount.c:914
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
+"mount: speciale apparaat %s bestaat niet\n"
+"       (een pad voorvoegsel is geen map)\n"
 
-#: mount/mount.c:918
+#: mount/mount.c:927
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
-msgstr ""
+msgstr "mount: %s nog niet aangekoppeld, of slechte optie"
 
-#: mount/mount.c:920
+#: mount/mount.c:929
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
+"mount: slechte bestandssysteem soort, slechte optie, slecht superblok op %"
+"s,\n"
+"       of teveel aangekoppelde bestandssystemen"
 
-#: mount/mount.c:954
+#: mount/mount.c:963
 msgid "mount table full"
-msgstr ""
-
-#: mount/mount.c:956
-#, c-format
-msgid "mount: %s: can't read superblock"
-msgstr ""
-
-#: mount/mount.c:960
-#, c-format
-msgid "mount: %s: unknown device"
-msgstr ""
+msgstr "aankoppelingstabel vol"
 
 #: mount/mount.c:965
 #, c-format
-msgid "mount: fs type %s not supported by kernel"
-msgstr ""
+msgid "mount: %s: can't read superblock"
+msgstr "mount: %s: kan superblok niet lezen"
 
-#: mount/mount.c:977
+#: mount/mount.c:969
+#, c-format
+msgid "mount: %s: unknown device"
+msgstr "mount: %s: onbekend apparaat"
+
+#: mount/mount.c:974
+#, c-format
+msgid "mount: fs type %s not supported by kernel"
+msgstr "mount: bestandssysteem soort %s niet ondersteund door kernel"
+
+#: mount/mount.c:986
 #, c-format
 msgid "mount: probably you meant %s"
-msgstr ""
+msgstr "mount: waarschijnlijk bedoelde u %s"
 
-#: mount/mount.c:979
+#: mount/mount.c:988
 msgid "mount: maybe you meant iso9660 ?"
-msgstr ""
+msgstr "mount: mogelijk bedoelde u iso9660 ?"
 
-#: mount/mount.c:982
+#: mount/mount.c:991
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
+"mount: %s heeft onjuist apparaatnummer of bestandssysteem soort %s niet "
+"ondersteund"
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:997
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr ""
+msgstr "mount: %s is geen blok-apparaat, en stat mislukt?"
 
-#: mount/mount.c:990
+#: mount/mount.c:999
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
+"mount: de kernel herkent %s niet als een blok-apparaat\n"
+"       (misschien `insmod stuurprogramma'?)"
 
-#: mount/mount.c:993
+#: mount/mount.c:1002
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr ""
+msgstr "mount: %s is geen blok-apparaat (misschien `-o loop' proberen?)"
 
-#: mount/mount.c:996
+#: mount/mount.c:1005
 #, c-format
 msgid "mount: %s is not a block device"
-msgstr ""
-
-#: mount/mount.c:999
-#, 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:1002
-msgid "block device "
-msgstr ""
-
-#: mount/mount.c:1004
-#, c-format
-msgid "mount: cannot mount %s%s read-only"
-msgstr ""
+msgstr "mount: %s is geen blok-apparaat"
 
 #: mount/mount.c:1008
 #, c-format
-msgid "mount: %s%s is write-protected but explicit `-w' flag given"
-msgstr ""
+msgid "mount: %s is not a valid block device"
+msgstr "mount: %s is geen geldig blok-apparaat"
 
-#: mount/mount.c:1024
+#. pre-linux 1.1.38, 1.1.41 and later
+#. linux 1.1.38 and later
+#: mount/mount.c:1011
+msgid "block device "
+msgstr "blok-apparaat "
+
+#: mount/mount.c:1013
+#, c-format
+msgid "mount: cannot mount %s%s read-only"
+msgstr "mount: kan %s%s niet alleen-lezen aankoppelen"
+
+#: mount/mount.c:1017
+#, 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
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
-msgstr ""
+msgstr "mount: %s%s is schrijf-beveiligd, alleen-lezen aankoppelen"
 
-#: mount/mount.c:1111
+#: mount/mount.c:1120
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s\n"
-msgstr ""
+msgstr "mount: het label %s komt voor op zowel %s als %s\n"
 
-#: mount/mount.c:1115
+#: mount/mount.c:1124
 #, c-format
 msgid "mount: %s duplicate - not mounted"
-msgstr ""
+msgstr "mount: %s dubbel - niet aangekoppeld"
 
-#: mount/mount.c:1125
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: going to mount %s by %s\n"
-msgstr ""
+msgstr "mount: %s wordt aangekoppeld door %s\n"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "UUID"
-msgstr ""
+msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "label"
-msgstr ""
+msgstr "label"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: mount/mount.c:1137 mount/mount.c:1587
 msgid "mount: no such partition found"
-msgstr ""
+msgstr "mount: die partitie is niet gevonden"
 
-#: mount/mount.c:1136
+#: mount/mount.c:1145
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
-msgstr ""
+msgstr "mount: geen soort gegeven - Ik neem aan nfs, vanwege de dubbele punt\n"
 
-#: mount/mount.c:1141
-msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+#: mount/mount.c:1150
+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"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1166
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
-msgstr ""
+msgstr "mount: op de achtergrond \"%s\"\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1177
 #, c-format
 msgid "mount: giving up \"%s\"\n"
-msgstr ""
+msgstr "mount: ik geef het op voor \"%s\"\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1254
 #, c-format
 msgid "mount: %s already mounted on %s\n"
-msgstr ""
+msgstr "mount: %s al aangekoppeld op %s\n"
 
-#: mount/mount.c:1376
+#: mount/mount.c:1386
+#, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -7925,171 +8135,199 @@
 "       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 fd].\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 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"
+"       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"
+"Voor meer informatie, zie  man 8 mount .\n"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1563
 msgid "mount: only root can do that"
-msgstr ""
-
-#: mount/mount.c:1554
-#, c-format
-msgid "mount: no %s found - creating it..\n"
-msgstr ""
+msgstr "mount: alleen root kan dat doen"
 
 #: mount/mount.c:1568
 #, c-format
-msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
-msgstr ""
+msgid "mount: no %s found - creating it..\n"
+msgstr "mount: geen %s gevonden - nu aanmaken..\n"
 
-#: mount/mount.c:1575
+#: 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:1589
 #, c-format
 msgid "mount: mounting %s\n"
-msgstr ""
+msgstr "mount: aankoppelen %s\n"
 
-#: mount/mount.c:1584
+#: mount/mount.c:1598
 msgid "nothing was mounted"
-msgstr ""
+msgstr "niets aangekoppeld"
 
-#: mount/mount.c:1599
+#: mount/mount.c:1613
 #, c-format
 msgid "mount: cannot find %s in %s"
-msgstr ""
+msgstr "mount: kan %s niet vinden in %s"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1628
 #, c-format
 msgid "mount: can't find %s in %s or %s"
-msgstr ""
+msgstr "mount: kan %s niet vinden in %s of %s"
 
-#: mount/mount_by_label.c:259
+#: mount/mount_by_label.c:189
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
+"mount: kon %s niet openen; UUID en LABEL conversie kon dus niet worden "
+"gedaan.\n"
 
-#: mount/mount_by_label.c:378
+#: mount/mount_by_label.c:309
 msgid "mount: bad UUID"
-msgstr ""
+msgstr "mount: slechte UUID"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:483
 msgid "mount: error while guessing filesystem type\n"
-msgstr ""
+msgstr "mount: fout bij raden bestandssysteem soort\n"
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:492
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr ""
+msgstr "mount: u gaf geen bestandssysteem soort aan voor %s\n"
 
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:495
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
-msgstr ""
+msgstr "       Ik zal alle soorten proberen die worden genoemd in %s of %s\n"
 
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:498
 msgid "       and it looks like this is swapspace\n"
-msgstr ""
+msgstr "       en het ziet er uit dat dit wisselgeheugen is\n"
 
-#: mount/mount_guess_fstype.c:501
+#: mount/mount_guess_fstype.c:500
 #, c-format
 msgid "       I will try type %s\n"
-msgstr ""
+msgstr "       Ik zal soort %s proberen\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:588
 #, c-format
 msgid "Trying %s\n"
-msgstr ""
+msgstr "Proberen %s\n"
 
 #: mount/nfsmount.c:237
 msgid "mount: excessively long host:dir argument\n"
-msgstr ""
+msgstr "mount: excessief lang host:map argument\n"
 
 #: mount/nfsmount.c:251
 msgid "mount: warning: multiple hostnames not supported\n"
-msgstr ""
+msgstr "mount: waarschuwing: meerdere hostnamen niet ondersteund\n"
 
 #: mount/nfsmount.c:256
 msgid "mount: directory to mount not in host:dir format\n"
-msgstr ""
+msgstr "mount: aan te koppelen map niet in host:map formaat\n"
 
 #: mount/nfsmount.c:267 mount/nfsmount.c:522
 #, c-format
 msgid "mount: can't get address for %s\n"
-msgstr ""
+msgstr "mount: kan geen adres verkrijgen voor %s\n"
 
 #: mount/nfsmount.c:273
 msgid "mount: got bad hp->h_length\n"
-msgstr ""
+msgstr "mount: slechte hp->h_length gekregen\n"
 
 #: mount/nfsmount.c:290
 msgid "mount: excessively long option argument\n"
-msgstr ""
+msgstr "mount: excessief lang optie argument\n"
 
 #: mount/nfsmount.c:382
 msgid "Warning: Unrecognized proto= option.\n"
-msgstr ""
+msgstr "Waarschuwing: Niet herkende proto= optie.\n"
 
 #: mount/nfsmount.c:389
 msgid "Warning: Option namlen is not supported.\n"
-msgstr ""
+msgstr "Waarschuwing: Optie namlen niet ondersteund.\n"
 
 #: mount/nfsmount.c:393
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
-msgstr ""
+msgstr "onbekend nfs mount parameter: %s=%d\n"
 
 #: mount/nfsmount.c:427
 msgid "Warning: option nolock is not supported.\n"
-msgstr ""
+msgstr "Waarschuwing: optie nolock niet ondersteund.\n"
 
 #: mount/nfsmount.c:432
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
-msgstr ""
+msgstr "onbekende nfs mount optie: %s%s\n"
 
 #: mount/nfsmount.c:528
 msgid "mount: got bad hp->h_length?\n"
-msgstr ""
+msgstr "mount: slechte hp->h_length gekregen?\n"
 
 #: mount/nfsmount.c:716
 msgid "NFS over TCP is not supported.\n"
-msgstr ""
+msgstr "NFS over TCP is niet ondersteund.\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 zei dat de voorziening niet beschikbaar is"
 
 #: mount/nfsmount.c:750
 msgid "used portmapper to find NFS port\n"
-msgstr ""
+msgstr "portmapper gebruikt voor vinden NFS poort\n"
 
 #: mount/nfsmount.c:754
 #, c-format
 msgid "using port %d for nfs deamon\n"
-msgstr ""
+msgstr "gebruiken poort %d voor nfs deamon\n"
 
 #: mount/nfsmount.c:765
 msgid "nfs connect"
-msgstr ""
+msgstr "nfs verbinden"
 
 #: mount/nfsmount.c:852
 #, c-format
 msgid "unknown nfs status return value: %d"
-msgstr ""
+msgstr "onbekende nfs status resultaatwaarde: %d"
 
 #: mount/sundries.c:55
 msgid "bug in xstrndup call"
-msgstr ""
+msgstr "programmeerfout in aanroep xstrndup"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8097,131 +8335,207 @@
 "       %s [-v] [-p priority] special ...\n"
 "       %s [-s]\n"
 msgstr ""
+"gebruik: %s [-hV]\n"
+"         %s -a [-e] [-v]\n"
+"         %s [-v] [-p prioriteit] speciaal ...\n"
+"         %s [-s]\n"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:84
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-v]\n"
 "       %s [-v] special ...\n"
 msgstr ""
+"gebruik: %s [-hV]\n"
+"         %s -a [-v]\n"
+"         %s [-v] speciaal ...\n"
 
-#: mount/swapon.c:178 mount/swapon.c:242
+#: mount/swapon.c:120 sys-utils/readprofile.c:69
+msgid "out of memory"
+msgstr "geheugentekort"
+
+#: mount/swapon.c:201 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
-msgstr ""
-
-#: mount/swapon.c:182
-#, c-format
-msgid "swapon: cannot stat %s: %s\n"
-msgstr ""
-
-#: mount/swapon.c:193
-#, c-format
-msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
-msgstr ""
+msgstr "%s op %s\n"
 
 #: mount/swapon.c:205
 #, c-format
+msgid "swapon: cannot stat %s: %s\n"
+msgstr "swapon: kan %s niet vinden: %s\n"
+
+#: mount/swapon.c:216
+#, 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
+#, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
-msgstr ""
+msgstr "swapon: Overslaan bestand %s - het lijkt gaten te hebben.\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:271
 msgid "Not superuser.\n"
+msgstr "Geen supergebruiker.\n"
+
+#: mount/swapon.c:301
+msgid "swapon: invalid swap device name\n"
 msgstr ""
 
-#: mount/swapon.c:312 mount/swapon.c:401
+#: 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
 #, c-format
 msgid "%s: cannot open %s: %s\n"
-msgstr ""
+msgstr "%s: niet %s niet openen: %s\n"
 
 #: mount/umount.c:77
 msgid "umount: compiled without support for -f\n"
-msgstr ""
+msgstr "umount: gecompileerd zonder ondersteuning voor -f\n"
 
 #: mount/umount.c:150
 #, c-format
 msgid "host: %s, directory: %s\n"
-msgstr ""
+msgstr "host: %s, map: %s\n"
 
 #: mount/umount.c:170
 #, c-format
 msgid "umount: can't get address for %s\n"
-msgstr ""
+msgstr "umount: kan geen adres krijgen voor %s\n"
 
 #: mount/umount.c:175
 msgid "umount: got bad hostp->h_length\n"
-msgstr ""
+msgstr "umount: slechte hostp->h_length gekregen\n"
 
 #: mount/umount.c:223
 #, c-format
 msgid "umount: %s: invalid block device"
-msgstr ""
+msgstr "umount: %s: ongeldig blok-apparaat"
 
 #: mount/umount.c:225
 #, c-format
 msgid "umount: %s: not mounted"
-msgstr ""
+msgstr "umount: %s: niet aangekoppeld"
 
 #: mount/umount.c:227
 #, c-format
 msgid "umount: %s: can't write superblock"
-msgstr ""
+msgstr "umount: %s: kan niet schrijven naar superblok"
 
 #. 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 ""
+msgstr "umount: %s: apparaat is bezig"
 
 #: mount/umount.c:233
 #, c-format
 msgid "umount: %s: not found"
-msgstr ""
+msgstr "umount: %s: niet gevonden"
 
 #: mount/umount.c:235
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr ""
+msgstr "umount: %s: moet supergebruiker zijn om te ontkoppelen"
 
 #: mount/umount.c:237
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
-msgstr ""
+msgstr "umount: %s: blok-apparaten niet toegestaan op bestandssysteem"
 
 #: mount/umount.c:239
 #, c-format
 msgid "umount: %s: %s"
-msgstr ""
+msgstr "umount: %s: %s"
 
 #: mount/umount.c:285
 msgid "no umount2, trying umount...\n"
-msgstr ""
+msgstr "geen umount2, proberen umount...\n"
 
 #: mount/umount.c:301
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
-msgstr ""
+msgstr "kon %s niet ontkoppelen - proberen %s in plaats daarvan\n"
 
 #: mount/umount.c:319
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
-msgstr ""
+msgstr "umount: %s bezig - alleen-lezen her-aangekoppeld\n"
 
 #: mount/umount.c:329
 #, c-format
 msgid "umount: could not remount %s read-only\n"
-msgstr ""
+msgstr "umount: kon %s niet alleen-lezen her-aankoppelen\n"
 
 #: mount/umount.c:338
 #, c-format
 msgid "%s umounted\n"
-msgstr ""
+msgstr "%s ontkoppeld\n"
 
 #: mount/umount.c:426
 msgid "umount: cannot find list of filesystems to unmount"
-msgstr ""
+msgstr "umount: kan geen lijst vinden met bestandssystemen om te ontkoppelen"
 
 #: mount/umount.c:457
 msgid ""
@@ -8229,60 +8543,67 @@
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
+"Gebruik: umount [-hV]\n"
+"         umount -a [-f] [-r] [-n] [-v] [-t vbestandssysteensoorten] [-O "
+"opties]\n"
+"         umount [-f] [-r] [-n] [-v] speciaal | node...\n"
 
 #: mount/umount.c:539
 #, c-format
 msgid "Trying to umount %s\n"
-msgstr ""
+msgstr "Proberen te ontkoppelen %s\n"
 
 #: mount/umount.c:543
 #, c-format
 msgid "Could not find %s in mtab\n"
-msgstr ""
+msgstr "Kon %s niet vinden in mtab\n"
 
 #: mount/umount.c:547
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
-msgstr ""
+msgstr "umount: %s is niet aangekoppeld (volgens mtab)"
 
 #: mount/umount.c:549
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr ""
+msgstr "umount: het lijkt erop dat %s meerdere keren is aangekoppeld"
 
 #: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr ""
+msgstr "umount: %s staat niet in fstab (en u bent niet root)"
 
-#: mount/umount.c:564
+#: mount/umount.c:566
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
-msgstr ""
+msgstr "umount: %s aankoppeling komt niet overeen met fstab"
 
-#: mount/umount.c:598
+#: mount/umount.c:602
 #, c-format
 msgid "umount: only root can unmount %s from %s"
-msgstr ""
+msgstr "umount: alleen root kan %s ontkoppelen van %s"
 
-#: mount/umount.c:669
+#: mount/umount.c:671
 msgid "umount: only root can do that"
-msgstr ""
+msgstr "umount: alleen root kan dat doen"
 
 #: sys-utils/ctrlaltdel.c:27
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr ""
+msgstr "U moet root zijn om het gedrag van Ctrl-Alt-Del in te stellen.\n"
 
 #: sys-utils/ctrlaltdel.c:42
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr ""
+msgstr "Gebruik: ctrlaltdel hard|soft\n"
 
+# wat die "For" betekent: geen idee
 #: 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 ""
+"Bestand %s, For drempelwaarde %lu, maximum aantal tekens in fifo was %d,\n"
+"en maximale overdrachtssnelheid in tekens/seconde was %f\n"
 
 #: sys-utils/cytune.c:131
 #, c-format
@@ -8291,31 +8612,34 @@
 "in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
+"Bestand %s, For drempelwaarde %lu en time-out waarde %lu, maximum tekens in "
+"fifo was %d,\n"
+"en maximale overdrachtssnelheid in tekens/seconde was %f\n"
 
 #: sys-utils/cytune.c:195
 #, c-format
 msgid "Invalid interval value: %s\n"
-msgstr ""
+msgstr "Onjuiste waarde interval: %s\n"
 
 #: sys-utils/cytune.c:203
 #, c-format
 msgid "Invalid set value: %s\n"
-msgstr ""
+msgstr "Onjuiste instellingswaarde: %s\n"
 
 #: sys-utils/cytune.c:211
 #, c-format
 msgid "Invalid default value: %s\n"
-msgstr ""
+msgstr "Onjuiste standaardwaarde: %s\n"
 
 #: sys-utils/cytune.c:219
 #, c-format
 msgid "Invalid set time value: %s\n"
-msgstr ""
+msgstr "Onjuiste waarde tijdsinstelling: %s\n"
 
 #: sys-utils/cytune.c:227
 #, c-format
 msgid "Invalid default time value: %s\n"
-msgstr ""
+msgstr "Onjuiste standaardwaarde tijdsinstelling: %s\n"
 
 #: sys-utils/cytune.c:244
 #, c-format
@@ -8323,106 +8647,110 @@
 "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
 "[-g|-G] file [file...]\n"
 msgstr ""
+"Gebruik: %s [-q [-i interval]] ([-s waarde]|[-S waarde]) ([-t waarde]|[-T "
+"waarde]) [-g|-G] bestand [bestand...]\n"
 
 #: sys-utils/cytune.c: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 "Kan %s niet openen: %s\n"
 
 #: sys-utils/cytune.c:263
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr ""
+msgstr "Kan %s niet instellen op drempelwaarde %d: %s\n"
 
 #: sys-utils/cytune.c:282
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr ""
+msgstr "Kan %s niet instellen op tijdsdrempel %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 ""
+msgstr "Kan drempelwaarde voor %s niet verkrijgen: %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 ""
+msgstr "Kan time-out niet verkrijgen voor %s: %s\n"
 
 #: sys-utils/cytune.c:312
 #, c-format
 msgid "%s: %ld current threshold and %ld current timeout\n"
-msgstr ""
+msgstr "%s: %ld huidige drempelwaarde en %ld huidige time-out\n"
 
 #: sys-utils/cytune.c:315
 #, c-format
 msgid "%s: %ld default threshold and %ld default timeout\n"
-msgstr ""
+msgstr "%s: %ld standaard drempelwaarde en %ld standaard time-out\n"
 
 #: sys-utils/cytune.c:333
 msgid "Can't set signal handler"
-msgstr ""
+msgstr "Kan geen signaalhandvat instellen"
 
 #: sys-utils/cytune.c:337 sys-utils/cytune.c:372
 msgid "gettimeofday failed"
-msgstr ""
+msgstr "gettimeofday mislukt"
 
 #: sys-utils/cytune.c:350 sys-utils/cytune.c:382
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr ""
+msgstr "Kan CYGETMON niet uitvoeren op %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 ints, %lu/%lu tekens; fifo: %lu drempel, %lu tmout, %lu max, %lu nu\n"
 
 #: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
-msgstr ""
+msgstr "   %f int/sec; %f ontvangen, %f verzonden (tekens/sec)\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 ints, %lu tekens; fifo: %lu drempel, %lu tmout, %lu max, %lu nu\n"
 
 #: sys-utils/cytune.c:441
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
-msgstr ""
+msgstr "   %f int/sec; %f ontvangen (tekens/sec)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
-msgstr ""
+msgstr "Gebruik: %s [-c] [-n niveau] [-s bufgrootte]\n"
 
 #: sys-utils/ipcrm.c:66
 #, c-format
 msgid "invalid id: %s\n"
-msgstr ""
+msgstr "onjuiste id: %s\n"
 
 #: sys-utils/ipcrm.c:84
 #, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr ""
+msgstr "kan id %s niet verwijderen (%s)\n"
 
 #: sys-utils/ipcrm.c:99
 #, c-format
 msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
-msgstr ""
+msgstr "afgeraden gebruik: %s {shm | msg | sem} id ...\n"
 
 #: sys-utils/ipcrm.c:126
 #, c-format
 msgid "unknown resource type: %s\n"
-msgstr ""
+msgstr "onbekende bronsoort: %s\n"
 
 #: sys-utils/ipcrm.c:130
 msgid "resource(s) deleted\n"
-msgstr ""
+msgstr "bron(nen) verwijderd\n"
 
 #: sys-utils/ipcrm.c:140
 #, c-format
@@ -8430,79 +8758,82 @@
 "usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
+"gebruik: %s [ [-q msqid] [-m shmid] [-s semid]\n"
+"            [-Q berichtsleutel] [-M shmsleutel] [-S semsleutel] ... ]\n"
 
 #: sys-utils/ipcrm.c:181
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr ""
+msgstr "%s: onjuiste optie -- %c\n"
 
 #: sys-utils/ipcrm.c:193
 #, c-format
 msgid "%s: illegal key (%s)\n"
-msgstr ""
+msgstr "%s: onjuiste sleutel (%s)\n"
 
 #: sys-utils/ipcrm.c:208 sys-utils/ipcrm.c:240
 msgid "permission denied for key"
-msgstr ""
+msgstr "toegang geweigerd voor sleutel"
 
 #: sys-utils/ipcrm.c:211 sys-utils/ipcrm.c:250
 msgid "already removed key"
-msgstr ""
+msgstr "sleutel al verwijderd"
 
 #: sys-utils/ipcrm.c:214 sys-utils/ipcrm.c:245
 msgid "invalid key"
-msgstr ""
+msgstr "onjuiste sleutel"
 
 #: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
 msgid "unknown error in key"
-msgstr ""
+msgstr "onbekende fout in sleutel"
 
 #: sys-utils/ipcrm.c:241
 msgid "permission denied for id"
-msgstr ""
+msgstr "toegang geweigerd voor id"
 
 #: sys-utils/ipcrm.c:246
 msgid "invalid id"
-msgstr ""
+msgstr "onjuiste id"
 
 #: sys-utils/ipcrm.c:251
 msgid "already removed id"
-msgstr ""
+msgstr "id al verwijderd"
 
 #: sys-utils/ipcrm.c:256
 msgid "unknown error in id"
-msgstr ""
+msgstr "onbekende fout in id"
 
 #: sys-utils/ipcrm.c:259
 #, c-format
 msgid "%s: %s (%s)\n"
-msgstr ""
+msgstr "%s: %s (%s)\n"
 
 #: sys-utils/ipcrm.c:267
 #, c-format
 msgid "%s: unknown argument: %s\n"
-msgstr ""
+msgstr "%s: onbekend argument: %s\n"
 
 #: sys-utils/ipcs.c:121
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
-msgstr ""
+msgstr "gebruik: %s -asmq -tclup\n"
 
 #: 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:123
 #, c-format
 msgid "\t%s -h for help.\n"
-msgstr ""
+msgstr "\t%s -h voor hulp.\n"
 
 #: sys-utils/ipcs.c:129
 #, c-format
 msgid ""
 "%s provides information on ipc facilities for which you have read access.\n"
 msgstr ""
+"%s geeft informatie over ipc voorzieningen waarvoor u leestoegang heeft.\n"
 
 #: sys-utils/ipcs.c:131
 msgid ""
@@ -8510,12 +8841,17 @@
 "\t-m : shared_mem\n"
 "\t-q : messages\n"
 msgstr ""
+"Bronspecificatie:\n"
+"\t-m : gedeeld_geheugen\n"
+"\t-q : berichten\n"
 
 #: sys-utils/ipcs.c:132
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
 msgstr ""
+"\t-s : semaphores\n"
+"\t-a : alle (standaard)\n"
 
 #: sys-utils/ipcs.c:133
 msgid ""
@@ -8524,179 +8860,185 @@
 "\t-p : pid\n"
 "\t-c : creator\n"
 msgstr ""
+"Uitvoerformaat:\n"
+"\t-t : tijd\n"
+"\t-p : pid\n"
+"\t-c : maker\n"
 
 #: sys-utils/ipcs.c:134
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
 msgstr ""
+"\t-l : grenzen\n"
+"\t-u : samenvatting\n"
 
 #: 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] : details over bron geïdentificeerd met id\n"
 
 #: sys-utils/ipcs.c:267
 msgid "kernel not configured for shared memory\n"
-msgstr ""
+msgstr "kernel niet ingesteld voor gedeeld geheugen\n"
 
 #: sys-utils/ipcs.c:273
 msgid "------ Shared Memory Limits --------\n"
-msgstr ""
+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"
-msgstr ""
+msgstr "max aantal segmenten = %ld\n"
 
 #: sys-utils/ipcs.c:280
 #, c-format
 msgid "max seg size (kbytes) = %ld\n"
-msgstr ""
+msgstr "max segmentgrootte (kbytes) = %ld\n"
 
 #: sys-utils/ipcs.c:282
 #, c-format
 msgid "max total shared memory (kbytes) = %ld\n"
-msgstr ""
+msgstr "max totale gedeelde geheugen (kbytes) = %ld\n"
 
 #: sys-utils/ipcs.c:284
 #, c-format
 msgid "min seg size (bytes) = %ld\n"
-msgstr ""
+msgstr "min segmentgrootte (bytes) = %ld\n"
 
 #: sys-utils/ipcs.c:289
 msgid "------ Shared Memory Status --------\n"
-msgstr ""
+msgstr "------ Status gedeeld geheugen --------\n"
 
 #: sys-utils/ipcs.c:290
 #, c-format
 msgid "segments allocated %d\n"
-msgstr ""
+msgstr "segmenten gereserveerd %d\n"
 
 #: sys-utils/ipcs.c:291
 #, c-format
 msgid "pages allocated %ld\n"
-msgstr ""
+msgstr "pagina's gereserveerd %ld\n"
 
 #: sys-utils/ipcs.c:292
 #, c-format
 msgid "pages resident  %ld\n"
-msgstr ""
+msgstr "pagina's in geheugen %ld\n"
 
 #: sys-utils/ipcs.c:293
 #, c-format
 msgid "pages swapped   %ld\n"
-msgstr ""
+msgstr "pagina's in wisselgeheugen %ld\n"
 
 #: sys-utils/ipcs.c:294
 #, c-format
 msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr ""
+msgstr "Prestaties wisselgeheugen: %ld pogingen\t %ld succesvol\n"
 
 #: sys-utils/ipcs.c:299
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
-msgstr ""
+msgstr "------ Segment aanmakers/eigenaars gedeeld geheugen --------\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 ""
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
 
 #: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
 #: sys-utils/ipcs.c:320 sys-utils/ipcs.c:427
 msgid "shmid"
-msgstr ""
+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 ""
+msgstr "rechten"
 
 #: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
 msgid "cuid"
-msgstr ""
+msgstr "cuid"
 
 #: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
 msgid "cgid"
-msgstr ""
+msgstr "cgid"
 
 #: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520
 msgid "uid"
-msgstr ""
+msgstr "uid"
 
 #: sys-utils/ipcs.c:301 sys-utils/ipcs.c:520
 msgid "gid"
-msgstr ""
+msgstr "gid"
 
 #: sys-utils/ipcs.c:305
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
-msgstr ""
+msgstr "------ Bevestig/Losmaak/Wijzig tijden gedeeld geheugen --------\n"
 
 #: 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: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 "eigenaar"
 
 #: sys-utils/ipcs.c:307
 msgid "attached"
-msgstr ""
+msgstr "bevestigd"
 
 #: sys-utils/ipcs.c:307
 msgid "detached"
-msgstr ""
+msgstr "losgemaakt"
 
 #: sys-utils/ipcs.c:308
 msgid "changed"
-msgstr ""
+msgstr "gewijzigd"
 
 #: sys-utils/ipcs.c:312
 msgid "------ Shared Memory Creator/Last-op --------\n"
-msgstr ""
+msgstr "------ Aanmaker/Laatste-op gedeeld geheugen --------\n"
 
 #: 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:314
 msgid "cpid"
-msgstr ""
+msgstr "cpid"
 
 #: sys-utils/ipcs.c:314
 msgid "lpid"
-msgstr ""
+msgstr "lpid"
 
 #: sys-utils/ipcs.c:318
 msgid "------ Shared Memory Segments --------\n"
-msgstr ""
+msgstr "------ Gedeeld geheugen segmenten --------\n"
 
 #: 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:320 sys-utils/ipcs.c:436 sys-utils/ipcs.c:538
 msgid "key"
-msgstr ""
+msgstr "sleutel"
 
 #: sys-utils/ipcs.c:320
 msgid "bytes"
-msgstr ""
+msgstr "bytes"
 
 #: sys-utils/ipcs.c:321
 msgid "nattch"
-msgstr ""
+msgstr "nattch"
 
 #: sys-utils/ipcs.c:321
 msgid "status"
-msgstr ""
+msgstr "status"
 
 #: 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
@@ -8704,201 +9046,201 @@
 #: 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 "Niet ingesteld"
 
 #: sys-utils/ipcs.c:374
 msgid "dest"
-msgstr ""
+msgstr "doel"
 
 #: sys-utils/ipcs.c:375
 msgid "locked"
-msgstr ""
+msgstr "geblokkeerd"
 
 #: sys-utils/ipcs.c:395
 msgid "kernel not configured for semaphores\n"
-msgstr ""
+msgstr "kernel niet ingesteld voor semaphores\n"
 
 #: sys-utils/ipcs.c:401
 msgid "------ Semaphore Limits --------\n"
-msgstr ""
+msgstr "------ Semaphore grenzen --------\n"
 
 #: sys-utils/ipcs.c:405
 #, c-format
 msgid "max number of arrays = %d\n"
-msgstr ""
+msgstr "max aantal arrays = %d\n"
 
 #: sys-utils/ipcs.c:406
 #, c-format
 msgid "max semaphores per array = %d\n"
-msgstr ""
+msgstr "max semaphores per array = %d\n"
 
 #: sys-utils/ipcs.c:407
 #, c-format
 msgid "max semaphores system wide = %d\n"
-msgstr ""
+msgstr "max semaphores systeemwijd = %d\n"
 
 #: sys-utils/ipcs.c:408
 #, c-format
 msgid "max ops per semop call = %d\n"
-msgstr ""
+msgstr "max ops per semop aanroep = %d\n"
 
 #: sys-utils/ipcs.c:409
 #, c-format
 msgid "semaphore max value = %d\n"
-msgstr ""
+msgstr "semaphore max waarde = %d\n"
 
 #: sys-utils/ipcs.c:413
 msgid "------ Semaphore Status --------\n"
-msgstr ""
+msgstr "------ Semaphore status --------\n"
 
 #: sys-utils/ipcs.c:414
 #, c-format
 msgid "used arrays = %d\n"
-msgstr ""
+msgstr "gebruikte arrays = %d\n"
 
 #: sys-utils/ipcs.c:415
 #, c-format
 msgid "allocated semaphores = %d\n"
-msgstr ""
+msgstr "gereserveerde semaphores = %d\n"
 
 #: sys-utils/ipcs.c:419
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
-msgstr ""
+msgstr "------ Semaphore arrays aanmakers/eigenaars --------\n"
 
 #: sys-utils/ipcs.c:421 sys-utils/ipcs.c:436
 msgid "semid"
-msgstr ""
+msgstr "semid"
 
 #: sys-utils/ipcs.c:425
 msgid "------ Shared Memory Operation/Change Times --------\n"
-msgstr ""
+msgstr "------ Gedeeld geheugen opdracht/wijzig tijden --------\n"
 
 #: 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:427
 msgid "last-op"
-msgstr ""
+msgstr "laatste-op"
 
 #: sys-utils/ipcs.c:427
 msgid "last-changed"
-msgstr ""
+msgstr "laatst-gewijzigd"
 
 #: sys-utils/ipcs.c:434
 msgid "------ Semaphore Arrays --------\n"
-msgstr ""
+msgstr "------ Semaphore arrays --------\n"
 
 #: sys-utils/ipcs.c:435 sys-utils/ipcs.c:678
 #, c-format
 msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr ""
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
 
 #: sys-utils/ipcs.c:437
 msgid "nsems"
-msgstr ""
+msgstr "nsems"
 
 #: sys-utils/ipcs.c:496
 msgid "kernel not configured for message queues\n"
-msgstr ""
+msgstr "kernel niet ingesteld voor berichtwachtrijen\n"
 
 #: sys-utils/ipcs.c:504
 msgid "------ Messages: Limits --------\n"
-msgstr ""
+msgstr "------ Berichten: grenzen --------\n"
 
 #: sys-utils/ipcs.c:505
 #, c-format
 msgid "max queues system wide = %d\n"
-msgstr ""
+msgstr "max wachtrijen systeemwijd = %d\n"
 
 #: sys-utils/ipcs.c:506
 #, c-format
 msgid "max size of message (bytes) = %d\n"
-msgstr ""
+msgstr "max grootte van bericht (bytes) = %d\n"
 
 #: sys-utils/ipcs.c:507
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
-msgstr ""
+msgstr "standaard max grootte wachtrij (bytes) = %d\n"
 
 #: sys-utils/ipcs.c:511
 msgid "------ Messages: Status --------\n"
-msgstr ""
+msgstr "------ Berichten: status --------\n"
 
 #: sys-utils/ipcs.c:512
 #, c-format
 msgid "allocated queues = %d\n"
-msgstr ""
+msgstr "gereserveerde wachtrijen = %d\n"
 
 #: sys-utils/ipcs.c:513
 #, c-format
 msgid "used headers = %d\n"
-msgstr ""
+msgstr "gebruikte koppen = %d\n"
 
 #: sys-utils/ipcs.c:514
 #, c-format
 msgid "used space = %d bytes\n"
-msgstr ""
+msgstr "gebruikte ruimte = %d bytes\n"
 
 #: sys-utils/ipcs.c:518
 msgid "------ Message Queues: Creators/Owners --------\n"
-msgstr ""
+msgstr "------ Bericht wachtrijen: aanmakers/eigenaars --------\n"
 
 #: 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:524
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
-msgstr ""
+msgstr "------ Bericht wachtrijen verzend/ontvang/wijzig tijden --------\n"
 
 #: 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:526
 msgid "send"
-msgstr ""
+msgstr "verzend"
 
 #: sys-utils/ipcs.c:526
 msgid "recv"
-msgstr ""
+msgstr "ontvang"
 
 #: sys-utils/ipcs.c:526
 msgid "change"
-msgstr ""
+msgstr "wijzig"
 
 #: sys-utils/ipcs.c:530
 msgid "------ Message Queues PIDs --------\n"
-msgstr ""
+msgstr "------ Bericht wachtrijen PIDs --------\n"
 
 #: sys-utils/ipcs.c:532
 msgid "lspid"
-msgstr ""
+msgstr "lspid"
 
 #: sys-utils/ipcs.c:532
 msgid "lrpid"
-msgstr ""
+msgstr "lrpid"
 
 #: sys-utils/ipcs.c:536
 msgid "------ Message Queues --------\n"
-msgstr ""
+msgstr "------ Bericht wachtrijen --------\n"
 
 #: 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:539
 msgid "used-bytes"
-msgstr ""
+msgstr "gebruikte-bytes"
 
 #: sys-utils/ipcs.c:539
 msgid "messages"
-msgstr ""
+msgstr "berichten"
 
 #: sys-utils/ipcs.c:607
 #, c-format
@@ -8906,36 +9248,38 @@
 "\n"
 "Shared memory Segment shmid=%d\n"
 msgstr ""
+"\n"
+"Gedeeld geheugen segment shmid=%d\n"
 
 #: 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:610
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
-msgstr ""
+msgstr "modus=%#o\tatoegangsrechten=%#o\n"
 
 #: sys-utils/ipcs.c:612
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr ""
+msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:615
 #, c-format
 msgid "att_time=%-26.24s\n"
-msgstr ""
+msgstr "att_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:617
 #, c-format
 msgid "det_time=%-26.24s\n"
-msgstr ""
+msgstr "det_time=%-26.24s\n"
 
 #: sys-utils/ipcs.c:619 sys-utils/ipcs.c:650
 #, c-format
 msgid "change_time=%-26.24s\n"
-msgstr ""
+msgstr "wijzig_tijd=%-26.24s\n"
 
 #: sys-utils/ipcs.c:634
 #, c-format
@@ -8943,26 +9287,28 @@
 "\n"
 "Message Queue msqid=%d\n"
 msgstr ""
+"\n"
+"Bericht wachtrij msqid=%d\n"
 
 #: 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\tmodus=%#o\n"
 
 #: sys-utils/ipcs.c:637
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
-msgstr ""
+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 ""
+msgstr "verzend_tijd=%-26.24s\n"
 
 #: sys-utils/ipcs.c:648
 #, c-format
 msgid "rcv_time=%-26.24s\n"
-msgstr ""
+msgstr "ontvang_tijd=%-26.24s\n"
 
 #: sys-utils/ipcs.c:668
 #, c-format
@@ -8970,112 +9316,122 @@
 "\n"
 "Semaphore Array semid=%d\n"
 msgstr ""
+"\n"
+"Semaphore array semid=%d\n"
 
 #: 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:671
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
-msgstr ""
+msgstr "modus=%#o, toegangsrechten=%#o\n"
 
 #: sys-utils/ipcs.c:673
 #, c-format
 msgid "nsems = %ld\n"
-msgstr ""
+msgstr "nsems = %ld\n"
 
 #: sys-utils/ipcs.c:674
 #, c-format
 msgid "otime = %-26.24s\n"
-msgstr ""
+msgstr "otime = %-26.24s\n"
 
 #: sys-utils/ipcs.c:676
 #, c-format
 msgid "ctime = %-26.24s\n"
-msgstr ""
+msgstr "ctime = %-26.24s\n"
 
 #: sys-utils/ipcs.c:679
 msgid "semnum"
-msgstr ""
+msgstr "semnum"
 
 #: sys-utils/ipcs.c:679
 msgid "value"
-msgstr ""
+msgstr "waarde"
 
 #: sys-utils/ipcs.c:679
 msgid "ncount"
-msgstr ""
+msgstr "ncount"
 
 #: sys-utils/ipcs.c:679
 msgid "zcount"
-msgstr ""
+msgstr "zcount"
 
 #: 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 ""
+"gebruik: rdev [ -rv ] [ -o PLAATS ] [ AFBEELDING [ WAARDE [ PLAATS ] ] ]"
 
 #: sys-utils/rdev.c:70
 msgid ""
 "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
 msgstr ""
+"  rdev /dev/fd0  (of rdev /linux, etc.) geeft huidige ROOT apparaat aan"
 
 #: sys-utils/rdev.c:71
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr ""
+msgstr "  rdev /dev/fd0 /dev/hda2         stelt ROOT in op /dev/hda2"
 
 #: sys-utils/rdev.c:72
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
 msgstr ""
+"  rdev -R /dev/fd0 1              stelt de ROOTFLAGS in (alleen-lezen status)"
 
 #: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr ""
+msgstr "  rdev -r /dev/fd0 627            stelt de RAMDISK grootte in"
 
 #: sys-utils/rdev.c:74
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
+msgstr "  rdev -v /dev/fd0 1              stelt de opstart VIDEOMODE in"
 
 #: sys-utils/rdev.c:75
 msgid "  rdev -o N ...                   use the byte offset N"
-msgstr ""
+msgstr "  rdev -o N ...                   gebruik de byte plaats N"
 
 #: sys-utils/rdev.c:76
 msgid "  rootflags ...                   same as rdev -R"
-msgstr ""
+msgstr "  rootflags ...                   zelfde als rdev -R"
 
 #: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
-msgstr ""
+msgstr "  ramsize ...                     zelfde als rdev -r"
 
 #: sys-utils/rdev.c:78
 msgid "  vidmode ...                     same as rdev -v"
-msgstr ""
+msgstr "  vidmode ...                     zelfde als rdev -v"
 
 #: sys-utils/rdev.c:79
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
+"Let op: video modes zijn: -3=Vraag, -2=Uitgebreid, -1=GewoonVga, 1=sleutel1, "
+"2=sleutel2,..."
 
 #: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
 msgstr ""
+"      gebruik -R 1 om root alleen-lezen aan te koppelen, -R 0 voor lezen/"
+"schrijven."
 
 #: sys-utils/rdev.c:247
 msgid "missing comma"
-msgstr ""
+msgstr "komma ontbreekt"
 
-#: sys-utils/readprofile.c:60
+#: 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"
@@ -9085,72 +9441,82 @@
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
+"%s: Gebruik: \"%s [opties]\n"
+"\t -m <afbeeldingsbestand>  (standaard: \"%s\" en\n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <pro-bestand> (standaard: \"%s\")\n"
+"\t -M <mult>     stelt profileer-vermenigvuldiger op <mult>\n"
+"\t -i            alleen info over bemonsterstap weergeven\n"
+"\t -v            meer gegevens weergeven\n"
+"\t -a            alle symbolen weergeven, zelfs als het aantal 0 is\n"
+"\t -b            individuele histogram-vak-aantallen weergeven\n"
+"\t -r            alle tellers op nul opnieuw instellen (alleen root)\n"
+"\t -n            byte volgorde auto-detectie uit zetten\n"
+"\t -V            versie weergeven en afsluiten\n"
 
-#: sys-utils/readprofile.c:84
-msgid "out of memory"
-msgstr ""
-
-#: sys-utils/readprofile.c:147
+#: sys-utils/readprofile.c:188
 #, c-format
-msgid "%s Version %s\n"
-msgstr ""
+msgid "%s version %s\n"
+msgstr "%s versie %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
-msgstr ""
+msgstr "Bemonsterstap: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: 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): foutieve afbeelding regel\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:308
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
-msgstr ""
+msgstr "%s: kan \"_stext\" niet vinden in %s\n"
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:334
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
-msgstr ""
+msgstr "%s: profiel adres buiten bereik. Fout afbeeldingsbestand?\n"
 
-#: sys-utils/readprofile.c:323
+#: sys-utils/readprofile.c:375
 msgid "total"
-msgstr ""
+msgstr "totaal"
 
 #: sys-utils/renice.c:68
 msgid ""
 "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 msgstr ""
+"gebruik: renice prioriteit [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
+"gebruikers ]\n"
 
 #: sys-utils/renice.c:97
 #, c-format
 msgid "renice: %s: unknown user\n"
-msgstr ""
+msgstr "renice: %s: onbekende gebruiker\n"
 
 #: sys-utils/renice.c:105
 #, c-format
 msgid "renice: %s: bad value\n"
-msgstr ""
+msgstr "renice: %s: slechte waarde\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: oude prioriteit %d, nieuwe prioriteit %d\n"
 
 #: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr ""
+msgstr "gebruik: %s programma [arg ...]\n"
 
 #: sys-utils/tunelp.c:75
 #, c-format
@@ -9159,116 +9525,122 @@
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
+"Gebruik: %s <apparaat> [ -i <IRQ> | -t <TIJD> | -c <TEKENS> | -w <WACHTEN> "
+"| \n"
+"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"          -T [on|off] ]\n"
 
 #: sys-utils/tunelp.c:91
 msgid "malloc error"
-msgstr ""
+msgstr "malloc() fout"
 
 #: sys-utils/tunelp.c:103
 #, c-format
 msgid "%s: bad value\n"
-msgstr ""
+msgstr "%s: slechte waarde\n"
 
 #: sys-utils/tunelp.c:242
 #, c-format
 msgid "%s: %s not an lp device.\n"
-msgstr ""
+msgstr "%s: %s niet een lp apparaat.\n"
 
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
-msgstr ""
+msgstr "%s status is %d"
 
 #: sys-utils/tunelp.c:264
 msgid ", busy"
-msgstr ""
+msgstr ", bezig"
 
 #: sys-utils/tunelp.c:265
 msgid ", ready"
-msgstr ""
+msgstr ", gereed"
 
 #: sys-utils/tunelp.c:266
 msgid ", out of paper"
-msgstr ""
+msgstr ", papier is op"
 
 #: sys-utils/tunelp.c:267
 msgid ", on-line"
-msgstr ""
+msgstr ", on-line"
 
 #: sys-utils/tunelp.c:268
 msgid ", error"
-msgstr ""
+msgstr ", fout"
 
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
-msgstr ""
+msgstr "LPGETIRQ fout"
 
 #: sys-utils/tunelp.c:291
 #, c-format
 msgid "%s using IRQ %d\n"
-msgstr ""
+msgstr "%s met IRQ %d\n"
 
 #: sys-utils/tunelp.c:293
 #, c-format
 msgid "%s using polling\n"
-msgstr ""
+msgstr "%s met status-opvraging\n"
 
 #: text-utils/col.c:153
 #, c-format
 msgid "col: bad -l argument %s.\n"
-msgstr ""
+msgstr "col: slecht -l argument %s.\n"
 
 #: text-utils/col.c:535
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr ""
+msgstr "gebruik: col [-bfpx] [-l nregels]\n"
 
 #: text-utils/col.c:541
 msgid "col: write error.\n"
-msgstr ""
+msgstr "col: schrijffout.\n"
 
 #: text-utils/col.c:548
 #, c-format
 msgid "col: warning: can't back up %s.\n"
-msgstr ""
+msgstr "col: waarschuwing: niet geen reservekopie maken van %s.\n"
 
 #: text-utils/col.c:549
 msgid "past first line"
-msgstr ""
+msgstr "na eerste regel"
 
 #: text-utils/col.c:549
 msgid "-- line already flushed"
-msgstr ""
+msgstr "-- regel als doorgespoeld"
 
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr ""
+msgstr "gebruik: %s [ - ] [ -2 ] [ bestand ... ]\n"
 
 #: text-utils/column.c:297
 msgid "line too long"
-msgstr ""
+msgstr "regel te lang"
 
 #: text-utils/column.c:374
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr ""
+msgstr "gebruik: column [-tx] [-c kolommen] [bestand ...]\n"
 
 #: text-utils/hexsyntax.c:82
 msgid "hexdump: bad length value.\n"
-msgstr ""
+msgstr "hexdump: slechte waarde voor lengte.\n"
 
 #: text-utils/hexsyntax.c:93
 msgid "hexdump: bad skip value.\n"
-msgstr ""
+msgstr "hexdump: slechte waarde voor overslaan.\n"
 
 #: text-utils/hexsyntax.c:131
 msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
+"hexdump: [-bcCdovx] [-e fmt] [-f formaat_bestand] [-n lengte] [-s overslaan] "
+"[bestand ...]\n"
 
 #: text-utils/more.c:263
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr ""
+msgstr "gebruik: %s [-dflpcsu] [+regelnummer | +/patroon] naam1 naam2 ...\n"
 
 #: text-utils/more.c:521
 #, c-format
@@ -9277,6 +9649,9 @@
 "*** %s: directory ***\n"
 "\n"
 msgstr ""
+"\n"
+"*** %s: map ***\n"
+"\n"
 
 #. simple ELF detection
 #: text-utils/more.c:564
@@ -9286,319 +9661,380 @@
 "******** %s: Not a text file ********\n"
 "\n"
 msgstr ""
+"\n"
+"******** %s: Geen tekstbestand ********\n"
+"\n"
 
 #: text-utils/more.c:667
 msgid "[Use q or Q to quit]"
-msgstr ""
+msgstr "[Gebruik q of Q om af te sluiten]"
 
 #: text-utils/more.c:847
 msgid "--More--"
-msgstr ""
+msgstr "--Meer--"
 
 #: text-utils/more.c:849
 #, c-format
 msgid "(Next file: %s)"
-msgstr ""
+msgstr "(Volgende bestand: %s)"
 
 #: text-utils/more.c:855
 msgid "[Press space to continue, 'q' to quit.]"
-msgstr ""
+msgstr "[Druk op de spatiebalk om door te gaan, 'q' om af te sluiten.]"
 
 #: text-utils/more.c:1269
 #, c-format
 msgid "...back %d pages"
-msgstr ""
+msgstr "...%d pagina's terug"
 
 #: text-utils/more.c:1271
 msgid "...back 1 page"
-msgstr ""
+msgstr "...1 pagina terug"
 
-#: text-utils/more.c:1313
+#: text-utils/more.c:1314
 msgid "...skipping one line"
-msgstr ""
+msgstr "...1 regel overslaan"
 
-#: text-utils/more.c:1315
+#: text-utils/more.c:1316
 #, c-format
 msgid "...skipping %d lines"
-msgstr ""
+msgstr "...%d regels overslaan"
 
-#: text-utils/more.c:1352
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
 "\n"
 msgstr ""
+"\n"
+"***Terug***\n"
+"\n"
 
-#: text-utils/more.c:1390
+#: 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"
+"De meeste opdrachten optioneel voorafgegaan door gehele getallen (k).  "
+"Standaard tussen haakjes.\n"
+"Ster (*) geeft aan dat argument de nieuwe standaardinstelling wordt.\n"
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1398
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
+"<spatie>                 Geef volgende k regels weer van tekst [huidige "
+"schermgrootte]\n"
+"z                       Geef volgende k regels weer van tekst [huidige "
+"schermgrootte]*\n"
+"<enter>                Geef volgende k regels weer van tekst [1]*\n"
+"d of ctrl-D             Schuif k regels op [huidige schuifgrootte, in het "
+"begin 11]*\n"
+"q of Q of <interrupt>   Afsluiten voor meer\n"
+"s                       Naar voren k regels overslaan [1]\n"
+"f                       Naar voren k schermen overslaan [1]\n"
+"b of ctrl-B             Naar achteren k schermen overslaan [1]\n"
+"'                       Ga naar de plaats waar de vorige zoekopdracht "
+"startte\n"
+"=                       Geef huidige regelnummer weer\n"
+"/<reguliere uitdrukking>   Zoek de kde overeenkomst van reguliere "
+"uitdrukking [1]\n"
+"n                       Zoek de kde overeenkomst van vorige reguliere "
+"uitdrukking [1]\n"
+"!<cmd> of :!<cmd>       Voer <cmd> uit in een subshell\n"
+"v                       Start /usr/bin/vi op de huidige regel\n"
+"ctrl-L                  Teken het scherm opnieuw\n"
+":n                      Ga naar het kde volgende bestand [1]\n"
+":p                      Ga naar het kde vorige bestand [1]\n"
+":f                      Geef de huidige bestandsnaam en het regelnummer "
+"weer\n"
+".                       Herhaal de vorige opdracht\n"
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
-msgstr ""
+msgstr "[Druk op 'h' voor instructies.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
-msgstr ""
+msgstr "\"%s\" regel %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
-msgstr ""
+msgstr "[Geen bestand] regel %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
-msgstr ""
+msgstr "  Overloop\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1642
 msgid "...skipping\n"
-msgstr ""
+msgstr "...overslaan\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
-msgstr ""
+msgstr "Reguliere uitdrukking knoeiwerk"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
+"\n"
+"Patroon niet gevonden\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
-msgstr ""
+msgstr "Patroon niet gevonden"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1748
 msgid "can't fork\n"
-msgstr ""
+msgstr "kan niet fork()\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
+"\n"
+"...Overslaan "
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1792
 msgid "...Skipping to file "
-msgstr ""
+msgstr "...Overslaan tot bestand "
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1794
 msgid "...Skipping back to file "
-msgstr ""
+msgstr "...Overslaan terug naar bestand "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2074
 msgid "Line too long"
-msgstr ""
+msgstr "Regels te lang"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
-msgstr ""
+msgstr "Geen vorige opdracht om voor te vervangen"
 
 #: text-utils/odsyntax.c:130
 msgid "od: od(1) has been deprecated for hexdump(1).\n"
-msgstr ""
+msgstr "od: od(1) wordt afgeraden, gebruik hexdump(1).\n"
 
 #: text-utils/odsyntax.c:133
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr ""
+msgstr "od: hexdump(1) compatibiliteit ondersteunt niet de -%c optie%s\n"
 
 #: text-utils/odsyntax.c:134
 msgid "; see strings(1)."
-msgstr ""
+msgstr "; zie strings(1)."
 
 #: text-utils/parse.c:63
 #, c-format
 msgid "hexdump: can't read %s.\n"
-msgstr ""
+msgstr "hexdump: kan %s niet lezen.\n"
 
 #: text-utils/parse.c:68
 msgid "hexdump: line too long.\n"
-msgstr ""
+msgstr "hexdump: regel te lang.\n"
 
 #: text-utils/parse.c:401
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr ""
+msgstr "hexdump: byte aantal met meerdere conversietekens.\n"
 
 #: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
-msgstr ""
+msgstr "hexdump: slecht byte aantal voor conversieteken %s.\n"
 
 #: text-utils/parse.c:490
 #, c-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
-msgstr ""
+msgstr "hexdump: %%s heeft een precisie nodig of een byte aantal.\n"
 
 #: text-utils/parse.c:496
 #, c-format
 msgid "hexdump: bad format {%s}\n"
-msgstr ""
+msgstr "hexdump: slecht formaat {%s}\n"
 
 #: text-utils/parse.c:502
 #, c-format
 msgid "hexdump: bad conversion character %%%s.\n"
-msgstr ""
+msgstr "hexdump: slecht conversieteken %%%s.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
+"%s: Gebruik: %s [-number] [-p tekst] [-cefnrs] [+regel] [+/patroon/] "
+"[bestanden]\n"
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
-msgstr ""
+msgstr "%s: optie vereist een argument -- %s\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, c-format
 msgid "%s: illegal option -- %s\n"
-msgstr ""
+msgstr "%s: onjuiste optie -- %s\n"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 msgid "...skipping forward\n"
-msgstr ""
+msgstr "...overslaan naar voren\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 msgid "...skipping backward\n"
-msgstr ""
-
-#: text-utils/pg.c:411
-msgid "No next file"
-msgstr ""
+msgstr "...overslaan naar achteren\n"
 
 #: text-utils/pg.c:415
-msgid "No previous file"
-msgstr ""
+msgid "No next file"
+msgstr "Geen volgend bestand"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:419
+msgid "No previous file"
+msgstr "Geen vorig bestand"
+
+#: text-utils/pg.c:949
 #, c-format
 msgid "%s: Read error from %s file\n"
-msgstr ""
+msgstr "%s: Leesfout bestand %s\n"
 
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
-msgstr ""
+msgstr "%s: Onverwacht EOF in bestand %s\n"
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, c-format
 msgid "%s: Unknown error in %s file\n"
-msgstr ""
+msgstr "%s: Onbekende fout in bestand %s\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, c-format
 msgid "%s: Cannot create tempfile\n"
-msgstr ""
+msgstr "%s: Kan geen tijdelijk bestand maken\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 msgid "RE error: "
-msgstr ""
+msgstr "RE fout: "
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
-msgstr ""
+msgstr "(EOF)"
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
-msgstr ""
+msgstr "Geen onthouden zoektekst"
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 msgid "Cannot open "
-msgstr ""
+msgstr "Kan niet openen "
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 msgid "saved"
-msgstr ""
+msgstr "opgeslagen"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
-msgstr ""
+msgstr ": !opdracht niet toegestaan in rflag modus.\n"
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 msgid "fork() failed, try again later\n"
-msgstr ""
+msgstr "fork() mislukt, probeer het later opnieuw\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 msgid "(Next file: "
-msgstr ""
+msgstr "(Volgende bestand: "
 
 #: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
-msgstr ""
+msgstr "Reserveren bufferruimte mislukt\n"
 
 #: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
-msgstr ""
+msgstr "gebruik: rev [bestand ...]\n"
 
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr ""
+msgstr "gebruik: %s [ -i ] [ -tTerm ] bestand...\n"
 
 #: text-utils/ul.c:152
 msgid "trouble reading terminfo"
-msgstr ""
+msgstr "problemen bij lezen terminfo"
 
 #: text-utils/ul.c:242
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
-msgstr ""
+msgstr "Onbekende stuurcode in invoer: %o, %o\n"
 
 #: text-utils/ul.c:425
 msgid "Unable to allocate buffer.\n"
-msgstr ""
+msgstr "Reserveren buffer mislukt.\n"
 
 #: text-utils/ul.c:586
 msgid "Input line too long.\n"
-msgstr ""
+msgstr "Invoerregel te lang.\n"
 
 #: text-utils/ul.c:599
 msgid "Out of memory when growing buffer.\n"
-msgstr ""
+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 "del_loop(%s): success\n"
+#~ msgstr "del_loop(%s): succes\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 "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 "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Partitie %i eindigt niet op een cylinder grens:\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "Disk %s: %d heads, %d sectors, %d cylinders\n"
-#~ "Units = %s of %d * %d bytes\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Schijf %s: %d koppen, %d sectoren, %d cylinders\n"
-#~ "Eenheden = %s of %d * %d bytes\n"
-#~ "\n"
+#~ msgid "Can't open help file"
+#~ msgstr "Kan hulpbestand niet openen"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cac5870..fd3e478 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: 2002-11-25 00:47+0100\n"
+"POT-Creation-Date: 2003-06-13 00:50+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"
@@ -157,7 +157,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -760,7 +760,7 @@
 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:2166
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -834,8 +834,8 @@
 msgstr ""
 "Uso: mkfs [-V] [-t tipoSistArq] [opções-sistArq] dispositivo [tamanho]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: memória insuficiente!\n"
@@ -845,7 +845,7 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versão %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
+#: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
 "usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
@@ -863,72 +863,72 @@
 " outfile    output file\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:328
+#: 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 ""
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:507
+#: disk-utils/mkfs.cramfs.c:514
 msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
 msgstr ""
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:812
+#: 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 ""
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, fuzzy, c-format
 msgid "Including: %s\n"
 msgstr "id inválido: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, fuzzy, c-format
 msgid "Super block: %d bytes\n"
 msgstr "espaço usado: %d bytes\n"
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
@@ -937,33 +937,33 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 #, fuzzy
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "Aviso: contagem de inodes grande demais.\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:926
+#: disk-utils/mkfs.cramfs.c:933
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -1116,8 +1116,8 @@
 msgid "too many bad pages"
 msgstr "número excessivo de páginas inválidas"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: 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 "Memória insuficiente"
 
@@ -1238,11 +1238,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "       %s [ -c | -y | -n ] disp\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
 msgid "Unusable"
 msgstr "Inutilizável"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
 msgid "Free Space"
 msgstr "Espaço livre"
 
@@ -1379,235 +1379,235 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu sem direção. Assumindo horizontal como padrão."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Tecla ilegal"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Pressione uma tecla para continuar"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2512
 msgid "Primary"
 msgstr "Primária"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Cria uma nova partição primária"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2512
 msgid "Logical"
 msgstr "Lógica"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Cria uma nova partição lógica"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Não criar uma partição"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Erro interno !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Tamanho (em MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Início"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Adicionar partição no início do espaço livre"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Fim"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Adicionar partição no final do espaço livre"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "Espaço insuficiente para criação de partição estendida"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1527
 #, fuzzy
 msgid "No partition table or unknown signature on partition table"
 msgstr "Assinatura inválida na tabela de partições"
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1529
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1576
+#: fdisk/cfdisk.c:1581
 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:1606
+#: fdisk/cfdisk.c:1611
 msgid "Cannot open disk drive"
 msgstr "Não foi possível abrir a unidade de disco"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
 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:1629
+#: fdisk/cfdisk.c:1634
 msgid "Cannot get disk size"
 msgstr "Não foi possível obter o tamanho do disco"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1659
 msgid "Bad primary partition"
 msgstr "Partição primária inválida"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1689
 msgid "Bad logical partition"
 msgstr "Partição lógica inválida"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1804
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Aviso!! Isto pode destruir dados existentes no disco!"
 
-#: fdisk/cfdisk.c:1803
+#: fdisk/cfdisk.c:1808
 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:1809
+#: fdisk/cfdisk.c:1814
 msgid "no"
 msgstr "nao"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1815
 msgid "Did not write partition table to disk"
 msgstr "A tabela de partições NÃO foi gravada no disco"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1817
 msgid "yes"
 msgstr "sim"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1820
 msgid "Please enter `yes' or `no'"
 msgstr "Responda `sim' ou `nao'"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1824
 msgid "Writing partition table to disk..."
 msgstr "Gravando tabela de partições no disco..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
 msgid "Wrote partition table to disk"
 msgstr "A tabela de partições foi gravada no disco"
 
-#: fdisk/cfdisk.c:1846
+#: fdisk/cfdisk.c:1851
 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:1856
+#: fdisk/cfdisk.c:1861
 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:1858
+#: fdisk/cfdisk.c:1863
 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:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
 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:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Não foi possível abrir o arquivo '%s'"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1941
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unidade de disco: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1943
 msgid "Sector 0:\n"
 msgstr "Setor 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1950
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Setor %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1970
 msgid "   None   "
 msgstr "  Nenhum  "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1972
 msgid "   Pri/Log"
 msgstr "   Pri/lóg"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1974
 msgid "   Primary"
 msgstr "   Primária"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1976
 msgid "   Logical"
 msgstr "   Lógica"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2020
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Boot (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconhecido (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2024
 #, c-format
 msgid "None (%02X)"
 msgstr "Nenhum (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabela de partições de %s\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2061
 msgid "            First    Last\n"
 msgstr "            Prim.    Últ.\n"
 
-#: fdisk/cfdisk.c:2057
+#: fdisk/cfdisk.c:2062
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Tipo     Setor    Setor    Desloc. Compr.   Tipo sist. arqs. (ID)  "
 "Opções\n"
 
-#: fdisk/cfdisk.c:2058
+#: fdisk/cfdisk.c:2063
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1616,469 +1616,469 @@
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2146
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         --- Início ---       ---- Fim ----       Núm. inicial de\n"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2147
 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:2143
+#: fdisk/cfdisk.c:2148
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Raw"
 msgstr "Brutos"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Print the table using raw data format"
 msgstr "Mostrar a tabela usando formato de dados brutos"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
 msgid "Sectors"
 msgstr "Setores"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2182
 msgid "Print the table ordered by sectors"
 msgstr "Mostrar a tabela ordenada por setores"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Table"
 msgstr "Tabela"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Just print the partition table"
 msgstr "Mostrar somente a tabela de partições"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2184
 msgid "Don't print the table"
 msgstr "Não mostrar a tabela"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2212
 msgid "Help Screen for cfdisk"
 msgstr "Tela de ajuda do cfdisk"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2214
 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:2210
+#: fdisk/cfdisk.c:2215
 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:2211
+#: fdisk/cfdisk.c:2216
 msgid "disk drive."
 msgstr "de disco rígido."
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2218
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2220
 msgid "Command      Meaning"
 msgstr "Comando      Significado"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2221
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2222
 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:2218
+#: fdisk/cfdisk.c:2223
 msgid "  d          Delete the current partition"
 msgstr "  d          Exclui a partição atual."
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2224
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Altera parâmetros de cilindros, cabeças, setores por trilha"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2225
 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:2221
+#: fdisk/cfdisk.c:2226
 msgid "             know what they are doing."
 msgstr "             saibam exatamente o que estão fazendo."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2227
 msgid "  h          Print this screen"
 msgstr "  h          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2228
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximiza o uso de disco da partição atual."
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2229
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Isto pode tornar a partição incompatível com"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2230
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2 ..."
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2231
 msgid "  n          Create new partition from free space"
 msgstr "  n          Cria uma nova partição a partir do espaço livre."
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2232
 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:2228
+#: fdisk/cfdisk.c:2233
 msgid "             There are several different formats for the partition"
 msgstr "             Pode-se selecionar diversos formatos diferentes para"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2234
 msgid "             that you can choose from:"
 msgstr "             uma partição:"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2235
 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:2231
+#: fdisk/cfdisk.c:2236
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabela ordenada por setores."
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2237
 msgid "                t - Table in raw format"
 msgstr "                t - Tabela em formato bruto."
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2238
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Sai do programa sem gravar a tabela de partições."
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2239
 msgid "  t          Change the filesystem type"
 msgstr "  t          Altera o tipo de sistema de arquivos."
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2240
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Altera unidades de exibição do tamanho das partições."
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2241
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, setores e cilindros."
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2242
 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:2238
+#: fdisk/cfdisk.c:2243
 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:2239
+#: fdisk/cfdisk.c:2244
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             confirmar ou cancelar a gravação indicando `sim' ou"
 
-#: fdisk/cfdisk.c:2240
+#: fdisk/cfdisk.c:2245
 msgid "             `no'"
 msgstr "             `não'"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2246
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Seta p/ cima  Move o cursor para a partição anterior."
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2247
 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:2243
+#: fdisk/cfdisk.c:2248
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Redesenha a tela."
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2249
 msgid "  ?          Print this screen"
 msgstr "  ?          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2251
 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:2247
+#: fdisk/cfdisk.c:2252
 msgid "case letters (except for Writes)."
 msgstr "minúsculas (exceto W)."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
-#: fdisk/fdisksunlabel.c:324
+#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2282
 msgid "Change cylinder geometry"
 msgstr "Alterar geometria dos cilindros"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Cabeças"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2283
 msgid "Change head geometry"
 msgstr "Alterar geometria das cabeças"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2284
 msgid "Change sector geometry"
 msgstr "Alterar geometria dos setores"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done"
 msgstr "Concluído"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done with changing geometry"
 msgstr "A alteração da geometria foi concluída"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2298
 msgid "Enter the number of cylinders: "
 msgstr "Digite o número de cilindros: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
 msgid "Illegal cylinders value"
 msgstr "Valor de cilindros inválido"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2316
 msgid "Enter the number of heads: "
 msgstr "Digite o número de cabeças: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
 msgid "Illegal heads value"
 msgstr "Valor de cabeças inválido"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2329
 msgid "Enter the number of sectors per track: "
 msgstr "Digite o número de setores por trilha: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
 msgid "Illegal sectors value"
 msgstr "Valor de setores inválido"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2439
 msgid "Enter filesystem type: "
 msgstr "Digite o tipo do sistema de arquivos: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2457
 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:2454
+#: fdisk/cfdisk.c:2459
 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:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Inicializar"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2489
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc (%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2511
 msgid "Pri/Log"
 msgstr "Pri/lóg"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2587
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disco: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2593
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "Tamanho: %lld bytes"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2596
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "Tamanho: %lld bytes"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2600
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Cabeças: %d  Setores por Trilha: %d  Cilindros: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2604
 msgid "Name"
 msgstr "Nome"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2605
 msgid "Flags"
 msgstr "Opções"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2606
 msgid "Part Type"
 msgstr "Tipo Part."
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2607
 msgid "FS Type"
 msgstr "Tipo SA"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2608
 msgid "[Label]"
 msgstr "[Rótulo]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2610
 msgid "  Sectors"
 msgstr "  Setores"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2614
 msgid "Size (MB)"
 msgstr "Tam. (Mb)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2616
 msgid "Size (GB)"
 msgstr "Tam. (Gb)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Bootable"
 msgstr "Iniciali."
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Toggle bootable flag of the current partition"
 msgstr "Alterna a opção da partição atual como inicializável"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete"
 msgstr "Excluir"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete the current partition"
 msgstr "Excluir a partição atual"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Change disk geometry (experts only)"
 msgstr "Alterar a geometria do disco (somente para usuários avançados)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Help"
 msgstr "Ajuda"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Print help screen"
 msgstr "Mostrar tela de ajuda"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize"
 msgstr "Maximize"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 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:2671
+#: fdisk/cfdisk.c:2676
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "Create new partition from free space"
 msgstr "Criar nova partição a partir do espaço livre"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print"
 msgstr "Mostre"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 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:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit"
 msgstr "Sair"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit program without writing partition table"
 msgstr "Sair do programa sem gravar a tabela de partições"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 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:2675
+#: fdisk/cfdisk.c:2680
 msgid "Units"
 msgstr "Unidades"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 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:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write"
 msgstr "Gravar"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 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:2722
+#: fdisk/cfdisk.c:2727
 msgid "Cannot make this partition bootable"
 msgstr "Não foi possível tornar esta partição inicializável."
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2737
 msgid "Cannot delete an empty partition"
 msgstr "Não foi possível excluir uma partição vazia"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
 msgid "Cannot maximize this partition"
 msgstr "Não foi possível maximizar esta partição"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2767
 msgid "This partition is unusable"
 msgstr "Esta partição é inutilizável"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2769
 msgid "This partition is already in use"
 msgstr "Esta partição já está sendo usada"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2786
 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:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
 msgid "No more partitions"
 msgstr "Sem mais partições"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2826
 msgid "Illegal command"
 msgstr "Comando inválido"
 
-#: fdisk/cfdisk.c:2831
+#: fdisk/cfdisk.c:2836
 #, 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:2838
+#: fdisk/cfdisk.c:2843
 #, c-format
 msgid ""
 "\n"
@@ -2361,11 +2361,11 @@
 msgid "heads"
 msgstr "cabeças"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "setores"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470
+#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cilindros"
@@ -2488,74 +2488,74 @@
 msgstr "Código hexadecimal (digite L para listar os códigos): "
 
 #: fdisk/fdisk.c:1069
-#, c-format
-msgid "%s (%d-%d, default %d): "
+#, fuzzy, c-format
+msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, padrão %d):"
 
-#: fdisk/fdisk.c:1134
-#, c-format
-msgid "Using default value %d\n"
+#: fdisk/fdisk.c:1136
+#, fuzzy, c-format
+msgid "Using default value %u\n"
 msgstr "Usando valor padrão %d\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1140
 msgid "Value out of range.\n"
 msgstr "Valor fora do intervalo.\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1150
 msgid "Partition number"
 msgstr "Número da partição"
 
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1161
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Aviso: a partição %d possui tipo vazio\n"
 
-#: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207
+#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Ignorando partição estendida extra %d\n"
 
-#: fdisk/fdisk.c:1184
+#: fdisk/fdisk.c:1186
 #, fuzzy
 msgid "No partition is defined yet!\n"
 msgstr "Nenhuma partição definida\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1212
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "sector"
 msgstr "setor"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1231
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Mudando as unidades das entradas mostradas para %s\n"
 
-#: fdisk/fdisk.c:1240
+#: fdisk/fdisk.c:1242
 #, 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:1251
+#: fdisk/fdisk.c:1253
 msgid "DOS Compatibility flag is set\n"
 msgstr "A opção de compatibilidade DOS está ativada\n"
 
-#: fdisk/fdisk.c:1255
+#: fdisk/fdisk.c:1257
 msgid "DOS Compatibility flag is not set\n"
 msgstr "A opção de compatibilidade DOS não está ativada\n"
 
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1357
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "A partição %d ainda não existe!\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1362
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2567,7 +2567,7 @@
 "tipo 0 não é recomendável. Você pode excluir\n"
 "uma partição usando o comando `d'.\n"
 
-#: fdisk/fdisk.c:1361
+#: fdisk/fdisk.c:1371
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2575,7 +2575,7 @@
 "Você não pode alterar uma partição normal para estendida ou vice-versa.\n"
 "Exclua a partição antes.\n"
 
-#: fdisk/fdisk.c:1370
+#: fdisk/fdisk.c:1380
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2585,7 +2585,7 @@
 "uma vez que o SunOS/Solaris espera isto e até mesmo o Linux gosta disto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1376
+#: fdisk/fdisk.c:1386
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2595,59 +2595,59 @@
 "e a partição 11 como um volume inteiro (6), uma vez que o IRIX espera isto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1389
+#: fdisk/fdisk.c:1399
 #, 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:1443
+#: fdisk/fdisk.c:1453
 #, 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:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fís. = (%d, %d, %d) "
 
-#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lógico = (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1451
+#: fdisk/fdisk.c:1461
 #, 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:1460
+#: fdisk/fdisk.c:1470
 #, 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:1463
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "deveria ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1469
+#: fdisk/fdisk.c:1479
 #, 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:1473
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "deveria ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1485
+#: fdisk/fdisk.c:1495
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1498
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2657,7 +2657,7 @@
 "Disco %s: %d cabeças, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1500
 #, fuzzy, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr ""
@@ -2665,19 +2665,19 @@
 "Disco %s: %d cabeças, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1493
+#: fdisk/fdisk.c:1503
 #, c-format
 msgid ", total %lu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1496
+#: fdisk/fdisk.c:1506
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1604
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2685,16 +2685,16 @@
 "Nada a fazer. Ordem já está correta\n"
 "\n"
 
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1678
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Boot    Início      Fim    Blocos   Id  Sistema\n"
 
-#: fdisk/fdisk.c:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1716
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2702,7 +2702,7 @@
 "\n"
 "Partições lógicas fora da ordem do disco\n"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
@@ -2713,94 +2713,94 @@
 "Disco %s: %d cabeças, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1728
 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:1762
+#: fdisk/fdisk.c:1772
 #, 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:1765
+#: fdisk/fdisk.c:1775
 #, 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:1768
+#: fdisk/fdisk.c:1778
 #, 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:1771
+#: fdisk/fdisk.c:1781
 #, 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:1775
+#: fdisk/fdisk.c:1785
 #, 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:1807
+#: fdisk/fdisk.c:1817
 #, 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:1815
+#: fdisk/fdisk.c:1825
 #, 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:1835
+#: fdisk/fdisk.c:1845
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Aviso: a partição %d está vazia\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1850
 #, 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:1846
+#: fdisk/fdisk.c:1856
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "O total de setores alocados, %d, é maior do que o máximo: %d\n"
 
-#: fdisk/fdisk.c:1849
+#: fdisk/fdisk.c:1859
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d setores não alocados\n"
 
-#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
+#: fdisk/fdisk.c:1872 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:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
-#: fdisk/fdisksunlabel.c:522
+#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Primeiro %s"
 
-#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
+#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "O setor %d já está alocado\n"
 
-#: fdisk/fdisk.c:1937
+#: fdisk/fdisk.c:1947
 msgid "No free sectors available\n"
 msgstr "Não há setores livres disponíveis\n"
 
-#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
+#: fdisk/fdisk.c:1956 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:2011
+#: fdisk/fdisk.c:2021
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2808,17 +2808,17 @@
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2033 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:2031
+#: fdisk/fdisk.c:2041
 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:2036
+#: fdisk/fdisk.c:2046
 #, c-format
 msgid ""
 "Command action\n"
@@ -2829,20 +2829,20 @@
 "   %s\n"
 "   p   partição primária (1-4)\n"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "l   logical (5 or over)"
 msgstr "l   lógica (5 ou superior)"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "e   extended"
 msgstr "e   estendida"
 
-#: fdisk/fdisk.c:2057
+#: fdisk/fdisk.c:2067
 #, 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:2093
+#: fdisk/fdisk.c:2103
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2850,11 +2850,11 @@
 "A tabela de partições foi alterada!\n"
 "\n"
 
-#: fdisk/fdisk.c:2102
+#: fdisk/fdisk.c:2112
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chamando ioctl() para reler tabela de partições.\n"
 
-#: fdisk/fdisk.c:2118
+#: fdisk/fdisk.c:2128
 #, c-format
 msgid ""
 "\n"
@@ -2863,7 +2863,7 @@
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2138
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2875,67 +2875,67 @@
 "partição DOS 6.x, consulte a página de manual\n"
 "do fdisk para obter informações adicionais.\n"
 
-#: fdisk/fdisk.c:2135
+#: fdisk/fdisk.c:2145
 msgid "Syncing disks.\n"
 msgstr "Sincronizando discos.\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2192
 #, 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:2187
+#: fdisk/fdisk.c:2197
 msgid "New beginning of data"
 msgstr "Novo início dos dados"
 
-#: fdisk/fdisk.c:2203
+#: fdisk/fdisk.c:2213
 msgid "Expert command (m for help): "
 msgstr "Comando avançado (m para ajuda): "
 
-#: fdisk/fdisk.c:2216
+#: fdisk/fdisk.c:2226
 msgid "Number of cylinders"
 msgstr "Número de cilindros"
 
-#: fdisk/fdisk.c:2243
+#: fdisk/fdisk.c:2253
 msgid "Number of heads"
 msgstr "Número de cabeças"
 
-#: fdisk/fdisk.c:2268
+#: fdisk/fdisk.c:2278
 msgid "Number of sectors"
 msgstr "Número de setores"
 
-#: fdisk/fdisk.c:2271
+#: fdisk/fdisk.c:2281
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Aviso: configurando o deslocamento de setor para compatibilidade com DOS\n"
 
-#: fdisk/fdisk.c:2346
+#: fdisk/fdisk.c:2356
 #, 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:2360
+#: fdisk/fdisk.c:2370
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Não foi possível abrir %s\n"
 
-#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
 msgstr "não foi possível abrir %s\n"
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2408
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: comando desconhecido:\n"
 
-#: fdisk/fdisk.c:2466
+#: fdisk/fdisk.c:2476
 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:2470
+#: fdisk/fdisk.c:2480
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2944,18 +2944,18 @@
 "dispositivo especificado\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2529
+#: fdisk/fdisk.c:2539
 #, 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:2539
+#: fdisk/fdisk.c:2549
 msgid "Command (m for help): "
 msgstr "Comando (m para ajuda): "
 
-#: fdisk/fdisk.c:2555
+#: fdisk/fdisk.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -2964,15 +2964,15 @@
 "\n"
 "O arquivo de boot atual é: %s\n"
 
-#: fdisk/fdisk.c:2557
+#: fdisk/fdisk.c:2567
 msgid "Please enter the name of the new boot file: "
 msgstr "Informe o nome do novo arquivo de boot: "
 
-#: fdisk/fdisk.c:2559
+#: fdisk/fdisk.c:2569
 msgid "Boot file unchanged\n"
 msgstr "Arquivo de boot inalterado\n"
 
-#: fdisk/fdisk.c:2624
+#: fdisk/fdisk.c:2642
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3287,80 +3287,80 @@
 "\n"
 "Sincronizando discos.\n"
 
-#: fdisk/fdisksgilabel.c:78
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "volhdr SGI"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
 msgstr "trkrepl SGI"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
 msgstr "secrepl SGI"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
 msgstr "raw SGI"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
 msgstr "bsd SGI"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
 msgstr "sysv SGI"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
 msgstr "volume SGI"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
 msgstr "efs SGI"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
 msgstr "lvol SGI"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
 msgstr "rlvol SGI"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
 msgstr "xfs SGI"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI xfslog"
 msgstr "SGI xfslog"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:92
 msgid "SGI xlv"
 msgstr "SGI xlv"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:93
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
 msgstr "Linux nativa"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:95
+#: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:163
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3368,7 +3368,7 @@
 "De acordo com a MIPS Computer Systems, Inc., o rótulo não pode conter mais "
 "do que 512 bytes\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Detectado rótulo de disco SGI com soma de verificação incorreta.\n"
 
@@ -3424,12 +3424,13 @@
 "Arquivo de inicialização: %s\n"
 "----- entradas de diretório -----\n"
 
-#: fdisk/fdisksgilabel.c:250
+#: fdisk/fdisksgilabel.c:248
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s setor %5u tamanho %8u\n"
 
-#: fdisk/fdisksgilabel.c:304
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3441,7 +3442,7 @@
 "\tO arquivo de inicialização precisa corresponder a um caminho \n"
 "\tdiferente de zero; por exemplo, \"/unix\" ou \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:311
+#: fdisk/fdisksgilabel.c:308
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3450,7 +3451,7 @@
 "\tNome de arquivo de inicialização longo demais: o máximo permitido é de 16 "
 "bytes.\n"
 
-#: fdisk/fdisksgilabel.c:316
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3458,7 +3459,7 @@
 "\n"
 "\tO arquivo de inicialização precisa ter um caminho totalmente qualificado.\n"
 
-#: fdisk/fdisksgilabel.c:321
+#: fdisk/fdisksgilabel.c:320
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3469,7 +3470,7 @@
 "\t é conferida. O padrão da SGI é \"/unix\" e, para o backup, \"/unix.save"
 "\".\n"
 
-#: fdisk/fdisksgilabel.c:349
+#: fdisk/fdisksgilabel.c:346
 #, c-format
 msgid ""
 "\n"
@@ -3478,19 +3479,19 @@
 "\n"
 "\tArquivo de inicialização alterado para \"%s\".\n"
 
-#: fdisk/fdisksgilabel.c:447
+#: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
 msgstr "Mais do que uma entrada de disco inteiro presente.\n"
 
-#: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
 msgstr "Nenhuma partição definida\n"
 
-#: fdisk/fdisksgilabel.c:462
+#: fdisk/fdisksgilabel.c:449
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "O IRIX gosta quando a partição 11 abrange todo o disco.\n"
 
-#: fdisk/fdisksgilabel.c:464
+#: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3499,7 +3500,7 @@
 "A partição de disco inteiro deve iniciar no bloco 0,\n"
 "não no bloco de disco %d.\n"
 
-#: fdisk/fdisksgilabel.c:468
+#: fdisk/fdisksgilabel.c:457
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3508,31 +3509,31 @@
 "A partição de disco inteiro tem um tamanho de apenas %d blocos de disco,\n"
 "mas o disco tem %d blocos de tamanho.\n"
 
-#: fdisk/fdisksgilabel.c:475
+#: fdisk/fdisksgilabel.c:463
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "Uma partição (nº 11) deve abranger todo o disco.\n"
 
-#: fdisk/fdisksgilabel.c:487
+#: fdisk/fdisksgilabel.c:473
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "A partição %d não inicia em um limite de cilindro.\n"
 
-#: fdisk/fdisksgilabel.c:494
+#: fdisk/fdisksgilabel.c:479
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "A partição %d não termina em um limite de cilindro.\n"
 
-#: fdisk/fdisksgilabel.c:502
+#: fdisk/fdisksgilabel.c:486
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "As partições %d e %d se sobrepõem por %d setores.\n"
 
-#: fdisk/fdisksgilabel.c:511 fdisk/fdisksgilabel.c:531
-#, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, fuzzy, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
 msgstr "Intervalo não utilizado de %8d setores - setores %8d - %d\n"
 
-#: fdisk/fdisksgilabel.c:544
+#: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
@@ -3540,7 +3541,7 @@
 "\n"
 "A partição de inicialização não existe.\n"
 
-#: fdisk/fdisksgilabel.c:548
+#: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
@@ -3548,7 +3549,7 @@
 "\n"
 "A partição de permuta não existe.\n"
 
-#: fdisk/fdisksgilabel.c:553
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
@@ -3556,16 +3557,17 @@
 "\n"
 "A partição de permuta não possui tipo de permuta.\n"
 
-#: fdisk/fdisksgilabel.c:557
+#: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVocê escolheu um nome de arquivo de inicialização incomum.\n"
 
-#: fdisk/fdisksgilabel.c:568
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr ""
 "Desculpe. Você pode alterar apenas a etiqueta de partições não vazias.\n"
 
-#: fdisk/fdisksgilabel.c:575
+#: 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"
@@ -3580,28 +3582,28 @@
 "Digite SIM se tiver certeza de que deseja etiquetar esta partição de modo "
 "diferente.\n"
 
-#: fdisk/fdisksgilabel.c:580 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
 msgid "YES\n"
 msgstr ""
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:606
+#: fdisk/fdisksgilabel.c:577
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "Você sabia que tem uma sobreposição de partições no disco?\n"
 
-#: fdisk/fdisksgilabel.c:668
+#: fdisk/fdisksgilabel.c:637
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "Tentando gerar entrada de disco inteiro automaticamente.\n"
 
-#: fdisk/fdisksgilabel.c:675
+#: fdisk/fdisksgilabel.c:642
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "O disco inteiro já está coberto com partições.\n"
 
-#: fdisk/fdisksgilabel.c:680
+#: fdisk/fdisksgilabel.c:646
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr "Existe uma sobreposição de partições no disco. Corrija-a antes!\n"
 
-#: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
+#: 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"
@@ -3609,16 +3611,16 @@
 "Recomenda-se fortemente que a partição 11\n"
 "cubra todo o disco e seja do tipo `volume SGI'\n"
 
-#: fdisk/fdisksgilabel.c:705
+#: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr "Haverá uma sobreposição de partições no disco. Corrija-a antes!\n"
 
-#: fdisk/fdisksgilabel.c:710
+#: fdisk/fdisksgilabel.c:676
 #, c-format
 msgid " Last %s"
 msgstr " Último %s"
 
-#: fdisk/fdisksgilabel.c:732
+#: 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"
@@ -3630,12 +3632,20 @@
 "o conteúdo anterior não poderá mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:758
+#: 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 ""
+
+#: fdisk/fdisksgilabel.c:738
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Tentando manter os parâmetros da partição %d.\n"
 
-#: fdisk/fdisksgilabel.c:760
+#: fdisk/fdisksgilabel.c:740
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tINÍCIO=%d\tCOMPRIMENTO=%d\n"
@@ -3724,63 +3734,63 @@
 msgid "Autoconfigure failed.\n"
 msgstr "A configuração automática falhou.\n"
 
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Setores/trilha"
 
-#: fdisk/fdisksunlabel.c:327
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Cilindros Alternativos"
 
-#: fdisk/fdisksunlabel.c:330
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Cilindros físicos"
 
-#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
 msgid "Rotation speed (rpm)"
 msgstr "Velocidade de rotação (RPM)"
 
-#: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
 msgid "Interleave factor"
 msgstr "Fator de \"Interleave\""
 
-#: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
 msgid "Extra sectors per cylinder"
 msgstr "Setores extras por cilindro: "
 
-#: fdisk/fdisksunlabel.c:352
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "Você pode alterar todos os parâmetros do disco a partir do menu x"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "Disquete de 3,5 pol."
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "Linux personalizado"
 
-#: fdisk/fdisksunlabel.c:446
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "A partição %d não termina em um limite de cilindro\n"
 
-#: fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:462
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "A partição %d sobrepõe-se a outras nos setores %d - %d\n"
 
-#: fdisk/fdisksunlabel.c:488
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervalo não utilizado - setores 0 - %d\n"
 
-#: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervalo não utilizado - setores %d - %d\n"
 
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3788,7 +3798,7 @@
 "Outras partições já cobrem o disco inteiro.\n"
 "Exclua ou reduza algumas antes de tentar novamente.\n"
 
-#: fdisk/fdisksunlabel.c:593
+#: fdisk/fdisksunlabel.c:589
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3799,7 +3809,7 @@
 "%d %s cobre alguma outra partição. Sua entrada foi alterada\n"
 "para %d %s\n"
 
-#: fdisk/fdisksunlabel.c:613
+#: fdisk/fdisksunlabel.c:609
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3808,7 +3818,7 @@
 "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:626
+#: fdisk/fdisksunlabel.c:622
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3823,7 +3833,7 @@
 "Digite SIM se tiver certeza de que deseja rotular esta partição como 82 "
 "(permuta do Linux): "
 
-#: fdisk/fdisksunlabel.c:657
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid ""
 "\n"
@@ -3842,7 +3852,7 @@
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:671
+#: fdisk/fdisksunlabel.c:667
 #, c-format
 msgid ""
 "\n"
@@ -3855,16 +3865,16 @@
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:676
+#: fdisk/fdisksunlabel.c:672
 #, 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:701
+#: fdisk/fdisksunlabel.c:697
 msgid "Number of alternate cylinders"
 msgstr "Número de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:734
+#: fdisk/fdisksunlabel.c:730
 msgid "Number of physical cylinders"
 msgstr "Número de cilindros físicos"
 
@@ -4477,9 +4487,9 @@
 msgstr "   Disp   Boot   Início      Fim   Blocos    Id  Sistema\n"
 
 #: fdisk/sfdisk.c:885
-#, c-format
+#, fuzzy, 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 ""
 "Unidades = megabytes de 1048576 bytes, blocos of 1024 bytes, contando a "
@@ -4488,7 +4498,7 @@
 
 #: fdisk/sfdisk.c:887
 #, fuzzy
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
+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
@@ -4629,6 +4639,11 @@
 "Isto não faz diferença para o LILO, mas o MBR DOS não inicializará este "
 "disco.\n"
 
+#: fdisk/sfdisk.c:1272
+#, fuzzy
+msgid "start"
+msgstr "status"
+
 #: fdisk/sfdisk.c:1275
 #, c-format
 msgid ""
@@ -4637,6 +4652,11 @@
 "partição %s - início: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado (%ld,"
 "%ld,%ld)\n"
 
+#: fdisk/sfdisk.c:1281
+#, fuzzy
+msgid "end"
+msgstr "envio"
+
 #: fdisk/sfdisk.c:1284
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4697,98 +4717,98 @@
 msgid "-n flag was given: Nothing changed\n"
 msgstr "a opção -n foi fornecida: nada foi alterado\n"
 
-#: fdisk/sfdisk.c:1577
+#: fdisk/sfdisk.c:1579
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Não foi possível salvar os setores antigos - abortando\n"
 
-#: fdisk/sfdisk.c:1582
+#: fdisk/sfdisk.c:1584
 #, 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:1659
+#: fdisk/sfdisk.c:1661
 msgid "long or incomplete input line - quitting\n"
 msgstr "linha de entrada longa demais ou incompleta - encerrando\n"
 
-#: fdisk/sfdisk.c:1695
+#: fdisk/sfdisk.c:1697
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "erro de entrada: `=' esperado após o campo %s\n"
 
-#: fdisk/sfdisk.c:1702
+#: fdisk/sfdisk.c:1704
 #, 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:1708
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entrada não reconhecida: %s\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
 msgstr "número grande demais\n"
 
-#: fdisk/sfdisk.c:1754
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
 msgstr "lixo após o número\n"
 
-#: fdisk/sfdisk.c:1875
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
 msgstr "sem espaço para o descritor da partição\n"
 
-#: fdisk/sfdisk.c:1908
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
 msgstr "não foi possível criar a partição estendida envoltória\n"
 
-#: fdisk/sfdisk.c:1959
+#: fdisk/sfdisk.c:1961
 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:1993
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
 msgstr "Não há espaço para mais\n"
 
-#: fdisk/sfdisk.c:2012
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
 msgstr "Tipo inválido\n"
 
-#: fdisk/sfdisk.c:2044
+#: fdisk/sfdisk.c:2046
 #, 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:2050
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
 msgstr "Atenção: partição vazia\n"
 
-#: fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2066
 #, 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:2077
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "opção de inicialização não reconhecida: selecione - ou *\n"
 
-#: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
 msgstr "especificação cil,cab,set parcial?\n"
 
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
 msgstr "Partição estendida não está no lugar esperado\n"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
 msgstr "entrada inválida\n"
 
-#: fdisk/sfdisk.c:2172
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
 msgstr "Número excessivo de partições\n"
 
-#: fdisk/sfdisk.c:2205
+#: 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"
@@ -4800,47 +4820,47 @@
 "Normalmente só é necessário especificar <início> e <tamanho> (e, talvez, "
 "<tipo>).\n"
 
-#: fdisk/sfdisk.c:2225
+#: fdisk/sfdisk.c:2227
 msgid "version"
 msgstr "versão"
 
-#: fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [opções] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: algo como /dev/hda ou /dev/sda"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
 msgstr "opções úteis:"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2236
 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:2235
+#: fdisk/sfdisk.c:2237
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [ou --id]:        mostra ou altera a ID da partição"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2238
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ou --list]:      lista as partições de cada dispositivo"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2239
 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:2238
+#: fdisk/sfdisk.c:2240
 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:2239
+#: fdisk/sfdisk.c:2241
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4848,56 +4868,56 @@
 "    -uS, -uB, -uC, -uM:  aceita/informa em unidades de setores/blocos/"
 "cilindros/MB"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2242
 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:2241
+#: fdisk/sfdisk.c:2243
 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:2242
+#: fdisk/sfdisk.c:2244
 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:2243
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                altera somente a partição de número #"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 não grava no disco, realmente"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2247
 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:2246
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I arquivo :         restaura os setores gravados em arquivo"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ou --version]:   mostra a versão"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ou --help]:      mostra esta mensagem"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
 msgstr "opções perigosas:"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2252
 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:2251
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4905,119 +4925,119 @@
 "    -x [ou --show-extended]: também lista partições estendidas na saída\n"
 "                             ou espera descritores para elas na entrada"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2255
 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:2254
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ou --quiet]:      suprime mensagens de aviso"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
 msgstr "    Você pode anular a geometria detectada usando:"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2258
 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:2257
+#: fdisk/sfdisk.c:2259
 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:2258
+#: fdisk/sfdisk.c:2260
 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:2259
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
 msgstr "Você pode desativar todas as verificações de consistência com:"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2262
 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:2266
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2267
+#: fdisk/sfdisk.c:2269
 #, 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:2268
+#: fdisk/sfdisk.c:2270
 #, 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:2269
+#: fdisk/sfdisk.c:2271
 #, 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:2421
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
 msgstr "nenhum comando?\n"
 
-#: fdisk/sfdisk.c:2539
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "total: %d blocos\n"
 
-#: fdisk/sfdisk.c:2576
+#: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Uso: sfdisk --print-id dispositivo número-partição\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2580
 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:2580
+#: fdisk/sfdisk.c:2582
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Uso: sfdisk --id dispositivo número-partição [ID]\n"
 
-#: fdisk/sfdisk.c:2587
+#: fdisk/sfdisk.c:2589
 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:2613
+#: fdisk/sfdisk.c:2615
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "não foi possível abrir %s\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2617
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "não foi possível abrir %s para leitura"
 
-#: fdisk/sfdisk.c:2640
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2657
+#: fdisk/sfdisk.c:2659
 #, 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:2674
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "ioctl BLKGETSIZE falhou para %s\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2754
 #, 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:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
@@ -5025,7 +5045,7 @@
 "Concluído\n"
 "\n"
 
-#: fdisk/sfdisk.c:2777
+#: fdisk/sfdisk.c:2781
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5034,35 +5054,35 @@
 "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:2791
+#: fdisk/sfdisk.c:2795
 #, 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:2848
+#: fdisk/sfdisk.c:2852
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "ID inválida: %lx\n"
 
-#: fdisk/sfdisk.c:2863
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
 msgstr "Este disco está atualmente sendo usado.\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erro fatal: não foi possível encontrar %s\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2887
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Aviso: %s não é um dispositivo de blocos\n"
 
-#: fdisk/sfdisk.c:2889
+#: fdisk/sfdisk.c:2893
 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:2891
+#: fdisk/sfdisk.c:2895
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5075,28 +5095,28 @@
 "todas as partições de permuta deste disco. Use a opção --no-reread para "
 "suprimir esta verificação.\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2899
 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:2899
+#: fdisk/sfdisk.c:2903
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2908
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
 msgstr "Situação antiga:\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2916
 #, 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:2920
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
 msgstr "Situação nova:\n"
 
-#: fdisk/sfdisk.c:2925
+#: fdisk/sfdisk.c:2929
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5104,19 +5124,19 @@
 "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:2928
+#: fdisk/sfdisk.c:2932
 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:2933
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Você está satisfeito com isto? [ynq] "
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Deseja gravar isto no disco? [ynq] "
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5124,15 +5144,15 @@
 "\n"
 "sfdisk: final de entrada prematuro\n"
 
-#: fdisk/sfdisk.c:2942
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
 msgstr "Saindo - nada foi alterado\n"
 
-#: fdisk/sfdisk.c:2948
+#: fdisk/sfdisk.c:2952
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda y, n ou q\n"
 
-#: fdisk/sfdisk.c:2956
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5140,7 +5160,7 @@
 "Nova tabela de partições gravada com sucesso\n"
 "\n"
 
-#: fdisk/sfdisk.c:2962
+#: 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"
@@ -5152,96 +5172,96 @@
 "count=1\n"
 "(consulte fdisk(8)).\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Tente `getopt --help' para maiores informações.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "opção longa vazia depois de argumento -l ou --long"
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "interpretador de comandos desconhecido após argumento -s ou --shell"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Uso: getopt texto_opções parâmetros\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [opções] [--] texto_opções parâmetros\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [opções] -o|--opções texto_opções [opções] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "              parâmetros\n"
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Permite opções longas iniciando com um único "
 "-\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Mostra este pequeno guia de uso\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=ops_longas Opções longas a serem reconhecidas\n"
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 "  -n, --name=nome_prog         O nome sob o qual erros são reportados\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=texto_opções     Opções curtas a serem reconhecidas\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 "  -q, --quiet                  Desativa a exibição de erros por getopt(3)\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Sem saída normal\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
 "  -s, --shell=shell            Configura as convenções de aspas do "
 "interpretador de comandos\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Teste de versão de getopt(1)\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -u, --unqote                 Não quota a saída\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Mostra informações de versão\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr "faltou o argumento texto_opções"
 
-#: getopt-1.1.2/getopt.c:441
+#: getopt/getopt.c:444
 #, fuzzy
-msgid "getopt (enhanced) 1.1.2\n"
+msgid "getopt (enhanced) 1.1.3\n"
 msgstr "getopt (melhorado) 1.1.0)\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "erro interno, entre em contato com o autor."
 
@@ -5772,7 +5792,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "ioctl KDGHWCLK para ler a hora falhou"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr "Tempo esgotado enquanto aguardava a hora mudar.\n"
 
@@ -5798,58 +5818,58 @@
 msgid "KDGHWCLK ioctl failed"
 msgstr "ioctl KDGHWCLK falhou"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "open() de %s falhou"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, 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:171
+#: hwclock/rtc.c:170
 #, 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:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s não possui funções de interrupção. "
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, 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:244
+#: hwclock/rtc.c:243
 #, 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:247
+#: hwclock/rtc.c:246
 #, 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:306
+#: hwclock/rtc.c:305
 #, 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:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) teve êxito.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "A abertura de %s falhou"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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' "
@@ -5860,17 +5880,17 @@
 "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:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr "Não foi possível abrir %s"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) para %s falhou"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, 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"
@@ -5878,24 +5898,24 @@
 #. 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:397
+#: hwclock/rtc.c:396
 #, 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:415
+#: hwclock/rtc.c:414
 #, 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:420
+#: hwclock/rtc.c:419
 #, 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:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) para %s falhou"
@@ -6095,9 +6115,8 @@
 msgid "Password error."
 msgstr "Erro de senha."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249
-#: mount/lomount.c:254
+#: 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
 msgid "Password: "
 msgstr "Senha:"
 
@@ -6318,29 +6337,29 @@
 "\n"
 "interrompido %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, fuzzy, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "mount: não foi possível abrir %s: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h somente pode ser especificado pelo superusuário.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "Uso: login [-fp] [nome_usuário]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: falha de PAM; abortando: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Não foi possível inicializar o PAM: %s"
@@ -6351,16 +6370,16 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "LOGIN FALHOU: %d A PARTIR DE %s PARA %s, %s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -6368,18 +6387,18 @@
 "Login incorreto\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
 "NÚMERO EXCESSIVO DE TENTATIVAS DE LOGIN (%d) A PARTIR DE %s PARA %s, %s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "SESSÃO DE LOGIN FALHOU: A PARTIR DE %s PARA %s, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -6387,51 +6406,51 @@
 "\n"
 "Login incorreto\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 #, fuzzy
 msgid "login: Out of memory\n"
 msgstr "%s: memória insuficiente!\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Nome de usuário inválido"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s: login recusado neste terminal.\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "%s: LOGIN RECUSADO A PARTIR DE %s NO TTY %s"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "%s: LOGIN RECUSADO NO TTY %s"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Login incorreto\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -6439,85 +6458,85 @@
 "Número máximo de usuários já conectados.\n"
 "Tente novamente mais tarde.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
 msgstr "Número excessivo de processos em execução.\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DISCAGEM EM %s POR %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN COMO ROOT EM %s A PARTIR DE %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN COMO ROOT EM %s"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN EM %s POR %s A PARTIR DE %s"
 
-#: login-utils/login.c:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN EM %s POR %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 #, fuzzy
 msgid "You have new mail.\n"
 msgstr "Você tem mensagens %s na caixa de correio.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 #, fuzzy
 msgid "You have mail.\n"
 msgstr "Você tem mensagens %s na caixa de correio.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: falha em fork: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr "setuid() falhou"
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr "O diretório %s não existe!\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr "Fazendo login com home = \"/\".\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 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:1206
+#: login-utils/login.c:1200
 #, 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:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: não existe interpretador de comandos: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6526,62 +6545,62 @@
 "\n"
 "%s usuário: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "nome de login longo demais.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "NOME longo demais"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
 msgstr "nomes de login não podem iniciar com '-'.\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "Número excessivo de saltos de linha.\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "Saltos de linha EXCESSIVOS"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Tempo de login esgotado após %d segundos\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Último login: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "a partir de %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "em: %.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "FALHA DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "FALHA DE LOGIN EM %s, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d FALHAS DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d FALHAS DE LOGIN EM %s, %s"
@@ -6941,7 +6960,7 @@
 msgid "fork failed\n"
 msgstr "o fork falhou\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
 msgstr "exec falhou\n"
 
@@ -7245,12 +7264,12 @@
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado, o arquivo é %s\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado em %s"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
@@ -7259,210 +7278,210 @@
 "\n"
 "Script concluído em %s"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script concluído, o arquivo é %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr "openpty falhou\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr "ptys esgotados\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 "%s: erro de argumento; uso\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nome_terminal ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -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 "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NUM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file arquivo_descarga ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq num_freq ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr "não é possível alterar o estado do modo de conservação de energia\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "erro de klogctl: %s\n"
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Erro ao ler %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr "Erro ao gravar descarga de tela\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "não foi possível ler %s e não é possível realizar ioctl da descarga\n"
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM indefinido.\n"
@@ -7518,17 +7537,17 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Mensagem de %s@%s em %s em %s ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "Aviso: erro ao ler %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 "Aviso: não foi possível abrir %s: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: não foi possível abrir %s - usando %s\n"
@@ -7537,42 +7556,42 @@
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:415
 #, 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:399
+#: mount/fstab.c:427
 #, 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:411
+#: mount/fstab.c:439
 #, 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:426
+#: mount/fstab.c:454
 #, 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:439
+#: mount/fstab.c:467
 #, 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:441
+#: mount/fstab.c:469
 msgid "timed out"
 msgstr "tempo esgotado"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:476
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7581,46 +7600,46 @@
 "Não foi possível criar o vínculo %s\n"
 "Talvez haja um arquivo de bloqueio vencido?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:525 mount/fstab.c:561
 #, 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:541
+#: mount/fstab.c:569
 #, c-format
 msgid "error writing %s: %s"
 msgstr "erro ao gravar %s: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:577
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "erro ao alterar o modo de %s: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:595
 #, 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:80
+#: mount/lomount.c:173
 #, 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:86
+#: mount/lomount.c:179
 #, 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:91
-#, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\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:177
+#: 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:181
+#: mount/lomount.c:249
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -7628,7 +7647,7 @@
 "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:185
+#: mount/lomount.c:253
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -7640,7 +7659,7 @@
 "       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:191
+#: 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"
@@ -7652,249 +7671,294 @@
 "use `insmod loop.o')\n"
 "       ou talvez dev/loop# tenha um número principal incorreto?"
 
-#: mount/lomount.c:195
+#: 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:225
-#, c-format
-msgid "Unsupported encryption type %s\n"
-msgstr "Tipo de criptografia não suportado: %s\n"
+#: mount/lomount.c:359
+#, 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:239
+#: mount/lomount.c:444 mount/lomount.c:478
+#, fuzzy
+msgid "Retype password: "
+msgstr "Redigite a nova senha: "
+
+#: mount/lomount.c:456
+#, fuzzy
+msgid "Error: gpg key file decryption failed\n"
+msgstr "abertura do diretório falhou\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:472
+#, 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"
+msgstr ""
+
+#: mount/lomount.c:611
+#, 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 "Não é possível bloquear (lock) na memória, saindo\n"
 
-#: mount/lomount.c:258
+#: mount/lomount.c:654
 msgid "Init (up to 16 hex digits): "
 msgstr "Inicialização (até 16 dígitos hexadecimais):"
 
-#: mount/lomount.c:265
+#: mount/lomount.c:661
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Digito não hexadecimal '%c'.\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:764
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr ""
 "O modo de obter a chave para o sistema de criptografia %d não é conhecido\n"
 
-#: mount/lomount.c:288
+#: 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:299
-#, c-format
-msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: não foi possível excluir o dispositivo %s: %s\n"
-
-#: mount/lomount.c:309
-#, c-format
-msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s): sucesso\n"
-
-#: mount/lomount.c:317
-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:354
+#: mount/lomount.c:831
 #, 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"
+"  %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 ""
-"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:372 mount/sundries.c:30 mount/sundries.c:45
-#: mount/sundries.c:244
+#: 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 "não há memória suficiente"
 
-#: mount/lomount.c:443
-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/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/mntent.c:165
+#: 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/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: aviso: não há nova linha final no final de %s\n"
 
-#: mount/mntent.c:216
+#: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: linha %d em %s tem %s inválido(a)\n"
 
-#: mount/mntent.c:219
+#: mount/mntent.c:222
 msgid "; rest of file ignored"
 msgstr "; resto do arquivo ignorado"
 
-#: mount/mount.c:385
+#: mount/mount.c:396
 #, 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:389
+#: mount/mount.c:400
 #, 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:410
+#: mount/mount.c:421
 #, 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:425 mount/mount.c:644
+#: mount/mount.c:436 mount/mount.c:660
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: erro ao gravar %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:443
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: erro ao alterar modo de %s: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:494
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s parece espaço de permuta - não montado"
 
-#: mount/mount.c:538
+#: mount/mount.c:554
 msgid "mount failed"
 msgstr "mount falhou"
 
-#: mount/mount.c:540
+#: mount/mount.c:556
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: somente o root pode montar %s em %s"
 
-#: mount/mount.c:568
+#: mount/mount.c:584
 msgid "mount: loop device specified twice"
 msgstr "mount: dispositivo de laço especificado duas vezes"
 
-#: mount/mount.c:573
+#: mount/mount.c:589
 msgid "mount: type specified twice"
 msgstr "mount: tipo especificado duas vezes"
 
-#: mount/mount.c:585
+#: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: ignorando a configuração de um dispositivo de laço\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: será usado o dispositivo de laço %s\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:614
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: falha ao configurar dispositivo de laço\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:618
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configuração de dispositivo de laço realizada com sucesso\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:655
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: não foi possível abrir %s: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:678
 #, 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:665
+#: mount/mount.c:681
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: não foi possível configurar velocidade: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:735 mount/mount.c:1309
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: não foi possível realizar fork: %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:815
 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:845
+#: mount/mount.c:854
 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:856
+#: mount/mount.c:865
 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:859
+#: mount/mount.c:868
 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:862
+#: mount/mount.c:871
 msgid "mount: mount failed"
 msgstr "mount: a montagem falhou"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:877 mount/mount.c:912
 #, 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:870
+#: mount/mount.c:879
 msgid "mount: permission denied"
 msgstr "mount: permissão negada"
 
-#: mount/mount.c:872
+#: mount/mount.c:881
 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:876 mount/mount.c:880
+#: mount/mount.c:885 mount/mount.c:889
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s está ocupado"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:891
 msgid "mount: proc already mounted"
 msgstr "mount: proc já montado"
 
-#: mount/mount.c:884
+#: mount/mount.c:893
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s já montado ou %s ocupado"
 
-#: mount/mount.c:890
+#: mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: o ponto de montagem %s não existe"
 
-#: mount/mount.c:892
+#: mount/mount.c:901
 #, 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:895
+#: mount/mount.c:904
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: o dispositivo especial %s não existe"
 
-#: mount/mount.c:905
+#: mount/mount.c:914
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7903,12 +7967,12 @@
 "mount: o dispositivo especial %s não existe\n"
 "       (um prefixo de caminho não é um diretório)\n"
 
-#: mount/mount.c:918
+#: mount/mount.c:927
 #, 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:920
+#: mount/mount.c:929
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7918,35 +7982,35 @@
 "inválido em %s,\n"
 "       ou número excessivo de sistemas de arquivos montados"
 
-#: mount/mount.c:954
+#: mount/mount.c:963
 msgid "mount table full"
 msgstr "tabela de montagem cheia"
 
-#: mount/mount.c:956
+#: mount/mount.c:965
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: não foi possível ler o superbloco"
 
-#: mount/mount.c:960
+#: mount/mount.c:969
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: dispositivo de blocos desconhecido"
 
-#: mount/mount.c:965
+#: mount/mount.c:974
 #, 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:977
+#: mount/mount.c:986
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: provavelmente você queria dizer %s"
 
-#: mount/mount.c:979
+#: mount/mount.c:988
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: talvez você quisesse dizer iso9660?"
 
-#: mount/mount.c:982
+#: mount/mount.c:991
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -7954,12 +8018,12 @@
 "arquivos %s não é suportado"
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:997
 #, 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:990
+#: mount/mount.c:999
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7968,99 +8032,98 @@
 "mount: o kernel não reconhece %s como dispositivo de blocos\n"
 "       (talvez `insmod driver'?)"
 
-#: mount/mount.c:993
+#: mount/mount.c:1002
 #, 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:996
+#: mount/mount.c:1005
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s não é um dispositivo de blocos"
 
-#: mount/mount.c:999
+#: mount/mount.c:1008
 #, 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:1002
+#: mount/mount.c:1011
 msgid "block device "
 msgstr "dispositivo de blocos "
 
-#: mount/mount.c:1004
+#: mount/mount.c:1013
 #, 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:1008
+#: mount/mount.c:1017
 #, 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:1024
+#: mount/mount.c:1033
 #, 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:1111
+#: mount/mount.c:1120
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s\n"
 msgstr ""
 
-#: mount/mount.c:1115
+#: mount/mount.c:1124
 #, fuzzy, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr "umount: %s: não montado"
 
-#: mount/mount.c:1125
+#: 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:1126
+#: mount/mount.c:1135
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "label"
 msgstr "rótulo"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: 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:1136
+#: mount/mount.c:1145
 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:1141
+#: mount/mount.c:1150
 #, fuzzy
-msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
-msgstr ""
-"mount: nenhum tipo foi fornecido - supondo nfs por causa dos dois-pontos\n"
+msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
+msgstr "mount: nenhum tipo foi fornecido - supondo smbfs por causa xxx\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1166
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: tentando montar em segundo plano \"%s\"\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1177
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: desistindo de \"%s\"\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1254
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s já montado em %s\n"
 
-#: mount/mount.c:1376
+#: mount/mount.c:1386
 #, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8082,7 +8145,7 @@
 "       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 fd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Uso:   mount -V                 : mostra versão\n"
@@ -8107,40 +8170,40 @@
 "Outras opções: [-nfFrsvw] [-o opções].\n"
 "Para mais detalhes, consulte `man 8 mount'.\n"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1563
 msgid "mount: only root can do that"
 msgstr "mount: operação exclusiva de root"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1568
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nenhum %s encontrado - criando-o...\n"
 
-#: mount/mount.c:1568
+#: mount/mount.c:1582
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
 msgstr ""
 
-#: mount/mount.c:1575
+#: mount/mount.c:1589
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: montando %s\n"
 
-#: mount/mount.c:1584
+#: mount/mount.c:1598
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1599
+#: mount/mount.c:1613
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: não foi possível localizar %s em %s"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1628
 #, 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:259
+#: mount/mount_by_label.c:189
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8148,35 +8211,35 @@
 "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:378
+#: mount/mount_by_label.c:309
 msgid "mount: bad UUID"
 msgstr "mount: UUID inválida"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:483
 #, 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:493
+#: mount/mount_guess_fstype.c:492
 #, 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:496
+#: mount/mount_guess_fstype.c:495
 #, 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:499
+#: mount/mount_guess_fstype.c:498
 msgid "       and it looks like this is swapspace\n"
 msgstr "       e parece ser um espaço de permuta\n"
 
-#: mount/mount_guess_fstype.c:501
+#: mount/mount_guess_fstype.c:500
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       experimentarei o tipo %s\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:588
 #, c-format
 msgid "Trying %s\n"
 msgstr "Experimentando %s\n"
@@ -8270,7 +8333,7 @@
 msgid "bug in xstrndup call"
 msgstr "erro na chamada a xstrndup"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:74
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8283,7 +8346,7 @@
 "       %s [-v] [-p prioridade] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:84
 #, fuzzy, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8295,31 +8358,99 @@
 "       %s [-v] [-p prioridade] especial ...\n"
 "       %s [-s]\n"
 
-#: mount/swapon.c:178 mount/swapon.c:242
+#: 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
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s em %s\n"
 
-#: mount/swapon.c:182
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: não foi possível stat %s: %s\n"
 
-#: mount/swapon.c:193
+#: mount/swapon.c:216
 #, 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:205
+#: mount/swapon.c:228
 #, 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:248
+#: mount/swapon.c:271
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:312 mount/swapon.c:401
+#: 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
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: não foi possível abrir %s: %s\n"
@@ -8451,17 +8582,17 @@
 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:564
+#: mount/umount.c:566
 #, 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:598
+#: mount/umount.c:602
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: somente root pode desmontar %s de %s"
 
-#: mount/umount.c:669
+#: mount/umount.c:671
 msgid "umount: only root can do that"
 msgstr "umount: operação exclusiva de root"
 
@@ -8604,7 +8735,7 @@
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/s; %f recebidos (char/s)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Uso: %s [-c] [-n nível] [-s tamanho_buffer]\n"
@@ -9313,12 +9444,13 @@
 msgid "missing comma"
 msgstr ""
 
-#: sys-utils/readprofile.c:60
+#: sys-utils/readprofile.c:115
 #, fuzzy, 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"
@@ -9338,37 +9470,32 @@
 "\t -r            reinicializa todos os contadores (somente root)\n"
 "\t -V            mostra a versão e sai\n"
 
-#: sys-utils/readprofile.c:84
-#, fuzzy
-msgid "out of memory"
-msgstr "memória insuficiente?\n"
-
-#: sys-utils/readprofile.c:147
-#, c-format
-msgid "%s Version %s\n"
+#: sys-utils/readprofile.c:188
+#, fuzzy, c-format
+msgid "%s version %s\n"
 msgstr "%s versão %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Passo de amostragem: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): linha de mapa incorreta\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:308
 #, 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:282
+#: sys-utils/readprofile.c:334
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:323
+#: sys-utils/readprofile.c:375
 msgid "total"
 msgstr "total"
 
@@ -9580,17 +9707,17 @@
 msgid "...back 1 page"
 msgstr "...voltar %d página(s)"
 
-#: text-utils/more.c:1313
+#: text-utils/more.c:1314
 #, fuzzy
 msgid "...skipping one line"
 msgstr "... pulando %d linha(s)"
 
-#: text-utils/more.c:1315
+#: text-utils/more.c:1316
 #, fuzzy, c-format
 msgid "...skipping %d lines"
 msgstr "... pulando %d linha(s)"
 
-#: text-utils/more.c:1352
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
@@ -9600,7 +9727,7 @@
 "***Voltar***\n"
 "\n"
 
-#: text-utils/more.c:1390
+#: text-utils/more.c:1391
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9608,56 +9735,56 @@
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1398
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
 msgstr "[Pressione 'h' para obter instruções.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" linha %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Não é um arquivo] linha %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
 msgstr "  Estouro\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1642
 msgid "...skipping\n"
 msgstr "...pulando\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
 msgstr "Expressão regular malformada"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9665,15 +9792,15 @@
 "\n"
 "Padrão não encontrado\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr "Padrão não encontrado"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1748
 msgid "can't fork\n"
 msgstr "não foi possível realizar fork\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
@@ -9681,21 +9808,21 @@
 "\n"
 "...Pulando "
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1792
 #, fuzzy
 msgid "...Skipping to file "
 msgstr "...Pulando "
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1794
 #, fuzzy
 msgid "...Skipping back to file "
 msgstr "de volta ao arquivo"
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2074
 msgid "Line too long"
 msgstr "Linha longa demais"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
 msgstr "Não há comando anterior para ser substituído"
 
@@ -9745,43 +9872,43 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: caractere de conversão inválido %%%s.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "a opção `%s' exige um argumento\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "Tecla ilegal"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...pulando\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...pulando\n"
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 #, fuzzy
 msgid "No next file"
 msgstr "(Próximo arquivo: %s)"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 #, fuzzy
 msgid "No previous file"
 msgstr "Nenhuma partição definida\n"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: erro de leitura em %s\n"
@@ -9789,54 +9916,54 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: erro de procura em %s\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: não foi possível ler arquivo temporário.\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 #, fuzzy
 msgid "RE error: "
 msgstr ", erro"
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 #, fuzzy
 msgid "Cannot open "
 msgstr "Não foi possível abrir %s\n"
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 #, fuzzy
 msgid "saved"
 msgstr "envio"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "A senha *NÃO* foi alterada. Tente novamente mais tarde.\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 #, fuzzy
 msgid "(Next file: "
 msgstr "(Próximo arquivo: %s)"
@@ -9875,6 +10002,33 @@
 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 "del_loop(%s): success\n"
+#~ msgstr "del_loop(%s): sucesso\n"
+
+#~ msgid "This mount was compiled without loop support. Please recompile.\n"
+#~ msgstr "Este mount foi compilado sem suporte a laços. Recompile-o.\n"
+
+#~ 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 ""
+#~ "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"
+#~ msgstr ""
+#~ "Não havia suporte a laço disponível quando da compilação. Recompile.\n"
+
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "A partição %i não termina em um limite de cilindro:\n"
 
diff --git a/po/ru.po b/po/ru.po
index 0bd8464..377e206 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -689,8 +689,8 @@
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:373 getopt-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:373 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: îÅÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ!\n"
@@ -4474,89 +4474,89 @@
 "(See fdisk(8).)\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:392 getopt/getopt.c:453
 msgid "missing optstring argument"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:441
+#: getopt/getopt.c:441
 msgid "getopt (enhanced) 1.1.2\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:447
 msgid "internal error, contact the author."
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index cad4776..eff8d2e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 # -*- mode: po -*- Slovenian translation for util-linux package.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2002.
-# $Id: util-linux-2.11u.sl.po,v 1.9 2002/08/19 13:41:17 peterlin Exp $
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2002, 2003.
+# $Id: util-linux-2.11z.sl.po,v 1.3 2003/04/22 09:36:06 peterlin Exp $
 #
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided that this
@@ -10,9 +10,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11u\n"
-"POT-Creation-Date: 2002-11-25 00:47+0100\n"
-"PO-Revision-Date: 2002-08-19 15:39+0200\n"
+"Project-Id-Version: util-linux 2.11z\n"
+"POT-Creation-Date: 2003-02-05 06:31-0500\n"
+"PO-Revision-Date: 2003-04-22 11:35+0200\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -29,23 +29,23 @@
 
 #: disk-utils/blockdev.c:64
 msgid "get read-only"
-msgstr ""
+msgstr "preberi samo za branje"
 
 #: disk-utils/blockdev.c:67
 msgid "get sectorsize"
-msgstr ""
+msgstr "preberi velikost sektorja"
 
 #: disk-utils/blockdev.c:70
 msgid "get blocksize"
-msgstr ""
+msgstr "preberi velikost bloka"
 
 #: disk-utils/blockdev.c:73
 msgid "set blocksize"
-msgstr ""
+msgstr "nastavi velikost bloka"
 
 #: disk-utils/blockdev.c:76
 msgid "get size"
-msgstr ""
+msgstr "preberi velikost"
 
 #: disk-utils/blockdev.c:79
 msgid "set readahead"
@@ -57,11 +57,11 @@
 
 #: disk-utils/blockdev.c:85
 msgid "flush buffers"
-msgstr ""
+msgstr "izprazni medpomnilnike"
 
 #: disk-utils/blockdev.c:89
 msgid "reread partition table"
-msgstr ""
+msgstr "ponovno preberi tabelo razdelkov"
 
 #: disk-utils/blockdev.c:98
 msgid "Usage:\n"
@@ -151,7 +151,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -227,14 +227,14 @@
 msgstr "%s: Zapisanih samo %lu od skupno %lu bajtov"
 
 #: disk-utils/fsck.cramfs.c:392
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid cramfs--bad path length\n"
-msgstr "%s: neveljavno dol¾ina pripone"
+msgstr "%s: neveljaven cramfs - slaba dol¾ina poti\n"
 
 #: disk-utils/fsck.cramfs.c:472
 #, c-format
 msgid "%s: compiled without -x support\n"
-msgstr ""
+msgstr "%s: prevedeno brez podpore -x\n"
 
 #: disk-utils/fsck.cramfs.c:498
 #, c-format
@@ -247,54 +247,54 @@
 msgstr "%s ni bloèna enota, niti datoteka\n"
 
 #: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid cramfs--file length too short\n"
-msgstr "%s: neveljavno dol¾ina pripone"
+msgstr "%s: neveljaven cramfs - ime datoteke prekratko\n"
 
 #: disk-utils/fsck.cramfs.c:541
 #, c-format
 msgid "%s: invalid cramfs--wrong magic\n"
-msgstr ""
+msgstr "%s: neveljaven cramfs - napaèno magièno ¹tevilo\n"
 
 #: disk-utils/fsck.cramfs.c:554
 #, c-format
 msgid "%s: warning--file length too long, padded image?\n"
-msgstr ""
+msgstr "%s: opozorilo - dol¾ina datoteke predolga, dopolnjena slika?\n"
 
 #: disk-utils/fsck.cramfs.c:564
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid cramfs--crc error\n"
-msgstr "%s: neveljavno ¹tevilo"
+msgstr "%s: neveljaven cramfs - napaka v nadzorni vsoti\n"
 
 #: disk-utils/fsck.cramfs.c:570
 #, c-format
 msgid "%s: warning--old cramfs image, no CRC\n"
-msgstr ""
+msgstr "%s: opozorilo - stari zapis cramfs, nadzorna vsota manjka\n"
 
 #: disk-utils/fsck.cramfs.c:592
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid cramfs--bad superblock\n"
-msgstr "%s: neveljavno ¹tevilo"
+msgstr "%s: neveljaven cramfs - slab superblok\n"
 
 #: disk-utils/fsck.cramfs.c:608
 #, c-format
 msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
-msgstr ""
+msgstr "%s: neveljaven cramfs - konec imenikov (%ld) ni enak zaèetku datotek (%ld)\n"
 
 #: disk-utils/fsck.cramfs.c:616
 #, c-format
 msgid "%s: invalid cramfs--invalid file data offset\n"
-msgstr ""
+msgstr "%s neveljaven cramfs - neveljaven odmik datoteènih podatkov\n"
 
 #: disk-utils/fsck.minix.c:200
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr ""
+msgstr "Uporaba: %s [-larvsmf] /dev/ime\n"
 
 #: disk-utils/fsck.minix.c:307
 #, c-format
 msgid "%s is mounted.\t "
-msgstr ""
+msgstr "%s je priklopljen.      "
 
 #: disk-utils/fsck.minix.c:309
 msgid "Do you really want to continue"
@@ -302,7 +302,7 @@
 
 #: disk-utils/fsck.minix.c:313
 msgid "check aborted.\n"
-msgstr ""
+msgstr "preverjanje prekinjeno.\n"
 
 #: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
 #, c-format
@@ -326,7 +326,7 @@
 #: disk-utils/fsck.minix.c:390
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
-msgstr ""
+msgstr "Napaka pri branju: slab blok v datoteki ,%s`\n"
 
 #: disk-utils/fsck.minix.c:405
 msgid ""
@@ -336,20 +336,20 @@
 
 #: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:279
 msgid "seek failed in write_block"
-msgstr ""
+msgstr "neuspel klic seek v funkciji write_block"
 
 #: disk-utils/fsck.minix.c:414
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
-msgstr ""
+msgstr "Napaka pri pisanju: slab blok v datoteki ,%s`\n"
 
 #: disk-utils/fsck.minix.c:532
 msgid "seek failed in write_super_block"
-msgstr ""
+msgstr "iskanje neuspelo v funkciji write_super_block"
 
 #: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:266
 msgid "unable to write super-block"
-msgstr ""
+msgstr "zapisovanje superbloka neuspe¹no"
 
 #: disk-utils/fsck.minix.c:544
 msgid "Unable to write inode map"
@@ -361,11 +361,11 @@
 
 #: disk-utils/fsck.minix.c:548
 msgid "Unable to write inodes"
-msgstr ""
+msgstr "Neuspe¹en zapis inodov"
 
 #: disk-utils/fsck.minix.c:577
 msgid "seek failed"
-msgstr ""
+msgstr "klic seek neuspe¹en"
 
 #: disk-utils/fsck.minix.c:579
 msgid "unable to read super block"
@@ -422,12 +422,12 @@
 #: disk-utils/fsck.minix.c:639 disk-utils/mkfs.minix.c:520
 #, c-format
 msgid "%ld inodes\n"
-msgstr ""
+msgstr "%ld inodov\n"
 
 #: disk-utils/fsck.minix.c:640 disk-utils/mkfs.minix.c:521
 #, c-format
 msgid "%ld blocks\n"
-msgstr ""
+msgstr "%ld blokov\n"
 
 #: disk-utils/fsck.minix.c:641 disk-utils/mkfs.minix.c:522
 #, c-format
@@ -459,11 +459,11 @@
 #: 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 "Inod %d oznaèen kot prost, vendar v rabi za datoteko ,%s`\n"
 
 #: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:716
 msgid "Mark in use"
-msgstr ""
+msgstr "Oznaèi kot uporabljen"
 
 #: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:736
 #, c-format
@@ -472,7 +472,7 @@
 
 #: disk-utils/fsck.minix.c:693 disk-utils/fsck.minix.c:742
 msgid "Warning: inode count too big.\n"
-msgstr ""
+msgstr "Opozorilo: ¹tevilo inodov preveliko.\n"
 
 #: disk-utils/fsck.minix.c:755
 msgid "root inode isn't a directory"
@@ -492,11 +492,11 @@
 #: 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 "Blok %d v datoteki ,%s` je oznaèen kot prost."
 
 #: disk-utils/fsck.minix.c:793 disk-utils/fsck.minix.c:827
 msgid "Correct"
-msgstr ""
+msgstr "Popravi"
 
 #: disk-utils/fsck.minix.c:973 disk-utils/fsck.minix.c:1041
 #, c-format
@@ -567,11 +567,11 @@
 #: 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 "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
 msgid "Unmark"
-msgstr ""
+msgstr "Odznaèi"
 
 #: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1245
 #, c-format
@@ -590,7 +590,7 @@
 #: disk-utils/fsck.minix.c:1296 disk-utils/mkfs.minix.c:643
 #: disk-utils/mkfs.minix.c:646
 msgid "bad inode size"
-msgstr ""
+msgstr "slaba velikost inoda"
 
 #: disk-utils/fsck.minix.c:1299
 msgid "bad v2 inode size"
@@ -603,12 +603,12 @@
 #: disk-utils/fsck.minix.c:1329
 #, c-format
 msgid "unable to open '%s'"
-msgstr ""
+msgstr "ni mogoèe odpreti ,%s`"
 
 #: disk-utils/fsck.minix.c:1344
 #, c-format
 msgid "%s is clean, no check.\n"
-msgstr ""
+msgstr "%s je èist, preverjanje ni potrebno.\n"
 
 #: disk-utils/fsck.minix.c:1348
 #, c-format
@@ -652,36 +652,39 @@
 "FILE SYSTEM HAS BEEN CHANGED\n"
 "----------------------------\n"
 msgstr ""
+"----------------------------------\n"
+"DATOTEÈNI SISTEM JE BIL SPREMENJEN\n"
+"----------------------------------\n"
 
 #: disk-utils/isosize.c:129
 #, c-format
 msgid "%s: failed to open: %s\n"
-msgstr ""
+msgstr "%s: odpiranje ni uspelo: %s\n"
 
 #: disk-utils/isosize.c:135
 #, c-format
 msgid "%s: seek error on %s\n"
-msgstr ""
+msgstr "%s: napaka pri iskanju na %s\n"
 
 #: disk-utils/isosize.c:141
 #, c-format
 msgid "%s: read error on %s\n"
-msgstr ""
+msgstr "%s: napaka pri branju z %s\n"
 
 #: disk-utils/isosize.c:150
 #, c-format
 msgid "sector count: %d, sector size: %d\n"
-msgstr ""
+msgstr "¹t. sektorjev: %d, vel. sektorjev: %d\n"
 
 #: disk-utils/isosize.c:198
 #, c-format
 msgid "%s: option parse error\n"
-msgstr ""
+msgstr "%s: izbira ni prepoznana\n"
 
 #: disk-utils/isosize.c:206
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr ""
+msgstr "Uporaba: %s [-x] [-d <¹t>] slika-iso9660\n"
 
 #: disk-utils/mkfs.bfs.c:88
 #, c-format
@@ -725,7 +728,7 @@
 
 #: disk-utils/mkfs.bfs.c:207
 msgid "too many inodes - max is 512"
-msgstr ""
+msgstr "preveè inodov - najveè 512"
 
 #: disk-utils/mkfs.bfs.c:216
 #, c-format
@@ -803,20 +806,20 @@
 
 #: disk-utils/mkfs.c:76
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
-msgstr ""
+msgstr "Uporaba: mkfs [-V] [-t tip] [izbire] naprava [velikost]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
-msgstr ""
+msgstr "%s: Zmanjkalo pomnilnika!\n"
 
 #: disk-utils/mkfs.c:99
 #, c-format
 msgid "mkfs version %s (%s)\n"
-msgstr ""
+msgstr "mkfs, izdaja %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
+#: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
 "usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
@@ -834,72 +837,68 @@
 " outfile    output file\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:328
+#: 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 ""
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:507
-msgid ""
-"Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
-"Exiting.\n"
+#: disk-utils/mkfs.cramfs.c:514
+msgid "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:812
+#: 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"
+msgid "warning: guestimate of required size (upper bound) is %LdMB, but maximum image size is %uMB.  We might die prematurely.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:853
-#, fuzzy, c-format
+#: disk-utils/mkfs.cramfs.c:860
+#, c-format
 msgid "Including: %s\n"
 msgstr "Vkljuèno: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, c-format
 msgid "Super block: %d bytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr ""
@@ -908,32 +907,30 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
-msgid ""
-"warning: uids truncated to %u bits.  (This may be a security concern.)\n"
+msgid "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
-msgid ""
-"warning: gids truncated to %u bits.  (This may be a security concern.)\n"
+msgid "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:926
+#: disk-utils/mkfs.cramfs.c:933
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -972,21 +969,21 @@
 
 #: disk-utils/mkfs.minix.c:272
 msgid "unable to write inodes"
-msgstr ""
+msgstr "zapis inodov ni uspel"
 
 #: disk-utils/mkfs.minix.c:281
 msgid "write failed in write_block"
-msgstr ""
+msgstr "pisanje neuspelo v funkciji 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
 msgid "too many bad blocks"
-msgstr ""
+msgstr "preveè slabih blokov"
 
 #: disk-utils/mkfs.minix.c:297
 msgid "not enough good blocks"
-msgstr ""
+msgstr "premalo uporabnih blokov"
 
 #: disk-utils/mkfs.minix.c:509
 msgid "unable to allocate buffers for maps"
@@ -1022,11 +1019,11 @@
 #: disk-utils/mkfs.minix.c:592 disk-utils/mkfs.minix.c:614
 #, c-format
 msgid "%d bad blocks\n"
-msgstr ""
+msgstr "%d slabih blokov\n"
 
 #: disk-utils/mkfs.minix.c:594 disk-utils/mkfs.minix.c:616
 msgid "one bad block\n"
-msgstr ""
+msgstr "en slab blok\n"
 
 #: disk-utils/mkfs.minix.c:604
 msgid "can't open file of bad blocks"
@@ -1035,16 +1032,16 @@
 #: disk-utils/mkfs.minix.c:674
 #, c-format
 msgid "%s: not compiled with minix v2 support\n"
-msgstr ""
+msgstr "%s: ni prevedeno s podporo za Minix v2\n"
 
 #: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
-msgstr ""
+msgstr "napaka v funkciji strtol: ¹tevilo blokov ni podano"
 
 #: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
-msgstr ""
+msgstr "ni mogoèe odpreti %s"
 
 #: disk-utils/mkfs.minix.c:727
 #, c-format
@@ -1059,17 +1056,17 @@
 #: disk-utils/mkswap.c:178
 #, c-format
 msgid "Bad user-specified page size %d\n"
-msgstr ""
+msgstr "Neustrezna podana velikost strani %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 "Uporabljamo podano velikost strani %d namesto privzete vrednosti %d/%d\n"
 
 #: disk-utils/mkswap.c:191
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr ""
+msgstr "Privzemamo strani velikosti %d (ne %d)\n"
 
 #: disk-utils/mkswap.c:326
 #, c-format
@@ -1078,26 +1075,26 @@
 
 #: disk-utils/mkswap.c:349
 msgid "too many bad pages"
-msgstr ""
+msgstr "preveè slabih strani"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1145
+#: text-utils/more.c:2064 text-utils/more.c:2075
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
 #: disk-utils/mkswap.c:380
 msgid "one bad page\n"
-msgstr ""
+msgstr "ena slaba stran\n"
 
 #: disk-utils/mkswap.c:382
 #, c-format
 msgid "%d bad pages\n"
-msgstr ""
+msgstr "%d slabih strani\n"
 
 #: disk-utils/mkswap.c:501
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
-msgstr ""
+msgstr "%s: napaka: Ni prostora za izmenjalni prostor?\n"
 
 #: disk-utils/mkswap.c:519
 #, c-format
@@ -1107,7 +1104,7 @@
 #: disk-utils/mkswap.c:538
 #, c-format
 msgid "%s: error: unknown version %d\n"
-msgstr ""
+msgstr "%s: napaka: neznana izdaja %d\n"
 
 #: disk-utils/mkswap.c:545
 #, c-format
@@ -1122,7 +1119,7 @@
 #: disk-utils/mkswap.c:576
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
-msgstr ""
+msgstr "Izmenjalnega prostora ne bomo posku¹ali napraviti na ,%s`"
 
 #: disk-utils/mkswap.c:585 disk-utils/mkswap.c:606
 msgid "fatal: first page unreadable"
@@ -1138,42 +1135,40 @@
 msgstr ""
 "%s: Enota ,%s` vsebuje veljavno Sunovo oznako diska.\n"
 "To pomeni, da bi ustvarjanje izmenjalnega prostora v0 unièijo razdelitveno\n"
-"tabelo. Izmenjalni prostor ni bil ustvarjen. Èe res ¾elite ustvariti "
-"izmenjalni\n"
-"prostor v0 na tej napravi, uporabite izbiro -f, s katero zaobidete "
-"varnostno\n"
+"tabelo. Izmenjalni prostor ni bil ustvarjen. Èe res ¾elite ustvariti izmenjalni\n"
+"prostor v0 na tej napravi, uporabite izbiro -f, s katero zaobidete varnostno\n"
 "preverjanje.\n"
 
 #: disk-utils/mkswap.c:615
 msgid "Unable to set up swap-space: unreadable"
-msgstr ""
+msgstr "Izmenjalnega prostora ni mogoèe pripraviti: branje ni mogoèe"
 
 #: disk-utils/mkswap.c:616
 #, c-format
 msgid "Setting up swapspace version %d, size = %llu kB\n"
-msgstr ""
+msgstr "Pripravljamo izmenjalni prostor izdaje %d, velikost = %llu kB\n"
 
 #: disk-utils/mkswap.c:622
 msgid "unable to rewind swap-device"
-msgstr ""
+msgstr "izmenjalne naprave ni mogoèe previti"
 
 #: disk-utils/mkswap.c:625
 msgid "unable to write signature page"
-msgstr ""
+msgstr "strani s podpisom ni mogoèe zapisati"
 
 #: disk-utils/mkswap.c:633
 msgid "fsync failed"
-msgstr ""
+msgstr "fsync() ni uspel"
 
 #: disk-utils/setfdprm.c:31
 #, c-format
 msgid "Invalid number: %s\n"
-msgstr ""
+msgstr "Neveljavno ¹tevilo: %s\n"
 
 #: disk-utils/setfdprm.c:81
 #, c-format
 msgid "Syntax error: '%s'\n"
-msgstr ""
+msgstr "Skladenjska napaka: ,%s`\n"
 
 #: disk-utils/setfdprm.c:91
 #, c-format
@@ -1183,29 +1178,28 @@
 #: disk-utils/setfdprm.c:101
 #, c-format
 msgid "   %s [ -p ] dev name\n"
-msgstr ""
+msgstr "   %s [ -p ] enota ime\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 ] enota vel sekt glav stez razteg presl stopnja spec1 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 ] enota\n"
 
 #: disk-utils/setfdprm.c:107
 #, c-format
 msgid "   %s [ -c | -y | -n ] dev\n"
-msgstr ""
+msgstr "   %s [ -c | -y | -n ] enota\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1993
 msgid "Unusable"
-msgstr ""
+msgstr "Neuporabno"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1995
 msgid "Free Space"
 msgstr "Neuporabljen prostor"
 
@@ -1248,8 +1242,7 @@
 
 #: fdisk/cfdisk.c:429
 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"
+msgstr "Ponovno za¾enite sistem, da bo razdelitvena tabela pravilno a¾urirana.\n"
 
 #: fdisk/cfdisk.c:432
 msgid ""
@@ -1258,6 +1251,10 @@
 "DOS 6.x partitions, please see the cfdisk manual\n"
 "page for additional information.\n"
 msgstr ""
+"\n"
+"OPOZORILO: Èe ste ustvarili ali spremenili\n"
+"kak¹en razdelek DOS 6.x, si prosim oglejte\n"
+"priroènik cfdiska za dodatne informacije.\n"
 
 #: fdisk/cfdisk.c:527
 msgid "FATAL ERROR"
@@ -1269,7 +1266,7 @@
 
 #: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583
 msgid "Cannot seek on disk drive"
-msgstr ""
+msgstr "Iskanje na disku ni mogoèe"
 
 #: fdisk/cfdisk.c:577
 msgid "Cannot read disk drive"
@@ -1316,707 +1313,692 @@
 msgstr "raz¹irjeni logièni razdelki se prekrivajo"
 
 #: fdisk/cfdisk.c:969
-msgid ""
-"!!!! Internal error creating logical drive with no extended partition !!!!"
-msgstr ""
-"!!! Interna napaka: ustvarjanje logiènega pogona brez raz¹irjenega "
-"razdelka !!!"
+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
-msgid ""
-"Cannot create logical drive here -- would create two extended partitions"
-msgstr ""
+msgid "Cannot create logical drive here -- would create two extended partitions"
+msgstr "Logiènega pogona ni mogoèe ustvariti - ustvarili bi dva raz¹irjena razdelka"
 
 #: fdisk/cfdisk.c:1140
 msgid "Menu item too long. Menu may look odd."
-msgstr ""
+msgstr "Menujski vnos predolg. Menu bi izgledal èudno."
 
 #: fdisk/cfdisk.c:1193
 msgid "Menu without direction. Defaulting horizontal."
-msgstr ""
+msgstr "Menu brez smeri. Privzeta je vodoravna."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
-msgstr ""
+msgstr "Nedovoljena tipka"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Pritisnite katerokoli tipko za nadaljevanje"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2495
+#: fdisk/cfdisk.c:2497
 msgid "Primary"
 msgstr "Primaren"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Ustvari nov primaren razdelek"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1964 fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2497
 msgid "Logical"
 msgstr "Logièen"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Ustvari nov logièen razdelek"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2169
 msgid "Cancel"
 msgstr "Preklièi"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Ne ustvari razdelka"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Interna napaka !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Velikost (v MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Zaèetek"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Dodaj razdelek na zaèetek prostega obmoèja"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Dodaj razdelek na konec prostega obmoèja"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "Ni prostora za ustvarjanje raz¹irjenega razdelka"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1512
 msgid "No partition table or unknown signature on partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1514
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1576
+#: fdisk/cfdisk.c:1566
 msgid "You specified more cylinders than fit on disk"
-msgstr ""
+msgstr "Navedli ste veè stez, kot jih disk zmore"
 
-#: fdisk/cfdisk.c:1606
+#: fdisk/cfdisk.c:1596
 msgid "Cannot open disk drive"
-msgstr ""
+msgstr "Diskovnega pogona ni moè odpreti"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1598 fdisk/cfdisk.c:1777
 msgid "Opened disk read-only - you have no permission to write"
-msgstr ""
+msgstr "Disk odprt samo za branje - nimate dovoljenja za pisanje"
 
-#: fdisk/cfdisk.c:1629
+#: fdisk/cfdisk.c:1619
 msgid "Cannot get disk size"
-msgstr ""
+msgstr "Velikosti diska ni mogoèe ugotoviti"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1644
 msgid "Bad primary partition"
-msgstr ""
+msgstr "Slab primarni razdelek"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1674
 msgid "Bad logical partition"
-msgstr ""
+msgstr "Slab logièni razdelek"
+
+#: 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: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:1799
-msgid "Warning!!  This may destroy data on your disk!"
-msgstr ""
-
-#: fdisk/cfdisk.c:1803
-msgid "Are you sure you want write the partition table to disk? (yes or no): "
-msgstr ""
-
-#: fdisk/cfdisk.c:1809
 msgid "no"
 msgstr "ne"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1800
 msgid "Did not write partition table to disk"
-msgstr ""
+msgstr "Tabela razdelkov ni bila zapisana"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1802
 msgid "yes"
 msgstr "da"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1805
 msgid "Please enter `yes' or `no'"
 msgstr "Prosim, odgovorite ,da` ali ,ne`"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1809
 msgid "Writing partition table to disk..."
 msgstr "Tabelo razdelkov zapisujemo na disk..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1834 fdisk/cfdisk.c:1838
 msgid "Wrote partition table to disk"
 msgstr "Tabela razdelkov zapisana na disku"
 
+#: 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:1846
-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:1856
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
-msgstr ""
-"Noben primaren razdelek ni oznaèen kot zagonski. DOS MBR se ne more zagnati."
+msgstr "Noben primarni razdelek ni oznaèen kot zagonski. DOS MBR se ne more zagnati."
 
-#: fdisk/cfdisk.c:1858
-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: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:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: 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:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: 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:1936
+#: fdisk/cfdisk.c:1926
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disk: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1928
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1935
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1955
 msgid "   None   "
 msgstr "   Brez   "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1957
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1959
 msgid "   Primary"
 msgstr "  Primaren"
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1961
 msgid "   Logical"
 msgstr "   Logièen"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
+#: fdisk/cfdisk.c:1999 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
 #: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Neznano"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2005
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Zagonski (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2007 fdisk/cfdisk.c:2503
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Neznano (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2009
 #, c-format
 msgid "None (%02X)"
 msgstr "Brez (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2046
 msgid "            First    Last\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2057
-msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+#: fdisk/cfdisk.c:2047
+msgid " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2058
-msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+#: fdisk/cfdisk.c:2048
+msgid "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
 msgstr ""
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2131
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         ----Zaèetni---      ----Konèni----  Zaèetni  ©tevilo\n"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2132
 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:2143
+#: fdisk/cfdisk.c:2133
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2166
 msgid "Raw"
 msgstr "Direktno"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2166
 msgid "Print the table using raw data format"
 msgstr "Izpis tabele v surovi obliki"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2167 fdisk/cfdisk.c:2269
 msgid "Sectors"
 msgstr "Sektorji"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2167
 msgid "Print the table ordered by sectors"
 msgstr "Izpis tabele, urejene po sektorjih"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2168
 msgid "Table"
 msgstr "Tabela"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2168
 msgid "Just print the partition table"
 msgstr "Enostaven izpis tabele razdelkov"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2169
 msgid "Don't print the table"
 msgstr "Brez izpisa tabele razdelkov"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2197
 msgid "Help Screen for cfdisk"
 msgstr "Osnovna navodila za cfdisk"
 
-#: fdisk/cfdisk.c:2209
+#: 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:2210
+#: 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:2211
+#: fdisk/cfdisk.c:2201
 msgid "disk drive."
 msgstr "na va¹em disku."
 
-#: fdisk/cfdisk.c:2213
+#: 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:2215
+#: fdisk/cfdisk.c:2205
 msgid "Command      Meaning"
 msgstr "  Ukaz        Pomen"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2206
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2207
 msgid "  b          Toggle bootable flag of the current partition"
-msgstr ""
+msgstr "  b          Preklop med zagonskim/nezagonskim razdelkom"
+
+#: fdisk/cfdisk.c:2208
+msgid "  d          Delete the current partition"
+msgstr "  d          Izbri¹i trenutni razdelek"
+
+#: fdisk/cfdisk.c:2209
+msgid "  g          Change cylinders, heads, sectors-per-track parameters"
+msgstr "  g          Spremeni parametre (¹t. stez, ¹t. glav, sektorjev/stezo)"
+
+#: fdisk/cfdisk.c:2210
+msgid "             WARNING: This option should only be used by people who"
+msgstr "             OPOZORILO: Izbiro naj izberejo le usposobljeni strokovnjaki,"
+
+#: fdisk/cfdisk.c:2211
+msgid "             know what they are doing."
+msgstr "             ki razumejo, kaj poènejo."
+
+#: fdisk/cfdisk.c:2212
+msgid "  h          Print this screen"
+msgstr "  h          Ta navodila"
+
+#: fdisk/cfdisk.c:2213
+msgid "  m          Maximize disk usage of the current partition"
+msgstr "  m          Maksimiziraj trenutni razdelek"
+
+#: fdisk/cfdisk.c:2214
+msgid "             Note: This may make the partition incompatible with"
+msgstr "             Opomba: To lahko napravi razdelek nezdru¾ljiv z drugimi"
+
+#: fdisk/cfdisk.c:2215
+msgid "             DOS, OS/2, ..."
+msgstr "             operacijskimi sistemi (DOS, OS/2)"
+
+#: fdisk/cfdisk.c:2216
+msgid "  n          Create new partition from free space"
+msgstr "  n          Ustvari nov razdelek na prostem delu diska"
+
+#: fdisk/cfdisk.c:2217
+msgid "  p          Print partition table to the screen or to a file"
+msgstr "  p          Izpi¹i tabelo razdelkov na zaslon ali v datoteko"
 
 #: fdisk/cfdisk.c:2218
-msgid "  d          Delete the current partition"
-msgstr ""
+msgid "             There are several different formats for the partition"
+msgstr "             Izbirate lahko med veè razliènimi izpisi"
 
 #: fdisk/cfdisk.c:2219
-msgid "  g          Change cylinders, heads, sectors-per-track parameters"
-msgstr ""
+msgid "             that you can choose from:"
+msgstr "             podatkov:"
 
 #: fdisk/cfdisk.c:2220
-msgid "             WARNING: This option should only be used by people who"
-msgstr ""
+msgid "                r - Raw data (exactly what would be written to disk)"
+msgstr "                r - Surovi podatki (natanèno tako, kot bodo zapisani)"
 
 #: fdisk/cfdisk.c:2221
-msgid "             know what they are doing."
-msgstr ""
+msgid "                s - Table ordered by sectors"
+msgstr "                s - Tabela urejena po sektorjih"
 
 #: fdisk/cfdisk.c:2222
-msgid "  h          Print this screen"
-msgstr ""
+msgid "                t - Table in raw format"
+msgstr "                t - Surova oblika tabele"
 
 #: fdisk/cfdisk.c:2223
-msgid "  m          Maximize disk usage of the current partition"
-msgstr ""
+msgid "  q          Quit program without writing partition table"
+msgstr "  q          Zapusti program, ne da bi zapisal tabelo razdelkov"
 
 #: fdisk/cfdisk.c:2224
-msgid "             Note: This may make the partition incompatible with"
-msgstr ""
+msgid "  t          Change the filesystem type"
+msgstr "  t          Spremeni vrsto datoteènega sistema"
 
 #: fdisk/cfdisk.c:2225
-msgid "             DOS, OS/2, ..."
-msgstr ""
+msgid "  u          Change units of the partition size display"
+msgstr "  u          Spremeni enote izpisa velikosti razdelkov"
 
 #: fdisk/cfdisk.c:2226
-msgid "  n          Create new partition from free space"
-msgstr ""
+msgid "             Rotates through MB, sectors and cylinders"
+msgstr "             (ciklièno MB, sektorji in steze)"
 
 #: fdisk/cfdisk.c:2227
-msgid "  p          Print partition table to the screen or to a file"
-msgstr ""
+msgid "  W          Write partition table to disk (must enter upper case W)"
+msgstr "  W          Zapi¹i tabelo razdelkov na disk (veliki W!)"
 
 #: fdisk/cfdisk.c:2228
-msgid "             There are several different formats for the partition"
-msgstr ""
+msgid "             Since this might destroy data on the disk, you must"
+msgstr "             Ker lahko ta izbira onemogoèi dostop do podatkoc na disku,"
 
 #: fdisk/cfdisk.c:2229
-msgid "             that you can choose from:"
-msgstr ""
+msgid "             either confirm or deny the write by entering `yes' or"
+msgstr "             morate izbiro potrditi ali preklicati z vnosom ,da` ali"
 
 #: fdisk/cfdisk.c:2230
-msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr ""
-
-#: fdisk/cfdisk.c:2231
-msgid "                s - Table ordered by sectors"
-msgstr ""
-
-#: fdisk/cfdisk.c:2232
-msgid "                t - Table in raw format"
-msgstr ""
-
-#: fdisk/cfdisk.c:2233
-msgid "  q          Quit program without writing partition table"
-msgstr ""
-
-#: fdisk/cfdisk.c:2234
-msgid "  t          Change the filesystem type"
-msgstr ""
-
-#: fdisk/cfdisk.c:2235
-msgid "  u          Change units of the partition size display"
-msgstr ""
-
-#: fdisk/cfdisk.c:2236
-msgid "             Rotates through MB, sectors and cylinders"
-msgstr ""
-
-#: fdisk/cfdisk.c:2237
-msgid "  W          Write partition table to disk (must enter upper case W)"
-msgstr ""
-
-#: fdisk/cfdisk.c:2238
-msgid "             Since this might destroy data on the disk, you must"
-msgstr ""
-
-#: fdisk/cfdisk.c:2239
-msgid "             either confirm or deny the write by entering `yes' or"
-msgstr ""
-
-#: fdisk/cfdisk.c:2240
 msgid "             `no'"
 msgstr "             ,ne`"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2231
 msgid "Up Arrow     Move cursor to the previous partition"
-msgstr ""
+msgstr "Pu¹èica gor  Premakni kazalèek na prej¹nji razdelek"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2232
 msgid "Down Arrow   Move cursor to the next partition"
-msgstr ""
+msgstr "Pu¹èica dol  Premakni kazalèek na naslednji razdelek"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2233
 msgid "CTRL-L       Redraws the screen"
-msgstr ""
+msgstr "CTRL-L       Osve¾en izris zaslona"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2234
 msgid "  ?          Print this screen"
-msgstr ""
+msgstr "  ?          Ta navodila"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2236
 msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr ""
+msgstr "Opomba: Vse ukaze razen W lahko vnesete kot male ali velike"
 
-#: fdisk/cfdisk.c:2247
+#: fdisk/cfdisk.c:2237
 msgid "case letters (except for Writes)."
-msgstr ""
+msgstr "èrke."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2597 fdisk/fdisksunlabel.c:322
 #: fdisk/fdisksunlabel.c:324
 msgid "Cylinders"
-msgstr ""
+msgstr "Stez"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2267
 msgid "Change cylinder geometry"
-msgstr ""
+msgstr "Spremeni ¹tevilo stez"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2268 fdisk/fdisksunlabel.c:319
 msgid "Heads"
-msgstr ""
+msgstr "Glav"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2268
 msgid "Change head geometry"
-msgstr ""
+msgstr "Spremeni ¹tevilo glav"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2269
 msgid "Change sector geometry"
-msgstr ""
+msgstr "Spremeni ¹tevilo sektorjev"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2270
 msgid "Done"
 msgstr "Opravljeno"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2270
 msgid "Done with changing geometry"
-msgstr ""
+msgstr "Opravljena spremeba geometrije"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2283
 msgid "Enter the number of cylinders: "
-msgstr ""
+msgstr "Vnesite ¹tevilo stez: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2295 fdisk/cfdisk.c:2865
 msgid "Illegal cylinders value"
-msgstr ""
+msgstr "Nedovoljena vrednost stez"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2301
 msgid "Enter the number of heads: "
-msgstr ""
+msgstr "Vnesite ¹tevilo glav: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2308 fdisk/cfdisk.c:2875
 msgid "Illegal heads value"
-msgstr ""
+msgstr "Nedovoljeno ¹tevilo glav"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2314
 msgid "Enter the number of sectors per track: "
-msgstr ""
+msgstr "Vnesite ¹tevilo sektorjev na stezo: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2321 fdisk/cfdisk.c:2882
 msgid "Illegal sectors value"
-msgstr ""
+msgstr "Nedovoljeno ¹tevilo sektorjev"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2424
 msgid "Enter filesystem type: "
-msgstr ""
+msgstr "Vnesite vrsto datoteènega sistema: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2442
 msgid "Cannot change FS Type to empty"
-msgstr ""
+msgstr "Vrste datoteènega sistema ni moè spremeniti na prazno"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2444
 msgid "Cannot change FS Type to extended"
-msgstr ""
+msgstr "Vrste datoteènega sistema ni moè spremeniti na raz¹irjeno"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2472 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr ""
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2474
 #, c-format
 msgid "Unk(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2477 fdisk/cfdisk.c:2480
 msgid ", NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2485 fdisk/cfdisk.c:2488
 msgid "NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2496
 msgid "Pri/Log"
-msgstr ""
+msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2572
 #, c-format
 msgid "Disk Drive: %s"
-msgstr ""
+msgstr "Pogon:      %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2578
 #, c-format
 msgid "Size: %lld bytes, %ld MB"
-msgstr ""
+msgstr "Vel. %lld bajtov, %ld MB"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2581
 #, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
-msgstr ""
+msgstr "Vel. %lld bajtov, %ld,%ld GB"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2585
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
-msgstr ""
+msgstr "Glav:  %d   Sektorjev/stezo:   %d   Stez:      %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2589
 msgid "Name"
 msgstr "Ime"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2590
 msgid "Flags"
 msgstr "Oznake"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2591
 msgid "Part Type"
 msgstr "Tip Razd."
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2592
 msgid "FS Type"
 msgstr "Dat. sistem"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2593
 msgid "[Label]"
 msgstr "[Oznaka]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2595
 msgid "  Sectors"
-msgstr ""
+msgstr "Sektorjev"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2599
 msgid "Size (MB)"
 msgstr "Vel. (MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2601
 msgid "Size (GB)"
 msgstr "Vel. (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2656
 msgid "Bootable"
 msgstr "Zagonski"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2656
 msgid "Toggle bootable flag of the current partition"
 msgstr "Oznaèi, ali je razdelek zagonski"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2657
 msgid "Delete"
 msgstr "Izbri¹i"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2657
 msgid "Delete the current partition"
 msgstr "Izbri¹i ta razdelek"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2658
 msgid "Geometry"
 msgstr "Geometr."
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2658
 msgid "Change disk geometry (experts only)"
 msgstr "Nastavi geometrijo diska (samo poznavalci)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2659
 msgid "Help"
 msgstr "Pomoè"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2659
 msgid "Print help screen"
 msgstr "Izpi¹i stran z navodili"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2660
 msgid "Maximize"
 msgstr "Razpni"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2660
 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:2671
+#: fdisk/cfdisk.c:2661
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2661
 msgid "Create new partition from free space"
 msgstr "Ustvari nov razdelek na prostem obmoèju diska"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2662
 msgid "Print"
 msgstr "Natisni"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2662
 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:2673
+#: fdisk/cfdisk.c:2663
 msgid "Quit"
 msgstr "Izhod"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2663
 msgid "Quit program without writing partition table"
 msgstr "Izhod iz programa brez zapisa tabele razdelkov"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2664
 msgid "Type"
 msgstr "Tip"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2664
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2665
 msgid "Units"
 msgstr "Enote"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2665
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2666
 msgid "Write"
 msgstr "Pi¹i"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2666
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2712
 msgid "Cannot make this partition bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2722
 msgid "Cannot delete an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2742 fdisk/cfdisk.c:2744
 msgid "Cannot maximize this partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2752
 msgid "This partition is unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2754
 msgid "This partition is already in use"
 msgstr ""
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2771
 msgid "Cannot change the type of an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2798 fdisk/cfdisk.c:2804
 msgid "No more partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2811
 msgid "Illegal command"
 msgstr ""
 
-#: fdisk/cfdisk.c:2831
-#, fuzzy
+#: fdisk/cfdisk.c:2821
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+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:2838
+#: fdisk/cfdisk.c:2828
 #, c-format
 msgid ""
 "\n"
@@ -2061,12 +2043,12 @@
 #: fdisk/fdisk.c:218
 #, c-format
 msgid "Unable to open %s\n"
-msgstr ""
+msgstr "Ni mogoèe odpreti %s\n"
 
 #: fdisk/fdisk.c:222
 #, c-format
 msgid "Unable to read %s\n"
-msgstr ""
+msgstr "Ni mogoèe prebrati %s\n"
 
 #: fdisk/fdisk.c:226
 #, c-format
@@ -2076,7 +2058,7 @@
 #: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to write %s\n"
-msgstr ""
+msgstr "Ni mogoèe pisati na %s\n"
 
 #: fdisk/fdisk.c:234
 #, c-format
@@ -2085,7 +2067,7 @@
 
 #: fdisk/fdisk.c:238
 msgid "Unable to allocate any more memory\n"
-msgstr ""
+msgstr "Pomnilnika ni veè mogoèe rezervirati\n"
 
 #: fdisk/fdisk.c:241
 msgid "Fatal error\n"
@@ -2095,11 +2077,11 @@
 #: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
 #: fdisk/fdiskbsdlabel.c:129
 msgid "Command action"
-msgstr ""
+msgstr "  Ukaz  dejanje"
 
 #: fdisk/fdisk.c:326
 msgid "   a   toggle a read only flag"
-msgstr ""
+msgstr "   a   preklopi samo za branje"
 
 #. sun
 #: fdisk/fdisk.c:327 fdisk/fdisk.c:371
@@ -2113,46 +2095,46 @@
 #. sun
 #: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
 msgid "   d   delete a partition"
-msgstr ""
+msgstr "   d   zbri¹i razdelek"
 
 #: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
 msgid "   l   list known partition types"
-msgstr ""
+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/fdiskbsdlabel.c:134
 msgid "   m   print this menu"
-msgstr ""
+msgstr "   m   izpi¹i ta menu"
 
 #: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376
 msgid "   n   add a new partition"
-msgstr ""
+msgstr "   n   dodaj nov razdelek"
 
 #: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:364 fdisk/fdisk.c:377
 msgid "   o   create a new empty DOS partition table"
-msgstr ""
+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
 msgid "   p   print the partition table"
-msgstr ""
+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/fdiskbsdlabel.c:137
 msgid "   q   quit without saving changes"
-msgstr ""
+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
 msgid "   s   create a new empty Sun disklabel"
-msgstr ""
+msgstr "   s   ustvari novo prazno Sunovo oznako diska"
 
 #. sun
 #: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381
 msgid "   t   change a partition's system id"
-msgstr ""
+msgstr "   t   spremeni sistemski ID razdelka"
 
 #: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382
 msgid "   u   change display/entry units"
@@ -2161,20 +2143,20 @@
 #: 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
 msgid "   v   verify the partition table"
-msgstr ""
+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
 msgid "   w   write table to disk and exit"
-msgstr ""
+msgstr "   w   zapi¹i tabelo razdelkov in konèaj"
 
 #: fdisk/fdisk.c:341 fdisk/fdisk.c:385
 msgid "   x   extra functionality (experts only)"
-msgstr ""
+msgstr "   x   posebne mo¾nosti (samo za poznavalce)"
 
 #: fdisk/fdisk.c:345
 msgid "   a   select bootable partition"
-msgstr ""
+msgstr "   a   doloèi razdelek kot zagonski"
 
 #. sgi flavour
 #: fdisk/fdisk.c:346
@@ -2339,9 +2321,7 @@
 msgstr ""
 
 #: fdisk/fdisk.c:927
-msgid ""
-"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
-"disklabel\n"
+msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
 msgstr ""
 
 #: fdisk/fdisk.c:944
@@ -2355,9 +2335,7 @@
 
 #: fdisk/fdisk.c:969
 #, c-format
-msgid ""
-"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
-"(rite)\n"
+msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n"
 msgstr ""
 
 #: fdisk/fdisk.c:991
@@ -2394,48 +2372,48 @@
 msgstr ""
 
 #: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207
-#, fuzzy, c-format
+#, c-format
 msgid "Selected partition %d\n"
-msgstr "Izbri¹i ta razdelek"
+msgstr "Izbrani razdelek %d\n"
 
 #: fdisk/fdisk.c:1184
 msgid "No partition is defined yet!\n"
-msgstr ""
+msgstr "Noben razdelek ¹e ni doloèen!\n"
 
 #: fdisk/fdisk.c:1210
 msgid "All primary partitions have been defined already!\n"
-msgstr ""
+msgstr "Vsi primarni razdelki so ¾e doloèeni!\n"
 
 #: fdisk/fdisk.c:1220
 msgid "cylinder"
-msgstr ""
+msgstr "steza"
 
 #: fdisk/fdisk.c:1220
 msgid "sector"
-msgstr ""
+msgstr "sektor"
 
 #: fdisk/fdisk.c:1229
 #, c-format
 msgid "Changing display/entry units to %s\n"
-msgstr ""
+msgstr "Enote prikaza/vnosa spremenjene na %s\n"
 
 #: fdisk/fdisk.c:1240
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
-msgstr ""
+msgstr "OPOZORILO: Razdelek %d je raz¹irjeni razdelek\n"
 
 #: fdisk/fdisk.c:1251
 msgid "DOS Compatibility flag is set\n"
-msgstr ""
+msgstr "Nastavljena je zdru¾ljivost z DOS.\n"
 
 #: fdisk/fdisk.c:1255
 msgid "DOS Compatibility flag is not set\n"
-msgstr ""
+msgstr "Zdru¾ljivost z DOS ni nastavljena.\n"
 
 #: fdisk/fdisk.c:1347
 #, c-format
 msgid "Partition %d does not exist yet!\n"
-msgstr ""
+msgstr "Razdelek %d ¹e ne obstaja!\n"
 
 #: fdisk/fdisk.c:1352
 msgid ""
@@ -2444,12 +2422,18 @@
 "type 0 is probably unwise. You can delete\n"
 "a partition using the `d' command.\n"
 msgstr ""
+"V mnogih sistemih pomeni tip 0 prazen prostor,\n"
+"v Linuxu pa ne. Najverjetneje ni pametno imeti\n"
+"razdelkov tipa 0. Razdelek lahko zbri¹ete z\n"
+"ukazom ,d`.\n"
 
 #: fdisk/fdisk.c:1361
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
+"Razdelka ne morete pretvoriti v raz¹irjenega ali obratno.\n"
+"Najprej ga morate zbrisati.\n"
 
 #: fdisk/fdisk.c:1370
 msgid ""
@@ -2457,6 +2441,9 @@
 "as SunOS/Solaris expects it and even Linux likes it.\n"
 "\n"
 msgstr ""
+"Razdelek 3 pustite kot celotni disk (5).\n"
+"Tak je dogovor v SunOS/Solaris, Linux pa ga spo¹tuje.\n"
+"\n"
 
 #: fdisk/fdisk.c:1376
 msgid ""
@@ -2464,58 +2451,63 @@
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
 "\n"
 msgstr ""
+"Razdelek 9 pustite kot glavo dela (0),\n"
+"razdelek 11 pa kot celotni del (6), kot prièakuje IRIX.\n"
+"\n"
 
 #: fdisk/fdisk.c:1389
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
-msgstr ""
+msgstr "Tip razdelka %d spremenjen v %x (%s)\n"
 
 #: fdisk/fdisk.c:1443
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
-msgstr ""
+msgstr "Fizièni zaèetek razdelka %d ni enak logiènemu (ne-Linux?):\n"
 
 #: fdisk/fdisk.c:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
 #, c-format
 msgid "     phys=(%d, %d, %d) "
-msgstr ""
+msgstr "  fizièni=(%d, %d, %d) "
 
 #: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
-msgstr ""
+msgstr "logièni=(%d, %d, %d)\n"
 
 #: fdisk/fdisk.c:1451
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
-msgstr ""
+msgstr "Fizièni konec razdelka %d ni enak logiènemu:\n"
 
 #: fdisk/fdisk.c:1460
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
-msgstr ""
+msgstr "Razdelek %i se ne zaène na meji stez:\n"
 
 #: fdisk/fdisk.c:1463
 #, c-format
 msgid "should be (%d, %d, 1)\n"
-msgstr ""
+msgstr "mora biti (%d, %d, 1)\n"
 
 #: fdisk/fdisk.c:1469
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr ""
+msgstr "Razdelek %i se ne konèa na meji stez.\n"
 
 #: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, %d)\n"
-msgstr ""
+msgstr "mora biti (%d, %d, %d)\n"
 
 #: fdisk/fdisk.c:1485
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
-msgstr "%s: Zapisanih samo %lu od skupno %lu bajtov"
+msgstr ""
+"\n"
+"Disk %s: %ld MB, %lld bajtov\n"
 
 #: fdisk/fdisk.c:1488
 #, c-format
@@ -2523,16 +2515,18 @@
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
+"\n"
+"Disk %s: %ld.%ld GB, %lld bytes\n"
 
 #: fdisk/fdisk.c:1490
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
-msgstr ""
+msgstr "%d glav, %d sektorjev/stezo, %d stez"
 
 #: fdisk/fdisk.c:1493
 #, c-format
 msgid ", total %lu sectors"
-msgstr ""
+msgstr ", skupno %lu sektorjev"
 
 #: fdisk/fdisk.c:1496
 #, c-format
@@ -2540,6 +2534,8 @@
 "Units = %s of %d * %d = %d bytes\n"
 "\n"
 msgstr ""
+"Enote = %s od %d x %d = %d bajtov\n"
+"\n"
 
 #: fdisk/fdisk.c:1604
 msgid ""
@@ -2776,9 +2772,7 @@
 msgstr ""
 
 #: fdisk/fdisk.c:2470
-msgid ""
-"Warning: the -b (set sector size) option should be used with one specified "
-"device\n"
+msgid "Warning: the -b (set sector size) option should be used with one specified device\n"
 msgstr ""
 
 #. OSF label, and no DOS label
@@ -3173,9 +3167,7 @@
 msgstr ""
 
 #: fdisk/fdisksgilabel.c:158
-msgid ""
-"According to MIPS Computer Systems, Inc the Label must not contain more than "
-"512 bytes\n"
+msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
 msgstr ""
 
 #: fdisk/fdisksgilabel.c:177
@@ -4073,22 +4065,17 @@
 
 #: fdisk/sfdisk.c:538
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgid "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
 #: fdisk/sfdisk.c:543
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
-"lu)\n"
+msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
 msgstr ""
 
 #: fdisk/sfdisk.c:548
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
-"lu)\n"
+msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
 msgstr ""
 
 #: fdisk/sfdisk.c:588
@@ -4169,12 +4156,12 @@
 #: 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 ""
 
 #: fdisk/sfdisk.c:887
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
+msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 
 #: fdisk/sfdisk.c:1047
@@ -4299,12 +4286,19 @@
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
+#: fdisk/sfdisk.c:1272
+msgid "start"
+msgstr "zaè. "
+
 #: fdisk/sfdisk.c:1275
 #, c-format
-msgid ""
-"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
+#: fdisk/sfdisk.c:1281
+msgid "end"
+msgstr "kon."
+
 #: fdisk/sfdisk.c:1284
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4498,9 +4492,7 @@
 msgstr ""
 
 #: fdisk/sfdisk.c:2239
-msgid ""
-"    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
-"MB"
+msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
 msgstr ""
 
 #: fdisk/sfdisk.c:2240
@@ -4524,8 +4516,7 @@
 msgstr ""
 
 #: fdisk/sfdisk.c:2245
-msgid ""
-"    -O file :            save the sectors that will be overwritten to file"
+msgid "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
 #: fdisk/sfdisk.c:2246
@@ -4555,8 +4546,7 @@
 msgstr ""
 
 #: fdisk/sfdisk.c:2253
-msgid ""
-"    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
+msgid "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
 #: fdisk/sfdisk.c:2254
@@ -4778,204 +4768,202 @@
 "(See fdisk(8).)\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "parametri\n"
 
-#: getopt-1.1.2/getopt.c:328
-msgid ""
-"  -a, --alternative            Allow long options starting with single -\n"
+#: getopt/getopt.c:328
+msgid "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:331
-msgid ""
-"  -n, --name=progname          The name under which errors are reported\n"
+#: getopt/getopt.c:331
+msgid "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
 msgstr ""
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr ""
 
 #: hwclock/cmos.c:172
 msgid "booted from MILO\n"
-msgstr ""
+msgstr "zagnano iz MILO\n"
 
 #: hwclock/cmos.c:181
 msgid "Ruffian BCD clock\n"
-msgstr ""
+msgstr "Ura Ruffian BCD\n"
 
 #: hwclock/cmos.c:197
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
-msgstr ""
+msgstr "vrata ure naravnana na 0x%x\n"
 
 #: hwclock/cmos.c:209
 msgid "funky TOY!\n"
-msgstr ""
+msgstr "funky TOY!\n"
 
 #: hwclock/cmos.c:263
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr ""
+msgstr "%s: atomski %s neuspe¹en v 1000 iteracijah!"
 
 #: hwclock/cmos.c:587
 #, c-format
 msgid "Cannot open /dev/port: %s"
-msgstr ""
+msgstr "Neuspelo odpiranje vrat /dev/port: %s"
 
 #: hwclock/cmos.c:594
 msgid "I failed to get permission because I didn't try.\n"
-msgstr ""
+msgstr "Dovoljenja nismo dobili, ker nismo posku¹ali.\n"
 
 #: 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 ne more dobiti dostopa do V/I vrat: klic iopl(3) neuspe¹en.\n"
 
 #: hwclock/cmos.c:600
 msgid "Probably you need root privileges.\n"
-msgstr ""
+msgstr "Verjetno potrebujete pravice skrbnika sistema.\n"
 
 #: hwclock/hwclock.c:223
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
-msgstr ""
+msgstr "Privzemamo, da strojna ura teèe v %s èasu.\n"
 
 #: hwclock/hwclock.c:224 hwclock/hwclock.c:318
 msgid "UTC"
-msgstr ""
+msgstr "univerzalnem (UTC)"
 
 #: hwclock/hwclock.c:224 hwclock/hwclock.c:317
 msgid "local"
-msgstr "krajevni"
+msgstr "krajevnem"
 
 #: hwclock/hwclock.c:303
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
-msgstr ""
+msgstr "%s: Opozorilo: neprepoznana tretja vrstica v datoteki adjtime\n"
 
 #: hwclock/hwclock.c:305
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
-msgstr ""
+msgstr "(Prièakovano: ,UTC`, ,LOCAL` ali pa niè).\n"
 
 #: hwclock/hwclock.c:312
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
-msgstr ""
+msgstr "Zadnji popravek drsenja opravljen %ld sekund po letu 1969\n"
 
 #: hwclock/hwclock.c:314
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
-msgstr ""
+msgstr "Zadnja kalibracija opravljena %ld sekund po letu 1969\n"
 
 #: hwclock/hwclock.c:316
 #, c-format
 msgid "Hardware clock is on %s time\n"
-msgstr ""
+msgstr "Strojna ura teèe v %s èasu\n"
 
 #: hwclock/hwclock.c:318
 msgid "unknown"
-msgstr "neznano"
+msgstr "neznanem"
 
 #: hwclock/hwclock.c:342
 msgid "Waiting for clock tick...\n"
-msgstr ""
+msgstr "Èakamo na tiktak ure...\n"
 
 #: hwclock/hwclock.c:346
 msgid "...got clock tick\n"
-msgstr ""
+msgstr "...dobili tiktak.\n"
 
 #: hwclock/hwclock.c:399
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr ""
+msgstr "Neveljavne vrednosti v strojni uri: %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 ""
+msgstr "Èas strojne ure: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekund po letu 1969\n"
 
 #: hwclock/hwclock.c:435
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-msgstr ""
+msgstr "Èas, prebran iz strojne ure: %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 ""
+msgstr "Strojno uro nastavljamo na %.2d:%.2d:%.2d = %ld sekund po letu 1969\n"
 
 #: hwclock/hwclock.c:468
 msgid "Clock not changed - testing only.\n"
-msgstr ""
+msgstr "Ure nismo premaknili - zgolj preizkus.\n"
 
 #: hwclock/hwclock.c:516
 #, c-format
@@ -4983,45 +4971,49 @@
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the next full second.\n"
 msgstr ""
+"Èas, ki je pretekel od referenènega, je  %.6f sekund.\n"
+"Poveèujemo zaostanek, da bi dosegli naslednjo celo sekundo.\n"
 
 #: hwclock/hwclock.c: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"
+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 ""
+"Registri strojne ure vsebujejo vrednosti ki so bodisi neveljavne\n"
+"(npr. 50. dan v mesecu), bodisi izven na¹ega obsega (npr. leto 2095).\n"
 
 #: hwclock/hwclock.c:555
 #, c-format
 msgid "%s  %.6f seconds\n"
-msgstr ""
+msgstr "%s  %.6f sekund\n"
 
 #: hwclock/hwclock.c:589
 msgid "No --date option specified.\n"
-msgstr ""
+msgstr "Izbira --date ni bila podana.\n"
 
 #: hwclock/hwclock.c:595
 msgid "--date argument too long\n"
-msgstr ""
+msgstr "Argument izbire --date je predolg.\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 ""
+"Vrednost, podana pri izbiri --date ni veljaven datum.\n"
+"Med drugim vsebuje narekovaje.\n"
 
 #: hwclock/hwclock.c:610
 #, c-format
 msgid "Issuing date command: %s\n"
-msgstr ""
+msgstr "Izvajamo ukaz date: %s\n"
 
 #: hwclock/hwclock.c:614
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr ""
+msgstr "Ne moremo pognati ukaza ,date` v lupini /bin/sh, klic popen() neuspe¹en"
 
 #: hwclock/hwclock.c:622
 #, c-format
 msgid "response from date command = %s\n"
-msgstr ""
+msgstr "odziv ukaza date = %s\n"
 
 #: hwclock/hwclock.c:624
 #, c-format
@@ -5032,12 +5024,16 @@
 "The response was:\n"
 "  %s\n"
 msgstr ""
+"Ukaz date, ki ga je pognal %s, je vrnil neprièakovan rezultat.\n"
+"Ukaz je bil:\n"
+"  %s\n"
+"Odziv pa:\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 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"
@@ -5050,9 +5046,7 @@
 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"
+msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
 msgstr ""
 
 #: hwclock/hwclock.c:701
@@ -5082,9 +5076,7 @@
 msgstr ""
 
 #: hwclock/hwclock.c:749
-msgid ""
-"Not adjusting drift factor because the Hardware Clock previously contained "
-"garbage.\n"
+msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
 msgstr ""
 
 #: hwclock/hwclock.c:754
@@ -5094,16 +5086,13 @@
 msgstr ""
 
 #: hwclock/hwclock.c:760
-msgid ""
-"Not adjusting drift factor because it has been less than a day since the "
-"last calibration.\n"
+msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
 msgstr ""
 
 #: hwclock/hwclock.c:808
 #, c-format
 msgid ""
-"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
-"of %f seconds/day.\n"
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
 
@@ -5133,8 +5122,7 @@
 msgstr ""
 
 #: hwclock/hwclock.c:956
-msgid ""
-"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 
 #: hwclock/hwclock.c:988
@@ -5156,8 +5144,7 @@
 
 #: 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 ""
@@ -5172,9 +5159,7 @@
 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"
+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:1159
@@ -5237,16 +5222,12 @@
 
 #: hwclock/hwclock.c:1410
 #, c-format
-msgid ""
-"%s: The --utc and --localtime options are mutually exclusive.  You specified "
-"both.\n"
+msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1417
 #, c-format
-msgid ""
-"%s: The --adjust and --noadjfile options are mutually exclusive.  You "
-"specified both.\n"
+msgid "%s: The --adjust and --noadjfile options are mutually exclusive.  You specified both.\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1424
@@ -5267,9 +5248,7 @@
 msgstr ""
 
 #: hwclock/hwclock.c:1464
-msgid ""
-"Sorry, only the superuser can change the Hardware Clock epoch in the "
-"kernel.\n"
+msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1484
@@ -5277,9 +5256,7 @@
 msgstr ""
 
 #: hwclock/hwclock.c:1488
-msgid ""
-"Use the --debug option to see the details of our search for an access "
-"method.\n"
+msgid "Use the --debug option to see the details of our search for an access method.\n"
 msgstr ""
 
 #: hwclock/kd.c:43
@@ -5290,7 +5267,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr ""
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr ""
 
@@ -5315,75 +5292,72 @@
 msgid "KDGHWCLK ioctl failed"
 msgstr ""
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr ""
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr ""
 
-#: hwclock/rtc.c:171
+#: hwclock/rtc.c:170
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr ""
 
-#: hwclock/rtc.c:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr ""
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr ""
 
-#: hwclock/rtc.c:244
+#: hwclock/rtc.c:243
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
 
-#: hwclock/rtc.c:247
+#: hwclock/rtc.c:246
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:305
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr ""
 
-#: hwclock/rtc.c:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr ""
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr ""
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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"
+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 ""
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr ""
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
@@ -5391,23 +5365,22 @@
 #. 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:397
+#: hwclock/rtc.c:396
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr ""
 
-#: hwclock/rtc.c:415
+#: hwclock/rtc.c:414
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr ""
 
-#: hwclock/rtc.c:420
+#: hwclock/rtc.c:419
 #, c-format
-msgid ""
-"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr ""
 
-#: hwclock/rtc.c:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr ""
@@ -5544,10 +5517,8 @@
 #: 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 ""
 
 #: login-utils/checktty.c:104 login-utils/checktty.c:125
@@ -5603,7 +5574,7 @@
 msgid "Password error."
 msgstr ""
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
+#: 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:249
 #: mount/lomount.c:254
 msgid "Password: "
@@ -5815,29 +5786,29 @@
 "interrupted %10.10s %5.5s \n"
 msgstr ""
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "USODNA NAPAKA: terminalske linije ni moè znova odpreti: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: izbira -h je na voljo samo za sistemskega skrbnika.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "uporaba: login [-fp] [uporabnik]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: napaka v PAM, nadaljevanje ni mogoèe: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM ni moè inicializirati: %s"
@@ -5848,16 +5819,16 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "prijava: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "NEUSPE©NA PRIJAVA %d IZ %s NA UPORABNIKA %s, %s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -5865,17 +5836,17 @@
 "Prijava ni uspela\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "PRE©TEVILNI (%d) POSKUSI PRIJAVE IZ %s NA UPORABNIKA %s, %s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -5883,50 +5854,50 @@
 "\n"
 "Prijava ni uspela\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
 msgstr ""
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Neveljavno uporabni¹ko ime"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr ""
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Prijava ni uspela\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -5934,82 +5905,82 @@
 "Prijavljenih je ¾e preveè uporabnikov.\n"
 "Poskusite pozneje.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
 msgstr "Hkrati teèe preveè va¹ih procesov.\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "TELEFONSKA PRIJAVA Z LINIJE %s, UPORABNIK %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "SKRBNI©KA PRIJAVA Z RAÈUNALNIKA %s, UPORABNIK %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "SKRBNI©KA PRIJAVA NA LINIJI %s"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, 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:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "PRIJAVA NA LINIJI %s UPORABNIKA %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
 msgstr "Èaka vas nova po¹ta.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
 msgstr "Èaka vas po¹ta.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: vejitev ni mogoèa: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr ""
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr ""
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr ""
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
 msgstr ""
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, 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:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ni ukazne lupine: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6018,62 +5989,62 @@
 "\n"
 "%s prijava: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "Prijavno ime je veliko predolgo.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "IME je predolgo"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
 msgstr "Prijavna imena se ne morejo zaèeti z znakom ,-`.\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr ""
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr ""
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Prijava je potekla po %d sekundah.\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Zadnja prijava: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "z raèunalnika %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "z linije %.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "NEUSPE©NA PRIJAVA Z RAÈUNALNIKA %s, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "NEUSPE©NA PRIJAVA NA LINIJI %s, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d NEUSPE©NIH PRIJAV Z RAÈUNALNIKA %s, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d NEUSPE©NIH PRIJAV NA LINIJI %s, %s"
@@ -6145,8 +6116,7 @@
 
 #: login-utils/passwd.c:225
 msgid "Only root may use the one and two argument forms.\n"
-msgstr ""
-"Samo sistemski skrbnik lahko uprablja obliko z enim ali dvema argumentoma.\n"
+msgstr "Samo sistemski skrbnik lahko uprablja obliko z enim ali dvema argumentoma.\n"
 
 #: login-utils/passwd.c:280
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
@@ -6432,7 +6402,7 @@
 msgid "fork failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1708
 msgid "exec failed\n"
 msgstr ""
 
@@ -6632,8 +6602,7 @@
 msgstr ""
 
 #: misc-utils/logger.c:286
-msgid ""
-"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
 
 #: misc-utils/look.c:348
@@ -6727,222 +6696,222 @@
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr ""
 
 #. 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 ""
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr ""
 
-#: 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 ""
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: 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 ""
 
-#: misc-utils/setterm.c:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:782
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:783
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:791
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Napaka pri branju %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
@@ -6998,17 +6967,17 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr ""
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr ""
 
-#: mount/fstab.c:141 mount/fstab.c:164
+#: mount/fstab.c:142 mount/fstab.c:165
 #, c-format
 msgid "warning: can't open %s: %s"
 msgstr ""
 
-#: mount/fstab.c:145
+#: mount/fstab.c:146
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
@@ -7017,58 +6986,58 @@
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:413
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:399
+#: mount/fstab.c:425
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:411
+#: mount/fstab.c:437
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:426
+#: mount/fstab.c:452
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:439
+#: mount/fstab.c:465
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr ""
 
-#: mount/fstab.c:441
+#: mount/fstab.c:467
 msgid "timed out"
 msgstr "èas se je iztekel"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:474
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:523 mount/fstab.c:559
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr ""
 
-#: mount/fstab.c:541
+#: mount/fstab.c:567
 #, c-format
 msgid "error writing %s: %s"
 msgstr ""
 
-#: mount/fstab.c:549
+#: mount/fstab.c:575
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:567
+#: mount/fstab.c:593
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
@@ -7191,314 +7160,312 @@
 msgid "; rest of file ignored"
 msgstr ""
 
-#: mount/mount.c:385
+#: mount/mount.c:388
 #, 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:389
+#: mount/mount.c:392
 #, 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:410
+#: mount/mount.c:413
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: enote %s ni moè odpreti za pisanje: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:428 mount/mount.c:647
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: napaka pri pisanju na %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:435
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr ""
 
-#: mount/mount.c:478
+#: mount/mount.c:481
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:538
+#: mount/mount.c:541
 msgid "mount failed"
 msgstr "priklop ni uspel"
 
-#: mount/mount.c:540
+#: mount/mount.c:543
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: samo sistemski skrbnik lahko priklopi %s na %s"
 
-#: mount/mount.c:568
+#: mount/mount.c:571
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:573
+#: mount/mount.c:576
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:585
+#: mount/mount.c:588
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:594
+#: mount/mount.c:597
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:598
+#: mount/mount.c:601
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:602
+#: mount/mount.c:605
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:639
+#: mount/mount.c:642
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:662
+#: mount/mount.c:665
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr ""
 
-#: mount/mount.c:665
+#: mount/mount.c:668
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:722 mount/mount.c:1296
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:806
+#: mount/mount.c:802
 msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr ""
 
-#: mount/mount.c:845
+#: mount/mount.c:841
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:856
-msgid ""
-"mount: I could not determine the filesystem type, and none was specified"
+#: mount/mount.c:852
+msgid "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:859
+#: mount/mount.c:855
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:858
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:864 mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: priklopna toèka %s ni imenik"
 
-#: mount/mount.c:870
+#: mount/mount.c:866
 msgid "mount: permission denied"
 msgstr "mount: dostop zavrnjen"
 
-#: mount/mount.c:872
+#: mount/mount.c:868
 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:876 mount/mount.c:880
+#: mount/mount.c:872 mount/mount.c:876
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s je v rabi"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:878
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:884
+#: mount/mount.c:880
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:890
+#: mount/mount.c:886
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:892
+#: mount/mount.c:888
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:895
+#: mount/mount.c:891
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:901
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:918
+#: mount/mount.c:914
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:920
+#: mount/mount.c:916
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
 
-#: mount/mount.c:954
+#: mount/mount.c:950
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:956
+#: mount/mount.c:952
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:960
+#: mount/mount.c:956
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:965
+#: mount/mount.c:961
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr ""
 
-#: mount/mount.c:977
+#: mount/mount.c:973
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:979
+#: mount/mount.c:975
 msgid "mount: maybe you meant iso9660 ?"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:978
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:984
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:990
+#: mount/mount.c:986
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:993
+#: mount/mount.c:989
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:996
+#: mount/mount.c:992
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:999
+#: mount/mount.c:995
 #, 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:1002
+#: mount/mount.c:998
 msgid "block device "
 msgstr "bloèna enota"
 
-#: mount/mount.c:1004
+#: mount/mount.c:1000
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s ni moè priklopiti v bralnem naèinu"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1004
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1024
+#: mount/mount.c:1020
 #, 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:1111
+#: mount/mount.c:1107
 #, c-format
 msgid "mount: the label %s occurs on both %s and %s\n"
 msgstr ""
 
-#: mount/mount.c:1115
+#: mount/mount.c:1111
 #, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr ""
 
-#: mount/mount.c:1125
+#: mount/mount.c:1121
 #, c-format
 msgid "mount: going to mount %s by %s\n"
 msgstr ""
 
-#: mount/mount.c:1126
+#: mount/mount.c:1122
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1122
 msgid "label"
 msgstr "oznaka"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: mount/mount.c:1124 mount/mount.c:1573
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:1136
+#: mount/mount.c:1132
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1141
+#: mount/mount.c:1137
 msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
 msgstr ""
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1153
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1168
+#: mount/mount.c:1164
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1245
+#: mount/mount.c:1241
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1376
-#, fuzzy
+#: mount/mount.c:1373
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -7529,23 +7496,18 @@
 "To so bile informativne izbire. Ukaz za priklop ima obliko\n"
 "  mount [-t tip] naprava imenik\n"
 "Èe je naprava ¾e navedena v /etc/fstab, lahko podrobnosti izpustimo.\n"
-"         mount -a               : priklop vseh naprav, navedenih v /etc/"
-"fstab\n"
+"         mount -a [-t|-O]       : priklop vseh naprav, navedenih v /etc/fstab\n"
 "         mount naprava          : priklop naprave na znano priklopno toèko\n"
 "         mount imenik           : priklop znane naprave na imenik\n"
 "         mount -t tip naprava imenik  : neokraj¹an ukaz mount\n"
-"V resnici pravzaprav ne priklopimo naprave, ampak datoteèni sistem "
-"(podanega\n"
+"V resnici pravzaprav ne priklopimo naprave, ampak datoteèni sistem (podanega\n"
 "tipa) na podani napravi.\n"
-"Tudi vidni imenik v obstojeèem datoteènem sistemu lahko priklopimo na drugo "
-"toèko:\n"
+"Tudi vidni imenik v obstojeèem datoteènem sistemu lahko priklopimo na drugo toèko:\n"
 "         mount --bind stari_imenik novi_imenik\n"
 "Mogoèe je premakniti tudi celo imeni¹ko strukturo:\n"
 "         mount --move stari_imenik novi_imenik\n"
-"Napravo lahko naslovimo z imenom posebne datoteke, npr. /dev/hda1 ali /dev/"
-"cdrom,\n"
-"z oznako (z izbiro -L oznaka), ali z identifikacijsko ¹tevilko (z izbiro -U "
-"uuid).\n"
+"Napravo lahko naslovimo z imenom posebne datoteke, npr. /dev/hda1 ali /dev/cdrom,\n"
+"z oznako (z izbiro -L oznaka), ali z identifikacijsko ¹tevilko (z izbiro -U uuid).\n"
 "Druge izbire: [-nfFrsvw] [-o izbire].\n"
 "Podrobnosti lahko poi¹èete v priroèniku z ukazom: man 8 mount\n"
 
@@ -7582,40 +7544,39 @@
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
 
-#: mount/mount_by_label.c:259
+#: mount/mount_by_label.c:153
 #, c-format
-msgid ""
-"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgid "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
 msgstr ""
 
-#: mount/mount_by_label.c:378
+#: mount/mount_by_label.c:272
 msgid "mount: bad UUID"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:486
 msgid "mount: error while guessing filesystem type\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:495
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:498
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:501
 msgid "       and it looks like this is swapspace\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:501
+#: mount/mount_guess_fstype.c:503
 #, c-format
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:591
 #, c-format
 msgid "Trying %s\n"
 msgstr ""
@@ -7907,8 +7868,7 @@
 #: 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 ""
 
@@ -7939,9 +7899,7 @@
 
 #: 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"
+msgid "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) [-g|-G] file [file...]\n"
 msgstr ""
 
 #: sys-utils/cytune.c:256 sys-utils/cytune.c:275 sys-utils/cytune.c:295
@@ -7995,8 +7953,7 @@
 
 #: sys-utils/cytune.c:424
 #, c-format
-msgid ""
-"%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgid "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
 #: sys-utils/cytune.c:430
@@ -8006,8 +7963,7 @@
 
 #: sys-utils/cytune.c:435
 #, c-format
-msgid ""
-"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
 #: sys-utils/cytune.c:441
@@ -8015,7 +7971,7 @@
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr ""
@@ -8074,38 +8030,34 @@
 msgstr "neveljaven kljuè"
 
 #: sys-utils/ipcrm.c:217 sys-utils/ipcrm.c:255
-#, fuzzy
 msgid "unknown error in key"
-msgstr "Neznana sistemska napaka"
+msgstr "neznana napaka v kljuèu"
 
 #: sys-utils/ipcrm.c:241
-#, fuzzy
 msgid "permission denied for id"
-msgstr "nastavljena dovoljenja za %s"
+msgstr "zavrnjen dostop za id"
 
 #: sys-utils/ipcrm.c:246
-#, fuzzy
 msgid "invalid id"
-msgstr "napaèna za¹èita"
+msgstr "neveljaven id"
 
 #: sys-utils/ipcrm.c:251
 msgid "already removed id"
 msgstr ""
 
 #: sys-utils/ipcrm.c:256
-#, fuzzy
 msgid "unknown error in id"
-msgstr "Neznana sistemska napaka"
+msgstr "neznana napaka v id"
 
 #: sys-utils/ipcrm.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s (%s)\n"
-msgstr "%%s na %s\n"
+msgstr "%s: %s (%s)\n"
 
 #: sys-utils/ipcrm.c:267
-#, fuzzy, c-format
+#, c-format
 msgid "%s: unknown argument: %s\n"
-msgstr " neznan tip datoteke %s\n"
+msgstr "%s: neznan argument: %s\n"
 
 #: sys-utils/ipcs.c:121
 #, c-format
@@ -8124,8 +8076,7 @@
 
 #: sys-utils/ipcs.c:129
 #, c-format
-msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+msgid "%s provides information on ipc facilities for which you have read access.\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:131
@@ -8645,8 +8596,7 @@
 msgstr ""
 
 #: sys-utils/rdev.c:70
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+msgid "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
 msgstr ""
 
 #: sys-utils/rdev.c:71
@@ -8682,8 +8632,7 @@
 msgstr ""
 
 #: sys-utils/rdev.c:79
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
+msgid "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
 
 #: sys-utils/rdev.c:80
@@ -8694,12 +8643,17 @@
 msgid "missing comma"
 msgstr ""
 
-#: sys-utils/readprofile.c:60
+#: sys-utils/readprofile.c:67
+msgid "out of memory"
+msgstr "zmanjkalo je pomnilnika"
+
+#: sys-utils/readprofile.c:113
 #, 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"
@@ -8710,42 +8664,37 @@
 "\t -V            print version and exit\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:84
-msgid "out of memory"
-msgstr "zmanjkalo je pomnilnika"
-
-#: sys-utils/readprofile.c:147
+#: sys-utils/readprofile.c:186
 #, c-format
-msgid "%s Version %s\n"
-msgstr "%s Razlièica %s\n"
+msgid "%s version %s\n"
+msgstr "%s razlièica %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:272
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:293 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:305
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:331
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:323
+#: sys-utils/readprofile.c:372
 msgid "total"
 msgstr "skupno"
 
 #: sys-utils/renice.c:68
-msgid ""
-"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 msgstr ""
 
 #: sys-utils/renice.c:97
@@ -8885,8 +8834,7 @@
 msgstr ""
 
 #: text-utils/hexsyntax.c:131
-msgid ""
-"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgid "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
 
 #: text-utils/more.c:263
@@ -8944,12 +8892,11 @@
 msgstr "...nazaj eno stran"
 
 #: text-utils/more.c:1313
-#, fuzzy
 msgid "...skipping one line"
-msgstr "...preskoèimo %d vrstic"
+msgstr "...preskoèimo eno vrstico"
 
 #: text-utils/more.c:1315
-#, fuzzy, c-format
+#, c-format
 msgid "...skipping %d lines"
 msgstr "...preskoèimo %d vrstic"
 
@@ -8966,61 +8913,60 @@
 #: text-utils/more.c:1390
 msgid ""
 "\n"
-"Most commands optionally preceded by integer argument k.  Defaults in "
-"brackets.\n"
+"Most commands optionally preceded by integer argument k.  Defaults in brackets.\n"
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1397
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1444 text-utils/more.c:1449
 msgid "[Press 'h' for instructions.]"
 msgstr "[Pritisnite ,h` za navodila.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1483
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" vrstica %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1485
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Ni datoteka] vrstica %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1569
 msgid "  Overflow\n"
 msgstr "  Prekoraèitev\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1616
 msgid "...skipping\n"
 msgstr "...preskakujemo\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1646
 msgid "Regular expression botch"
 msgstr ""
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1658
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9028,207 +8974,203 @@
 "\n"
 "Vzorca ni moè najti\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1661 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr "Vzorca ni moè najti"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1722
 msgid "can't fork\n"
 msgstr "vejitev ni mogoèa\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1761
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
+"\n"
+"... Preskakujemo "
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1766
 msgid "...Skipping to file "
-msgstr ""
+msgstr "... Preskakujemo na datoteko "
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1768
 msgid "...Skipping back to file "
-msgstr ""
+msgstr "... Preskakujemo nazaj na datoteko "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2048
 msgid "Line too long"
 msgstr "Vrstica je predolga"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2091
 msgid "No previous command to substitute for"
-msgstr ""
+msgstr "Nobenega prej¹njega ukaza ni za zamenjavo"
 
 #: text-utils/odsyntax.c:130
 msgid "od: od(1) has been deprecated for hexdump(1).\n"
-msgstr ""
+msgstr "od: od(1) je nadome¹èen s programom hexdump(1).\n"
 
 #: text-utils/odsyntax.c:133
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr ""
+msgstr "od: hexdump(1) ne podpira izbire -%c izbir%s\n"
 
 #: text-utils/odsyntax.c:134
 msgid "; see strings(1)."
-msgstr ""
+msgstr "; glejte strings(1)."
 
 #: text-utils/parse.c:63
 #, c-format
 msgid "hexdump: can't read %s.\n"
-msgstr ""
+msgstr "hexdump: branje %s ni uspelo.\n"
 
 #: text-utils/parse.c:68
 msgid "hexdump: line too long.\n"
-msgstr ""
+msgstr "hexdump: vrstica predolga.\n"
 
 #: text-utils/parse.c:401
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr ""
+msgstr "hexdump: ¹tevec bajtov naveden z veè pretvornimi znaki.\n"
 
 #: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
-msgstr ""
+msgstr "hexdump: slab ¹tevec bajtov za pretvorni znak %s.\n"
 
 #: text-utils/parse.c:490
 #, c-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
-msgstr ""
+msgstr "hexdump: %%s zahteva bodisi natanènost bodisi ¹tevec bajtov.\n"
 
 #: text-utils/parse.c:496
 #, c-format
 msgid "hexdump: bad format {%s}\n"
-msgstr ""
+msgstr "hexdump: slab format [%s]\n"
 
 #: text-utils/parse.c:502
 #, c-format
 msgid "hexdump: bad conversion character %%%s.\n"
-msgstr ""
+msgstr "hexdump: slab pretvorni znak %%%s.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
-msgid ""
-"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
-msgstr ""
+msgid "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr "%s: Uporaba: %s [-¹tevilo] [-p niz] [-cefnrs] [+vrstica] [+/vzorec/] [datoteke]\n"
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: izbira zahteva argument -- %s\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: nedovoljena izbira -- %s\n"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 msgid "...skipping forward\n"
-msgstr ""
+msgstr "... preskakujemo naprej\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 msgid "...skipping backward\n"
-msgstr ""
-
-#: text-utils/pg.c:411
-#, fuzzy
-msgid "No next file"
-msgstr "odpiranje ni uspelo"
+msgstr "... preskakujemo nazaj\n"
 
 #: text-utils/pg.c:415
-#, fuzzy
-msgid "No previous file"
-msgstr "Ni navadna datoteka"
+msgid "No next file"
+msgstr "Naslednje datoteke ni"
 
-#: text-utils/pg.c:945
-#, fuzzy, c-format
+#: text-utils/pg.c:419
+msgid "No previous file"
+msgstr "Prej¹nje datoteke ni"
+
+#: text-utils/pg.c:949
+#, c-format
 msgid "%s: Read error from %s file\n"
-msgstr "Napaka pri pisanju na %s"
+msgstr "%s: Napaka pri branju iz datoteke %s\n"
 
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
-#, fuzzy, c-format
+#: text-utils/pg.c:955
+#, c-format
 msgid "%s: Unexpected EOF in %s file\n"
-msgstr "Neprièakovan znak za konec datoteke v arhivu"
+msgstr "%s: Neprièakovan znak za konec datoteke v datoteki %s\n"
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, c-format
 msgid "%s: Unknown error in %s file\n"
-msgstr ""
+msgstr "%s: Neznana napaka v datoteki %s\n"
 
-#: text-utils/pg.c:1049
-#, fuzzy, c-format
+#: text-utils/pg.c:1053
+#, c-format
 msgid "%s: Cannot create tempfile\n"
-msgstr "%s: Ni mogoèe ustvariti datoteke"
+msgstr "%s: Ni mogoèe ustvariti zaèasne datoteke\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
-#, fuzzy
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 msgid "RE error: "
-msgstr "napaka"
+msgstr "napaka RE: "
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
-msgstr ""
+msgstr "(EOF)"
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
-msgstr ""
+msgstr "Nobenega shranjenega iskanega niza"
 
-#: text-utils/pg.c:1324
-#, fuzzy
+#: text-utils/pg.c:1328
 msgid "Cannot open "
-msgstr "Ni mogoèe odpreti %s"
+msgstr "Ni mogoèe odpreti "
 
-#: text-utils/pg.c:1372
-#, fuzzy
+#: text-utils/pg.c:1376
 msgid "saved"
-msgstr "po¹lji"
+msgstr "shranjeno"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
-msgstr ""
+msgstr ": !ukaz ni dovoljen v naèinu rflag.\n"
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 msgid "fork() failed, try again later\n"
-msgstr ""
+msgstr "klic fork() neuspel, poskusite pozneje\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 msgid "(Next file: "
-msgstr ""
+msgstr "(Naslednja datoteka: "
 
 #: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
-msgstr ""
+msgstr "Ni mogoèe dodeliti prostora za medpomnilnik.\n"
 
 #: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
-msgstr ""
+msgstr "Uporaba: rev [datoteka ...]\n"
 
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr ""
+msgstr "Uporaba: %s [ -i ] [ -tTerminal ] datoteka...\n"
 
 #: text-utils/ul.c:152
 msgid "trouble reading terminfo"
-msgstr ""
+msgstr "te¾ave pri branju zbirke terminfo"
 
 #: text-utils/ul.c:242
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
-msgstr ""
+msgstr "Neznano ube¾no na vhodu: %o, %o\n"
 
 #: text-utils/ul.c:425
 msgid "Unable to allocate buffer.\n"
-msgstr ""
+msgstr "Ni mogoèe dodeliti pomnilnika za medpomnilnik.\n"
 
 #: text-utils/ul.c:586
 msgid "Input line too long.\n"
-msgstr ""
+msgstr "Vhodna vrstica je predolga.\n"
 
 #: text-utils/ul.c:599
 msgid "Out of memory when growing buffer.\n"
-msgstr ""
+msgstr "Pri poveèevanju medpomnilnika je zmanjkalo pomnilnika.\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 ae2db36..f055b53 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,6 +1,6 @@
 # Swedish messages for util-linux.
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-# Christian Rose <menthos@menthos.com>, 2001, 2002.
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Christian Rose <menthos@menthos.com>, 2001, 2002, 2003.
 #
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided that this
@@ -9,9 +9,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11x\n"
-"POT-Creation-Date: 2002-11-25 00:47+0100\n"
-"PO-Revision-Date: 2002-11-08 01:50+0100\n"
+"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"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -150,7 +150,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -757,7 +757,7 @@
 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:2166
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhet: %s\n"
@@ -832,8 +832,8 @@
 "Användning: mkfs [-V] [-t filsystemstyp] [filsystemsflaggor] enhet "
 "[storlek]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Slut på minne!\n"
@@ -843,7 +843,7 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs version %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
+#: disk-utils/mkfs.cramfs.c:124
 #, c-format
 msgid ""
 "usage: %s [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname outfile\n"
@@ -875,7 +875,7 @@
 " katnamn    rot på filsystemet som ska komprimeras\n"
 " utfil      utdatafil\n"
 
-#: disk-utils/mkfs.cramfs.c:328
+#: disk-utils/mkfs.cramfs.c:335
 #, c-format
 msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
@@ -884,11 +884,11 @@
 "Mycket långt (%u byte) filnamn \"%s\" hittades.\n"
 " Öka MAX_INPUT_NAMELEN i mkcramfs.c och kompilera om. Avslutar.\n"
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr "filsystemet är för stort. Avslutar.\n"
 
-#: disk-utils/mkfs.cramfs.c:507
+#: disk-utils/mkfs.cramfs.c:514
 msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
@@ -897,17 +897,17 @@
 "Avslutar.\n"
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr "AIEEE: block \"komprimerat\" till > 2*blocklängd (%ld)\n"
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr "%6.2f%% (%+d byte)\t%s\n"
 
-#: disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.cramfs.c:819
 #, c-format
 msgid ""
 "warning: guestimate of required size (upper bound) is %LdMB, but maximum "
@@ -916,39 +916,39 @@
 "varning: uppskattning av begärd storlek (övre gräns) är %Ld MB, men maximal "
 "avbildsstorlek är %u MB. Vi kan dö i förtid.\n"
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
 msgstr "Inklusive: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr "Katalogdata: %d byte\n"
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr "Allting: %d kilobyte\n"
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, c-format
 msgid "Super block: %d bytes\n"
 msgstr "Superblock: %d byte\n"
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr "CRC: %x\n"
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
 "inte tillräckligt med utrymme allokerat för ROM-avbild (%Ld allokerat, %d "
 "använt)\n"
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr "ROM-avbildsskrivning misslyckades (%d %d)\n"
@@ -957,34 +957,34 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "varning: filnamn trunkerade till 255 byte.\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr "varning: filer hoppades över på grund av fel.\n"
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr "varning: filstorlekar avkortade till %lu MB (minus 1 byte).\n"
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 "varning: uid avkortade till %u bitar (detta kan vara ett säkerhetsproblem).\n"
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 "varning: gid avkortade till %u bitar (detta kan vara ett säkerhetsproblem).\n"
 
-#: disk-utils/mkfs.cramfs.c:926
+#: disk-utils/mkfs.cramfs.c:933
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -1137,8 +1137,8 @@
 msgid "too many bad pages"
 msgstr "för många felaktiga sidor"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: 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 "Slut på minne"
 
@@ -1259,11 +1259,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] enhet\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
 msgid "Unusable"
 msgstr "Oanvändbar"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
 msgid "Free Space"
 msgstr "Ledigt utrymme"
 
@@ -1398,234 +1398,234 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Meny utan riktning. Använder standardvärdet vågrät."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Ogiltig tangent"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Tryck en tangent för att fortsätta"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2512
 msgid "Primary"
 msgstr "Primär"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Skapa en ny primär partition"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2512
 msgid "Logical"
 msgstr "Logisk"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Skapa en ny logisk partition"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Skapa inte någon partition"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Internt fel !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Storlek (i MB): "
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "Början"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Add partition at beginning of free space"
 msgstr "Lägg till partition i början av det lediga utrymmet"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Slutet"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Lägg till partition i slutet av det lediga utrymmet"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "Ingen plats att skapa den utökade partitionen"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1527
 msgid "No partition table or unknown signature on partition table"
 msgstr "Ingen partitionstabell eller okänd signatur på partitionstabell"
 
-#: fdisk/cfdisk.c:1524
+#: fdisk/cfdisk.c:1529
 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:1576
+#: fdisk/cfdisk.c:1581
 msgid "You specified more cylinders than fit on disk"
 msgstr "Du angav fler cylindrar än som ryms på disken"
 
-#: fdisk/cfdisk.c:1606
+#: fdisk/cfdisk.c:1611
 msgid "Cannot open disk drive"
 msgstr "Kan inte öppna diskenhet"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
 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:1629
+#: fdisk/cfdisk.c:1634
 msgid "Cannot get disk size"
 msgstr "Kan inte hämta diskstorlek"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1659
 msgid "Bad primary partition"
 msgstr "Felaktig primär partition"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1689
 msgid "Bad logical partition"
 msgstr "Felaktig logisk partition"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1804
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Varning!! Detta kan förstöra data på din disk!"
 
-#: fdisk/cfdisk.c:1803
+#: fdisk/cfdisk.c:1808
 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:1809
+#: fdisk/cfdisk.c:1814
 msgid "no"
 msgstr "nej"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1815
 msgid "Did not write partition table to disk"
 msgstr "Skrev inte partitionstabellen till disk"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1817
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1820
 msgid "Please enter `yes' or `no'"
 msgstr "Ange \"ja\" eller \"nej\""
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1824
 msgid "Writing partition table to disk..."
 msgstr "Skriver partitionstabell till disk..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
 msgid "Wrote partition table to disk"
 msgstr "Skrev partitionstabell till disk"
 
-#: fdisk/cfdisk.c:1846
+#: fdisk/cfdisk.c:1851
 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:1856
+#: fdisk/cfdisk.c:1861
 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:1858
+#: fdisk/cfdisk.c:1863
 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:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
 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:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan inte öppna filen \"%s\""
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1941
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Diskenhet: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1943
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1950
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1970
 msgid "   None   "
 msgstr "   Ingen  "
 
 # Primär/Logisk antar jag
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1972
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1974
 msgid "   Primary"
 msgstr "   Primär "
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1976
 msgid "   Logical"
 msgstr "   Logisk "
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Okänd"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2020
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Start (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Okänd (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2024
 #, c-format
 msgid "None (%02X)"
 msgstr "Ingen (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabell för %s\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2061
 msgid "            First    Last\n"
 msgstr "            Första   Sista\n"
 
-#: fdisk/cfdisk.c:2057
+#: fdisk/cfdisk.c:2062
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Typ      Sektor   Sektor   Avstånd  Längd   Filsystemstyp (ID)     "
 "Flaggor\n"
 
-#: fdisk/cfdisk.c:2058
+#: fdisk/cfdisk.c:2063
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1646,467 +1646,466 @@
 # (the one from the line below in the source).
 #
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2146
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         ----Start-----      -----Slut-----   Start-    Antal\n"
 
-#: fdisk/cfdisk.c:2142
+#: 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:2143
+#: fdisk/cfdisk.c:2148
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Raw"
 msgstr "Rått"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Print the table using raw data format"
 msgstr "Visa tabellen i rått dataformat"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
 msgid "Sectors"
 msgstr "Sektorer"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2182
 msgid "Print the table ordered by sectors"
 msgstr "Visa tabellen sorterad efter sektorer"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Table"
 msgstr "Tabell"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Just print the partition table"
 msgstr "Visa bara partitionstabellen"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2184
 msgid "Don't print the table"
 msgstr "Visa inte tabellen"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2212
 msgid "Help Screen for cfdisk"
 msgstr "Hjälpskärm för cfdisk"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2214
 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:2210
+#: fdisk/cfdisk.c:2215
 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:2211
+#: fdisk/cfdisk.c:2216
 msgid "disk drive."
 msgstr "hårddisk."
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2218
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright © 1994-1999 Kevin E. Martin och aeb"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2220
 msgid "Command      Meaning"
 msgstr "Kommando     Betydelse"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2221
 msgid "-------      -------"
 msgstr "--------     ---------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2222
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Slå på/av startbarhetsflaggan på aktuell partition"
 
-#: fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2223
 msgid "  d          Delete the current partition"
 msgstr "  d          Ta bort aktuell partition"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2224
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Ändra parametrarna för cylindrar, huvuden, sektorer-per-spår"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2225
 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:2221
+#: fdisk/cfdisk.c:2226
 msgid "             know what they are doing."
 msgstr "             vet vad de gör."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2227
 msgid "  h          Print this screen"
 msgstr "  h          Visa denna hjälpskärm"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2228
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximera diskanvändandet på aktuell partition"
 
-#: fdisk/cfdisk.c:2224
+#: fdisk/cfdisk.c:2229
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Obs: Detta kan komma att göra partitionen inkompatibel med"
 
-#: fdisk/cfdisk.c:2225
+#: fdisk/cfdisk.c:2230
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2231
 msgid "  n          Create new partition from free space"
 msgstr "  n          Skapa en ny partition från ledigt utrymme"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2232
 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:2228
+#: fdisk/cfdisk.c:2233
 msgid "             There are several different formats for the partition"
 msgstr "             Det finns flera olika format på partitionen"
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2234
 msgid "             that you can choose from:"
 msgstr "             som du kan välja mellan:"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2235
 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:2231
+#: fdisk/cfdisk.c:2236
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabell sorterad efter sektorer"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2237
 msgid "                t - Table in raw format"
 msgstr "                t - Tabell i rått format"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2238
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Avsluta programmet utan att skriva partitionstabellen"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2239
 msgid "  t          Change the filesystem type"
 msgstr "  t          Byt filsystemstypen"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2240
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Byt enheter på visningen av partitionsstorlek"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2241
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Byter mellan MB, sektorer och cylindrar"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2242
 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:2238
+#: fdisk/cfdisk.c:2243
 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:2239
+#: fdisk/cfdisk.c:2244
 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:2240
+#: fdisk/cfdisk.c:2245
 msgid "             `no'"
 msgstr "             eller \"nej\""
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2246
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Uppil        Flytta markören till föregående partition"
 
-#: fdisk/cfdisk.c:2242
+#: fdisk/cfdisk.c:2247
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nerpil       Flytta markören till nästa partition"
 
-#: fdisk/cfdisk.c:2243
+#: fdisk/cfdisk.c:2248
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL+L       Rita om skärmen"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2249
 msgid "  ?          Print this screen"
 msgstr "  ?          Visa denna skärm"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2251
 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:2247
+#: fdisk/cfdisk.c:2252
 msgid "case letters (except for Writes)."
 msgstr "(utom för skrivningar med W)."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
-#: fdisk/fdisksunlabel.c:324
+#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cylindrar"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2282
 msgid "Change cylinder geometry"
 msgstr "Ändra cylindergeometri"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Huvuden"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2283
 msgid "Change head geometry"
 msgstr "Ändra huvudgeometri"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2284
 msgid "Change sector geometry"
 msgstr "Ändra sektorgeometri"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done"
 msgstr "Klar"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done with changing geometry"
 msgstr "Färdig med geometriändring"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2298
 msgid "Enter the number of cylinders: "
 msgstr "Ange antalet cylindrar: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
 msgid "Illegal cylinders value"
 msgstr "Ogiltigt antal cylindrar"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2316
 msgid "Enter the number of heads: "
 msgstr "Ange antalet huvuden: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
 msgid "Illegal heads value"
 msgstr "Ogiltigt antal huvuden"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2329
 msgid "Enter the number of sectors per track: "
 msgstr "Ange antalet sektorer per spår: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
 msgid "Illegal sectors value"
 msgstr "Ogiltigt antal sektorer"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2439
 msgid "Enter filesystem type: "
 msgstr "Ange typen av filsystem: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2457
 msgid "Cannot change FS Type to empty"
 msgstr "Kan inte ändra filsystemstypen till ett tomt värde"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2459
 msgid "Cannot change FS Type to extended"
 msgstr "Kan inte ändra filsystemstypen till utökad"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Start"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2489
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Okänd(%02X)"
 
 # Vad är detta?
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2511
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2587
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Diskenhet: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2593
 #, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "Storlek: %lld byte, %ld MB"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2596
 #, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "Storlek: %lld byte, %ld,%ld GB"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2600
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Huvuden: %d   Sektorer per spår: %d   Cylindrar: %d"
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2604
 msgid "Name"
 msgstr "Namn"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2605
 msgid "Flags"
 msgstr "Flaggor"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2606
 msgid "Part Type"
 msgstr "Part.-typ"
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2607
 msgid "FS Type"
 msgstr "FS-typ"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2608
 msgid "[Label]"
 msgstr "[Etikett]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2610
 msgid "  Sectors"
 msgstr "  Sektorer"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2614
 msgid "Size (MB)"
 msgstr "Storlek (MB)"
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2616
 msgid "Size (GB)"
 msgstr "Storlek (GB)"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Bootable"
 msgstr "Startbar"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Toggle bootable flag of the current partition"
 msgstr "Slå på/av startbarhetsflaggan på aktuell partition"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete"
 msgstr "Ta bort"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete the current partition"
 msgstr "Ta bort aktuell partition"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Change disk geometry (experts only)"
 msgstr "Ändra diskgeometri (endast experter)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Help"
 msgstr "Hjälp"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Print help screen"
 msgstr "Visa hjälpskärm"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize"
 msgstr "Maximera"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximera diskanvändningen för aktuell partition (endast experter)"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "New"
 msgstr "Ny"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "Create new partition from free space"
 msgstr "Skapa ny partition från ledigt utrymme"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print"
 msgstr "Visa"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 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:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit"
 msgstr "Avsluta"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit program without writing partition table"
 msgstr "Avsluta programmet utan att skriva partitionstabellen"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 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:2675
+#: fdisk/cfdisk.c:2680
 msgid "Units"
 msgstr "Enheter"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Byt enheter på visningen av partitionsstorleken (MB, sektorer, cylindrar)"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write"
 msgstr "Skriv"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Skriv partitionstabellen till disk (detta kan förstöra data)"
 
-#: fdisk/cfdisk.c:2722
+#: fdisk/cfdisk.c:2727
 msgid "Cannot make this partition bootable"
 msgstr "Kan inte göra denna partition startbar"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2737
 msgid "Cannot delete an empty partition"
 msgstr "Kan inte ta bort en tom partition"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
 msgid "Cannot maximize this partition"
 msgstr "Kan inte maximera denna partition"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2767
 msgid "This partition is unusable"
 msgstr "Denna partition är oanvändbar"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2769
 msgid "This partition is already in use"
 msgstr "Denna partition används redan"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2786
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan inte ändra typen på en tom partition"
 
-#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
 msgid "No more partitions"
 msgstr "Inge fler partitioner"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2826
 msgid "Illegal command"
 msgstr "Ogiltigt kommando"
 
-#: fdisk/cfdisk.c:2831
-#, fuzzy
+#: fdisk/cfdisk.c:2836
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Copyright © 1994-2000 Kevin E. Martin och 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:2838
+#: fdisk/cfdisk.c:2843
 #, c-format
 msgid ""
 "\n"
@@ -2384,11 +2383,11 @@
 msgid "heads"
 msgstr "huvuden"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "sektorer"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470
+#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cylindrar"
@@ -2513,73 +2512,73 @@
 msgstr "Hexadecimal kod (tryck L för att se koder): "
 
 #: fdisk/fdisk.c:1069
-#, c-format
-msgid "%s (%d-%d, default %d): "
+#, fuzzy, c-format
+msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, standardvärde %d): "
 
-#: fdisk/fdisk.c:1134
-#, c-format
-msgid "Using default value %d\n"
+#: fdisk/fdisk.c:1136
+#, fuzzy, c-format
+msgid "Using default value %u\n"
 msgstr "Använder standardvärdet %d\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1140
 msgid "Value out of range.\n"
 msgstr "Värdet är utanför intervallet.\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1150
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1161
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Varning: partition %d har tom typ\n"
 
-#: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207
+#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Valde partition %d\n"
 
-#: fdisk/fdisk.c:1184
+#: fdisk/fdisk.c:1186
 msgid "No partition is defined yet!\n"
 msgstr "Ingen partition är definierad än!\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1212
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alla primära partitioner har redan definierats!\n"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1231
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Ändrar visnings-/inmatningsenheter till %s\n"
 
-#: fdisk/fdisk.c:1240
+#: fdisk/fdisk.c:1242
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VARNING: Partition %d är en utökad partition\n"
 
-#: fdisk/fdisk.c:1251
+#: fdisk/fdisk.c:1253
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-kompatibilitetsflagga är satt\n"
 
-#: fdisk/fdisk.c:1255
+#: fdisk/fdisk.c:1257
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-kompatibilitetsflagga är inte satt\n"
 
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1357
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d finns inte än!\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1362
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2592,7 +2591,7 @@
 "oklokt. Du kan ta bort en partition\n"
 "genom att använda kommandot \"d\".\n"
 
-#: fdisk/fdisk.c:1361
+#: fdisk/fdisk.c:1371
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2600,7 +2599,7 @@
 "Du kan inte ändra en partition till en utökad partition eller tvärtom\n"
 "Ta bort den först.\n"
 
-#: fdisk/fdisk.c:1370
+#: fdisk/fdisk.c:1380
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2611,7 +2610,7 @@
 "gillar det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1376
+#: fdisk/fdisk.c:1386
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2622,52 +2621,52 @@
 "förväntar sig det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1389
+#: fdisk/fdisk.c:1399
 #, 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:1443
+#: fdisk/fdisk.c:1453
 #, 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:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisk=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1451
+#: fdisk/fdisk.c:1461
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d har olika fysiska/logiska slut:\n"
 
-#: fdisk/fdisk.c:1460
+#: fdisk/fdisk.c:1470
 #, 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:1463
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "borde vara (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1469
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1479
+#, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr "Partition %d slutar inte på en jämn cylindergräns.\n"
+msgstr "Partition %i slutar inte på cylindergräns.\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "borde vara (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1485
+#: fdisk/fdisk.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -2676,7 +2675,7 @@
 "\n"
 "Disk %s: %ld MB, %lld byte\n"
 
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid ""
 "\n"
@@ -2685,17 +2684,17 @@
 "\n"
 "Disk %s: %ld,%ld GB, %lld byte\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d huvuden, %d sektorer/spår, %d cylindrar"
 
-#: fdisk/fdisk.c:1493
+#: fdisk/fdisk.c:1503
 #, c-format
 msgid ", total %lu sectors"
 msgstr ", totalt %lu sektorer"
 
-#: fdisk/fdisk.c:1496
+#: fdisk/fdisk.c:1506
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2704,7 +2703,7 @@
 "Enheter = %s av %d × %d = %d byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1604
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2712,16 +2711,16 @@
 "Ingenting att göra. Ordningen är redan korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1678
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Start   Början      Slut   Block    Id  System\n"
 
-#: fdisk/fdisk.c:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
 msgid "Device"
 msgstr "Enhet"
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1716
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2729,7 +2728,7 @@
 "\n"
 "Posterna i partitionstabellen är inte i diskordning\n"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
@@ -2740,94 +2739,94 @@
 "Disk %s: %d huvuden, %d sektorer, %d cylindrar\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: 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:1762
+#: fdisk/fdisk.c:1772
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varning: partition %d innehåller sektor 0\n"
 
-#: fdisk/fdisk.c:1765
+#: fdisk/fdisk.c:1775
 #, 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:1768
+#: fdisk/fdisk.c:1778
 #, 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:1771
+#: fdisk/fdisk.c:1781
 #, 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:1775
+#: fdisk/fdisk.c:1785
 #, 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:1807
+#: fdisk/fdisk.c:1817
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varning: felaktig databörjan på partition %d\n"
 
-#: fdisk/fdisk.c:1815
+#: fdisk/fdisk.c:1825
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Varning: partition %d överlappar med partition %d.\n"
 
-#: fdisk/fdisk.c:1835
+#: fdisk/fdisk.c:1845
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varning: partition %d är tom\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1850
 #, 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:1846
+#: fdisk/fdisk.c:1856
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "Totala antalet allokerade sektorer %d större än maximala %d\n"
 
-#: fdisk/fdisk.c:1849
+#: fdisk/fdisk.c:1859
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d oallokerade sektorer\n"
 
-#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
+#: fdisk/fdisk.c:1872 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:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
-#: fdisk/fdisksunlabel.c:522
+#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Första %s"
 
-#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
+#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d är redan allokerad\n"
 
-#: fdisk/fdisk.c:1937
+#: fdisk/fdisk.c:1947
 msgid "No free sectors available\n"
 msgstr "Inga lediga sektorer är tillgängliga\n"
 
-#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
+#: fdisk/fdisk.c:1956 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:2011
+#: fdisk/fdisk.c:2021
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2840,16 +2839,16 @@
 "\tVARNING: Detta kommer att förstöra det nuvarande innehållet\n"
 "\tpå disken.\n"
 
-#: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2033 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:2031
+#: fdisk/fdisk.c:2041
 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:2036
+#: fdisk/fdisk.c:2046
 #, c-format
 msgid ""
 "Command action\n"
@@ -2860,20 +2859,20 @@
 "   %s\n"
 "   p   primär partition (1-4)\n"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "l   logical (5 or over)"
 msgstr "l   logisk (5 eller högre)"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "e   extended"
 msgstr "e   utökad"
 
-#: fdisk/fdisk.c:2057
+#: fdisk/fdisk.c:2067
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ogiltigt partitionsnummer för typen \"%c\"\n"
 
-#: fdisk/fdisk.c:2093
+#: fdisk/fdisk.c:2103
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2881,11 +2880,11 @@
 "Partitionstabellen har ändrats!\n"
 "\n"
 
-#: fdisk/fdisk.c:2102
+#: fdisk/fdisk.c:2112
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Anropar ioctl() för att läsa om partitionstabellen.\n"
 
-#: fdisk/fdisk.c:2118
+#: fdisk/fdisk.c:2128
 #, c-format
 msgid ""
 "\n"
@@ -2898,7 +2897,7 @@
 "Kärnan använder fortfarande den gamla tabellen.\n"
 "Den nya tabellen kommer att användas vid nästa omstart.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2138
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2909,64 +2908,64 @@
 "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:2135
+#: fdisk/fdisk.c:2145
 msgid "Syncing disks.\n"
 msgstr "Synkroniserar hårddiskar.\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har inget dataområde\n"
 
-#: fdisk/fdisk.c:2187
+#: fdisk/fdisk.c:2197
 msgid "New beginning of data"
 msgstr "Ny början utav data"
 
-#: fdisk/fdisk.c:2203
+#: fdisk/fdisk.c:2213
 msgid "Expert command (m for help): "
 msgstr "Expertkommando (m för hjälp): "
 
-#: fdisk/fdisk.c:2216
+#: fdisk/fdisk.c:2226
 msgid "Number of cylinders"
 msgstr "Antal cylindrar"
 
-#: fdisk/fdisk.c:2243
+#: fdisk/fdisk.c:2253
 msgid "Number of heads"
 msgstr "Antal huvuden"
 
-#: fdisk/fdisk.c:2268
+#: fdisk/fdisk.c:2278
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2271
+#: fdisk/fdisk.c:2281
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varning: ställer in sektoravstånd för DOS-kompatibilitet\n"
 
-#: fdisk/fdisk.c:2346
+#: fdisk/fdisk.c:2356
 #, 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:2360
+#: fdisk/fdisk.c:2370
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2408
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: okänt kommando\n"
 
-#: fdisk/fdisk.c:2466
+#: fdisk/fdisk.c:2476
 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:2470
+#: fdisk/fdisk.c:2480
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2975,16 +2974,16 @@
 "enhet\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2529
+#: fdisk/fdisk.c:2539
 #, 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:2539
+#: fdisk/fdisk.c:2549
 msgid "Command (m for help): "
 msgstr "Kommando (m för hjälp): "
 
-#: fdisk/fdisk.c:2555
+#: fdisk/fdisk.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -2993,15 +2992,15 @@
 "\n"
 "Aktuell startfil är: %s\n"
 
-#: fdisk/fdisk.c:2557
+#: fdisk/fdisk.c:2567
 msgid "Please enter the name of the new boot file: "
 msgstr "Ange namnet på den nya startfilen: "
 
-#: fdisk/fdisk.c:2559
+#: fdisk/fdisk.c:2569
 msgid "Boot file unchanged\n"
 msgstr "Startfilen oförändrad\n"
 
-#: fdisk/fdisk.c:2624
+#: fdisk/fdisk.c:2642
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3316,80 +3315,80 @@
 "\n"
 "Synkroniserar hårddiskar.\n"
 
-#: fdisk/fdisksgilabel.c:78
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI-volhvd"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
 msgstr "SGI-sprrepl"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
 msgstr "SGI-sekrepl"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
 msgstr "SGI rå"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
 msgstr "SGI-volym"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
 msgstr "SGI rvol"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI xfslog"
 msgstr "SGI xfslog"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:92
 msgid "SGI xlv"
 msgstr "SGI xlv"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:93
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux växling"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
 msgstr "Linux egen"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:95
+#: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:163
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3397,7 +3396,7 @@
 "Enligt MIPS Computer Systems, Inc får etiketten inte innehålla mer än 512 "
 "byte\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Hittade sgi-disketikett med felaktig kontrollsumma.\n"
 
@@ -3453,12 +3452,13 @@
 "Startfil: %s\n"
 "----- Katalogposter -----\n"
 
-#: fdisk/fdisksgilabel.c:250
+#: fdisk/fdisksgilabel.c:248
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor%5u storlek%8u\n"
 
-#: fdisk/fdisksgilabel.c:304
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3470,7 +3470,7 @@
 "\tStartfilen måste vara en absolut icketom sökväg,\n"
 "\tt.ex. \"/unix\" eller \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:311
+#: fdisk/fdisksgilabel.c:308
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3478,7 +3478,7 @@
 "\n"
 "\tNamnet på startfilen är för långt: 16 byte är max.\n"
 
-#: fdisk/fdisksgilabel.c:316
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3486,7 +3486,7 @@
 "\n"
 "\tStartfilen måste ha en fullständig sökväg.\n"
 
-#: fdisk/fdisksgilabel.c:321
+#: fdisk/fdisksgilabel.c:320
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3497,7 +3497,7 @@
 "\tSGI:s standardalternativ är \"/unix\" respektive \"/unix.save\"\n"
 "\tför säkerhetskopior.\n"
 
-#: fdisk/fdisksgilabel.c:349
+#: fdisk/fdisksgilabel.c:346
 #, c-format
 msgid ""
 "\n"
@@ -3506,19 +3506,19 @@
 "\n"
 "\tStartfilen ändrades till \"%s\".\n"
 
-#: fdisk/fdisksgilabel.c:447
+#: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
 msgstr "Det finns fler än en diskpost.\n"
 
-#: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
 msgstr "Inga partitioner är angivna\n"
 
-#: fdisk/fdisksgilabel.c:462
+#: fdisk/fdisksgilabel.c:449
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "IRIX gillar om partition 11 täcker hela hårddisken.\n"
 
-#: fdisk/fdisksgilabel.c:464
+#: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3527,7 +3527,7 @@
 "Hela diskpartitionen måste börja vid block 0,\n"
 "inte vid diskblock %d.\n"
 
-#: fdisk/fdisksgilabel.c:468
+#: fdisk/fdisksgilabel.c:457
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3536,31 +3536,31 @@
 "Hela diskpartitionen är endast %d diskblock stor,\n"
 "men hårddisken är %d diskblock lång.\n"
 
-#: fdisk/fdisksgilabel.c:475
+#: fdisk/fdisksgilabel.c:463
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "En partition (11) måste täcka hela hårddisken.\n"
 
-#: fdisk/fdisksgilabel.c:487
+#: fdisk/fdisksgilabel.c:473
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "Partition %d börjar inte på en jämn cylindergräns.\n"
 
-#: fdisk/fdisksgilabel.c:494
+#: fdisk/fdisksgilabel.c:479
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "Partition %d slutar inte på en jämn cylindergräns.\n"
 
-#: fdisk/fdisksgilabel.c:502
+#: fdisk/fdisksgilabel.c:486
 #, c-format
 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:511 fdisk/fdisksgilabel.c:531
-#, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, fuzzy, c-format
+msgid "Unused gap of %8u sectors - sectors %8u-%u\n"
 msgstr "Oanvänt mellanrum på %8d sektorer - sektorerna %8d-%d\n"
 
-#: fdisk/fdisksgilabel.c:544
+#: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
@@ -3568,7 +3568,7 @@
 "\n"
 "Startpartitionen finns inte.\n"
 
-#: fdisk/fdisksgilabel.c:548
+#: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
@@ -3576,7 +3576,7 @@
 "\n"
 "Växlingspartitionen finns inte.\n"
 
-#: fdisk/fdisksgilabel.c:553
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
@@ -3584,15 +3584,16 @@
 "\n"
 "Växlingspartitionen har ingen växlingstyp.\n"
 
-#: fdisk/fdisksgilabel.c:557
+#: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tDu har valt ett ovanligt namn på startfilen.\n"
 
-#: fdisk/fdisksgilabel.c:568
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr "Tyvärr, du kan ändra taggen på icke-tomma partitioner.\n"
 
-#: fdisk/fdisksgilabel.c:575
+#: 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"
@@ -3607,29 +3608,29 @@
 "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:580 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
 msgid "YES\n"
 msgstr "JA\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:606
+#: fdisk/fdisksgilabel.c:577
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "Vet du om att partitioner överlappar varandra på hårddisken?\n"
 
-#: fdisk/fdisksgilabel.c:668
+#: fdisk/fdisksgilabel.c:637
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "Försöker att generera fullständig diskpost automatiskt.\n"
 
-#: fdisk/fdisksgilabel.c:675
+#: fdisk/fdisksgilabel.c:642
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "Hela disken är redan täckt med partitioner.\n"
 
-#: fdisk/fdisksgilabel.c:680
+#: fdisk/fdisksgilabel.c:646
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Du har partitioner som överlappar varandra på disken. Fixa det först!\n"
 
-#: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
+#: 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"
@@ -3637,17 +3638,17 @@
 "Det rekommenderas varmt att den elfte partitionen\n"
 "täcker hela hårddisken och är av typen \"SGI-volym\"\n"
 
-#: fdisk/fdisksgilabel.c:705
+#: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Du kommer att få överlappande partitioner på hårddisken. Fixa det först!\n"
 
-#: fdisk/fdisksgilabel.c:710
+#: fdisk/fdisksgilabel.c:676
 #, c-format
 msgid " Last %s"
 msgstr " sista %s"
 
-#: fdisk/fdisksgilabel.c:732
+#: 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"
@@ -3659,12 +3660,20 @@
 "naturligtvis det tidigare innehållet att vara spårlöst borta.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:758
+#: 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 ""
+
+#: fdisk/fdisksgilabel.c:738
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Försöker att behålla parametrarna för partition %d.\n"
 
-#: fdisk/fdisksgilabel.c:760
+#: fdisk/fdisksgilabel.c:740
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tBÖRJAN=%d\tLÄNGD=%d\n"
@@ -3754,63 +3763,63 @@
 msgid "Autoconfigure failed.\n"
 msgstr "Automatisk konfiguration misslyckades.\n"
 
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Sektorer/spår"
 
-#: fdisk/fdisksunlabel.c:327
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Alternativa cylindrar"
 
-#: fdisk/fdisksunlabel.c:330
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Fysiska cylindrar"
 
-#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
 msgid "Rotation speed (rpm)"
 msgstr "Rotationshastighet (varv per minut)"
 
-#: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
 msgid "Interleave factor"
 msgstr "Mellanrumsfaktor"
 
-#: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektorer per cylinder"
 
-#: fdisk/fdisksunlabel.c:352
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "Du kan ändra alla diskaparametrar från x-menyn"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "3,5-tumsdiskett"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "Linux anpassad"
 
-#: fdisk/fdisksunlabel.c:446
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partition %d slutar inte på jämn cylindergräns\n"
 
-#: fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:462
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partition %d överlappar med andra på sektorerna %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:488
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Oanvänt mellanrum - sektorerna 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Oanvänt mellanrum - sektorerna %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3818,7 +3827,7 @@
 "Andra partitioner täcker redan hela hårddisken.\n"
 "Ta bort/krymp dem innan du försöker igen.\n"
 
-#: fdisk/fdisksunlabel.c:593
+#: fdisk/fdisksunlabel.c:589
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3828,7 +3837,7 @@
 "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:613
+#: fdisk/fdisksunlabel.c:609
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3837,7 +3846,7 @@
 "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:626
+#: fdisk/fdisksunlabel.c:622
 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 +3861,7 @@
 "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:657
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid ""
 "\n"
@@ -3872,7 +3881,7 @@
 "Enheter = %s av %d × 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:671
+#: fdisk/fdisksunlabel.c:667
 #, c-format
 msgid ""
 "\n"
@@ -3885,16 +3894,16 @@
 "Enheter = %s av %d × 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:676
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flagga  Början      Slut   Block    Id  System\n"
 
-#: fdisk/fdisksunlabel.c:701
+#: fdisk/fdisksunlabel.c:697
 msgid "Number of alternate cylinders"
 msgstr "Antal alternerande cylindrar"
 
-#: fdisk/fdisksunlabel.c:734
+#: fdisk/fdisksunlabel.c:730
 msgid "Number of physical cylinders"
 msgstr "Antal fysiska cylindrar"
 
@@ -4469,7 +4478,7 @@
 
 #: fdisk/sfdisk.c:870
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
-msgstr "   Enhet  Start Början   Slut  Cyl.     Block     Id  System\n"
+msgstr "   Enhet Start Början   Slut     Cyl.     Block   Id  System\n"
 
 #: fdisk/sfdisk.c:875
 #, c-format
@@ -4482,7 +4491,7 @@
 
 #: fdisk/sfdisk.c:877
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
-msgstr "   Enhet  Start   Början      Slut  Sektorer  Id  System\n"
+msgstr "   Enhet Start   Början      Slut   Sektorer  Id  System\n"
 
 #: fdisk/sfdisk.c:880
 #, c-format
@@ -4495,20 +4504,20 @@
 
 #: fdisk/sfdisk.c:882
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
-msgstr "   Enhet  Start  Början      Slut   Block     Id  System\n"
+msgstr "   Enhet Start  Början      Slut      Block   Id  System\n"
 
 #: 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 ""
-"Enheter = megabyte med 1048576 byte, block med 1024 byte, räknat från %d\n"
+"Enheter = mebibyte med 1048576 byte, block med 1024 byte, räknat från %d\n"
 "\n"
 
 #: fdisk/sfdisk.c:887
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
-msgstr "   Enhet  Start Början Slut    MB    Block     Id  System\n"
+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
 #, c-format
@@ -4647,6 +4656,10 @@
 "LILO bryr sig inte om detta, men DOS huvudstartpost (MBR) kommer inte att\n"
 "kunna starta denna disk.\n"
 
+#: fdisk/sfdisk.c:1272
+msgid "start"
+msgstr "början"
+
 #: fdisk/sfdisk.c:1275
 #, c-format
 msgid ""
@@ -4655,6 +4668,10 @@
 "partition %s: början: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) "
 "hittades\n"
 
+#: fdisk/sfdisk.c:1281
+msgid "end"
+msgstr "slut"
+
 #: fdisk/sfdisk.c:1284
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4718,99 +4735,99 @@
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Flaggan -n angavs: Inget ändrades\n"
 
-#: fdisk/sfdisk.c:1577
+#: fdisk/sfdisk.c:1579
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Misslyckades med att spara de gamla sektorerna - avbryter\n"
 
-#: fdisk/sfdisk.c:1582
+#: fdisk/sfdisk.c:1584
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Misslyckades med att skriva partitionen på %s\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1661
 msgid "long or incomplete input line - quitting\n"
 msgstr "lång eller ofullständig indatarad - avslutar\n"
 
-#: fdisk/sfdisk.c:1695
+#: fdisk/sfdisk.c:1697
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "indatafel: \"=\" förväntas efter %s-fält\n"
 
-#: fdisk/sfdisk.c:1702
+#: fdisk/sfdisk.c:1704
 #, 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:1708
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "okänd indata: %s\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
 msgstr "talet är för stort\n"
 
-#: fdisk/sfdisk.c:1754
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
 msgstr "eftersläpande skräp efter tal\n"
 
-#: fdisk/sfdisk.c:1875
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
 msgstr "ingen plats för partitionshandtag\n"
 
-#: fdisk/sfdisk.c:1908
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan inte bygga omgivande utökad partition\n"
 
-#: fdisk/sfdisk.c:1959
+#: fdisk/sfdisk.c:1961
 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:1993
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
 msgstr "Inte plats för mer\n"
 
-#: fdisk/sfdisk.c:2012
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
 msgstr "Ogiltig typ\n"
 
-#: fdisk/sfdisk.c:2044
+#: fdisk/sfdisk.c:2046
 #, 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:2050
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
 msgstr "Varning: tom partition\n"
 
-#: fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2066
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varning: felaktig början på partition (första %lu)\n"
 
-#: fdisk/sfdisk.c:2077
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "okänd startbarhetsflagga - välj - eller *\n"
 
-#: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s-specifikation ofullständig?\n"
 
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
 msgstr "Utökad partition finns inte där den förväntades\n"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
 msgstr "felaktig indata\n"
 
-#: fdisk/sfdisk.c:2172
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
 msgstr "för många partitioner\n"
 
-#: fdisk/sfdisk.c:2205
+#: 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"
@@ -4820,46 +4837,46 @@
 "<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:2225
+#: fdisk/sfdisk.c:2227
 msgid "version"
 msgstr "version"
 
-#: fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "enhet: någonting liknande /dev/hda eller /dev/sda"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
 msgstr "användbara flaggor:"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2236
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [eller --show-size]: visa storlek på en partition"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2237
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [eller --id]:     visa eller ändra partitionsid"
 
-#: fdisk/sfdisk.c:2236
+#: fdisk/sfdisk.c:2238
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [eller --list]:   visa partitioner på varje enhet"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2239
 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:2238
+#: fdisk/sfdisk.c:2240
 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:2239
+#: fdisk/sfdisk.c:2241
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4867,55 +4884,55 @@
 "    -uS, -uB, -uC, -uM:  acceptera/rapportera i enheter om sektorer/block/"
 "cylindrar/MB"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2242
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [eller --list-types]:visa de kända partitionstyperna"
 
-#: fdisk/sfdisk.c:2241
+#: fdisk/sfdisk.c:2243
 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:2242
+#: fdisk/sfdisk.c:2244
 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:2243
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N<nummer>:          ändra endast partitionen med numret <nummer>"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 skriv inte till hårddisken"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2247
 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:2246
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fil :             återställ dessa sektorer igen"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [eller --version]: visa versionsinformation"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [eller --help]:   visa detta meddelande"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
 msgstr "farliga flaggor:"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2252
 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:2251
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4923,117 +4940,117 @@
 "    -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:2253
+#: fdisk/sfdisk.c:2255
 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:2254
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [eller --quiet]:   undertryck varningsmeddelanden"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
 msgstr "    Du kan åsidosätta den detekterade geometrin genom att använda:"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2258
 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:2257
+#: fdisk/sfdisk.c:2259
 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:2258
+#: fdisk/sfdisk.c:2260
 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:2259
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
 msgstr "Du kan stänga av all konsekvenskontroll med:"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2262
 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:2266
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
 msgstr "Användning:"
 
-#: fdisk/sfdisk.c:2267
+#: fdisk/sfdisk.c:2269
 #, 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:2268
+#: fdisk/sfdisk.c:2270
 #, 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:2269
+#: fdisk/sfdisk.c:2271
 #, 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:2421
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
 msgstr "inget kommando?\n"
 
-#: fdisk/sfdisk.c:2539
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "totalt: %d block\n"
 
-#: fdisk/sfdisk.c:2576
+#: fdisk/sfdisk.c:2578
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "användning: sfdisk --print-id enhet partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2578
+#: fdisk/sfdisk.c:2580
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "användning: sfdisk --change-id enhet partitionsnummer Id\n"
 
-#: fdisk/sfdisk.c:2580
+#: fdisk/sfdisk.c:2582
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "användning: sfdisk --id enhet partitionsnummer [Id]\n"
 
-#: fdisk/sfdisk.c:2587
+#: fdisk/sfdisk.c:2589
 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:2613
+#: fdisk/sfdisk.c:2615
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan inte öppna %s för läsning och skrivning\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2617
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan inte öppna %s för läsning\n"
 
-#: fdisk/sfdisk.c:2640
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2657
+#: fdisk/sfdisk.c:2659
 #, 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:2674
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE-ioctl misslyckades för %s\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2754
 #, 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:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
@@ -5041,7 +5058,7 @@
 "Färdig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2777
+#: fdisk/sfdisk.c:2781
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5051,35 +5068,35 @@
 "DOS huvudstartpost (MBR) kan endast starta en hårddisk med 1 aktiv\n"
 "partition.\n"
 
-#: fdisk/sfdisk.c:2791
+#: fdisk/sfdisk.c:2795
 #, 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:2848
+#: fdisk/sfdisk.c:2852
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Felaktigt Id %lx\n"
 
-#: fdisk/sfdisk.c:2863
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
 msgstr "Denna hårddisk används för tillfället.\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ödesdigert fel: kan inte hitta %s\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2887
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varning: %s är ingen blockenhet\n"
 
-#: fdisk/sfdisk.c:2889
+#: fdisk/sfdisk.c:2893
 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:2891
+#: fdisk/sfdisk.c:2895
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5092,28 +5109,28 @@
 "på denna disk är utväxlade. Använd flaggan --no-reread för att\n"
 "undertrycka denna kontroll.\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2899
 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:2899
+#: fdisk/sfdisk.c:2903
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2908
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
 msgstr "Tidigare situation:\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2916
 #, 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:2920
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
 msgstr "Ny situation:\n"
 
-#: fdisk/sfdisk.c:2925
+#: fdisk/sfdisk.c:2929
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5121,19 +5138,19 @@
 "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:2928
+#: fdisk/sfdisk.c:2932
 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:2933
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Är du nöjd med detta? [ynq] "
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Vill du skriva detta till disk? [ynq] "
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5141,15 +5158,15 @@
 "\n"
 "sfdisk: för tidigt slut på indata\n"
 
-#: fdisk/sfdisk.c:2942
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
 msgstr "Avslutar - ingenting ändrades\n"
 
-#: fdisk/sfdisk.c:2948
+#: fdisk/sfdisk.c:2952
 msgid "Please answer one of y,n,q\n"
 msgstr "Svara med ett av y, n eller q\n"
 
-#: fdisk/sfdisk.c:2956
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5157,7 +5174,7 @@
 "Lyckades skapa den nya partitionstabellen\n"
 "\n"
 
-#: fdisk/sfdisk.c:2962
+#: 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"
@@ -5168,91 +5185,91 @@
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Se fdisk(8)).\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Försök med \"getopt --help\" för mer information.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "tom lång flagga efter argumenten -l eller --long"
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "okänt skal efter argumenten -s eller --shell"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Användning: getopt flaggsträng parametrar\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [flaggor] [--] flaggsträng parametrar\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [flaggor] -o|--options flaggsträng [flaggor] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "              parametrar\n"
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Tillåt långa flaggor som börjar med ensamt -\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Denna enkla användningsguide\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=långflg    Långa flaggor att känna igen\n"
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr "  -n, --name=programnamn       Det namn under vilket fel rapporteras\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=flaggsträng    Korta flaggor att känna igen\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr "  -q, --quiet                  Stäng av felrapportering av getopt(3)\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Ingen normal utdata\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
 "  -s, --shell=skal             Ställ in konventioner för skalcitering\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Undersök getopt(1)-version\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -u, --unquote                Citera inte utdata\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Skriv ut versionsinformation\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr "flaggsträngsargument saknas"
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
-msgstr "getopt (utökad) 1.1.2\n"
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (utökad) 1.1.3\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "internt fel, kontakta författaren."
 
@@ -5763,7 +5780,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK-ioctl för att läsa tid misslyckades"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr "Gjorde time-out under väntan på att tiden skulle ändras.\n"
 
@@ -5788,57 +5805,57 @@
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK-ioctl misslyckades"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "open() på %s misslyckades"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, 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:171
+#: hwclock/rtc.c:170
 #, 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:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s har inga avbrottsfunktioner. "
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, 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:244
+#: hwclock/rtc.c:243
 #, 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:247
+#: hwclock/rtc.c:246
 #, 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:306
+#: hwclock/rtc.c:305
 #, 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:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) lyckades.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "Öppning av %s misslyckades"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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' "
@@ -5848,17 +5865,17 @@
 "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:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr "Kan inte öppna %s"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr "ioctl(RTC_EPOCH_READ) på %s misslyckades"
 
-#: hwclock/rtc.c:377
+#: hwclock/rtc.c:376
 #, 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"
@@ -5866,23 +5883,23 @@
 #. 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:397
+#: hwclock/rtc.c:396
 #, 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:415
+#: hwclock/rtc.c:414
 #, 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:420
+#: hwclock/rtc.c:419
 #, 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:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) på %s misslyckades"
@@ -6083,9 +6100,8 @@
 msgid "Password error."
 msgstr "Lösenordsfel."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249
-#: mount/lomount.c:254
+#: 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
 msgid "Password: "
 msgstr "Lösenord: "
 
@@ -6304,29 +6320,29 @@
 "\n"
 "avbruten %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "ÖDESDIGERT: kan inte återöppna tty: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
 msgstr "ÖDESDIGERT: felaktig tty"
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h endast för superanvändaren.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "användning: login [-fp] [användarnamn]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM-fel, avbryter: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Kunde inte initiera PAM: %s"
@@ -6337,16 +6353,16 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "användarnamn: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "MISSLYCKAD INLOGGNING %d FRÅN %s FÖR %s, %s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -6354,17 +6370,17 @@
 "Felaktig inloggning\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "FÖR MÅNGA INLOGGNINGSFÖRSÖK (%d) FRÅN %s FÖR %s, %s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "MISSLYCKAD INLOGGNINGSSESSION FRÅN %s FÖR %s, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -6372,7 +6388,7 @@
 "\n"
 "Felaktig inloggning\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
@@ -6380,45 +6396,45 @@
 "\n"
 "Problem med upprättandet av sessionen, avbryter.\n"
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Användarnamnet är NULL i %s:%d. Avbryter."
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Ogiltigt användarnamn \"%s\" i %s:%d. Avbryter."
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
 msgstr "login: Slut på minne\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Ogiltigt användarnamn"
 
 # %s blir här "root" i de flesta fall vad jag förstår
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s-inloggning nekas på denna terminal.\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "INLOGGNING AV %s NEKAS FRÅN %s PÅ TTY %s"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "INLOGGNING AV %s NEKAS PÅ TTY %s"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Felaktig inloggning\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -6426,82 +6442,82 @@
 "För många användare är redan inloggade.\n"
 "Försök igen senare.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 msgid "You have too many processes running.\n"
 msgstr "Du har för många processer körande.\n"
 
-#: login-utils/login.c:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "UPPRINGNING PÅ %s AV %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT-INLOGGNING PÅ %s FRÅN %s"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT-INLOGGNING PÅ %s"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "INLOGGNING PÅ %s AV %s FRÅN %s"
 
-#: login-utils/login.c:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "INLOGGNING PÅ %s AV %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
 msgstr "Du har ny post.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
 msgstr "Du har post.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: grenande misslyckades: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY misslyckades: %m"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr "setuid() misslyckades"
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Katalogen %s finns inte!\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr "Loggar in med hemkatalog = \"/\".\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
 msgstr "login: inget minne för skalskript.\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kunde inte köra skalskript: %s.\n"
 
-#: login-utils/login.c:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: inget skal: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6510,62 +6526,62 @@
 "\n"
 "%s användarnamn: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "användarnamnet är alldeles för långt.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "NAMNET är för långt"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
 msgstr "användarnamn får inte börja med \"-\".\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "för många tomma nyrader.\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "FÖR MÅNGA nyrader"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Inloggning gjorde time-out efter %d sekunder\n"
 
-#: login-utils/login.c:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Senaste inloggning: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "från %.*s\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "på %.*s\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "MISSLYCKAD INLOGGNING FRÅN %s, %s"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "MISSLYCKAD INLOGGNING PÅ %s, %s"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR FRÅN %s, %s"
 
-#: login-utils/login.c:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR PÅ %s, %s"
@@ -6894,7 +6910,7 @@
 
 #: login-utils/simpleinit.c:210
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr ""
+msgstr "fel vid inställning av close-on-exec på /dev/initctl"
 
 #: login-utils/simpleinit.c:257
 msgid "error running finalprog\n"
@@ -6929,7 +6945,7 @@
 msgid "fork failed\n"
 msgstr "grening misslyckades\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
 msgstr "körning misslyckades\n"
 
@@ -7240,12 +7256,12 @@
 msgid "Script started, file is %s\n"
 msgstr "Skriptet startades, filen är %s\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr "Skriptet startades %s"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
@@ -7254,210 +7270,210 @@
 "\n"
 "Skriptet färdigt %s"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skriptet färdigt, filen är %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr "openpty misslyckades\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr "Slut på pty:er\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:744
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Argumentfel, användning\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminalnamn ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -tabs [ tabb1 tabb2 tabb3 ... ] ]      (tabbnummer = 1-160)\n"
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:783
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tabb1 tabb2 tabb3 ... ] ]   (tabbnummer = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-ANTAL_KONSOLLER] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumpfilnamn ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq frekvensnummer ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr "kan inte ställa in/återställa strömsparläget\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl-fel: %s\n"
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fel vid läsning av %s\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr "Fel vid skrivning av skärmdump\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "kunde inte läsa %s, och kan inte dumpa ioctl\n"
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM är inte angiven.\n"
@@ -7513,17 +7529,17 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Meddelande från %s@%s på %s klockan %s ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "varning: fel vid läsning av %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 "varning: kan inte öppna %s: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: kunde inte öppna %s - använder %s istället\n"
@@ -7532,36 +7548,36 @@
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:415
 #, 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:399
+#: mount/fstab.c:427
 #, 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:411
+#: mount/fstab.c:439
 #, 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:426
+#: mount/fstab.c:454
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Kan inte låsa låsfilen %s: %s\n"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:467
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "kan inte låsa låsfilen %s: %s"
 
-#: mount/fstab.c:441
+#: mount/fstab.c:469
 msgid "timed out"
 msgstr "gjorde time-out"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:476
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7570,46 +7586,46 @@
 "Kan inte skapa länken %s\n"
 "Det finns kanske en kvarglömd låsfil?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:525 mount/fstab.c:561
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "kan inte öppna %s (%s) - mtab uppdaterades inte"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:569
 #, c-format
 msgid "error writing %s: %s"
 msgstr "fel vid skrivning av %s: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:577
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "fel vid byte av rättigheter på %s: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:595
 #, 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:80
+#: mount/lomount.c:173
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kan inte öppna enheten %s: %s\n"
 
-#: mount/lomount.c:86
+#: mount/lomount.c:179
 #, 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:91
-#, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#: 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:177
+#: 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:181
+#: mount/lomount.c:249
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -7617,7 +7633,7 @@
 "mount: Kunde inte hitta någon slingenhet.\n"
 "       Kanske /dev/loop# har ett felaktigt huvudnummer?"
 
-#: mount/lomount.c:185
+#: mount/lomount.c:253
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -7628,7 +7644,7 @@
 "       vet denna kärna inte om slingenheten.\n"
 "       (Om det är så bör du kompilera om eller \"insmod loop.o\")."
 
-#: mount/lomount.c:191
+#: 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"
@@ -7638,244 +7654,290 @@
 "       om slingenheten (om det är så bör du kompilera om eller\n"
 "       \"insmod loop.o\"), eller kanske /dev/loop# har fel huvudnummer?"
 
-#: mount/lomount.c:195
+#: mount/lomount.c:263
 msgid "mount: could not find any free loop device"
 msgstr "mount: kunde inte hitta någon ledig slingenhet"
 
-#: mount/lomount.c:225
-#, c-format
-msgid "Unsupported encryption type %s\n"
-msgstr "Krypteringstypen %s stöds inte\n"
+#: 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:239
+#: 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
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kunde inte låsa i minne, avslutar.\n"
 
-#: mount/lomount.c:258
+#: mount/lomount.c:654
 msgid "Init (up to 16 hex digits): "
 msgstr "Init (upp till 16 hexadecimala siffror): "
 
-#: mount/lomount.c:265
+#: mount/lomount.c:661
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Icke-hexadecimal siffra \"%c\".\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:764
 #, 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"
 
-#: mount/lomount.c:288
+#: 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:299
-#, c-format
-msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: kan inte ta bort enheten %s: %s\n"
-
-#: mount/lomount.c:309
-#, c-format
-msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s): lyckades\n"
-
-#: mount/lomount.c:317
-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:354
+#: mount/lomount.c:831
 #, 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"
+"  %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 ""
-"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:372 mount/sundries.c:30 mount/sundries.c:45
-#: mount/sundries.c:244
+#: 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:443
-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/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/mntent.c:165
+#: 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/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: varning: ingen avslutande nyrad på slutet av %s\n"
 
-#: mount/mntent.c:216
+#: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: rad %d i %s är felaktig%s\n"
 
-#: mount/mntent.c:219
+#: mount/mntent.c:222
 msgid "; rest of file ignored"
 msgstr "; resten av filen ignoreras"
 
-#: mount/mount.c:385
+#: mount/mount.c:396
 #, 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:389
+#: mount/mount.c:400
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: enligt mtab är %s monterat på %s"
 
-#: mount/mount.c:410
+#: mount/mount.c:421
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kan inte öppna %s för skrivning: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:436 mount/mount.c:660
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fel vid skrivning av %s: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:443
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: fel vid byte av rättigheter på %s: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:494
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ser ut som växlingsutrymme - monteras inte"
 
-#: mount/mount.c:538
+#: mount/mount.c:554
 msgid "mount failed"
 msgstr "montering misslyckades"
 
-#: mount/mount.c:540
+#: mount/mount.c:556
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: endast root kan montera %s på %s"
 
-#: mount/mount.c:568
+#: mount/mount.c:584
 msgid "mount: loop device specified twice"
 msgstr "mount: slingenheten angiven två gånger"
 
-#: mount/mount.c:573
+#: mount/mount.c:589
 msgid "mount: type specified twice"
 msgstr "mount: typen angiven två gånger"
 
-#: mount/mount.c:585
+#: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: hoppar över konfigurationen av en slingenhet\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: kommer att använda slingenheten %s\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:614
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: misslyckades konfigurera slingenheten\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:618
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: lyckades konfigurera slingenheten\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:655
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kan inte öppna %s: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:678
 #, 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:665
+#: mount/mount.c:681
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kan inte ställa in hastighet: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:735 mount/mount.c:1309
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kan inte grena: %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:815
 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:845
+#: mount/mount.c:854
 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:856
+#: mount/mount.c:865
 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:859
+#: mount/mount.c:868
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: du måste ange filsystemstypen"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:871
 msgid "mount: mount failed"
 msgstr "mount: montering misslyckades"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:877 mount/mount.c:912
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: monteringspunkten %s är inte en katalog"
 
-#: mount/mount.c:870
+#: mount/mount.c:879
 msgid "mount: permission denied"
 msgstr "mount: åtkomst nekas"
 
-#: mount/mount.c:872
+#: mount/mount.c:881
 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:876 mount/mount.c:880
+#: mount/mount.c:885 mount/mount.c:889
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s är upptagen"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:891
 msgid "mount: proc already mounted"
 msgstr "mount: proc är redan monterad"
 
-#: mount/mount.c:884
+#: mount/mount.c:893
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s är redan monterad eller %s är upptagen"
 
-#: mount/mount.c:890
+#: mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: monteringspunkten %s finns inte"
 
-#: mount/mount.c:892
+#: mount/mount.c:901
 #, 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:895
+#: mount/mount.c:904
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: specialenheten %s finns inte"
 
-#: mount/mount.c:905
+#: mount/mount.c:914
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7884,12 +7946,12 @@
 "mount: specialenheten %s finns inte\n"
 "       (ett sökvägsprefix är inte en katalog)\n"
 
-#: mount/mount.c:918
+#: mount/mount.c:927
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s är inte redan monterad, eller felaktig flagga"
 
-#: mount/mount.c:920
+#: mount/mount.c:929
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7898,46 +7960,46 @@
 "mount: fel filsystemstyp, felaktig flagga, felaktigt superblock\n"
 "       på %s, eller för många monterade filsystem"
 
-#: mount/mount.c:954
+#: mount/mount.c:963
 msgid "mount table full"
 msgstr "monteringstabellen full"
 
-#: mount/mount.c:956
+#: mount/mount.c:965
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kan inte läsa superblock"
 
-#: mount/mount.c:960
+#: mount/mount.c:969
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: okänd enhet"
 
-#: mount/mount.c:965
+#: mount/mount.c:974
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: filsystemstypen %s stöds inte av kärnan"
 
-#: mount/mount.c:977
+#: mount/mount.c:986
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: du menade troligtvis %s"
 
-#: mount/mount.c:979
+#: mount/mount.c:988
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: du menade kanske iso9660?"
 
-#: mount/mount.c:982
+#: mount/mount.c:991
 #, 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:988
+#: mount/mount.c:997
 #, 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:990
+#: mount/mount.c:999
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7946,98 +8008,99 @@
 "mount: kärnan känner inte igen %s som en blockenhet\n"
 "       (kanske \"insmod drivrutin\"?)"
 
-#: mount/mount.c:993
+#: mount/mount.c:1002
 #, 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:996
+#: mount/mount.c:1005
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s är ingen blockenhet"
 
-#: mount/mount.c:999
+#: mount/mount.c:1008
 #, 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:1002
+#: mount/mount.c:1011
 msgid "block device "
 msgstr "blockenhet "
 
-#: mount/mount.c:1004
+#: mount/mount.c:1013
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kan inte montera %s%s som endast läsbar"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1017
 #, 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:1024
+#: mount/mount.c:1033
 #, 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:1111
+#: 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:1115
+#: mount/mount.c:1124
 #, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr "mount: %s dubblerad - inte monterad"
 
-#: mount/mount.c:1125
+#: 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:1126
+#: mount/mount.c:1135
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "label"
 msgstr "etikett"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: mount/mount.c:1137 mount/mount.c:1587
 msgid "mount: no such partition found"
 msgstr "mount: ingen sådan partition hittades"
 
-#: mount/mount.c:1136
+#: mount/mount.c:1145
 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:1141
-msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+#: mount/mount.c:1150
+msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
 msgstr ""
-"mount: ingen typ angavs - jag kommer att anta smb på grund //-prefixet\n"
+"mount: ingen typ angavs - jag kommer att anta smbfs på grund //-prefixet\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1166
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: förlägger \"%s\" till bakgrunden\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1177
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: ger upp \"%s\"\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1254
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s är redan monterad på %s\n"
 
-#: mount/mount.c:1376
+#: mount/mount.c:1386
+#, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -8058,7 +8121,7 @@
 "       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 fd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 "Användning: mount -V                  : visa version\n"
@@ -8083,40 +8146,40 @@
 "genom att använda  -U uuid . Andra flaggor: [-nfFrsvw] [-o flaggor].\n"
 "Säg  man 8 mount  för många fler detaljer.\n"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1563
 msgid "mount: only root can do that"
 msgstr "mount: endast root kan göra det"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1568
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ingen %s hittades - skapar den...\n"
 
-#: mount/mount.c:1568
+#: 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:1575
+#: mount/mount.c:1589
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: monterar %s\n"
 
-#: mount/mount.c:1584
+#: mount/mount.c:1598
 msgid "nothing was mounted"
 msgstr "ingenting monterades"
 
-#: mount/mount.c:1599
+#: mount/mount.c:1613
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: kan inte hitta %s i %s"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1628
 #, 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:259
+#: mount/mount_by_label.c:189
 #, c-format
 msgid ""
 "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -8124,34 +8187,34 @@
 "mount: kunde inte öppna %s, så UUID och ETIKETT-konvertering kan inte "
 "utföras.\n"
 
-#: mount/mount_by_label.c:378
+#: mount/mount_by_label.c:309
 msgid "mount: bad UUID"
 msgstr "mount: felaktig UUID"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:483
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: fel vid gissning av filsystemstypen\n"
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:492
 #, 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:496
+#: mount/mount_guess_fstype.c:495
 #, 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:499
+#: mount/mount_guess_fstype.c:498
 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:501
+#: mount/mount_guess_fstype.c:500
 #, 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:589
+#: mount/mount_guess_fstype.c:588
 #, c-format
 msgid "Trying %s\n"
 msgstr "Försöker med %s\n"
@@ -8245,7 +8308,7 @@
 msgid "bug in xstrndup call"
 msgstr "programfel i xstrndup-anrop"
 
-#: mount/swapon.c:64
+#: mount/swapon.c:74
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8258,7 +8321,7 @@
 "            %s [-v] [-p prioritet] special ...\n"
 "            %s [-s]\n"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:84
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8269,31 +8332,98 @@
 "            %s -a [-v]\n"
 "            %s [-v] special ...\n"
 
-#: mount/swapon.c:178 mount/swapon.c:242
+#: 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
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s på %s\n"
 
-#: mount/swapon.c:182
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: kan inte ta status på %s: %s\n"
 
-#: mount/swapon.c:193
+#: mount/swapon.c:216
 #, 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:205
+#: mount/swapon.c:228
 #, 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:248
+#: mount/swapon.c:271
 msgid "Not superuser.\n"
 msgstr "Inte superanvändare.\n"
 
-#: mount/swapon.c:312 mount/swapon.c:401
+#: 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
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: kan inte öppna %s: %s\n"
@@ -8421,17 +8551,17 @@
 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:564
+#: mount/umount.c:566
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montering av %s stämmer inte överens med fstab"
 
-#: mount/umount.c:598
+#: mount/umount.c:602
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: endast root kan avmontera %s från %s"
 
-#: mount/umount.c:669
+#: mount/umount.c:671
 msgid "umount: only root can do that"
 msgstr "umount: endast root kan göra det"
 
@@ -8572,7 +8702,7 @@
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f avbrott/sek; %f mott. (tecken/s)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Användning: %s [-c] [-n nivå] [-s buffertstorlek]\n"
@@ -9113,9 +9243,9 @@
 msgstr "rättighet=%#o\tåtkomsträttigheter=%#o\n"
 
 #: sys-utils/ipcs.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr "byte=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "byte=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:615
 #, c-format
@@ -9274,12 +9404,13 @@
 msgid "missing comma"
 msgstr "komma saknas"
 
-#: sys-utils/readprofile.c:60
+#: 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"
@@ -9290,8 +9421,9 @@
 "\t -V            print version and exit\n"
 msgstr ""
 "%s: Användning: \"%s [flaggor]\n"
-"\t -m <tabellfil>  (standard = \"%s\")\n"
-"\t -p <pro-fil>    (standard = \"%s\")\n"
+"\t -m <tabellfil>  (standardalternativ: \"%s\" och\n"
+"\t\t\t\t  \"%s\")\n"
+"\t -p <pro-fil>    (standardalternativ: \"%s\")\n"
 "\t -M <mult>       ställ in profileringsmultiplikatorn till <mult>\n"
 "\t -i              visa endast information om samplingssteget\n"
 "\t -v              visa utförlig data\n"
@@ -9301,36 +9433,32 @@
 "\t -n              deaktivera automatisk detektering av byteordning\n"
 "\t -V              visa versionsinformation och avsluta\n"
 
-#: sys-utils/readprofile.c:84
-msgid "out of memory"
-msgstr "slut på minne"
-
-#: sys-utils/readprofile.c:147
+#: sys-utils/readprofile.c:188
 #, c-format
-msgid "%s Version %s\n"
+msgid "%s version %s\n"
 msgstr "%s version %s\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Samplingssteg: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): felaktig tabellrad\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:308
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: kan inte hitta \"_stext\" i %s\n"
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:334
 #, 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:323
+#: sys-utils/readprofile.c:375
 msgid "total"
 msgstr "totalt"
 
@@ -9542,16 +9670,16 @@
 msgid "...back 1 page"
 msgstr "...tillbaka 1 sida"
 
-#: text-utils/more.c:1313
+#: text-utils/more.c:1314
 msgid "...skipping one line"
 msgstr "...hoppar över en rad"
 
-#: text-utils/more.c:1315
+#: text-utils/more.c:1316
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...hoppar över %d rader"
 
-#: text-utils/more.c:1352
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
@@ -9561,64 +9689,91 @@
 "***Tillbaka***\n"
 "\n"
 
-#: text-utils/more.c:1390
+#: 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"
+"De flesta kommandon valfritt föregångna av ett heltalsargument k.\n"
+"Standardalternativ inom hakparenteser.\n"
+"\n"
+"Stjärna (*) indikerar att argumentet blir nytt standardalternativ.\n"
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1398
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
+"<blanksteg>             Visa nästa k rader med text [aktuell skärmstorlek]\n"
+"z                       Visa nästa k rader med text [aktuell skärmstorlek]*\n"
+"<retur>                 Visa nästa k rader med text [1]*\n"
+"d eller ctrl-D          Rulla k rader [aktuell rullningsstorlek, initialt 11]"
+"*\n"
+"q, Q eller <avbrott>    Avsluta more\n"
+"s                       Hoppa framåt k rader med text [1]\n"
+"f                       Hoppa framåt k skärmlängder med text [1]\n"
+"b eller ctrl-B          Hoppa bakåt k skärmlängder med text [1]\n"
+"'                       Gå till platsen där föregående sökning började\n"
+"=                       Visa aktuellt radnummer\n"
+"/<reguljärt uttryck>    Sök efter den k:te förekomsten av reguljärt uttryck "
+"[1]\n"
+"n                       Sök efter den k:te förekomsten av senaste reguljära\n"
+"                        uttrycket [1]\n"
+"!<kmdo> eller :!<kmdo>  Kör <kmdo> i ett underskal\n"
+"v                       Starta /usr/bin/vi vid aktuell rad\n"
+"ctrl-L                  Rita om skärmen\n"
+":n                      Gå till k:te nästa fil [1]\n"
+":p                      Gå till k:te föregående fil [1]\n"
+":f                      Visa aktuellt filnamn och radnummer\n"
+".                       Upprepa föregående kommando\n"
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
 msgstr "[Tryck \"h\" för instruktioner.]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" rad %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Inte en fil] rad %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
 msgstr "  Spill\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1642
 msgid "...skipping\n"
 msgstr "...hoppar över\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
 msgstr "Reguljärt uttrycksmischmasch"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9626,15 +9781,15 @@
 "\n"
 "Mönstret hittades inte\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr "Mönstret hittades inte"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1748
 msgid "can't fork\n"
 msgstr "kan inte grena\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
@@ -9642,19 +9797,19 @@
 "\n"
 "...Hoppar över "
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1792
 msgid "...Skipping to file "
 msgstr "...Hoppar över till filen "
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1794
 msgid "...Skipping back to file "
 msgstr "...Hoppar tillbaka till filen "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2074
 msgid "Line too long"
 msgstr "Raden är för lång"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
 msgstr "Inget tidigare kommando att ersätta"
 
@@ -9704,7 +9859,7 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: felaktigt konverteringstecken %%%s.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -9712,33 +9867,33 @@
 "%s: Användning: %s [-number] [-p sträng] [-cefnrs] [+rad] [+/mönster/] "
 "[filer]\n"
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: flaggan kräver ett argument -- %s\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: otillåten flagga -- %s\n"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 msgid "...skipping forward\n"
 msgstr "...hoppar framåt\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 msgid "...skipping backward\n"
 msgstr "...hoppar bakåt\n"
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 msgid "No next file"
 msgstr "Ingen nästa fil"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 msgid "No previous file"
 msgstr "Inga tidigare fil"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Läsfel från %s-fil\n"
@@ -9746,50 +9901,50 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Oväntat filslut i %s-fil\n"
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Okänt fel i %s-fil\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Kan inte skapa temporär fil\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 msgid "RE error: "
 msgstr "RE-fel: "
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr "(Filslut)"
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr "Ingen ihågkommen söksträng"
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 msgid "Cannot open "
 msgstr "Kan inte öppna "
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 msgid "saved"
 msgstr "sparad"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !kommando inte tillåtet i rflag-läge.\n"
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 msgid "fork() failed, try again later\n"
 msgstr "fork() misslyckades, försök igen senare\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 msgid "(Next file: "
 msgstr "(Nästa fil: "
 
@@ -9827,6 +9982,43 @@
 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 "del_loop(%s): success\n"
+#~ msgstr "del_loop(%s): lyckades\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 ""
+#~ "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 ""
+#~ "användning:\n"
+#~ "  %s slingenhet                                        # ge information\n"
+#~ "  %s -d slingenhet                                     # ta bort\n"
+#~ "  %s [ -e kryptering ] [ -o avstånd ] slingenhet fil   # konfiguration\n"
+
+#~ 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"
+
+#~ msgid ""
+#~ "Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %"
+#~ "d\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Enheter = megabyte med 1048576 byte, block med 1024 byte, räknat från %d\n"
+#~ "\n"
+
+#~ msgid "   Device Boot Start   End    MB    #blocks   Id  System\n"
+#~ msgstr "   Enhet Start Början Slut    MB      Block   Id  System\n"
+
 #~ msgid "Partition %i does not end on cylinder boundary:\n"
 #~ msgstr "Partition %i slutar inte på cylindergräns:\n"
 
diff --git a/po/tr.po b/po/tr.po
index 4e2f152..a636dcd 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,17 +1,17 @@
 # Turkish translations for util-linux messages.
-# Copyright (C) 2002 Nilgün Belma Bugüner.
-# Nilgün Belma Bugüner <nilgun@superonline.com>, 2001, 2002.
+# 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.
+# as such. No warranty.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.11w\n"
-"POT-Creation-Date: 2002-11-25 00:47+0100\n"
-"PO-Revision-Date: 2002-10-28 09:04+0300\n"
+"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"
 "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"
@@ -151,7 +151,7 @@
 
 #: 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.cramfs.c:771 disk-utils/mkfs.minix.c:638
+#: 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:132
@@ -759,7 +759,7 @@
 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:2166
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2176
 #, c-format
 msgid "Device: %s\n"
 msgstr "Aygıt: %s\n"
@@ -833,8 +833,8 @@
 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-1.1.2/getopt.c:89
-#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt/getopt.c:89
+#: getopt/getopt.c:99 login-utils/wall.c:237
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Bellek yetersiz!\n"
@@ -844,8 +844,8 @@
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs sürüm %s (%s)\n"
 
-#: disk-utils/mkfs.cramfs.c:117
-#, fuzzy, c-format
+#: 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"
@@ -861,20 +861,22 @@
 " dirname    root of the filesystem to be compressed\n"
 " outfile    output file\n"
 msgstr ""
-"kullanımı: %s [-h] [-v] [-e baskı] [-i dosya] [-n isim] dizinismi çdosyası\n"
+"kullanımı: %s [-v] [-b blkuz] [-e baskı] [-i dosya] [-n isim] dizinismi "
+"çdosyası\n"
 " -h        bu yardım iletisi gösterilir\n"
 " -v        çıktı daha ayrıntılı olur\n"
 " -E        uyarılar hata olarak verilir (sıfırdan farklı çıkış kodu)\n"
+" -b blkuz  bu blok uzunluğu kullanılır, sayfa uzunluğuna eşit olmalıdır\n"
 " -e baskı  baskı numarasını ayarlar (dosyasistemi kimliÄŸinin bir parçası)\n"
 " -i dosya  dosya sistemine bir dosya eÅŸlemi sokuÅŸturur (>= 2.4.0 gerekir)\n"
-" -n isim   cramfs dosya sistemi ismi ayarlanırr  -p        önyükleme koduna %"
-"d baytlık adımlama uygulanır\n"
-" -s        dizin içeriÄŸini sıralar (eski seçenek, yoksayılır)\n"
+" -n isim   cramfs dosya sistemi ismi ayarlanır\n"
+" -p        önyükleme koduna %d baytlık adımlama uygulanır\n"
+" -s        dizin içeriÄŸini sıralar (eski seçenek - yoksayılır)\n"
 " -z        belirgin delikler yapar (>= 2.3.39 gerekir)\n"
-" dizinismi sıkıştırılan dosya sisteminin kökü\n"
+" dizinismi sıkıştırılacak dosya sisteminin kökü\n"
 " çdosyası  çıktı dosyası\n"
 
-#: disk-utils/mkfs.cramfs.c:328
+#: disk-utils/mkfs.cramfs.c:335
 #, c-format
 msgid ""
 "Very long (%u bytes) filename `%s' found.\n"
@@ -884,11 +886,11 @@
 "mkcramfs.c içinde MAX_INPUT_NAMELEN deÄŸerini arttırın ve tekrar derleyin.   "
 "Çıkılıyor.\n"
 
-#: disk-utils/mkfs.cramfs.c:456
+#: disk-utils/mkfs.cramfs.c:463
 msgid "filesystem too big.  Exiting.\n"
 msgstr "dosya sistemi çok büyük.  Çıklıyor.\n"
 
-#: disk-utils/mkfs.cramfs.c:507
+#: disk-utils/mkfs.cramfs.c:514
 msgid ""
 "Exceeded MAXENTRIES.  Raise this value in mkcramfs.c and recompile.  "
 "Exiting.\n"
@@ -897,17 +899,17 @@
 "derleyin.   Çıkılıyor.\n"
 
 #. (I don't think this can happen with zlib.)
-#: disk-utils/mkfs.cramfs.c:615
+#: disk-utils/mkfs.cramfs.c:622
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr "OLAMAZ: blok \"sıkıştırması\" > 2*blokuzunluğu (%ld)\n"
 
-#: disk-utils/mkfs.cramfs.c:634
+#: disk-utils/mkfs.cramfs.c:641
 #, c-format
 msgid "%6.2f%% (%+d bytes)\t%s\n"
 msgstr "%%%6.2f (%+d bayt)\t%s\n"
 
-#: disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.cramfs.c:819
 #, c-format
 msgid ""
 "warning: guestimate of required size (upper bound) is %LdMB, but maximum "
@@ -916,38 +918,38 @@
 "uyarı: gereken tahmini boyut (üst sınır) %Ld MB, ama en büyük bellekeÅŸlem "
 "boyu %u MB.   Vakitsiz ölüm.\n"
 
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:860
 #, c-format
 msgid "Including: %s\n"
 msgstr "Ä°çeriÄŸi: %s\n"
 
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:866
 #, c-format
 msgid "Directory data: %d bytes\n"
 msgstr "Dizin verisi: %d bayt\n"
 
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:874
 #, c-format
 msgid "Everything: %d kilobytes\n"
 msgstr "Hepsi: %d kB\n"
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:879
 #, c-format
 msgid "Super block: %d bytes\n"
 msgstr "Süper blok: %d bayt\n"
 
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
 msgid "CRC: %x\n"
 msgstr "CRC: %x\n"
 
-#: disk-utils/mkfs.cramfs.c:884
+#: disk-utils/mkfs.cramfs.c:891
 #, c-format
 msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
 msgstr ""
 "ROM bellekeÅŸlemi için ayrılan alan yetersiz (%Ld ayrıldı, %d kullanıldı)\n"
 
-#: disk-utils/mkfs.cramfs.c:896
+#: disk-utils/mkfs.cramfs.c:903
 #, c-format
 msgid "ROM image write failed (%d %d)\n"
 msgstr "ROM bellekeÅŸlemi yazmada hata (%d %d)\n"
@@ -956,20 +958,20 @@
 #. screen too quickly.)
 #. (can't happen when reading from ext2fs)
 #. bytes, not chars: think UTF8.
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:912
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr "uyarı: dosya isimleri 255 bayt olarak kısaltıldı.\n"
 
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:915
 msgid "warning: files were skipped due to errors.\n"
 msgstr "uyarı: hatalardan dolayı dosyalar atlandı.\n"
 
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:918
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr "uyarı: dosya boyutları %luMB'a düÅŸürüldü (eksi 1 bayt).\n"
 
-#: disk-utils/mkfs.cramfs.c:916
+#: disk-utils/mkfs.cramfs.c:923
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
@@ -977,7 +979,7 @@
 "uyarı: kullanıcı kimlikleri %u bite düÅŸürüldü. (Bu bir güvenlik kaygısı "
 "olabilir.)\n"
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:928
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
@@ -985,7 +987,7 @@
 "uyarı: grup kimlikleri %u bite düÅŸürüldü. (Bu bir güvenlik kaygısı "
 "olabilir.)\n"
 
-#: disk-utils/mkfs.cramfs.c:926
+#: disk-utils/mkfs.cramfs.c:933
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -1140,8 +1142,8 @@
 msgid "too many bad pages"
 msgstr "çok fazla bozuk sayfa var"
 
-#: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2065 text-utils/more.c:2076
+#: 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 "Bellek yetersiz"
 
@@ -1260,11 +1262,11 @@
 msgid "   %s [ -c | -y | -n ] dev\n"
 msgstr "   %s [ -c | -y | -n ] aygıt\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2008
 msgid "Unusable"
 msgstr "Kullanışsız"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005
+#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2010
 msgid "Free Space"
 msgstr "BoÅŸ Alan"
 
@@ -1365,7 +1367,7 @@
 
 #: fdisk/cfdisk.c:910
 msgid "Partition ends in the final partial cylinder"
-msgstr ""
+msgstr "Disk bölümü son kısmî silindir içinde bitiyor"
 
 #: fdisk/cfdisk.c:934
 msgid "logical partitions not in disk order"
@@ -1398,233 +1400,233 @@
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menü yönsüz. Yatay olarak öntanımlanıyor."
 
-#: fdisk/cfdisk.c:1334
+#: fdisk/cfdisk.c:1324
 msgid "Illegal key"
 msgstr "Kuraldışı tuş"
 
-#: fdisk/cfdisk.c:1357
+#: fdisk/cfdisk.c:1347
 msgid "Press a key to continue"
 msgstr "Devam etmek için bir tuÅŸa basınız"
 
-#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1394 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2510
+#: fdisk/cfdisk.c:2512
 msgid "Primary"
 msgstr "Birincil"
 
-#: fdisk/cfdisk.c:1404
+#: fdisk/cfdisk.c:1394
 msgid "Create a new primary partition"
 msgstr "Yeni birincil disk bölümü oluÅŸturur"
 
-#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504
-#: fdisk/cfdisk.c:2507
+#: fdisk/cfdisk.c:1395 fdisk/cfdisk.c:1979 fdisk/cfdisk.c:2509
+#: fdisk/cfdisk.c:2512
 msgid "Logical"
 msgstr "Mantıksal"
 
-#: fdisk/cfdisk.c:1405
+#: fdisk/cfdisk.c:1395
 msgid "Create a new logical partition"
 msgstr "Yeni mantıksal disk bölümü oluÅŸturur"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451 fdisk/cfdisk.c:2184
 msgid "Cancel"
 msgstr "Vazgeç"
 
-#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461
+#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1451
 msgid "Don't create a partition"
 msgstr "Bir disk bölümü oluÅŸturulmaz"
 
-#: fdisk/cfdisk.c:1422
+#: fdisk/cfdisk.c:1412
 msgid "!!! Internal error !!!"
 msgstr "!!! Ä°ç hata !!!"
 
-#: fdisk/cfdisk.c:1425
+#: fdisk/cfdisk.c:1415
 msgid "Size (in MB): "
 msgstr "Alan (MB):"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 msgid "Beginning"
 msgstr "BaÅŸlangıç"
 
-#: fdisk/cfdisk.c:1459
+#: fdisk/cfdisk.c:1449
 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:1460
+#: fdisk/cfdisk.c:1450
 msgid "End"
 msgstr "Son"
 
-#: fdisk/cfdisk.c:1460
+#: fdisk/cfdisk.c:1450
 msgid "Add partition at end of free space"
 msgstr "Disk bölümnü boÅŸ alanın sonuna ekler"
 
-#: fdisk/cfdisk.c:1478
+#: fdisk/cfdisk.c:1468
 msgid "No room to create the extended partition"
 msgstr "Ek disk bölümünü oluÅŸturacak yer yok"
 
-#: fdisk/cfdisk.c:1522
+#: fdisk/cfdisk.c:1527
 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:1524
+#: fdisk/cfdisk.c:1529
 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:1576
+#: fdisk/cfdisk.c:1581
 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:1606
+#: fdisk/cfdisk.c:1611
 msgid "Cannot open disk drive"
 msgstr "Disk açılamıyor"
 
-#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787
+#: fdisk/cfdisk.c:1613 fdisk/cfdisk.c:1792
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Açılan disk salt-okunur - yazma izniniz yok"
 
-#: fdisk/cfdisk.c:1629
+#: fdisk/cfdisk.c:1634
 msgid "Cannot get disk size"
 msgstr "Diskin toplam alanı hesaplanamıyor"
 
-#: fdisk/cfdisk.c:1654
+#: fdisk/cfdisk.c:1659
 msgid "Bad primary partition"
 msgstr "Birincil disk bölümü bozuk"
 
-#: fdisk/cfdisk.c:1684
+#: fdisk/cfdisk.c:1689
 msgid "Bad logical partition"
 msgstr "Mantıksal disk bölümü bozuk"
 
-#: fdisk/cfdisk.c:1799
+#: fdisk/cfdisk.c:1804
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Uyarı!! Bu iÅŸlem disk üzerindeki veriyi yokedebilir!"
 
-#: fdisk/cfdisk.c:1803
+#: fdisk/cfdisk.c:1808
 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:1809
+#: fdisk/cfdisk.c:1814
 msgid "no"
 msgstr "hayır"
 
-#: fdisk/cfdisk.c:1810
+#: fdisk/cfdisk.c:1815
 msgid "Did not write partition table to disk"
 msgstr "Disk bölümleme tablosu diske yazılmadı"
 
-#: fdisk/cfdisk.c:1812
+#: fdisk/cfdisk.c:1817
 msgid "yes"
 msgstr "evet"
 
-#: fdisk/cfdisk.c:1815
+#: fdisk/cfdisk.c:1820
 msgid "Please enter `yes' or `no'"
 msgstr "Lütfen ya `evet´ ya da `hayır´ yazınız"
 
-#: fdisk/cfdisk.c:1819
+#: fdisk/cfdisk.c:1824
 msgid "Writing partition table to disk..."
 msgstr "Disk bölümleme tablosu diske yazılıyor..."
 
-#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848
+#: fdisk/cfdisk.c:1849 fdisk/cfdisk.c:1853
 msgid "Wrote partition table to disk"
 msgstr "Disk bölümleme tablosu diske yazıldı"
 
-#: fdisk/cfdisk.c:1846
+#: fdisk/cfdisk.c:1851
 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:1856
+#: fdisk/cfdisk.c:1861
 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:1858
+#: fdisk/cfdisk.c:1863
 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:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:1921 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Dosya ismini girin ya da ENTER tuşuna basın: "
 
-#: fdisk/cfdisk.c:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:1930 fdisk/cfdisk.c:2048 fdisk/cfdisk.c:2132
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "'%s' dosyası açılamıyor"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1941
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Sabit Disk: %s\n"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1943
 msgid "Sector 0:\n"
 msgstr "Sektör 0:\n"
 
-#: fdisk/cfdisk.c:1945
+#: fdisk/cfdisk.c:1950
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektör %d:\n"
 
-#: fdisk/cfdisk.c:1965
+#: fdisk/cfdisk.c:1970
 msgid "   None   "
 msgstr "   Yok    "
 
-#: fdisk/cfdisk.c:1967
+#: fdisk/cfdisk.c:1972
 msgid "   Pri/Log"
 msgstr "   Bir/Man"
 
-#: fdisk/cfdisk.c:1969
+#: fdisk/cfdisk.c:1974
 msgid "   Primary"
 msgstr "  Birincil "
 
-#: fdisk/cfdisk.c:1971
+#: fdisk/cfdisk.c:1976
 msgid "   Logical"
 msgstr " Mantıksal "
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697
-#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:2014 fdisk/fdisk.c:1402 fdisk/fdisk.c:1707
+#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:688 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:2020
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Boot (%02X)"
 
-#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513
+#: fdisk/cfdisk.c:2022 fdisk/cfdisk.c:2518
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Bilinmeyen (%02X)"
 
-#: fdisk/cfdisk.c:2019
+#: fdisk/cfdisk.c:2024
 #, c-format
 msgid "None (%02X)"
 msgstr "Yok (%02X)"
 
-#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2059 fdisk/cfdisk.c:2143
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s için Disk Bölümleme Tablosu\n"
 
-#: fdisk/cfdisk.c:2056
+#: fdisk/cfdisk.c:2061
 msgid "            First    Last\n"
 msgstr " Bölüm       Ä°lk      Son              Sektör     Dosya\n"
 
-#: fdisk/cfdisk.c:2057
+#: fdisk/cfdisk.c:2062
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Türü     Sektör   Sektör    BaÅŸl    Sayısı    Sistemi     Kimlik   "
 "Flamalar\n"
 
-#: fdisk/cfdisk.c:2058
+#: fdisk/cfdisk.c:2063
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1633,467 +1635,466 @@
 "---------\n"
 
 #. Three-line heading. Read "Start Sector" etc vertically.
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2146
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         --BaÅŸlangıç---      ----BitiÅŸ----- BaÅŸlangÄ±ç  Sektör\n"
 
-#: fdisk/cfdisk.c:2142
+#: 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:2143
+#: fdisk/cfdisk.c:2148
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Raw"
 msgstr "Temel"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2181
 msgid "Print the table using raw data format"
 msgstr "Tablo temel veri biçemi olarak yazılır"
 
-#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2182 fdisk/cfdisk.c:2284
 msgid "Sectors"
 msgstr "Sektör"
 
-#: fdisk/cfdisk.c:2177
+#: fdisk/cfdisk.c:2182
 msgid "Print the table ordered by sectors"
 msgstr "Tabloyu sektörlere dağılımına göre yazar"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Table"
 msgstr "Tablo"
 
-#: fdisk/cfdisk.c:2178
+#: fdisk/cfdisk.c:2183
 msgid "Just print the partition table"
 msgstr "Disk bölümleme tablosunu yazar"
 
-#: fdisk/cfdisk.c:2179
+#: fdisk/cfdisk.c:2184
 msgid "Don't print the table"
 msgstr "Tablo yazılamıyor"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2212
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk Yardım Ekranı"
 
-#: fdisk/cfdisk.c:2209
+#: fdisk/cfdisk.c:2214
 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:2210
+#: fdisk/cfdisk.c:2215
 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:2211
+#: fdisk/cfdisk.c:2216
 msgid "disk drive."
 msgstr " "
 
-#: fdisk/cfdisk.c:2213
+#: fdisk/cfdisk.c:2218
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Telif Hakkı (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2215
+#: fdisk/cfdisk.c:2220
 msgid "Command      Meaning"
 msgstr " Komut       Anlamı"
 
-#: fdisk/cfdisk.c:2216
+#: fdisk/cfdisk.c:2221
 msgid "-------      -------"
 msgstr " -----       ------"
 
-#: fdisk/cfdisk.c:2217
+#: fdisk/cfdisk.c:2222
 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:2218
+#: fdisk/cfdisk.c:2223
 msgid "  d          Delete the current partition"
 msgstr "  d          Seçilen disk bölümünü siler"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2224
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Silindir, kafa, sektör/Ä°z parametrelerini deÄŸiÅŸtirir"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2225
 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:2221
+#: fdisk/cfdisk.c:2226
 msgid "             know what they are doing."
 msgstr "             kullanılabilir."
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2227
 msgid "  h          Print this screen"
 msgstr "  h          Bu yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2228
 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:2224
+#: fdisk/cfdisk.c:2229
 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:2225
+#: fdisk/cfdisk.c:2230
 msgid "             DOS, OS/2, ..."
 msgstr "             uyumsuzluk oluÅŸturabilir."
 
-#: fdisk/cfdisk.c:2226
+#: fdisk/cfdisk.c:2231
 msgid "  n          Create new partition from free space"
 msgstr "  n          BoÅŸ alanda yeni bir disk bölümü oluÅŸturur"
 
-#: fdisk/cfdisk.c:2227
+#: fdisk/cfdisk.c:2232
 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:2228
+#: fdisk/cfdisk.c:2233
 msgid "             There are several different formats for the partition"
 msgstr ""
 "             Disk bölümleme tablosunu farklı biçemlerde elde edebilirsiniz."
 
-#: fdisk/cfdisk.c:2229
+#: fdisk/cfdisk.c:2234
 msgid "             that you can choose from:"
 msgstr "             Bu biçemler:"
 
-#: fdisk/cfdisk.c:2230
+#: fdisk/cfdisk.c:2235
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Temel veri (verinin diske yazılan biçemi)"
 
-#: fdisk/cfdisk.c:2231
+#: fdisk/cfdisk.c:2236
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Disk bölümlerinin sektörlere dağılımını gösterir"
 
-#: fdisk/cfdisk.c:2232
+#: fdisk/cfdisk.c:2237
 msgid "                t - Table in raw format"
 msgstr "                t - Geleneksel disk bölümleme tablosu"
 
-#: fdisk/cfdisk.c:2233
+#: fdisk/cfdisk.c:2238
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Disk bölümleme tablosu diskteki yerine kaydedilmeden çıkılır"
 
-#: fdisk/cfdisk.c:2234
+#: fdisk/cfdisk.c:2239
 msgid "  t          Change the filesystem type"
 msgstr "  t          Dosya sistemi türünü deÄŸiÅŸtirir"
 
-#: fdisk/cfdisk.c:2235
+#: fdisk/cfdisk.c:2240
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Disk bölümü boyunun birimini deÄŸiÅŸtirir"
 
-#: fdisk/cfdisk.c:2236
+#: fdisk/cfdisk.c:2241
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, sektör, silindir birimleri sırayla yer deÄŸiÅŸtirir"
 
-#: fdisk/cfdisk.c:2237
+#: fdisk/cfdisk.c:2242
 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:2238
+#: fdisk/cfdisk.c:2243
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Diskteki veriyi yanlışlıkla kaybetmemek için "
 
-#: fdisk/cfdisk.c:2239
+#: fdisk/cfdisk.c:2244
 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:2240
+#: fdisk/cfdisk.c:2245
 msgid "             `no'"
 msgstr "             yazdırmayacağınıza kesin karar verebilirsiniz"
 
-#: fdisk/cfdisk.c:2241
+#: fdisk/cfdisk.c:2246
 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:2242
+#: fdisk/cfdisk.c:2247
 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:2243
+#: fdisk/cfdisk.c:2248
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Ekranı tazeler"
 
-#: fdisk/cfdisk.c:2244
+#: fdisk/cfdisk.c:2249
 msgid "  ?          Print this screen"
 msgstr "  ?          Bu yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2246
+#: fdisk/cfdisk.c:2251
 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:2247
+#: fdisk/cfdisk.c:2252
 msgid "case letters (except for Writes)."
 msgstr "olarak kullanabilirsiniz."
 
-#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322
-#: fdisk/fdisksunlabel.c:324
+#: fdisk/cfdisk.c:2282 fdisk/cfdisk.c:2612 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Silindir"
 
-#: fdisk/cfdisk.c:2277
+#: fdisk/cfdisk.c:2282
 msgid "Change cylinder geometry"
 msgstr "Silindir geometrisini deÄŸiÅŸtirir"
 
-#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319
+#: fdisk/cfdisk.c:2283 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Kafa"
 
-#: fdisk/cfdisk.c:2278
+#: fdisk/cfdisk.c:2283
 msgid "Change head geometry"
 msgstr "Kafa geometrisini deÄŸiÅŸtirir"
 
-#: fdisk/cfdisk.c:2279
+#: fdisk/cfdisk.c:2284
 msgid "Change sector geometry"
 msgstr "Sektör geometrisini deÄŸiÅŸtirir"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done"
 msgstr "Tamam"
 
-#: fdisk/cfdisk.c:2280
+#: fdisk/cfdisk.c:2285
 msgid "Done with changing geometry"
 msgstr "Geometri değişikliği yapıldı"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2298
 msgid "Enter the number of cylinders: "
 msgstr "Silindir sayısını verin: "
 
-#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875
+#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2880
 msgid "Illegal cylinders value"
 msgstr "Silindir sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2316
 msgid "Enter the number of heads: "
 msgstr "Kafa sayısını verin: "
 
-#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885
+#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2890
 msgid "Illegal heads value"
 msgstr "Kafa sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2329
 msgid "Enter the number of sectors per track: "
 msgstr "sektör/iz sayısını verin: "
 
-#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892
+#: fdisk/cfdisk.c:2336 fdisk/cfdisk.c:2897
 msgid "Illegal sectors value"
 msgstr "sektör sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2434
+#: fdisk/cfdisk.c:2439
 msgid "Enter filesystem type: "
 msgstr "Dosya sistemi türünü verin: "
 
-#: fdisk/cfdisk.c:2452
+#: fdisk/cfdisk.c:2457
 msgid "Cannot change FS Type to empty"
 msgstr "Dosya sistemi türü boÅŸ olarak deÄŸiÅŸtirilemez"
 
-#: fdisk/cfdisk.c:2454
+#: fdisk/cfdisk.c:2459
 msgid "Cannot change FS Type to extended"
 msgstr "Dosya sistemi türü ek olarak deÄŸiÅŸtirilemez"
 
-#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45
+#: fdisk/cfdisk.c:2487 fdisk/fdisksunlabel.c:45
 msgid "Boot"
 msgstr "Açılış"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2489
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ne?(%02X)"
 
-#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2492 fdisk/cfdisk.c:2495
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2500 fdisk/cfdisk.c:2503
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2506
+#: fdisk/cfdisk.c:2511
 msgid "Pri/Log"
 msgstr "Bir/Man"
 
-#: fdisk/cfdisk.c:2582
+#: fdisk/cfdisk.c:2587
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Sabit Disk: %s"
 
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:2593
 #, c-format
 msgid "Size: %lld bytes, %ld MB"
 msgstr "Toplam: %lld bayt, %ld MB"
 
-#: fdisk/cfdisk.c:2591
+#: fdisk/cfdisk.c:2596
 #, c-format
 msgid "Size: %lld bytes, %ld.%ld GB"
 msgstr "Toplam: %lld bayt, %ld.%ld GB"
 
-#: fdisk/cfdisk.c:2595
+#: fdisk/cfdisk.c:2600
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Kafa: %d        Sektör/Ä°z: %d       Silindir: %d  "
 
-#: fdisk/cfdisk.c:2599
+#: fdisk/cfdisk.c:2604
 msgid "Name"
 msgstr "Ä°sim"
 
-#: fdisk/cfdisk.c:2600
+#: fdisk/cfdisk.c:2605
 msgid "Flags"
 msgstr "Flama"
 
-#: fdisk/cfdisk.c:2601
+#: fdisk/cfdisk.c:2606
 msgid "Part Type"
 msgstr "Bölüm Türü"
 
-#: fdisk/cfdisk.c:2602
+#: fdisk/cfdisk.c:2607
 msgid "FS Type"
 msgstr "DS Türü"
 
-#: fdisk/cfdisk.c:2603
+#: fdisk/cfdisk.c:2608
 msgid "[Label]"
 msgstr "[Etiket]"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2610
 msgid "  Sectors"
 msgstr "  Sektör  "
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2614
 msgid "Size (MB)"
 msgstr " Boy (MB) "
 
-#: fdisk/cfdisk.c:2611
+#: fdisk/cfdisk.c:2616
 msgid "Size (GB)"
 msgstr " Boy (GB) "
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 msgid "Bootable"
 msgstr "Açılış"
 
-#: fdisk/cfdisk.c:2666
+#: fdisk/cfdisk.c:2671
 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:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete"
 msgstr "Sil"
 
-#: fdisk/cfdisk.c:2667
+#: fdisk/cfdisk.c:2672
 msgid "Delete the current partition"
 msgstr "Seçilen disk bölümünü kaldırır"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2673
 msgid "Change disk geometry (experts only)"
 msgstr "Disk geometrisini deÄŸiÅŸtirir (uzmanlar için)"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Help"
 msgstr "Yardım"
 
-#: fdisk/cfdisk.c:2669
+#: fdisk/cfdisk.c:2674
 msgid "Print help screen"
 msgstr "Yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 msgid "Maximize"
 msgstr "Sığdır"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2675
 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:2671
+#: fdisk/cfdisk.c:2676
 msgid "New"
 msgstr "Yeni"
 
-#: fdisk/cfdisk.c:2671
+#: fdisk/cfdisk.c:2676
 msgid "Create new partition from free space"
 msgstr "BoÅŸ alanda yeni bir disk bölümü oluÅŸturur"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 msgid "Print"
 msgstr "Yaz"
 
-#: fdisk/cfdisk.c:2672
+#: fdisk/cfdisk.c:2677
 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:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit"
 msgstr "Çık"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2678
 msgid "Quit program without writing partition table"
 msgstr "Disk bölümleme tablosunu diske kaydetmeden çıkar"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 msgid "Type"
 msgstr "Türü"
 
-#: fdisk/cfdisk.c:2674
+#: fdisk/cfdisk.c:2679
 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:2675
+#: fdisk/cfdisk.c:2680
 msgid "Units"
 msgstr "Birim"
 
-#: fdisk/cfdisk.c:2675
+#: fdisk/cfdisk.c:2680
 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:2676
+#: fdisk/cfdisk.c:2681
 msgid "Write"
 msgstr "Kaydet"
 
-#: fdisk/cfdisk.c:2676
+#: fdisk/cfdisk.c:2681
 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:2722
+#: fdisk/cfdisk.c:2727
 msgid "Cannot make this partition bootable"
 msgstr "Bu disk bölümüne açılış kaydı yapılamaz"
 
-#: fdisk/cfdisk.c:2732
+#: fdisk/cfdisk.c:2737
 msgid "Cannot delete an empty partition"
 msgstr "Bir boÅŸ disk bölümü silinemez"
 
-#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2757 fdisk/cfdisk.c:2759
 msgid "Cannot maximize this partition"
 msgstr "Bu disk bölümü sığdırılamıyor"
 
-#: fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2767
 msgid "This partition is unusable"
 msgstr "Bu disk bölümü kullanışsız"
 
-#: fdisk/cfdisk.c:2764
+#: fdisk/cfdisk.c:2769
 msgid "This partition is already in use"
 msgstr "Bu disk bölümü zaten kullanımda"
 
-#: fdisk/cfdisk.c:2781
+#: fdisk/cfdisk.c:2786
 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:2808 fdisk/cfdisk.c:2814
+#: fdisk/cfdisk.c:2813 fdisk/cfdisk.c:2819
 msgid "No more partitions"
 msgstr "BaÅŸka disk bölümü yok"
 
-#: fdisk/cfdisk.c:2821
+#: fdisk/cfdisk.c:2826
 msgid "Illegal command"
 msgstr "Kuraldışı komut"
 
-#: fdisk/cfdisk.c:2831
-#, fuzzy
+#: fdisk/cfdisk.c:2836
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
-msgstr "Telif Hakkı (C) 1994-2000 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:2838
+#: fdisk/cfdisk.c:2843
 #, c-format
 msgid ""
 "\n"
@@ -2374,11 +2375,11 @@
 msgid "heads"
 msgstr "kafa"
 
-#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1224 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "sektör"
 
-#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470
+#: fdisk/fdisk.c:582 fdisk/fdisk.c:1224 fdisk/fdiskbsdlabel.c:470
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "silindir"
@@ -2501,73 +2502,73 @@
 msgstr "Onaltılık kod (kod listesi için L tuÅŸlayın):"
 
 #: fdisk/fdisk.c:1069
-#, c-format
-msgid "%s (%d-%d, default %d): "
+#, fuzzy, c-format
+msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, öntanımlı %d): "
 
-#: fdisk/fdisk.c:1134
-#, c-format
-msgid "Using default value %d\n"
+#: fdisk/fdisk.c:1136
+#, fuzzy, c-format
+msgid "Using default value %u\n"
 msgstr "Öntanımlı deÄŸer %d kullanılıyor\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1140
 msgid "Value out of range.\n"
 msgstr "Değer kapsamdışı.\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1150
 msgid "Partition number"
 msgstr "Disk bölümü numarası"
 
-#: fdisk/fdisk.c:1159
+#: fdisk/fdisk.c:1161
 #, 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:1181 fdisk/fdisk.c:1207
+#: fdisk/fdisk.c:1183 fdisk/fdisk.c:1209
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Seçilen disk bölümü %d\n"
 
-#: fdisk/fdisk.c:1184
+#: fdisk/fdisk.c:1186
 msgid "No partition is defined yet!\n"
 msgstr "Tanımlı bir disk bölümü henüz yok!\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1212
 msgid "All primary partitions have been defined already!\n"
 msgstr "Tüm birincil bölümler zaten tanımlı!\n"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "cylinder"
 msgstr "silindir"
 
-#: fdisk/fdisk.c:1220
+#: fdisk/fdisk.c:1222
 msgid "sector"
 msgstr "sektör"
 
-#: fdisk/fdisk.c:1229
+#: fdisk/fdisk.c:1231
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "gösterme/girdi birimi %s olarak deÄŸiÅŸtiriliyor\n"
 
-#: fdisk/fdisk.c:1240
+#: fdisk/fdisk.c:1242
 #, 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:1251
+#: fdisk/fdisk.c:1253
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS uyumluluk flaması etkin\n"
 
-#: fdisk/fdisk.c:1255
+#: fdisk/fdisk.c:1257
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS uyumluluk flaması etkin değil\n"
 
-#: fdisk/fdisk.c:1347
+#: fdisk/fdisk.c:1357
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "%d disk bölümü henüz yok!\n"
 
-#: fdisk/fdisk.c:1352
+#: fdisk/fdisk.c:1362
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2579,7 +2580,7 @@
 "muhtemelen pek uygun olmayacaktır. 'd' komutunu\n"
 "kullanarak bir disk bölümünü silebilirsiniz.\n"
 
-#: fdisk/fdisk.c:1361
+#: fdisk/fdisk.c:1371
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2587,7 +2588,7 @@
 "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:1370
+#: fdisk/fdisk.c:1380
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2596,7 +2597,7 @@
 "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:1376
+#: fdisk/fdisk.c:1386
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2605,54 +2606,54 @@
 "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:1389
+#: fdisk/fdisk.c:1399
 #, 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:1443
+#: fdisk/fdisk.c:1453
 #, 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:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472
+#: fdisk/fdisk.c:1455 fdisk/fdisk.c:1463 fdisk/fdisk.c:1472 fdisk/fdisk.c:1482
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " fiziksel=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454
+#: fdisk/fdisk.c:1456 fdisk/fdisk.c:1464
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "mantıksal=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1451
+#: fdisk/fdisk.c:1461
 #, 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:1460
+#: fdisk/fdisk.c:1470
 #, 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:1463
+#: fdisk/fdisk.c:1473
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "(%d, %d, 1) olmalıydı\n"
 
-#: fdisk/fdisk.c:1469
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1479
+#, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
-msgstr "%d disk bölümü silindir sınırında bitmiyor.\n"
+msgstr "%i. disk bölümü silindir sınırında bitmiyor.\n"
 
-#: fdisk/fdisk.c:1473
+#: fdisk/fdisk.c:1483
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "(%d, %d, %d) olmalıydı\n"
 
-#: fdisk/fdisk.c:1485
+#: fdisk/fdisk.c:1495
 #, c-format
 msgid ""
 "\n"
@@ -2661,7 +2662,7 @@
 "\n"
 "Disk %s: %ld MB %lld bayt\n"
 
-#: fdisk/fdisk.c:1488
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid ""
 "\n"
@@ -2670,17 +2671,17 @@
 "\n"
 "Disk %s: %ld.%ld GB, %lld bayt\n"
 
-#: fdisk/fdisk.c:1490
+#: fdisk/fdisk.c:1500
 #, c-format
 msgid "%d heads, %d sectors/track, %d cylinders"
 msgstr "%d kafa, %d sektör/iz, %d silindir"
 
-#: fdisk/fdisk.c:1493
+#: fdisk/fdisk.c:1503
 #, c-format
 msgid ", total %lu sectors"
 msgstr ", toplam %lu sektör"
 
-#: fdisk/fdisk.c:1496
+#: fdisk/fdisk.c:1506
 #, c-format
 msgid ""
 "Units = %s of %d * %d = %d bytes\n"
@@ -2689,7 +2690,7 @@
 "Birimler = %s / %d * %d = %d bayt\n"
 "\n"
 
-#: fdisk/fdisk.c:1604
+#: fdisk/fdisk.c:1614
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2697,16 +2698,16 @@
 "Hiçbir ÅŸey yapılmadı. Sıralama zaten doÄŸru.\n"
 "\n"
 
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1678
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Açılış BaÅŸlangÄ±ç  BitiÅŸ  BlokSayısı Kml Sistem\n"
 
-#: fdisk/fdisk.c:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677
+#: fdisk/fdisk.c:1679 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:673
 msgid "Device"
 msgstr "Aygıt"
 
-#: fdisk/fdisk.c:1706
+#: fdisk/fdisk.c:1716
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2714,7 +2715,7 @@
 "\n"
 "Disk bölümleme tablosu girdileri diskteki sırasında deÄŸil\n"
 
-#: fdisk/fdisk.c:1716
+#: fdisk/fdisk.c:1726
 #, c-format
 msgid ""
 "\n"
@@ -2725,95 +2726,95 @@
 "Disk %s: %d kafa, %d sektör, %d silindir\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: 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:1762
+#: fdisk/fdisk.c:1772
 #, 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:1765
+#: fdisk/fdisk.c:1775
 #, 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:1768
+#: fdisk/fdisk.c:1778
 #, 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:1771
+#: fdisk/fdisk.c:1781
 #, 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:1775
+#: fdisk/fdisk.c:1785
 #, 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:1807
+#: fdisk/fdisk.c:1817
 #, 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:1815
+#: fdisk/fdisk.c:1825
 #, 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:1835
+#: fdisk/fdisk.c:1845
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Uyarı: %d disk bölümü boÅŸ\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1850
 #, 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:1846
+#: fdisk/fdisk.c:1856
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr ""
 "Tahsis edilen sektör sayısı %d en fazla olması gereken %d deÄŸerinden büyük\n"
 
-#: fdisk/fdisk.c:1849
+#: fdisk/fdisk.c:1859
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d sektör kullanılmadı\n"
 
-#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507
+#: fdisk/fdisk.c:1872 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:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
-#: fdisk/fdisksunlabel.c:522
+#: fdisk/fdisk.c:1896 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:649
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Ä°lk %s"
 
-#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563
+#: fdisk/fdisk.c:1911 fdisk/fdisksunlabel.c:559
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: fdisk/fdisk.c:1937
+#: fdisk/fdisk.c:1947
 msgid "No free sectors available\n"
 msgstr "BoÅŸta sektör yok\n"
 
-#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574
+#: fdisk/fdisk.c:1956 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:2011
+#: fdisk/fdisk.c:2021
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
 "\tIf you want to add DOS-type partitions, create\n"
@@ -2825,16 +2826,16 @@
 "\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:2023 fdisk/fdiskbsdlabel.c:618
+#: fdisk/fdisk.c:2033 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:2031
+#: fdisk/fdisk.c:2041
 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:2036
+#: fdisk/fdisk.c:2046
 #, c-format
 msgid ""
 "Command action\n"
@@ -2845,20 +2846,20 @@
 "   %s\n"
 "   p   birincil disk bölümü (1-4)\n"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "l   logical (5 or over)"
 msgstr "l   mantıksal (5 veya üzeri)"
 
-#: fdisk/fdisk.c:2038
+#: fdisk/fdisk.c:2048
 msgid "e   extended"
 msgstr "e   ek"
 
-#: fdisk/fdisk.c:2057
+#: fdisk/fdisk.c:2067
 #, 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:2093
+#: fdisk/fdisk.c:2103
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2866,11 +2867,11 @@
 "Disk bölümleme tablosu zaten deÄŸiÅŸmiÅŸti!\n"
 "\n"
 
-#: fdisk/fdisk.c:2102
+#: fdisk/fdisk.c:2112
 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:2118
+#: fdisk/fdisk.c:2128
 #, c-format
 msgid ""
 "\n"
@@ -2883,7 +2884,7 @@
 "Çekirdek hala eski tabloyu kullanıyor.\n"
 "Yeni tablo makinayı yeniden baÅŸlattığınızda geçerli olacak.\n"
 
-#: fdisk/fdisk.c:2128
+#: fdisk/fdisk.c:2138
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2895,65 +2896,65 @@
 "deÄŸiÅŸiklik yaptıysanız, lütfen fdisk man sayfalarındaki\n"
 "ek bilgileri okuyun.\n"
 
-#: fdisk/fdisk.c:2135
+#: fdisk/fdisk.c:2145
 msgid "Syncing disks.\n"
 msgstr "Diskler eşzamanlanıyor.\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2192
 #, 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:2187
+#: fdisk/fdisk.c:2197
 msgid "New beginning of data"
 msgstr "Yeni veri başlangıcı"
 
-#: fdisk/fdisk.c:2203
+#: fdisk/fdisk.c:2213
 msgid "Expert command (m for help): "
 msgstr "Uzman komutları (yardım için m): "
 
-#: fdisk/fdisk.c:2216
+#: fdisk/fdisk.c:2226
 msgid "Number of cylinders"
 msgstr "Silindir sayısı"
 
-#: fdisk/fdisk.c:2243
+#: fdisk/fdisk.c:2253
 msgid "Number of heads"
 msgstr "Kafa sayısı"
 
-#: fdisk/fdisk.c:2268
+#: fdisk/fdisk.c:2278
 msgid "Number of sectors"
 msgstr "Sektör sayısı"
 
-#: fdisk/fdisk.c:2271
+#: fdisk/fdisk.c:2281
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Uyarı: Sektör hizalaması DOS uyumlu olarak yapılıyor\n"
 
-#: fdisk/fdisk.c:2346
+#: fdisk/fdisk.c:2356
 #, 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:2360
+#: fdisk/fdisk.c:2370
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2386 fdisk/sfdisk.c:2365
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2408
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: komut bilinmiyor\n"
 
-#: fdisk/fdisk.c:2466
+#: fdisk/fdisk.c:2476
 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:2470
+#: fdisk/fdisk.c:2480
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2962,17 +2963,17 @@
 "olmalıydı\n"
 
 #. OSF label, and no DOS label
-#: fdisk/fdisk.c:2529
+#: fdisk/fdisk.c:2539
 #, 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:2539
+#: fdisk/fdisk.c:2549
 msgid "Command (m for help): "
 msgstr "Komut (yardım için m): "
 
-#: fdisk/fdisk.c:2555
+#: fdisk/fdisk.c:2565
 #, c-format
 msgid ""
 "\n"
@@ -2981,15 +2982,15 @@
 "\n"
 "Åžu anki önyükleme dosyası: %s\n"
 
-#: fdisk/fdisk.c:2557
+#: fdisk/fdisk.c:2567
 msgid "Please enter the name of the new boot file: "
 msgstr "Lütfen yeni açılış dosyasının ismini giriniz:"
 
-#: fdisk/fdisk.c:2559
+#: fdisk/fdisk.c:2569
 msgid "Boot file unchanged\n"
 msgstr "Açılış dosyası deÄŸiÅŸtirilmedi\n"
 
-#: fdisk/fdisk.c:2624
+#: fdisk/fdisk.c:2642
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3303,87 +3304,87 @@
 "\n"
 "Diskler eşzamanlanıyor.\n"
 
-#: fdisk/fdisksgilabel.c:78
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:79
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:80
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:81
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI raw"
 msgstr "SGI temel"
 
-#: fdisk/fdisksgilabel.c:82
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:83
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:84
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI volume"
 msgstr "SGI bölümü"
 
-#: fdisk/fdisksgilabel.c:85
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:86
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:87
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:88
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:89
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI xfslog"
 msgstr "SGI xfslog"
 
-#: fdisk/fdisksgilabel.c:90
+#: fdisk/fdisksgilabel.c:92
 msgid "SGI xlv"
 msgstr "SGI xlv"
 
-#: fdisk/fdisksgilabel.c:91
+#: fdisk/fdisksgilabel.c:93
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux takas"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54
 msgid "Linux native"
 msgstr "Linux doÄŸal"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:95
+#: fdisk/fdisksgilabel.c:97
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: fdisk/fdisksgilabel.c:158
+#: 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'e göre, Etiket 512 bayttan fazlasını içeremez\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:182
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Yanlış sağlama toplamı veren sgi disk etiketi saptandı.\n"
 
@@ -3439,12 +3440,13 @@
 "Önyükleme dosyası: %s\n"
 "----- Dizin Girdileri -----\n"
 
-#: fdisk/fdisksgilabel.c:250
+#: fdisk/fdisksgilabel.c:248
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektör%5u boy%8u\n"
 
-#: fdisk/fdisksgilabel.c:304
+#. "/a\n" is minimum
+#: fdisk/fdisksgilabel.c:302
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3456,7 +3458,7 @@
 "\tÖnyükleme dosyasının okunabilir bir ismi olmalıdır,\n"
 "\törn. \"/unix\" ya da \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:311
+#: fdisk/fdisksgilabel.c:308
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3464,7 +3466,7 @@
 "\n"
 "\tÖnyükleme dosyasının ismi çok uzun:  en çok 16 bayt.\n"
 
-#: fdisk/fdisksgilabel.c:316
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3472,7 +3474,7 @@
 "\n"
 "\tÖnyükleme dosyasının ismi dosya yolunu da içermeli.\n"
 
-#: fdisk/fdisksgilabel.c:321
+#: fdisk/fdisksgilabel.c:320
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3483,7 +3485,7 @@
 "\tSGI için \"/unix\" öntanımlı önyükleme dosyasıdır ve yedek dosyasının\n"
 "öntanımlı ismi \"/unix.save\"dir.\n"
 
-#: fdisk/fdisksgilabel.c:349
+#: fdisk/fdisksgilabel.c:346
 #, c-format
 msgid ""
 "\n"
@@ -3492,19 +3494,19 @@
 "\n"
 "\tÖnyükleme dosyası \"%s\" olarak deÄŸiÅŸtirildi.\n"
 
-#: fdisk/fdisksgilabel.c:447
+#: fdisk/fdisksgilabel.c:436
 msgid "More than one entire disk entry present.\n"
 msgstr "Birden fazla tüm disk girdisi var.\n"
 
-#: fdisk/fdisksgilabel.c:455 fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksgilabel.c:443 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
 msgstr "Atanmış disk bölümü yok\n"
 
-#: fdisk/fdisksgilabel.c:462
+#: fdisk/fdisksgilabel.c:449
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "11. disk bölümü tüm diski kapsadığında IRIX'e uygun olur.\n"
 
-#: fdisk/fdisksgilabel.c:464
+#: fdisk/fdisksgilabel.c:451
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3513,7 +3515,7 @@
 "Diskin tümünü kaplayan bir disk bölümü blok 0'dan baÅŸlamalıydı.\n"
 "%d. bloktan deÄŸil\n"
 
-#: fdisk/fdisksgilabel.c:468
+#: fdisk/fdisksgilabel.c:457
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3522,31 +3524,31 @@
 "Diskin tümünü kapladığı belirtilen disk bölümü %d blok,\n"
 "diskin tamamı ise %d blok.\n"
 
-#: fdisk/fdisksgilabel.c:475
+#: fdisk/fdisksgilabel.c:463
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "Tek disk bölümü (#11) tüm diski kaplamalıydı.\n"
 
-#: fdisk/fdisksgilabel.c:487
+#: fdisk/fdisksgilabel.c:473
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "%d disk bölümü silindir sınırında baÅŸlamıyor.\n"
 
-#: fdisk/fdisksgilabel.c:494
+#: fdisk/fdisksgilabel.c:479
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "%d disk bölümü silindir sınırında bitmiyor.\n"
 
-#: fdisk/fdisksgilabel.c:502
+#: fdisk/fdisksgilabel.c:486
 #, c-format
 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:511 fdisk/fdisksgilabel.c:531
-#, c-format
-msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+#: fdisk/fdisksgilabel.c:494 fdisk/fdisksgilabel.c:512
+#, fuzzy, 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"
 
-#: fdisk/fdisksgilabel.c:544
+#: fdisk/fdisksgilabel.c:523
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
@@ -3554,7 +3556,7 @@
 "\n"
 "Önyükleme disk bölümü yok.\n"
 
-#: fdisk/fdisksgilabel.c:548
+#: fdisk/fdisksgilabel.c:526
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
@@ -3562,7 +3564,7 @@
 "\n"
 "Takas bölümü yok.\n"
 
-#: fdisk/fdisksgilabel.c:553
+#: fdisk/fdisksgilabel.c:530
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
@@ -3570,15 +3572,16 @@
 "\n"
 "Takas bölümünün türü takas deÄŸil.\n"
 
-#: fdisk/fdisksgilabel.c:557
+#: fdisk/fdisksgilabel.c:533
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tKullanışsız bir önyükleme dosyası seçtiniz.\n"
 
-#: fdisk/fdisksgilabel.c:568
+#. caught already before, ...
+#: fdisk/fdisksgilabel.c:542
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr "BoÅŸ olmayan bir disk bölümünün etiketini deÄŸiÅŸtirebilirsiniz!\n"
 
-#: fdisk/fdisksgilabel.c:575
+#: 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"
@@ -3592,32 +3595,32 @@
 "\"SGI volume\" onunla çeliÅŸebilir. Bu disk bölümünü farklı\n"
 "oluşturmak istiyorsanız EVET yazın.\n"
 
-#: fdisk/fdisksgilabel.c:580 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisksgilabel.c:553 fdisk/fdisksunlabel.c:627
 msgid "YES\n"
 msgstr "EVET\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:606
+#: fdisk/fdisksgilabel.c:577
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr ""
 "Disk üzerindeki diÄŸer bölümlerin üzerine taÅŸan bir disk bölümü\n"
 "ayırdığınızın farkında mısınız?\n"
 
-#: fdisk/fdisksgilabel.c:668
+#: fdisk/fdisksgilabel.c:637
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "Tüm disk girdisi otomatik olarak üretilmeye çalışılıyor.\n"
 
-#: fdisk/fdisksgilabel.c:675
+#: fdisk/fdisksgilabel.c:642
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "Tüm disk alanı zaten disk bölümlerince kullanılmış.\n"
 
-#: fdisk/fdisksgilabel.c:680
+#: fdisk/fdisksgilabel.c:646
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Disk üzerindeki diÄŸer bölümlerin üzerine taÅŸan bir disk bölümü\n"
 "ayırdığınız. Önce bunu düzeltin!\n"
 
-#: fdisk/fdisksgilabel.c:689 fdisk/fdisksgilabel.c:718
+#: 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"
@@ -3625,18 +3628,18 @@
 "Onbirinci disk bölümünün tüm diski kapsaması ve `SGI volume'\n"
 "türünde olması tavsiye edilir.\n"
 
-#: fdisk/fdisksgilabel.c:705
+#: fdisk/fdisksgilabel.c:671
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Disk üzerindeki diÄŸer bölümlerin üzerine taÅŸan bir disk bölümü\n"
 "ayıracaksınız. Önce bunu düzeltin!\n"
 
-#: fdisk/fdisksgilabel.c:710
+#: fdisk/fdisksgilabel.c:676
 #, c-format
 msgid " Last %s"
 msgstr " Son %s"
 
-#: fdisk/fdisksgilabel.c:732
+#: 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"
@@ -3648,12 +3651,20 @@
 "diskte bulunan tüm bilgiyi bir daha geri alamamak üzere\n"
 "kaybedeceksiniz.\n"
 
-#: fdisk/fdisksgilabel.c:758
+#: 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 ""
+
+#: fdisk/fdisksgilabel.c:738
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "%d disk bölümünün parametreleri okunmaya çalışılıyor.\n"
 
-#: fdisk/fdisksgilabel.c:760
+#: fdisk/fdisksgilabel.c:740
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "Kimlik=%02x\tBaÅŸlangıç=%d\tBoy=%d\n"
@@ -3742,63 +3753,63 @@
 msgid "Autoconfigure failed.\n"
 msgstr "Otoyapılandırma hata verdi.\n"
 
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Sektör/iz"
 
-#: fdisk/fdisksunlabel.c:327
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Almaşık silindirler"
 
-#: fdisk/fdisksunlabel.c:330
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Fiziksel silindirler"
 
-#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:727
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:723
 msgid "Rotation speed (rpm)"
 msgstr "Devir sayısı (rpm)"
 
-#: fdisk/fdisksunlabel.c:335 fdisk/fdisksunlabel.c:720
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:716
 msgid "Interleave factor"
 msgstr "SerpiÅŸtirme etkeni"
 
-#: fdisk/fdisksunlabel.c:338 fdisk/fdisksunlabel.c:713
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:709
 msgid "Extra sectors per cylinder"
 msgstr "Silindir başına fazladan sektörler"
 
-#: fdisk/fdisksunlabel.c:352
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "Tüm disk parametrelerini x menüsünden deÄŸiÅŸtirebilirsiniz"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "3,5\" floppy"
 
-#: fdisk/fdisksunlabel.c:359
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "Linux özel"
 
-#: fdisk/fdisksunlabel.c:446
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "%d disk bölümü silindir sınırında bitmiyor\n"
 
-#: fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:462
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "%d disk bölümü diÄŸerleriyle %d-%d sektörlerinde üstüste biniyor\n"
 
-#: fdisk/fdisksunlabel.c:488
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Kullanılmamış boÅŸluk - 0-%d sektörlerinde\n"
 
-#: fdisk/fdisksunlabel.c:490 fdisk/fdisksunlabel.c:494
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Kullanılmamış boÅŸluk - %d-%d sektörlerinde\n"
 
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3807,7 +3818,7 @@
 "Tekrar denemeden önce bazılarını silmeniz ya da\n"
 "küçültmeniz gerek.\n"
 
-#: fdisk/fdisksunlabel.c:593
+#: fdisk/fdisksunlabel.c:589
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3818,7 +3829,7 @@
 "diÄŸer disk bölümlerine de geçiyor. GirdiÄŸiniz deÄŸer %d %s olarak\n"
 "deÄŸiÅŸtirildi.\n"
 
-#: fdisk/fdisksunlabel.c:613
+#: fdisk/fdisksunlabel.c:609
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3827,7 +3838,7 @@
 "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:626
+#: fdisk/fdisksunlabel.c:622
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3841,7 +3852,7 @@
 "82 etiketli (Linux takas) olmasını istediÄŸinizden eminseniz lütfen\n"
 "EVET yazınız: "
 
-#: fdisk/fdisksunlabel.c:657
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid ""
 "\n"
@@ -3860,7 +3871,7 @@
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:671
+#: fdisk/fdisksunlabel.c:667
 #, c-format
 msgid ""
 "\n"
@@ -3873,16 +3884,16 @@
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:676
+#: fdisk/fdisksunlabel.c:672
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flama BaÅŸlangÄ±ç    BitiÅŸ   Blok#   Kiml Sistem\n"
 
-#: fdisk/fdisksunlabel.c:701
+#: fdisk/fdisksunlabel.c:697
 msgid "Number of alternate cylinders"
 msgstr "Almaşık silindirlerin sayısı"
 
-#: fdisk/fdisksunlabel.c:734
+#: fdisk/fdisksunlabel.c:730
 msgid "Number of physical cylinders"
 msgstr "Fiziksel silindirlerin sayısı"
 
@@ -4496,16 +4507,16 @@
 #: 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 ""
-"birimler = 1048576 baytlık megabayt, 1024 baytlık blok, %d'den başlayarak\n"
+"birimler = 1048576 baytlık mebibayt, 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
 #: fdisk/sfdisk.c:887
-msgid "   Device Boot Start   End     MB    #blocks   Id  System\n"
+msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
-"   Aygıt Önyük BaÅŸl   BitiÅŸ    MB     blok    Kiml Sistem\n"
+"   Aygıt Önyük BaÅŸl   BitiÅŸ    MiB     blok    Kiml Sistem\n"
 "                                     sayısı\n"
 
 #: fdisk/sfdisk.c:1047
@@ -4646,6 +4657,10 @@
 "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
+msgid "start"
+msgstr "baÅŸlangıç"
+
 #: fdisk/sfdisk.c:1275
 #, c-format
 msgid ""
@@ -4654,6 +4669,10 @@
 "%s: baÅŸlangıç: (sld,kafa,sekt) sırasıyla (%ld,%ld,%ld) olmalıydı\n"
 "(%ld,%ld,%ld) bulundu\n"
 
+#: fdisk/sfdisk.c:1281
+msgid "end"
+msgstr "bitiÅŸ"
+
 #: fdisk/sfdisk.c:1284
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4717,98 +4736,98 @@
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n flaması verilmiÅŸ: Hiçbir ÅŸey deÄŸiÅŸmedi\n"
 
-#: fdisk/sfdisk.c:1577
+#: fdisk/sfdisk.c:1579
 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:1582
+#: fdisk/sfdisk.c:1584
 #, 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:1659
+#: fdisk/sfdisk.c:1661
 msgid "long or incomplete input line - quitting\n"
 msgstr "uzun ve eksik girdi satırı - çıkılıyor\n"
 
-#: fdisk/sfdisk.c:1695
+#: fdisk/sfdisk.c:1697
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "girdi hatası: %s alanından sonra bir `=' gerekli\n"
 
-#: fdisk/sfdisk.c:1702
+#: fdisk/sfdisk.c:1704
 #, 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:1708
+#: fdisk/sfdisk.c:1710
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "anlaşılmayan girdi: %s\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1752
 msgid "number too big\n"
 msgstr "sayı çok büyük\n"
 
-#: fdisk/sfdisk.c:1754
+#: fdisk/sfdisk.c:1756
 msgid "trailing junk after number\n"
 msgstr "sayıdan sonrasında süprüntü\n"
 
-#: fdisk/sfdisk.c:1875
+#: fdisk/sfdisk.c:1877
 msgid "no room for partition descriptor\n"
 msgstr "disk bölümü betimleyici için yer yok\n"
 
-#: fdisk/sfdisk.c:1908
+#: fdisk/sfdisk.c:1910
 msgid "cannot build surrounding extended partition\n"
 msgstr "kuÅŸatan ek disk bölümü kurgulanamıyor\n"
 
-#: fdisk/sfdisk.c:1959
+#: fdisk/sfdisk.c:1961
 msgid "too many input fields\n"
 msgstr "girdi alanları çok fazla\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1993
+#: fdisk/sfdisk.c:1995
 msgid "No room for more\n"
 msgstr "Daha fazla yer yok\n"
 
-#: fdisk/sfdisk.c:2012
+#: fdisk/sfdisk.c:2014
 msgid "Illegal type\n"
 msgstr "Kuraldışı tür\n"
 
-#: fdisk/sfdisk.c:2044
+#: fdisk/sfdisk.c:2046
 #, 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:2050
+#: fdisk/sfdisk.c:2052
 msgid "Warning: empty partition\n"
 msgstr "Uyarı: boÅŸ disk bölümü\n"
 
-#: fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2066
 #, 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:2077
+#: fdisk/sfdisk.c:2079
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "anlaşılmayan önyükleme flaması; - ya da * seçiniz\n"
 
-#: fdisk/sfdisk.c:2094 fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2096 fdisk/sfdisk.c:2109
 msgid "partial c,h,s specification?\n"
 msgstr "kısmi sld,kafa,sekt özellikleri?\n"
 
-#: fdisk/sfdisk.c:2118
+#: fdisk/sfdisk.c:2120
 msgid "Extended partition not where expected\n"
 msgstr "Ek disk bölümü gereken yerde deÄŸil\n"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2152
 msgid "bad input\n"
 msgstr "girdi hatalı\n"
 
-#: fdisk/sfdisk.c:2172
+#: fdisk/sfdisk.c:2174
 msgid "too many partitions\n"
 msgstr "çok fazla disk bölümü var\n"
 
-#: fdisk/sfdisk.c:2205
+#: 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"
@@ -4821,46 +4840,46 @@
 "Genellikle <baÅŸlangıç> ve <uzunluk> deÄŸerleri (ve tabii ki <türü>)\n"
 "belirtmek yeterlidir.\n"
 
-#: fdisk/sfdisk.c:2225
+#: fdisk/sfdisk.c:2227
 msgid "version"
 msgstr "sürüm"
 
-#: fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2233
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: fdisk/sfdisk.c:2232
+#: fdisk/sfdisk.c:2234
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "aygıt: /dev/hda veya /dev/sda gibi"
 
-#: fdisk/sfdisk.c:2233
+#: fdisk/sfdisk.c:2235
 msgid "useful options:"
 msgstr "kullanışlı seçenekler:"
 
-#: fdisk/sfdisk.c:2234
+#: fdisk/sfdisk.c:2236
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s  --show-size     disk bölümü uzunlukları listelenir"
 
-#: fdisk/sfdisk.c:2235
+#: fdisk/sfdisk.c:2237
 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:2236
+#: fdisk/sfdisk.c:2238
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l  --list          aygıtların disk bölümlerini listeler"
 
-#: fdisk/sfdisk.c:2237
+#: fdisk/sfdisk.c:2239
 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:2238
+#: fdisk/sfdisk.c:2240
 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:2239
+#: fdisk/sfdisk.c:2241
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -4868,53 +4887,53 @@
 "    -uS, -uB, -uC, -uM  sektör/blok/silindir/MB birimleriyle deÄŸer alır/"
 "gösterir"
 
-#: fdisk/sfdisk.c:2240
+#: fdisk/sfdisk.c:2242
 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:2241
+#: fdisk/sfdisk.c:2243
 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:2242
+#: fdisk/sfdisk.c:2244
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R  --re-read       çekirdek yeniden okuma tablosu yapar"
 
-#: fdisk/sfdisk.c:2243
+#: fdisk/sfdisk.c:2245
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N#                 sadece # numaralı disk alanı değiştirilir"
 
-#: fdisk/sfdisk.c:2244
+#: fdisk/sfdisk.c:2246
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n                  gerçekte diske yazılmaz"
 
-#: fdisk/sfdisk.c:2245
+#: fdisk/sfdisk.c:2247
 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:2246
+#: fdisk/sfdisk.c:2248
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I dosya            sektörleri bu dosyadan tekrar oluÅŸturur"
 
-#: fdisk/sfdisk.c:2247
+#: fdisk/sfdisk.c:2249
 msgid "    -v [or --version]:   print version"
 msgstr "    -v  --version       sürüm bilgilerini gösterir"
 
-#: fdisk/sfdisk.c:2248
+#: fdisk/sfdisk.c:2250
 msgid "    -? [or --help]:      print this message"
 msgstr "    -?  --help          bu yardım iletisini gösterir ve çıkar"
 
-#: fdisk/sfdisk.c:2249
+#: fdisk/sfdisk.c:2251
 msgid "dangerous options:"
 msgstr "tehlikeli seçenekler:"
 
-#: fdisk/sfdisk.c:2250
+#: fdisk/sfdisk.c:2252
 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:2251
+#: fdisk/sfdisk.c:2253
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4922,119 +4941,119 @@
 "    -x  --show-extended ek disk bölümlerini gösterir ve\n"
 "                        betimleyicileri için girdi bekler"
 
-#: fdisk/sfdisk.c:2253
+#: fdisk/sfdisk.c:2255
 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:2254
+#: fdisk/sfdisk.c:2256
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  --quiet         uyarıları engeller"
 
-#: fdisk/sfdisk.c:2255
+#: fdisk/sfdisk.c:2257
 msgid "    You can override the detected geometry using:"
 msgstr "Saptanan geometriyi aÅŸmak için seçenekler:"
 
-#: fdisk/sfdisk.c:2256
+#: fdisk/sfdisk.c:2258
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C#  --cylinders #  kullanılacak silindir sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2257
+#: fdisk/sfdisk.c:2259
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H#  --heads #      kulanılacak kafa sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2258
+#: fdisk/sfdisk.c:2260
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S#  --sectors #    kullanılacak sektör sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2259
+#: fdisk/sfdisk.c:2261
 msgid "You can disable all consistency checking with:"
 msgstr "Kararlılık denetimlerini etkisizleÅŸtirme seçenekleri:"
 
-#: fdisk/sfdisk.c:2260
+#: fdisk/sfdisk.c:2262
 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:2266
+#: fdisk/sfdisk.c:2268
 msgid "Usage:"
 msgstr "Kullanımı:"
 
-#: fdisk/sfdisk.c:2267
+#: fdisk/sfdisk.c:2269
 #, 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:2268
+#: fdisk/sfdisk.c:2270
 #, 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:2269
+#: fdisk/sfdisk.c:2271
 #, 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:2421
+#: fdisk/sfdisk.c:2423
 msgid "no command?\n"
 msgstr "Komut?\n"
 
-#: fdisk/sfdisk.c:2539
+#: fdisk/sfdisk.c:2541
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "toplam: %d blok\n"
 
-#: fdisk/sfdisk.c:2576
+#: fdisk/sfdisk.c:2578
 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:2578
+#: fdisk/sfdisk.c:2580
 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:2580
+#: fdisk/sfdisk.c:2582
 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:2587
+#: fdisk/sfdisk.c:2589
 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:2613
+#: fdisk/sfdisk.c:2615
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s oku-yaz açılamıyor\n"
 
-#: fdisk/sfdisk.c:2615
+#: fdisk/sfdisk.c:2617
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s okumak için açılamıyor\n"
 
-#: fdisk/sfdisk.c:2640
+#: fdisk/sfdisk.c:2642
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: TAMAM\n"
 
-#: fdisk/sfdisk.c:2657
+#: fdisk/sfdisk.c:2659
 #, 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:2674
+#: fdisk/sfdisk.c:2676
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE ioctl %s için baÅŸarısız\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2754
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "hatalı etkin bayt: 0x80 yerine 0x%x\n"
 
-#: fdisk/sfdisk.c:2768 fdisk/sfdisk.c:2821 fdisk/sfdisk.c:2852
+#: fdisk/sfdisk.c:2772 fdisk/sfdisk.c:2825 fdisk/sfdisk.c:2856
 msgid ""
 "Done\n"
 "\n"
@@ -5042,7 +5061,7 @@
 "Bitti\n"
 "\n"
 
-#: fdisk/sfdisk.c:2777
+#: fdisk/sfdisk.c:2781
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5051,35 +5070,35 @@
 "%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:2791
+#: fdisk/sfdisk.c:2795
 #, 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:2848
+#: fdisk/sfdisk.c:2852
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Kimlik %lx hatalı\n"
 
-#: fdisk/sfdisk.c:2863
+#: fdisk/sfdisk.c:2867
 msgid "This disk is currently in use.\n"
 msgstr "Bu disk şu an kullanılıyor.\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2884
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ölümcül hata: %s bulunamıyor\n"
 
-#: fdisk/sfdisk.c:2883
+#: fdisk/sfdisk.c:2887
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Uyarı: %s bir blok aygıtı değil\n"
 
-#: fdisk/sfdisk.c:2889
+#: fdisk/sfdisk.c:2893
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Diskin kullanımda olup olmadığı denetleniyor...\n"
 
-#: fdisk/sfdisk.c:2891
+#: fdisk/sfdisk.c:2895
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5092,28 +5111,28 @@
 "alanlarını swapoff ile kapatın. --no-reread bayrağını kullanarak\n"
 "yeniden okuma iÅŸlemini engelleyin.\n"
 
-#: fdisk/sfdisk.c:2895
+#: fdisk/sfdisk.c:2899
 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:2899
+#: fdisk/sfdisk.c:2903
 msgid "OK\n"
 msgstr "TAMAM\n"
 
-#: fdisk/sfdisk.c:2908
+#: fdisk/sfdisk.c:2912
 msgid "Old situation:\n"
 msgstr "Eski durum:\n"
 
-#: fdisk/sfdisk.c:2912
+#: fdisk/sfdisk.c:2916
 #, 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:2920
+#: fdisk/sfdisk.c:2924
 msgid "New situation:\n"
 msgstr "Yeni durum:\n"
 
-#: fdisk/sfdisk.c:2925
+#: fdisk/sfdisk.c:2929
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5121,19 +5140,19 @@
 "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:2928
+#: fdisk/sfdisk.c:2932
 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:2933
+#: fdisk/sfdisk.c:2937
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bundan memnun musunuz? [ehs] "
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2939
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Bunu diske yazmak ister misiniz? [ehs] "
 
-#: fdisk/sfdisk.c:2940
+#: fdisk/sfdisk.c:2944
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5141,15 +5160,15 @@
 "\n"
 "sfdisk: girdi sonu eksik\n"
 
-#: fdisk/sfdisk.c:2942
+#: fdisk/sfdisk.c:2946
 msgid "Quitting - nothing changed\n"
 msgstr "Çıkılıyor - DeÄŸiÅŸiklik yok\n"
 
-#: fdisk/sfdisk.c:2948
+#: fdisk/sfdisk.c:2952
 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:2956
+#: fdisk/sfdisk.c:2960
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5157,7 +5176,7 @@
 "Yeni disk bölümleme tablosu baÅŸarıyla yazıldı\n"
 "\n"
 
-#: fdisk/sfdisk.c:2962
+#: 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"
@@ -5169,93 +5188,93 @@
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(daha fazla bilgi için: fdisk(8).)\n"
 
-#: getopt-1.1.2/getopt.c:233
+#: getopt/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Daha fazla bilgi için `getopt --help' yazınız.\n"
 
-#: getopt-1.1.2/getopt.c:299
+#: getopt/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "-l ya da --long için argüman olarak uzun seçenek verilmemiÅŸ"
 
-#: getopt-1.1.2/getopt.c:319
+#: getopt/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "-s ya da --shell seçenekleri ile belirtilen kabuk bilinmiyor"
 
-#: getopt-1.1.2/getopt.c:324
+#: getopt/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Kullanımı: getopt seçenek-dizgesi parametreler\n"
 
-#: getopt-1.1.2/getopt.c:325
+#: getopt/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [seçenekler] [--] seçenek-dizgesi parametreler\n"
 
-#: getopt-1.1.2/getopt.c:326
+#: getopt/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
 "       getopt [seçenekler] -o|--options seçenek-dizgesi [seçenekler] [--]\n"
 
-#: getopt-1.1.2/getopt.c:327
+#: getopt/getopt.c:327
 msgid "              parameters\n"
 msgstr "              parametreler\n"
 
-#: getopt-1.1.2/getopt.c:328
+#: getopt/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative             tek - ile baÅŸlayan uzun seçeneklere izin\n"
 "                                verilir\n"
 
-#: getopt-1.1.2/getopt.c:329
+#: getopt/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                    Bu yardım iletisini gösterir\n"
 
-#: getopt-1.1.2/getopt.c:330
+#: getopt/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=uzunSeçnk   tanınacak uzun seçenek belirtilir\n"
 
-#: getopt-1.1.2/getopt.c:331
+#: getopt/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr "  -n, --name=uygismi            Hatalar bu isim altında raporlanır\n"
 
-#: getopt-1.1.2/getopt.c:332
+#: getopt/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=sçnkdizgesi     Tanınacak kısa seçenekler belirtilir\n"
 
-#: getopt-1.1.2/getopt.c:333
+#: getopt/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 "  -q, --quiet                   getopt(3)'un ürettiÄŸi hatalar gösterilmez\n"
 
-#: getopt-1.1.2/getopt.c:334
+#: getopt/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Normalde verilen çıktı verilmez\n"
 
-#: getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=kabukTürü         Kullanılacak kabuk türü belirtilir\n"
 
-#: getopt-1.1.2/getopt.c:336
+#: getopt/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                    getopt(1) sürümü için test\n"
 
-#: getopt-1.1.2/getopt.c:337
+#: getopt/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -u, --unqote                  Çıktı tırnak içine alınmaz\n"
 
-#: getopt-1.1.2/getopt.c:338
+#: getopt/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                 Sürüm bilgilerini gösterir\n"
 
-#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
+#: getopt/getopt.c:395 getopt/getopt.c:456
 msgid "missing optstring argument"
 msgstr "seçenek-dizgesi verilmemiÅŸ"
 
-#: getopt-1.1.2/getopt.c:441
-msgid "getopt (enhanced) 1.1.2\n"
-msgstr "getopt (geliÅŸmiÅŸ) 1.1.2\n"
+#: getopt/getopt.c:444
+msgid "getopt (enhanced) 1.1.3\n"
+msgstr "getopt (geliÅŸmiÅŸ) 1.1.3\n"
 
-#: getopt-1.1.2/getopt.c:447
+#: getopt/getopt.c:450
 msgid "internal error, contact the author."
 msgstr "iç hata, yazara bildirin."
 
@@ -5764,7 +5783,7 @@
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK ioctl zamanı okumada başarısız"
 
-#: hwclock/kd.c:67 hwclock/rtc.c:187
+#: hwclock/kd.c:67 hwclock/rtc.c:186
 msgid "Timed out waiting for time change.\n"
 msgstr "Zamanı deÄŸiÅŸtirmek için zamanaşımı bekleniyor.\n"
 
@@ -5789,57 +5808,57 @@
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK ioctl başarısız"
 
-#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#: hwclock/rtc.c:114 hwclock/rtc.c:207
 #, c-format
 msgid "open() of %s failed"
 msgstr "%s için open() iÅŸlevi hata verdi"
 
-#: hwclock/rtc.c:149
+#: hwclock/rtc.c:148
 #, 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:171
+#: hwclock/rtc.c:170
 #, 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:226
+#: hwclock/rtc.c:225
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr "%s için kesme iÅŸlevleri yok."
 
-#: hwclock/rtc.c:235
+#: hwclock/rtc.c:234
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr "read() %s den saat darbesi beklerken hata verdi"
 
-#: hwclock/rtc.c:244
+#: hwclock/rtc.c:243
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "ioctl() %s den güncelleme kesmelerini durduramadı"
 
-#: hwclock/rtc.c:247
+#: hwclock/rtc.c:246
 #, 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:306
+#: hwclock/rtc.c:305
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr "ioctl() %s den zamanı ayarlayamadı.\n"
 
-#: hwclock/rtc.c:312
+#: hwclock/rtc.c:311
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) başarıldı.\n"
 
-#: hwclock/rtc.c:341
+#: hwclock/rtc.c:340
 #, c-format
 msgid "Open of %s failed"
 msgstr "%s açılamadı"
 
-#: hwclock/rtc.c:359 hwclock/rtc.c:405
+#: 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' "
@@ -5850,17 +5869,17 @@
 "üzerinden Linux 'rtc' aygıt sürücüsüne eriÅŸilmelidir.   Bu dosya sistemde "
 "yok.\n"
 
-#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#: hwclock/rtc.c:363 hwclock/rtc.c:409
 #, c-format
 msgid "Unable to open %s"
 msgstr "%s açılamıyor"
 
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:370
 #, 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:377
+#: hwclock/rtc.c:376
 #, 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"
@@ -5868,24 +5887,24 @@
 #. 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:397
+#: hwclock/rtc.c:396
 #, 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:415
+#: hwclock/rtc.c:414
 #, 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:420
+#: hwclock/rtc.c:419
 #, 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:423
+#: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) %s için hata verdi"
@@ -6087,9 +6106,8 @@
 msgid "Password error."
 msgstr "Parola hatası."
 
-#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780
-#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249
-#: mount/lomount.c:254
+#: 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
 msgid "Password: "
 msgstr "Parola: "
 
@@ -6308,29 +6326,29 @@
 "\n"
 "durduruldu: %10.10s %5.5s \n"
 
-#: login-utils/login.c:260
+#: login-utils/login.c:254
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
 msgstr "ÖLÜMCÜL: tty tekrar açılamıyor: %s"
 
-#: login-utils/login.c:291
+#: login-utils/login.c:285
 msgid "FATAL: bad tty"
 msgstr "ÖLÜMCÜL: tty hatalı"
 
-#: login-utils/login.c:424
+#: login-utils/login.c:418
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h sadece root tarafından kullanılabilir.\n"
 
-#: login-utils/login.c:451
+#: login-utils/login.c:445
 msgid "usage: login [-fp] [username]\n"
 msgstr "Kullanımı: login [-fp] [kullanıcı]\n"
 
-#: login-utils/login.c:544
+#: login-utils/login.c:538
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM hatası, çıkılıyor: %s\n"
 
-#: login-utils/login.c:546
+#: login-utils/login.c:540
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM başlatılamadı: %s"
@@ -6341,16 +6359,16 @@
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:563
+#: login-utils/login.c:557
 msgid "login: "
 msgstr "Kullanıcı ismi: "
 
-#: login-utils/login.c:603
+#: login-utils/login.c:597
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "%3$s %2$s ÜZERÄ°NDEN %1$d DEFA GÄ°REMEDÄ°, %4$s"
 
-#: login-utils/login.c:607
+#: login-utils/login.c:601
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -6358,17 +6376,17 @@
 "Giriş başarısız\n"
 "\n"
 
-#: login-utils/login.c:616
+#: login-utils/login.c:610
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "%3$s %2$s ÜZERÄ°NDEN ÇOK FAZLA GÄ°RÄ°Åž DENEDÄ° (%1$d), %4$s"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:614
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "%s MAKÄ°NASINA %s Ä°ÇÄ°N GÄ°RÄ°Åž OTURUMU KAPANDI, %s"
 
-#: login-utils/login.c:624
+#: login-utils/login.c:618
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -6376,7 +6394,7 @@
 "\n"
 "Giriş başarısız\n"
 
-#: login-utils/login.c:646 login-utils/login.c:653 login-utils/login.c:687
+#: login-utils/login.c:640 login-utils/login.c:647 login-utils/login.c:681
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
@@ -6384,45 +6402,45 @@
 "\n"
 "Oturum ayarları sorunu, çıkılıyor.\n"
 
-#: login-utils/login.c:647
+#: login-utils/login.c:641
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "%s işlevinin %d. satırında kullanıcı ismi yok (NULL)."
 
-#: login-utils/login.c:654
+#: login-utils/login.c:648
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 "%2$s iÅŸlevinin %3$d. satırında kullanıcı ismi \"%1$s\" geçersiz. Çıkılıyor."
 
-#: login-utils/login.c:673
+#: login-utils/login.c:667
 msgid "login: Out of memory\n"
 msgstr "login: Bellek yetersiz\n"
 
-#: login-utils/login.c:715
+#: login-utils/login.c:709
 msgid "Illegal username"
 msgstr "Kullanıcı ismi kuraldışı"
 
-#: login-utils/login.c:758
+#: login-utils/login.c:752
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s için bu terminalden giriÅŸ reddedildi.\n"
 
-#: login-utils/login.c:763
+#: login-utils/login.c:757
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "%s Ä°ÇÄ°N %s MAKÄ°NASINDAN %s TERMÄ°NALÄ°NE GÄ°RÄ°Åž REDDEDÄ°LDÄ°"
 
-#: login-utils/login.c:767
+#: login-utils/login.c:761
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "%s Ä°ÇÄ°N %s TERMÄ°NALÄ°NE GÄ°RÄ°Åž REDDEDÄ°LDÄ°"
 
-#: login-utils/login.c:820
+#: login-utils/login.c:814
 msgid "Login incorrect\n"
 msgstr "Giriş başarısız\n"
 
-#: login-utils/login.c:842
+#: login-utils/login.c:836
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -6430,82 +6448,82 @@
 "Kullanıcı sayısı sınırı aşıldı.\n"
 "Daha sonra tekrar deneyin.\n"
 
-#: login-utils/login.c:846
+#: login-utils/login.c:840
 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:1070
+#: login-utils/login.c:1064
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "%s ÜZERÄ°NDEN %s Ä°SMÄ°YLE DIALUP"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1071
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "%s ÜZERÄ°NDEN %s MAKÄ°NASINA ROOT GÄ°RİŞİ"
 
-#: login-utils/login.c:1080
+#: login-utils/login.c:1074
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "%s ÜZERÄ°NDE ROOT GÄ°RİŞİ"
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1077
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "%s ÜZERÄ°NDEN %s, %s MAKÄ°NASINA GÄ°RDÄ°"
 
-#: login-utils/login.c:1086
+#: login-utils/login.c:1080
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "%s ÜZERÄ°NDEN %s SÄ°STEME GÄ°RDÄ°"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1092
 msgid "You have new mail.\n"
 msgstr "Yeni e-postanız var.\n"
 
-#: login-utils/login.c:1100
+#: login-utils/login.c:1094
 msgid "You have mail.\n"
 msgstr "E-postanız var.\n"
 
 #. error in fork()
-#: login-utils/login.c:1118
+#: login-utils/login.c:1112
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: ast süreç oluÅŸturma baÅŸarısız: %s"
 
-#: login-utils/login.c:1155
+#: login-utils/login.c:1149
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY başarısız: %m"
 
-#: login-utils/login.c:1161
+#: login-utils/login.c:1155
 msgid "setuid() failed"
 msgstr "setuid() başarısız"
 
-#: login-utils/login.c:1167
+#: login-utils/login.c:1161
 #, c-format
 msgid "No directory %s!\n"
 msgstr "%s dizini yok!\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1165
 msgid "Logging in with home = \"/\".\n"
 msgstr "Ev dizini \"/\" ile giriÅŸ.\n"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1173
 msgid "login: no memory for shell script.\n"
 msgstr "login: kabuk betiÄŸi için bellek yetersiz.\n"
 
-#: login-utils/login.c:1206
+#: login-utils/login.c:1200
 #, 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:1209
+#: login-utils/login.c:1203
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: kabuk yok: %s.\n"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1218
 #, c-format
 msgid ""
 "\n"
@@ -6514,62 +6532,62 @@
 "\n"
 "%s kullanıcı ismi: "
 
-#: login-utils/login.c:1235
+#: login-utils/login.c:1229
 msgid "login name much too long.\n"
 msgstr "Kullanıcı adınız çok uzun.\n"
 
-#: login-utils/login.c:1236
+#: login-utils/login.c:1230
 msgid "NAME too long"
 msgstr "Ä°SÄ°M çok uzun"
 
-#: login-utils/login.c:1243
+#: login-utils/login.c:1237
 msgid "login names may not start with '-'.\n"
 msgstr "kullanıcı isimleri bir '-' ile başlayamaz.\n"
 
-#: login-utils/login.c:1253
+#: login-utils/login.c:1247
 msgid "too many bare linefeeds.\n"
 msgstr "çok fazla boÅŸ geçildi.\n"
 
-#: login-utils/login.c:1254
+#: login-utils/login.c:1248
 msgid "EXCESSIVE linefeeds"
 msgstr "HADDÄ°NDEN FAZLA boÅŸ giriÅŸ"
 
-#: login-utils/login.c:1265
+#: login-utils/login.c:1259
 #, 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:1354
+#: login-utils/login.c:1348
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Son giriÅŸ: %.*s "
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1352
 #, c-format
 msgid "from %.*s\n"
 msgstr "sularında %.*s makinasına yapıldı\n"
 
-#: login-utils/login.c:1361
+#: login-utils/login.c:1355
 #, c-format
 msgid "on %.*s\n"
 msgstr "sularında %.*s konsoluna yapıldı\n"
 
-#: login-utils/login.c:1381
+#: login-utils/login.c:1375
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s MAKİNASINDAN %s GİRİŞİ BAŞARISIZ"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1378
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s ÜZERÄ°NDEN %s GÄ°RİŞİ BAÅžARISIZ"
 
-#: login-utils/login.c:1388
+#: login-utils/login.c:1382
 #, 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:1391
+#: login-utils/login.c:1385
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%3$s %2$s ÜZERÄ°NDEN %1$d KERE GÄ°REMEDÄ°"
@@ -6898,7 +6916,7 @@
 
 #: login-utils/simpleinit.c:210
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr ""
+msgstr "/dev/initctl üstünde close-on-exec ayarlanırken hata"
 
 #: login-utils/simpleinit.c:257
 msgid "error running finalprog\n"
@@ -6933,7 +6951,7 @@
 msgid "fork failed\n"
 msgstr "ast süreç oluÅŸturulamadı\n"
 
-#: login-utils/simpleinit.c:537 text-utils/more.c:1709
+#: login-utils/simpleinit.c:537 text-utils/more.c:1734
 msgid "exec failed\n"
 msgstr "çalıştırma baÅŸarısız\n"
 
@@ -7234,12 +7252,12 @@
 msgid "Script started, file is %s\n"
 msgstr "Betik başlatıldı, dosyası %s\n"
 
-#: misc-utils/script.c:255
+#: misc-utils/script.c:264
 #, c-format
 msgid "Script started on %s"
 msgstr "%s de betik başlatıldı"
 
-#: misc-utils/script.c:327
+#: misc-utils/script.c:338
 #, c-format
 msgid ""
 "\n"
@@ -7248,210 +7266,210 @@
 "\n"
 "%s üzerinde betik tamamlandı"
 
-#: misc-utils/script.c:335
+#: misc-utils/script.c:345
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Betik tamamlandı, dosyası %s\n"
 
-#: misc-utils/script.c:346
+#: misc-utils/script.c:356
 msgid "openpty failed\n"
 msgstr "openpty başarısız\n"
 
-#: misc-utils/script.c:380
+#: misc-utils/script.c:390
 msgid "Out of pty's\n"
 msgstr "pty sayısı yetersiz\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:744
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Argüman hatası, kullanımı\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:747
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_ismi ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:748
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:749
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:750
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:752
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:753
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:755
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:756
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:757
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:758
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:759
 msgid "  [ -foreground black|blue|green|cyan"
 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 "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:761
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:763
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
-#: misc-utils/setterm.c:769
+#: 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:764
+#: misc-utils/setterm.c:765
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:766
+#: misc-utils/setterm.c:767
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:768
+#: misc-utils/setterm.c:769
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:772
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:773
+#: misc-utils/setterm.c:774
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:775
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:775
+#: misc-utils/setterm.c:776
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:777
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:778
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:779
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:780
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:781
 msgid "  [ -clear [all|rest] ]\n"
 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 "  [ -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 "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:784
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:785
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:786
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-Konsol_nr] ]\n"
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:787
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-Konsol_nr] ]\n"
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:788
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dökümDosyası ]\n"
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:789
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:790
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:790
+#: 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:791
+#: misc-utils/setterm.c:792
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:793
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:794
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq frekans_nr ]\n"
 
-#: misc-utils/setterm.c:1048
+#: misc-utils/setterm.c:1049
 msgid "cannot (un)set powersave mode\n"
 msgstr "ekonomi kipi denetim dışı\n"
 
-#: misc-utils/setterm.c:1087 misc-utils/setterm.c:1095
+#: misc-utils/setterm.c:1088 misc-utils/setterm.c:1096
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl hatası: %s\n"
 
-#: misc-utils/setterm.c:1134
+#: misc-utils/setterm.c:1149
 #, c-format
 msgid "Error reading %s\n"
 msgstr "%s okunurken hata\n"
 
-#: misc-utils/setterm.c:1149
+#: misc-utils/setterm.c:1164
 msgid "Error writing screendump\n"
 msgstr "Ekran dökümü yazılırken hata\n"
 
-#: misc-utils/setterm.c:1163
+#: misc-utils/setterm.c:1178
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "%s okunamadı ve ioctl dökümlenemiyor\n"
 
-#: misc-utils/setterm.c:1229
+#: misc-utils/setterm.c:1244
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM atanmamış.\n"
@@ -7507,17 +7525,17 @@
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "%s@%s den ileti var (%s üzerinden, ÅŸu an %s) ..."
 
-#: mount/fstab.c:113
+#: mount/fstab.c:114
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "uyarı: %s okunurken hata: %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 "uyarı: %s açılamıyor: %s"
 
-#: mount/fstab.c:145
+#: mount/fstab.c:147
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s açılamadı - yerine %s kullanılıyor\n"
@@ -7526,39 +7544,39 @@
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:387
+#: mount/fstab.c:415
 #, 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:399
+#: mount/fstab.c:427
 #, 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:411
+#: mount/fstab.c:439
 #, 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:426
+#: mount/fstab.c:454
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "%s kilit dosyası kilitlenemiyor: %s\n"
 
-#: mount/fstab.c:439
+#: mount/fstab.c:467
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "%s kilit dosyası kilitlenemiyor: %s"
 
-#: mount/fstab.c:441
+#: mount/fstab.c:469
 msgid "timed out"
 msgstr "zaman aşımı"
 
-#: mount/fstab.c:448
+#: mount/fstab.c:476
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -7567,46 +7585,46 @@
 "%s bağı oluşturulamıyor\n"
 "Kalmış bir kilit dosyası olabilir mi?\n"
 
-#: mount/fstab.c:497 mount/fstab.c:533
+#: mount/fstab.c:525 mount/fstab.c:561
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "%s açılamıyor (%s) - mtab güncel deÄŸil"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:569
 #, c-format
 msgid "error writing %s: %s"
 msgstr "%s yazılırken hata: %s"
 
-#: mount/fstab.c:549
+#: mount/fstab.c:577
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "%s için kip deÄŸiÅŸtirilirken hata: %s\n"
 
-#: mount/fstab.c:567
+#: mount/fstab.c:595
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s %s olarak deÄŸiÅŸtirilemiyor: %s\n"
 
-#: mount/lomount.c:80
+#: mount/lomount.c:173
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: %s aygıtı açılamıyor: %s\n"
 
-#: mount/lomount.c:86
+#: mount/lomount.c:179
 #, 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:91
-#, c-format
-msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+#: 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:177
+#: 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:181
+#: mount/lomount.c:249
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -7614,7 +7632,7 @@
 "mount: Hiç bir loop aygıtı bulunamadı.\n"
 "       /dev/loop# bir yanlış major numarası içeriyor olabilir mi?"
 
-#: mount/lomount.c:185
+#: mount/lomount.c:253
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -7626,7 +7644,7 @@
 "       (`insmod loop.o' deneyin, sonuç alamazsanız çekirdeÄŸi\n"
 "        yeniden derleyin.)"
 
-#: mount/lomount.c:191
+#: 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"
@@ -7638,241 +7656,289 @@
 "numarasına\n"
 "       sahip olabilir?"
 
-#: mount/lomount.c:195
+#: mount/lomount.c:263
 msgid "mount: could not find any free loop device"
 msgstr "mount: hiç serbest loop aygıtı yok"
 
-#: mount/lomount.c:225
-#, c-format
-msgid "Unsupported encryption type %s\n"
-msgstr "%s ÅŸifreleme türü bilinmiyor\n"
+#: 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:239
+#: 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
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Bellek içinde kilitlenemedi, çıkılıyor.\n"
 
-#: mount/lomount.c:258
+#: mount/lomount.c:654
 msgid "Init (up to 16 hex digits): "
 msgstr "BaÅŸlangıç (16 taneye kadar onaltılık rakam): "
 
-#: mount/lomount.c:265
+#: mount/lomount.c:661
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "'%c' onaltılık bir rakam değil.\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:764
 #, 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"
 
-#: mount/lomount.c:288
+#: 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:299
-#, c-format
-msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: %s aygıtı silinemiyor: %s\n"
-
-#: mount/lomount.c:309
-#, c-format
-msgid "del_loop(%s): success\n"
-msgstr "del_loop(%s): başarılı\n"
-
-#: mount/lomount.c:317
-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:354
+#: mount/lomount.c:831
 #, 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"
+"  %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 ""
-"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:372 mount/sundries.c:30 mount/sundries.c:45
-#: mount/sundries.c:244
+#: 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:443
-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/lomount.c:945
+#, fuzzy
+msgid "Error: unable to open /etc/fstab for reading\n"
+msgstr "%s okumak için açılamıyor\n"
 
-#: mount/mntent.c:165
+#: 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/mntent.c:168
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: uyarı: %s dosyasının sonunda son bir satırsonu gerekli\n"
 
-#: mount/mntent.c:216
+#: mount/mntent.c:219
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: %d satırı %s dosyasında hatalı%s\n"
 
-#: mount/mntent.c:219
+#: mount/mntent.c:222
 msgid "; rest of file ignored"
 msgstr "; dosyanın kalanı yoksayıldı"
 
-#: mount/mount.c:385
+#: mount/mount.c:396
 #, 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:389
+#: mount/mount.c:400
 #, 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:410
+#: mount/mount.c:421
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s yazmak için açılamıyor: %s"
 
-#: mount/mount.c:425 mount/mount.c:644
+#: mount/mount.c:436 mount/mount.c:660
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: %s yazılırken hata: %s"
 
-#: mount/mount.c:432
+#: mount/mount.c:443
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: %s kipi deÄŸiÅŸtirilirken hata: %s"
 
-#: mount/mount.c:478
+#: mount/mount.c:494
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s takas alanı gibi görünüyor - baÄŸlanmadı"
 
-#: mount/mount.c:538
+#: mount/mount.c:554
 msgid "mount failed"
 msgstr "mount başarısız"
 
-#: mount/mount.c:540
+#: mount/mount.c:556
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: %s %s üzerinde sadece root tarafından baÄŸlanabilir"
 
-#: mount/mount.c:568
+#: mount/mount.c:584
 msgid "mount: loop device specified twice"
 msgstr "mount: loop aygıtı iki kere belirtilmiş"
 
-#: mount/mount.c:573
+#: mount/mount.c:589
 msgid "mount: type specified twice"
 msgstr "mount: türü iki defa belirtilmiÅŸ"
 
-#: mount/mount.c:585
+#: mount/mount.c:601
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: loop aygıtı ayarları atlanıyor\n"
 
-#: mount/mount.c:594
+#: mount/mount.c:610
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: %s loop aygıtının kullanımına gidiliyor\n"
 
-#: mount/mount.c:598
+#: mount/mount.c:614
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop aygıtı ayarları yapılamadı\n"
 
-#: mount/mount.c:602
+#: mount/mount.c:618
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop aygıtı ayarları tamamlandı\n"
 
-#: mount/mount.c:639
+#: mount/mount.c:655
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s açılamıyor: %s"
 
-#: mount/mount.c:662
+#: mount/mount.c:678
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: hızı ayarlamak için %s açılamıyor"
 
-#: mount/mount.c:665
+#: mount/mount.c:681
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/mount.c:726 mount/mount.c:1300
+#: mount/mount.c:735 mount/mount.c:1309
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ast süreç oluÅŸturulamıyor: %s"
 
-#: mount/mount.c:806
+#: mount/mount.c:815
 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:845
+#: mount/mount.c:854
 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:856
+#: mount/mount.c:865
 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:859
+#: mount/mount.c:868
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: dosya sistemi türünü belirtmelisiniz"
 
 #. should not happen
-#: mount/mount.c:862
+#: mount/mount.c:871
 msgid "mount: mount failed"
 msgstr "mount: bağlanamadı"
 
-#: mount/mount.c:868 mount/mount.c:903
+#: mount/mount.c:877 mount/mount.c:912
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: bağlama noktası %s bir dizin değil"
 
-#: mount/mount.c:870
+#: mount/mount.c:879
 msgid "mount: permission denied"
 msgstr "mount: eriÅŸim engellendi"
 
-#: mount/mount.c:872
+#: mount/mount.c:881
 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:876 mount/mount.c:880
+#: mount/mount.c:885 mount/mount.c:889
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s meÅŸgul"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:882
+#: mount/mount.c:891
 msgid "mount: proc already mounted"
 msgstr "mount: proc zaten bağlı"
 
-#: mount/mount.c:884
+#: mount/mount.c:893
 #, 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:890
+#: mount/mount.c:899
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: bağlama noktası %s yok"
 
-#: mount/mount.c:892
+#: mount/mount.c:901
 #, 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:895
+#: mount/mount.c:904
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: özel aygıt %s yok"
 
-#: mount/mount.c:905
+#: mount/mount.c:914
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7881,12 +7947,12 @@
 "mount: özel aygıt %s yok\n"
 "       (dosya yolu öneki bir dizin deÄŸil)\n"
 
-#: mount/mount.c:918
+#: mount/mount.c:927
 #, 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:920
+#: mount/mount.c:929
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7895,35 +7961,35 @@
 "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:954
+#: mount/mount.c:963
 msgid "mount table full"
 msgstr "baÄŸ tablosu dolu"
 
-#: mount/mount.c:956
+#: mount/mount.c:965
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok okunamıyor"
 
-#: mount/mount.c:960
+#: mount/mount.c:969
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: aygıt bilinmiyor"
 
-#: mount/mount.c:965
+#: mount/mount.c:974
 #, 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:977
+#: mount/mount.c:986
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: herhalde %s kastettiniz"
 
-#: mount/mount.c:979
+#: mount/mount.c:988
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: iso9660 kastetmiÅŸ olabilir misiniz?"
 
-#: mount/mount.c:982
+#: mount/mount.c:991
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -7931,14 +7997,14 @@
 "desteklenmiyor"
 
 #. strange ...
-#: mount/mount.c:988
+#: mount/mount.c:997
 #, 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:990
+#: mount/mount.c:999
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7947,97 +8013,98 @@
 "mount: çekirdek %s aygıtını bir blok aygıtı olarak tanımıyor\n"
 "       (`insmod sürücü' denenebilir?)"
 
-#: mount/mount.c:993
+#: mount/mount.c:1002
 #, 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:996
+#: mount/mount.c:1005
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s bir blok aygıtı değil"
 
-#: mount/mount.c:999
+#: mount/mount.c:1008
 #, 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:1002
+#: mount/mount.c:1011
 msgid "block device "
 msgstr "blok aygıtı "
 
-#: mount/mount.c:1004
+#: mount/mount.c:1013
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s salt-okunur bağlanamıyor"
 
-#: mount/mount.c:1008
+#: mount/mount.c:1017
 #, 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:1024
+#: mount/mount.c:1033
 #, 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:1111
+#: 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:1115
+#: mount/mount.c:1124
 #, c-format
 msgid "mount: %s duplicate - not mounted"
 msgstr "mount: %s yinelendi - bağlanmadı"
 
-#: mount/mount.c:1125
+#: 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:1126
+#: mount/mount.c:1135
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1135
 msgid "label"
 msgstr "yafta"
 
-#: mount/mount.c:1128 mount/mount.c:1573
+#: 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:1136
+#: mount/mount.c:1145
 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:1141
-msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
-msgstr "mount: tür belirtilmemiÅŸ - '//' öneki içerdiÄŸinden smb varsayılıyor\n"
+#: mount/mount.c:1150
+msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n"
+msgstr ""
+"mount: tür belirtilmemiÅŸ - '//' öneki içerdiÄŸinden smbfs varsayılıyor\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1157
+#: mount/mount.c:1166
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: \"%s\" artalana alınıyor\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1177
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: \"%s\" bırakılıyor\n"
 
-#: mount/mount.c:1245
+#: mount/mount.c:1254
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s zaten %s üzerinde baÄŸlı\n"
 
-#: mount/mount.c:1376
+#: mount/mount.c:1386
 #, fuzzy
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8059,20 +8126,25 @@
 "       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 fd].\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 -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"
-"  mount -a       /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          AYGITı TÜR türünde DÄ°ZÄ°Ne baÄŸlar\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"
+"\n"
+"Bir aygıtı bağlama:\n"
+"  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"
 "  mount --bind ESKÄ°DÄ°ZÄ°N YENÄ°DÄ°ZÄ°N\n"
 "                 ESKİDİZİNde bağlı olan aygıtı YENİDİZİNe yeniden bağlar\n"
 "  mount --move ESKÄ°DÄ°ZÄ°N YENÄ°DÄ°ZÄ°N\n"
@@ -8086,73 +8158,73 @@
 "Ç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:1549
+#: mount/mount.c:1563
 msgid "mount: only root can do that"
 msgstr "mount: bunu sadece root yapabilir"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1568
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s yok - oluÅŸturuluyor...\n"
 
-#: mount/mount.c:1568
+#: 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:1575
+#: mount/mount.c:1589
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: %s bağlanıyor\n"
 
-#: mount/mount.c:1584
+#: mount/mount.c:1598
 msgid "nothing was mounted"
 msgstr "hiçbir ÅŸey baÄŸlanmadı"
 
-#: mount/mount.c:1599
+#: mount/mount.c:1613
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s  %s içinde bulunamıyor"
 
-#: mount/mount.c:1614
+#: mount/mount.c:1628
 #, 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:259
+#: mount/mount_by_label.c:189
 #, 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:378
+#: mount/mount_by_label.c:309
 msgid "mount: bad UUID"
 msgstr "mount: UUID hatalı"
 
-#: mount/mount_guess_fstype.c:484
+#: mount/mount_guess_fstype.c:483
 msgid "mount: error while guessing filesystem type\n"
 msgstr "mount: dosya sistemi türü belirlenirken hata\n"
 
-#: mount/mount_guess_fstype.c:493
+#: mount/mount_guess_fstype.c:492
 #, 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:496
+#: mount/mount_guess_fstype.c:495
 #, 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:499
+#: mount/mount_guess_fstype.c:498
 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:501
+#: mount/mount_guess_fstype.c:500
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       %s türü denenecek\n"
 
-#: mount/mount_guess_fstype.c:589
+#: mount/mount_guess_fstype.c:588
 #, c-format
 msgid "Trying %s\n"
 msgstr "%s deneniyor\n"
@@ -8246,8 +8318,8 @@
 msgid "bug in xstrndup call"
 msgstr "xstrndup çaÄŸrısında yazılım hatası"
 
-#: mount/swapon.c:64
-#, fuzzy, c-format
+#: mount/swapon.c:74
+#, c-format
 msgid ""
 "usage: %s [-hV]\n"
 "       %s -a [-e] [-v]\n"
@@ -8255,11 +8327,17 @@
 "       %s [-s]\n"
 msgstr ""
 "kullanımı: %s [-hV]\n"
-"           %s -a [-v]\n"
+"           %s -a [-e] [-v]\n"
 "           %s [-v] [-p öncelik] özel ...\n"
 "           %s [-s]\n"
+"  -h          bu yardım iletisini gösterir.\n"
+"  -V          sürüm bilgilerini gösterir.\n"
+"  -s          bağlı takas aygıtlarını listeler.\n"
+"  -a          /etc/fstab dosyasındaki takas aygıtlarını bağlar.\n"
+"  -p öncelik  öncelik 0 ile 32767 arasında bir deÄŸerdir.\n"
+"Takas öncelikleri için: 'man 2 swapon'\n"
 
-#: mount/swapon.c:74
+#: mount/swapon.c:84
 #, c-format
 msgid ""
 "usage: %s [-hV]\n"
@@ -8270,31 +8348,98 @@
 "           %s -a [-v]\n"
 "           %s [-v] özel ...\n"
 
-#: mount/swapon.c:178 mount/swapon.c:242
+#: mount/swapon.c:120 sys-utils/readprofile.c:69
+msgid "out of memory"
+msgstr "bellek yetersiz"
+
+#: mount/swapon.c:201 mount/swapon.c:265
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s %s üzerinde\n"
 
-#: mount/swapon.c:182
+#: mount/swapon.c:205
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: %s durum bilgileri alınamıyor: %s\n"
 
-#: mount/swapon.c:193
+#: mount/swapon.c:216
 #, 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:205
+#: mount/swapon.c:228
 #, 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:248
+#: mount/swapon.c:271
 msgid "Not superuser.\n"
 msgstr "root deÄŸil.\n"
 
-#: mount/swapon.c:312 mount/swapon.c:401
+#: 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
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s açılamıyor: %s\n"
@@ -8388,15 +8533,14 @@
 msgstr "umount: ayrılacak dosya sistemlerinin listesi bulunamıyor"
 
 #: mount/umount.c:457
-#, fuzzy
 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 ""
 "Kullanımı: umount [-hV]\n"
-"       umount -a [-f] [-l] [-r] [-n] [-v] [-t ds-türü]\n"
-"       umount [-f] [-l] [-r] [-n] [-v] dizin | aygıt...\n"
+"       umount -a [-f] [-l] [-r] [-n] [-v] [-t ds-türü] [-O seçenekler]\n"
+"       umount [-f] [-r] [-n] [-v] özel | düÄŸüm...\n"
 "BaÄŸlı dosya sistemlerini ayırmak için kullanılır.\n"
 "  -h          bu yardım iletisini gösterir ve çıkar\n"
 "  -V          sürüm bilgilerini gösterir ve çıkar\n"
@@ -8438,17 +8582,17 @@
 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:564
+#: mount/umount.c:566
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s bağı fstab ile çeliÅŸiyor"
 
-#: mount/umount.c:598
+#: mount/umount.c:602
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: sadece root %s aygıtını %s dizininden ayırabilir"
 
-#: mount/umount.c:669
+#: mount/umount.c:671
 msgid "umount: only root can do that"
 msgstr "umount: bu sadece root tarafından yapılabilir"
 
@@ -8590,7 +8734,7 @@
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f kesme/sec; %f kayıt (karkt/s)\n"
 
-#: sys-utils/dmesg.c:37
+#: sys-utils/dmesg.c:38
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Kullanımı: %s [-c] [-n seviye] [-s tamponBoyu]\n"
@@ -9131,9 +9275,9 @@
 msgstr "kip=%#o\teriÅŸim_izni=%#o\n"
 
 #: sys-utils/ipcs.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr "bayt=%d\tlpid=%d\tcpid=%d\tekSayısı=%ld\n"
+msgstr "bayt=%ld\tlpid=%d\tcpid=%d\tekSayısı=%ld\n"
 
 #: sys-utils/ipcs.c:615
 #, c-format
@@ -9290,12 +9434,13 @@
 msgid "missing comma"
 msgstr "virgül eksik"
 
-#: sys-utils/readprofile.c:60
+#: 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"
@@ -9306,7 +9451,8 @@
 "\t -V            print version and exit\n"
 msgstr ""
 "%s: Kullanımı: \"%s [seçenekler]\n"
-"\t -m <eÅŸlemdosyası>  (öntanımlı = \"%s\")\n"
+"\t -m <eÅŸlemdosyası>  (öntanımlı = \"%s\" ve\n"
+"\t                     \"%s\")\n"
 "\t -p <prodosyası>    (öntanımlı = \"%s\")\n"
 "\t -M <çarpan>        profil çoÄŸullayıcı belirtilir\n"
 "\t -i                 örnekleme adımı hakkında bilgi verir\n"
@@ -9317,38 +9463,34 @@
 "\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:84
-msgid "out of memory"
-msgstr "bellek yetersiz"
-
-#: sys-utils/readprofile.c:147
+#: sys-utils/readprofile.c:188
 #, c-format
-msgid "%s Version %s\n"
+msgid "%s version %s\n"
 msgstr ""
-"%s Sürüm %s\n"
+"%s sürüm %s\n"
 "Çeviri hatalarını <gnu-tr-u12a@listssourceforge.net> adresine bildiriniz\n"
 
-#: sys-utils/readprofile.c:231
+#: sys-utils/readprofile.c:275
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Örnekleme_adımı: %i\n"
 
-#: sys-utils/readprofile.c:244 sys-utils/readprofile.c:268
+#: sys-utils/readprofile.c:296 sys-utils/readprofile.c:320
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): eşlem satırı yanlış\n"
 
-#: sys-utils/readprofile.c:256
+#: sys-utils/readprofile.c:308
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: \"_stext\" %s içinde bulunamıyor\n"
 
-#: sys-utils/readprofile.c:282
+#: sys-utils/readprofile.c:334
 #, 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:323
+#: sys-utils/readprofile.c:375
 msgid "total"
 msgstr "toplam"
 
@@ -9560,16 +9702,16 @@
 msgid "...back 1 page"
 msgstr "...kalan 1 sayfa"
 
-#: text-utils/more.c:1313
+#: text-utils/more.c:1314
 msgid "...skipping one line"
 msgstr "...bir satır atlanıyor"
 
-#: text-utils/more.c:1315
+#: text-utils/more.c:1316
 #, c-format
 msgid "...skipping %d lines"
 msgstr "...%d satır atlanıyor"
 
-#: text-utils/more.c:1352
+#: text-utils/more.c:1353
 msgid ""
 "\n"
 "***Back***\n"
@@ -9579,64 +9721,91 @@
 "***Kalan***\n"
 "\n"
 
-#: text-utils/more.c:1390
+#: 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"
+"Komutların çoÄŸu bir k tamsayı argüman alabilir. Verilmezse köÅŸeli\n"
+"parantezlerle belirtilenler öntanımlıdır. Yıldız (*) iÅŸareti yeni öntanımlı\n"
+"değer olacağını belirtir.\n"
 
-#: text-utils/more.c:1395
+#: text-utils/more.c:1398
 msgid ""
-"<space>\t\t\tDisplay next k lines of text [current screen size]\n"
-"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-"<return>\t\tDisplay next k lines of text [1]*\n"
-"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n"
-"q or Q or <interrupt>\tExit from more\n"
-"s\t\t\tSkip forward k lines of text [1]\n"
-"f\t\t\tSkip forward k screenfuls of text [1]\n"
-"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-"'\t\t\tGo to place where previous search started\n"
-"=\t\t\tDisplay current line number\n"
-"/<regular expression>\tSearch for kth occurrence of regular expression [1]\n"
-"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-"v\t\t\tStart up /usr/bin/vi at current line\n"
-"ctrl-L\t\t\tRedraw screen\n"
-":n\t\t\tGo to kth next file [1]\n"
-":p\t\t\tGo to kth previous file [1]\n"
-":f\t\t\tDisplay current file name and line number\n"
-".\t\t\tRepeat previous command\n"
+"<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 ""
+"<boÅŸluk>       Metnin sonraki k satırını gösterir [ekranın satır sayısı]\n"
+"z              Metnin sonraki k satırını gösterir [ekranın satır sayısı]*\n"
+"<enter>        Metnin sonraki k satırını gösterir [1]*\n"
+"d veya ctrl-D  Metni k satır ilerletir [genellikle 11 satır]*\n"
+"q veya Q ya da <kesme>\n"
+"               more'dan çıkılır.\n"
+"s              Metnin k satırını atlar [1]\n"
+"f              Metnin k ekranlık bölümünü atlar [1]\n"
+"b veya ctrl-B  Metnin geriye doÄŸru k ekranlık bölümünü atlar [1]\n"
+"'              Aramanın ilk baÅŸlatıldığı yere döner\n"
+"=              O anki satır numarasını gösterir\n"
+"/<düzenli ifade>\n"
+"               Düzenli ifade ile belirtilen k'ıncı eÅŸleÅŸmeyi arar [1]\n"
+"n              Son düzenli ifade ile belirtilen sonraki k'ıncı eÅŸleÅŸmeyi\n"
+"               arar [1]\n"
+"!<komut> veya :!<komut>\n"
+"               Alt kabuÄŸunda <komut>u çalıştırır\n"
+"v              Bulunulan satırda /usr/bin/vi çalıştırılır\n"
+"ctrl-L         Ekranı tazeler\n"
+":n             Sonraki k'ıncı satıra gider [1]\n"
+":p             Önceki k'ıncı satıra gider [1]\n"
+":f             Dosya ismini ve satır numarasını gösterir\n"
+".              Önceki komut tekrarlanır\n"
 
-#: text-utils/more.c:1445 text-utils/more.c:1450
+#: text-utils/more.c:1470 text-utils/more.c:1475
 msgid "[Press 'h' for instructions.]"
 msgstr "[Yardım baÅŸlıkları için 'h' tuÅŸuna basınız]"
 
-#: text-utils/more.c:1484
+#: text-utils/more.c:1509
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" satır %d"
 
-#: text-utils/more.c:1486
+#: text-utils/more.c:1511
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Dosya değil] satır %d"
 
-#: text-utils/more.c:1570
+#: text-utils/more.c:1595
 msgid "  Overflow\n"
 msgstr "  TaÅŸma\n"
 
-#: text-utils/more.c:1617
+#: text-utils/more.c:1642
 msgid "...skipping\n"
 msgstr "...atlanıyor\n"
 
-#: text-utils/more.c:1647
+#: text-utils/more.c:1672
 msgid "Regular expression botch"
 msgstr "Düzenli ifade acemice"
 
-#: text-utils/more.c:1659
+#: text-utils/more.c:1684
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9644,15 +9813,15 @@
 "\n"
 "Kalıp bulunamadı\n"
 
-#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292
+#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296
 msgid "Pattern not found"
 msgstr "Kalıp bulunamadı"
 
-#: text-utils/more.c:1723
+#: text-utils/more.c:1748
 msgid "can't fork\n"
 msgstr "ast süreç oluÅŸturulamadı\n"
 
-#: text-utils/more.c:1762
+#: text-utils/more.c:1787
 msgid ""
 "\n"
 "...Skipping "
@@ -9660,19 +9829,19 @@
 "\n"
 "...Atlanıyor "
 
-#: text-utils/more.c:1767
+#: text-utils/more.c:1792
 msgid "...Skipping to file "
 msgstr "...Dosyaya atlanıyor: "
 
-#: text-utils/more.c:1769
+#: text-utils/more.c:1794
 msgid "...Skipping back to file "
 msgstr "...Önceki dosyaya atlanıyor: "
 
-#: text-utils/more.c:2049
+#: text-utils/more.c:2074
 msgid "Line too long"
 msgstr "Satır çok uzun"
 
-#: text-utils/more.c:2092
+#: text-utils/more.c:2117
 msgid "No previous command to substitute for"
 msgstr "Yerini alacak öncesinde bir komut yok"
 
@@ -9722,7 +9891,7 @@
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: dönüÅŸüm karakteri %%%s hatalı.\n"
 
-#: text-utils/pg.c:253
+#: text-utils/pg.c:257
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -9730,33 +9899,33 @@
 "%s: Kullanımı: %s [-number] [-p dizge] [-cefnrs] [+satır] [+/kalıp/] "
 "[dosyalar]\n"
 
-#: text-utils/pg.c:262
+#: text-utils/pg.c:266
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: seçenek bir argümanla kullanılır -- %s\n"
 
-#: text-utils/pg.c:270
+#: text-utils/pg.c:274
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: kuraldışı seçenek -- %s\n"
 
-#: text-utils/pg.c:387
+#: text-utils/pg.c:391
 msgid "...skipping forward\n"
 msgstr "...ileri atlanıyor\n"
 
-#: text-utils/pg.c:389
+#: text-utils/pg.c:393
 msgid "...skipping backward\n"
 msgstr "...geri atlanıyor\n"
 
-#: text-utils/pg.c:411
+#: text-utils/pg.c:415
 msgid "No next file"
 msgstr "Sonrasında dosya yok"
 
-#: text-utils/pg.c:415
+#: text-utils/pg.c:419
 msgid "No previous file"
 msgstr "Öncesinde dosya yok"
 
-#: text-utils/pg.c:945
+#: text-utils/pg.c:949
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: %s dosyasından okuma hatası\n"
@@ -9764,50 +9933,50 @@
 #.
 #. * Most likely '\0' in input.
 #.
-#: text-utils/pg.c:951
+#: text-utils/pg.c:955
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: %s doyasında beklenmedik dosya sonu\n"
 
-#: text-utils/pg.c:954
+#: text-utils/pg.c:958
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: %s doyasında bilinmeyen hata\n"
 
-#: text-utils/pg.c:1049
+#: text-utils/pg.c:1053
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: geçici dosya oluÅŸturulamıyor.\n"
 
-#: text-utils/pg.c:1058 text-utils/pg.c:1233
+#: text-utils/pg.c:1062 text-utils/pg.c:1237
 msgid "RE error: "
 msgstr "RE hatası:"
 
-#: text-utils/pg.c:1215
+#: text-utils/pg.c:1219
 msgid "(EOF)"
 msgstr "(DosyaSonu)"
 
-#: text-utils/pg.c:1241
+#: text-utils/pg.c:1245
 msgid "No remembered search string"
 msgstr "Arama dizgesi yok"
 
-#: text-utils/pg.c:1324
+#: text-utils/pg.c:1328
 msgid "Cannot open "
 msgstr "Açılamıyor"
 
-#: text-utils/pg.c:1372
+#: text-utils/pg.c:1376
 msgid "saved"
 msgstr "kaydedildi"
 
-#: text-utils/pg.c:1479
+#: text-utils/pg.c:1483
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": rflag kipinde ! komutu kullanılmaz.\n"
 
-#: text-utils/pg.c:1511
+#: text-utils/pg.c:1515
 msgid "fork() failed, try again later\n"
 msgstr "Alt süreç oluÅŸturulamadı, daha sonra tekrar deneyin\n"
 
-#: text-utils/pg.c:1716
+#: text-utils/pg.c:1720
 msgid "(Next file: "
 msgstr "(Sonraki dosya: "
 
@@ -9845,6 +10014,32 @@
 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 "del_loop(%s): success\n"
+#~ msgstr "del_loop(%s): başarılı\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 ""
+#~ "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 ""
+#~ "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"
+
+#~ 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"
+
 #~ 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/sys-utils/dmesg.c b/sys-utils/dmesg.c
index 29a1bd7..b9a978e 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -34,81 +34,82 @@
 
 static void
 usage(void) {
-   fprintf( stderr, _("Usage: %s [-c] [-n level] [-s bufsize]\n"), progname );
+	fprintf(stderr,
+		_("Usage: %s [-c] [-n level] [-s bufsize]\n"), progname);
 }
 
 int
-main( int argc, char *argv[] ) {
-   char *buf;
-   int	bufsize = 16392;
-   int  i;
-   int  n;
-   int  c;
-   int  level = 0;
-   int  lastc;
-   int  cmd = 3;
+main(int argc, char *argv[]) {
+	char *buf;
+	int  bufsize = 16392;
+	int  i;
+	int  n;
+	int  c;
+	int  level = 0;
+	int  lastc;
+	int  cmd = 3;
 
-   setlocale(LC_ALL, "");
-   bindtextdomain(PACKAGE, LOCALEDIR);
-   textdomain(PACKAGE);
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
 
-   progname = argv[0];
-   while ((c = getopt( argc, argv, "cn:s:" )) != -1) {
-      switch (c) {
-      case 'c':
-	 cmd = 4;
-	 break;
-      case 'n':
-	 cmd = 8;
-	 level = atoi(optarg);
-	 break;
-      case 's':
-	bufsize = atoi(optarg);
-	break;
-      case '?':
-      default:
-	 usage();
-	 exit(1);
-      }
-   }
-   argc -= optind;
-   argv += optind;
+	progname = argv[0];
+	while ((c = getopt(argc, argv, "cn:s:")) != -1) {
+		switch (c) {
+		case 'c':
+			cmd = 4;
+			break;
+		case 'n':
+			cmd = 8;
+			level = atoi(optarg);
+			break;
+		case 's':
+			bufsize = atoi(optarg);
+			break;
+		case '?':
+		default:
+			usage();
+			exit(1);
+		}
+	}
+	argc -= optind;
+	argv += optind;
    
-   if (argc > 1) {
-      usage();
-      exit(1);
-   }
+	if (argc > 1) {
+		usage();
+		exit(1);
+	}
 
-   if (cmd == 8) {
-      n = klogctl( cmd, NULL, level );
-      if (n < 0) {
-	 perror( "klogctl" );
-	 exit( 1 );
-      }
-      exit( 0 );
-   }
+	if (cmd == 8) {
+		n = klogctl(cmd, NULL, level);
+		if (n < 0) {
+			perror("klogctl");
+			exit(1);
+		}
+		exit(0);
+	}
 
-   if (bufsize < 4096) bufsize = 4096;
-   buf = (char*)malloc(bufsize);
-   n = klogctl( cmd, buf, bufsize );
-   if (n < 0) {
-      perror( "klogctl" );
-      exit( 1 );
-   }
+	if (bufsize < 4096) bufsize = 4096;
+	buf = (char*)malloc(bufsize);
+	n = klogctl(cmd, buf, bufsize);
+	if (n < 0) {
+		perror("klogctl");
+		exit(1);
+	}
 
-   lastc = '\n';
-   for (i = 0; i < n; i++) {
-      if ((i == 0 || buf[i - 1] == '\n') && buf[i] == '<') {
-	 i++;
-	 while (buf[i] >= '0' && buf[i] <= '9')
-	    i++;
-	 if (buf[i] == '>')
-	    i++;
-      }
-      lastc = buf[i];
-      putchar( lastc );
-   }
-   if (lastc != '\n')
-      putchar( '\n' );
-   return 0;
+	lastc = '\n';
+	for (i = 0; i < n; i++) {
+		if ((i == 0 || buf[i - 1] == '\n') && buf[i] == '<') {
+			i++;
+			while (buf[i] >= '0' && buf[i] <= '9')
+				i++;
+			if (buf[i] == '>')
+				i++;
+		}
+		lastc = buf[i];
+		putchar(lastc);
+	}
+	if (lastc != '\n')
+		putchar('\n');
+	return 0;
 }
diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index c91c265..d6ce884 100644
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -31,20 +31,23 @@
  * - skip step size (index 0)
  * 2002-03-09 John Levon <moz@compsoc.man.ac.uk>
  * - make maplineno do something
+ * 2002-11-28 Mads Martin Joergensen +
+ * - 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
  */
 
 #include <errno.h>
 #include <stdio.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/utsname.h>
 #include "nls.h"
 
-#define RELEASE "2.0, May 1996"
-
 #define S_LEN 128
 
 static char *prgname;
@@ -54,24 +57,6 @@
 static char defaultpro[]="/proc/profile";
 static char optstring[]="M:m:np:itvarVb";
 
-static void
-usage(void) {
-  fprintf(stderr,
-		  _("%s: Usage: \"%s [options]\n"
-		  "\t -m <mapfile>  (default = \"%s\")\n"
-		  "\t -p <pro-file> (default = \"%s\")\n"
-		  "\t -M <mult>     set the profiling multiplier to <mult>\n"
-		  "\t -i            print only info about the sampling step\n"
-		  "\t -v            print verbose data\n"
-		  "\t -a            print all symbols, even if count is 0\n"
-		  "\t -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")
-		  ,prgname,prgname,defaultmap,defaultpro);
-  exit(1);
-}
-
 static void *
 xmalloc (size_t size) {
 	void *t;
@@ -105,8 +90,45 @@
 	return fopen(name,mode);
 }
 
+#ifndef BOOT_SYSTEM_MAP
+#define BOOT_SYSTEM_MAP "/boot/System.map-"
+#endif
+
+static char *
+boot_uname_r_str(void) {
+	struct utsname uname_info;
+	char *s;
+	size_t len;
+
+	if (uname(&uname_info))
+		return "";
+	len = strlen(BOOT_SYSTEM_MAP) + strlen(uname_info.release) + 1;
+	s = xmalloc(len);
+	strcpy(s, BOOT_SYSTEM_MAP);
+	strcat(s, uname_info.release);
+	return s;
+}
+
+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"),
+		prgname, prgname, defaultmap, boot_uname_r_str(), defaultpro);
+	exit(1);
+}
+
 int
-main (int argc, char **argv) {
+main(int argc, char **argv) {
 	FILE *map;
 	int proFd;
 	char *mapFile, *proFile, *mult=0;
@@ -129,24 +151,45 @@
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-	prgname=argv[0];
-	proFile=defaultpro;
-	mapFile=defaultmap;
+	prgname = argv[0];
+	proFile = defaultpro;
+	mapFile = defaultmap;
 
-	while ((c = getopt(argc,argv,optstring)) != -1) {
+	while ((c = getopt(argc, argv, optstring)) != -1) {
 		switch(c) {
-		case 'm': mapFile=optarg; break;
-		case 'n': optNative++;	  break;
-		case 'p': proFile=optarg; break;
-		case 'a': optAll++;       break;
-		case 'b': optBins++;	  break;
-		case 'i': optInfo++;      break;
-		case 'M': mult=optarg;    break;
-		case 'r': optReset++;     break;
-		case 'v': optVerbose++;   break;
-		case 'V': printf(_("%s Version %s\n"),prgname,RELEASE);
+		case 'm':
+			mapFile = optarg;
+			break;
+		case 'n':
+			optNative++;
+			break;
+		case 'p':
+			proFile = optarg;
+			break;
+		case 'a':
+			optAll++;
+			break;
+		case 'b':
+			optBins++;
+			break;
+		case 'i':
+			optInfo++;
+			break;
+		case 'M':
+			mult = optarg;
+			break;
+		case 'r':
+			optReset++;
+			break;
+		case 'v':
+			optVerbose++;
+			break;
+		case 'V':
+			printf(_("%s version %s\n"), prgname,
+			       UTIL_LINUX_VERSION);
 			exit(0);
-		default: usage();
+		default:
+			usage();
 		}
 	}
 
@@ -183,15 +226,15 @@
 	/*
 	 * Use an fd for the profiling buffer, to skip stdio overhead
 	 */
-	if ( ((proFd=open(proFile,O_RDONLY)) < 0)
+	if (((proFd=open(proFile,O_RDONLY)) < 0)
 	     || ((int)(len=lseek(proFd,0,SEEK_END)) < 0)
-	     || (lseek(proFd,0,SEEK_SET)<0) ) {
+	     || (lseek(proFd,0,SEEK_SET) < 0)) {
 		fprintf(stderr,"%s: %s: %s\n",prgname,proFile,strerror(errno));
 		exit(1);
 	}
 
-	if ( !(buf=malloc(len)) ) {
-		fprintf(stderr,"%s: malloc(): %s\n",prgname, strerror(errno));
+	if (!(buf=malloc(len))) {
+		fprintf(stderr,"%s: malloc(): %s\n", prgname, strerror(errno));
 		exit(1);
 	}
 
@@ -206,11 +249,12 @@
 		int big = 0,small = 0,i;
 		unsigned *p;
 
-		for (p = buf+1; p < buf+entries; p++)
-			if (*p) {
-				if (*p >= 1 << (sizeof(*buf)/2)) big++;
-				else small++;
-			}
+		for (p = buf+1; p < buf+entries; p++) {
+			if (*p & ~0U << (sizeof(*buf)*4))
+				big++;
+			if (*p & ((1 << (sizeof(*buf)*4))-1))
+				small++;
+		}
 		if (big > small) {
 			fprintf(stderr,"Assuming reversed byte order. "
 			   "Use -n to force native byte order.\n");
@@ -226,16 +270,24 @@
 		}
 	}
 
-	step=buf[0];
+	step = buf[0];
 	if (optInfo) {
-		printf(_("Sampling_step: %i\n"),step);
+		printf(_("Sampling_step: %i\n"), step);
 		exit(0);
 	} 
 
-	total=0;
+	total = 0;
 
-	if (!(map=myopen(mapFile,"r",&popenMap))) {
-		fprintf(stderr,"%s: ",prgname);perror(mapFile);
+	map = myopen(mapFile, "r", &popenMap);
+	if (map == NULL && mapFile == defaultmap) {
+		mapFile = boot_uname_r_str();
+		map = myopen(mapFile, "r", &popenMap);
+	}
+	if (map == NULL) {
+		int errsv = errno;
+		fprintf(stderr, "%s: ", prgname);
+		errno = errsv;
+		perror(mapFile);
 		exit(1);
 	}
 
@@ -273,7 +325,7 @@
 
 		/* ignore any LEADING (before a '[tT]' symbol is found)
 		   Absolute symbols */
-		if (*mode == 'A' && total == 0) continue;
+		if ((*mode == 'A' || *mode == '?') && total == 0) continue;
 		if (*mode != 'T' && *mode != 't' &&
 		    *mode != 'W' && *mode != 'w')
 			break;	/* only text is profiled */
diff --git a/text-utils/Makefile b/text-utils/Makefile
index 1e86b0e..cbe3a5a 100644
--- a/text-utils/Makefile
+++ b/text-utils/Makefile
@@ -6,9 +6,9 @@
 include ../make_include
 include ../MCONFIG
 
-MAN1= 		col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1
+MAN1= 		col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1
 
-USRBIN=		col colcrt colrm column hexdump rev line
+USRBIN=		col colcrt colrm column hexdump rev line tailf
 
 BIN=
 
@@ -72,6 +72,7 @@
 more.o: more.c $(LIB)/pathnames.h
 rev: rev.o
 line: line.o
+tailf: tailf.o
 
 colcrt.o colrm.o column.o rev.o ul.o: $(LIB)/widechar.h
 
diff --git a/text-utils/more.c b/text-utils/more.c
index 7d6de00..f8fe347 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -1099,11 +1099,11 @@
 ** Erase the current line entirely
 */
 
-void kill_line ()
+void kill_line()
 {
-    erasep (0);
+    erasep(0);
     if (!eraseln || dumb)
-	putchar ('\r');
+	putchar('\r');
 }
 
 /*
@@ -1301,6 +1301,7 @@
 	    end_it (0);
 	case 's':
 	case 'f':
+	case ctrl('F'):
 	    if (nlines == 0) nlines++;
 	    if (comchar == 'f')
 		nlines *= dlines;
@@ -1387,40 +1388,46 @@
 	case '?':
 	case 'h':
 	    if (noscroll) doclear();
-	    xprintf(_("\nMost commands optionally preceded by integer argument"
-		" k.  Defaults in brackets.\n"
-		"Star (*) indicates argument becomes new default.\n"));
+	    xprintf(_("\n"
+"Most commands optionally preceded by integer argument k.  "
+"Defaults in brackets.\n"
+"Star (*) indicates argument becomes new default.\n"));
 	    xprintf("---------------------------------------"
 		"----------------------------------------\n");
-	    xprintf(_("<space>\t\t\t"
-			"Display next k lines of text [current screen size]\n"
-		"z\t\t\tDisplay next k lines of text [current screen size]*\n"
-		"<return>\t\tDisplay next k lines of text [1]*\n"
-		"d or ctrl-D\t\t"
-			"Scroll k lines [current scroll size, initially 11]*\n"
-		"q or Q or <interrupt>\tExit from more\n"
-		"s\t\t\tSkip forward k lines of text [1]\n"
-		"f\t\t\tSkip forward k screenfuls of text [1]\n"
-		"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n"
-		"'\t\t\tGo to place where previous search started\n"
-		"=\t\t\tDisplay current line number\n"
-		"/<regular expression>\t"
-			"Search for kth occurrence of regular expression [1]\n"
-		"n\t\t\tSearch for kth occurrence of last r.e [1]\n"
-		"!<cmd> or :!<cmd>\tExecute <cmd> in a subshell\n"
-		"v\t\t\tStart up /usr/bin/vi at current line\n"
-		"ctrl-L\t\t\tRedraw screen\n"
-		":n\t\t\tGo to kth next file [1]\n"
-		":p\t\t\tGo to kth previous file [1]\n"
-		":f\t\t\tDisplay current file name and line number\n"
-		".\t\t\tRepeat previous command\n"));
+	    xprintf(_(
+"<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"));
 	    xprintf("---------------------------------------"
 		"----------------------------------------\n");
 	    prompt(filename);
 	    break;
 	case 'v':	/* This case should go right before default */
 	    if (!no_intty) {
-		    char *editor;
+		    /*
+		     * Earlier: call vi +n file. This also works for emacs.
+		     * POSIX: call vi -c n file (when editor is vi or ex).
+		     */
+		    char *editor, *p;
+		    int n = (Currline - dlines <= 0 ? 1 :
+			     Currline - (dlines + 1) / 2);
+		    int split = 0;
 
 		    editor = getenv("VISUAL");
 		    if (editor == NULL || *editor == '\0')
@@ -1428,15 +1435,33 @@
 		    if (editor == NULL || *editor == '\0')
 			    editor = VI;
 
-		    kill_line ();
-		    cmdbuf[0] = '+';
-		    scanstr (Currline - dlines <= 0 ? 1
-			     : Currline - (dlines + 1) / 2, &cmdbuf[1]);
-		    pr (editor); putchar (' ');
-		    pr (cmdbuf); putchar (' '); pr (fnames[fnum]);
-		    execute (filename, editor, editor, cmdbuf, fnames[fnum], 0);
+		    p = strrchr(editor, '/');
+		    if (p)
+			    p++;
+		    else
+			    p = editor;
+		    if (!strcmp(p, "vi") || !strcmp(p, "ex")) {
+			    strcpy(cmdbuf, "-c ");
+			    scanstr(n, &cmdbuf[3]);
+			    split = 1;
+		    } else {
+			    cmdbuf[0] = '+';
+			    scanstr(n, &cmdbuf[1]);
+		    }
+
+		    kill_line();
+		    pr(editor); putchar(' ');
+		    pr(cmdbuf); putchar(' '); pr(fnames[fnum]);
+		    if (split) {
+			    cmdbuf[2] = 0;
+			    execute(filename, editor, editor, cmdbuf,
+				    cmdbuf+3, fnames[fnum], (char *)0);
+		    } else
+			    execute(filename, editor, editor,
+				    cmdbuf, fnames[fnum], (char *)0);
 		    break;
 	    }
+	    /* fall through */
 	default:
 	    if (dum_opt) {
    		kill_line ();
@@ -1664,7 +1689,7 @@
 }
 
 /*VARARGS2*/
-void execute (char * filename, char * cmd, ...)
+void execute (char *filename, char *cmd, ...)
 {
 	int id;
 	int n;
diff --git a/text-utils/more.help b/text-utils/more.help
deleted file mode 100644
index bd415cf..0000000
--- a/text-utils/more.help
+++ /dev/null
@@ -1,24 +0,0 @@
-
-Most commands optionally preceded by integer argument k.  Defaults in brackets.
-Star (*) indicates argument becomes new default.
--------------------------------------------------------------------------------
-<space>			Display next k lines of text [current screen size]
-z			Display next k lines of text [current screen size]*
-<return>		Display next k lines of text [1]*
-d or ctrl-D		Scroll k lines [current scroll size, initially 11]*
-q or Q or <interrupt>	Exit from more
-s			Skip forward k lines of text [1]
-f			Skip forward k screenfuls of text [1]
-b or ctrl-B		Skip backwards k screenfuls of text [1]
-'			Go to place where previous search started
-=			Display current line number
-/<regular expression>	Search for kth occurrence of regular expression [1]
-n			Search for kth occurrence of last r.e [1]
-!<cmd> or :!<cmd>	Execute <cmd> in a subshell
-v			Start up /usr/bin/vi at current line
-ctrl-L			Redraw screen
-:n			Go to kth next file [1]
-:p			Go to kth previous file [1]
-:f			Display current file name and line number
-.			Repeat previous command
--------------------------------------------------------------------------------
diff --git a/text-utils/more.help.cs b/text-utils/more.help.cs
deleted file mode 100644
index 1a69cb3..0000000
--- a/text-utils/more.help.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Vìt¹inì pøíkazù mù¾e jako argument pøedcházet celé èíslo k. Implicitní hodnoty
-jsou v hranatých závorkách. Hvìzdièka (*) znamená, ¾e hodnota argumentu se
-stane implicitní.
--------------------------------------------------------------------------------
-<mezerník>              Zobrazí dal¹ích k øádkù textu. [aktuální velikost
-                        obrazovky]
-z                       Zobrazí dal¹ích k øádkù textu. [aktuální velikost
-                        obrazovky]*
-<return>                Zobrazí dal¹ích k øádkù textu. [1]*
-d èi ctrl-D             Posun o k øádkù [aktuální velikost posunu, po spu¹tìní
-                        11]*
-q èi Q èi <interrupt>   Ukonèení programu
-s                       Posun vpøed o k øádkù [1]
-f                       Posun vpøed o k stran [1]
-b èi ctrl-B             Posun vzad o k stran [1]
-'                       Pøeskoèí na místo, kde bylo zahájeno pøedchozí hledání
-=                       Zobrazí èíslo aktuálního øádku
-/<regulární výraz>      Hledá ktý výskyt regulárního výrazu [1]
-n                       Hledá ktý výrazu posledního regulárního výrazu [1]
-!<pøíkaz> èi :!<pøíkaz> Spustí <pøíkaz> v podshellu
-v                       Spustí /usr/bin/vi na aktuálním øádku
-ctrl-L                  Pøekreslí obrazovku
-:n                      Pøeskoèí na ktý následující soubor [1]
-:p                      Pøeskoèí na ktý pøedcházející soubor [1]
-:f                      Vypí¹e jméno aktuálního souboru a èíslo aktuálního øádku
-.                       Zopakuje pøedcházející pøíkaz
--------------------------------------------------------------------------------
diff --git a/text-utils/more.help.ja b/text-utils/more.help.ja
deleted file mode 100644
index 3654e89..0000000
--- a/text-utils/more.help.ja
+++ /dev/null
@@ -1,24 +0,0 @@
-
-¥³¥Þ¥ó¥É¤Î¿¤¯¤ÏÁ°¤Ë¿ôÃÍ(k)¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£[] Æâ¤ÎÃͤ¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£
-À±°õ(*)¤Ï¥Ç¥Õ¥©¥ë¥È¤¬Êѹ¹¤µ¤ì¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
--------------------------------------------------------------------------------
-<space>			¼¡¤Î k ¹Ô¤òɽ¼¨¤¹¤ë [¸½ºß¤Î²èÌÌ¥µ¥¤¥º]
-z			¼¡¤Î k ¹Ô¤òɽ¼¨¤¹¤ë [¸½ºß¤Î²èÌÌ¥µ¥¤¥º]*
-<return>		¼¡¤Î k ¹Ô¤òɽ¼¨¤¹¤ë [1]*
-d or ctrl-D		k ¹Ô¥¹¥¯¥í¡¼¥ë¤¹¤ë [¸½ºß¤Î¥¹¥¯¥í¡¼¥ë¹Ô¿ô ½é´üÃÍ¤Ï 11]*
-q or Q or <interrupt>	more ¤ò½ªÎ»¤¹¤ë
-s			¼¡¤Î k ¹Ô¤òÆɤßÈô¤Ð¤¹ [1]
-f			¼¡¤Î k ²èÌ̤òÆɤßÈô¤Ð¤¹ [1]
-b or ctrl-B		k ²èÌÌÌá¤ë [1]
-'			Á°²ó¤Î¸¡º÷¤ò³«»Ï¤·¤¿°ÌÃÖ¤ËÌá¤ë
-=			¸½ºß¤Î¹ÔÈÖ¹æ¤òɽ¼¨¤¹¤ë
-/<Àµµ¬É½¸½>		Àµµ¬É½¸½¤ò¸¡º÷¤·¡¢k ÈÖÌܤΰÌÃÖ¤ËÈô¤Ö [1]
-n			Á°²ó¤Î¸¡º÷¤òºÆ¼Â¹Ô¤·¡¢k ÈÖÌܤΰÌÃÖ¤ËÈô¤Ö [1]
-!<cmd> or :!<cmd>	¥µ¥Ö¥·¥§¥ë¤Ç <cmd> ¤ò¼Â¹Ô¤¹¤ë
-v			vi ¤òµ¯Æ°¤¹¤ë
-ctrl-L			²èÌ̤òºÆÉÁ²è¤¹¤ë
-:n			¼¡¤Î k ÈÖÌܤΥե¡¥¤¥ë¤òɽ¼¨¤¹¤ë [1]
-:p			Á°¤Î k ÈÖÌܤΥե¡¥¤¥ë¤òɽ¼¨¤¹¤ë [1]
-:f			¸½ºß¤Î¥Õ¥¡¥¤¥ë̾¤È¹ÔÈÖ¹æ¤òɽ¼¨¤¹¤ë
-.			ľÁ°¤Î¥³¥Þ¥ó¥É¤ò·«¤êÊÖ¤¹
--------------------------------------------------------------------------------
diff --git a/text-utils/pg.1 b/text-utils/pg.1
index 056be06..1f8d570 100644
--- a/text-utils/pg.1
+++ b/text-utils/pg.1
@@ -1,19 +1,19 @@
-.\" @(#)pg.1	1.7 (gritter) 4/25/01
-.TH PG 1 "2001-04-25" "Gunnar Ritter" "User Commands"
+.\" @(#)pg.1	1.12 (gritter) 3/12/03
+.TH PG 1 "2003-03-12" "Gunnar Ritter" "User Commands"
 .SH NAME
 pg \- browse pagewise through text files
 .SH SYNOPSIS
 .B pg
 [
-.I \-number
+.BI \- number
 ] [
 .BI \-p \ string
 ] [
 .B \-cefnrs
 ] [
-.I +line
+.BI + line
 ] [
-.I +/pattern/
+.BI +/ pattern /
 ] [ file . . . ]
 .SH DESCRIPTION
 .I Pg
@@ -76,7 +76,7 @@
 .I string
 contains
 .I %d
-, its first occurence is replaced by the number of the current page.
+, its first occurrence is replaced by the number of the current page.
 .TP
 .B \-r
 Disallow the shell escape.
@@ -91,7 +91,7 @@
 Start at the given line.
 .TP
 .BI +/ pattern /
-Start at the line containing the Basic Regular Expression
+Start at the line containing the basic regular expression
 .I pattern
 given.
 .SH USAGE
@@ -137,7 +137,7 @@
 .TP
 .IB i / pattern /
 Search forward until the first or the \fIi\fR-th
-occurence of the Basic Regular Expression 
+occurrence of the basic regular expression 
 .I pattern
 is found. The search starts
 after the current page and stops at the end of the file. No wrap-around is
@@ -147,7 +147,7 @@
 .TP
 \fIi\fR\fB?\fR\fIpattern\fR\fB?\fR or \fIi\fR\fB^\fR\fIpattern\fR\fB^\fR
 Search backward until the first or the \fIi\fR-th
-occurence of the Basic Regular Expression
+occurrence of the basic regular expression
 .I pattern
 is found. The search starts
 before the current page and stops at the beginning of the file.
diff --git a/text-utils/tailf.1 b/text-utils/tailf.1
new file mode 100644
index 0000000..33a000d
--- /dev/null
+++ b/text-utils/tailf.1
@@ -0,0 +1,52 @@
+.\" tailf.1 -- 
+.\" Created: Thu Jan 11 16:43:10 1996 by faith@acm.org
+.\" Copyright 1996, 2003 Rickard E. Faith (faith@acm.org)
+.\" 
+.\" Permission is granted to make and distribute verbatim copies of this
+.\" manual provided the copyright notice and this permission notice are
+.\" preserved on all copies.
+.\" 
+.\" Permission is granted to copy and distribute modified versions of this
+.\" manual under the conditions for verbatim copying, provided that the
+.\" entire resulting derived work is distributed under the terms of a
+.\" permission notice identical to this one.
+.\" 
+.\" Since the Linux kernel and libraries are constantly changing, this
+.\" manual page may be incorrect or out-of-date.  The author(s) assume no
+.\" responsibility for errors or omissions, or for damages resulting from
+.\" the use of the information contained herein.  The author(s) may not
+.\" have taken the same level of care in the production of this manual,
+.\" which is licensed free of charge, as they might when working
+.\" professionally.
+.\" 
+.\" Formatted or processed versions of this manual, if unaccompanied by
+.\" the source, must acknowledge the copyright and authors of this work.
+.\" 
+.TH TAILF 1 "13 February 2003" "" "Linux Programmer's Manual"
+.SH NAME
+tailf \- follow the growth of a log file
+.SH SYNOPSIS
+.BI tailf " file"
+.SH DESCRIPTION
+.B tailf
+will print out the last 10 lines of a file and then wait for the file to
+grow.  It is similar to
+.B tail -f
+but does not access the file when it is not growing.  This has the side
+effect of not updating the access time for the file, so a filesystem flush
+does not occur periodically when no log activity is happening.
+.PP
+.B tailf
+is extremely useful for monitoring log files on a laptop when logging is
+infrequent and the user desires that the hard disk spin down to conserve
+battery life.
+.SH BUGS
+An option could be provided to print out the last
+.I n
+lines instead of the last 10.
+.SH AUTHOR
+This program was written by Rik Faith (faith@acm.org) and may be freely
+distributed under the terms of the X11/MIT License.  There is ABSOLUTELY
+NO WARRANTY for this program.
+.SH "SEE ALSO"
+.BR tail "(1), " less "(1)"
diff --git a/text-utils/tailf.c b/text-utils/tailf.c
new file mode 100644
index 0000000..e10243f
--- /dev/null
+++ b/text-utils/tailf.c
@@ -0,0 +1,119 @@
+/* tailf.c -- tail a log file and then follow it
+ * Created: Tue Jan  9 15:49:21 1996 by faith@acm.org
+ * Copyright 1996, 2003 Rickard E. Faith (faith@acm.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ * less -F and tail -f cause a disk access every five seconds.  This
+ * program avoids this problem by waiting for the file size to change.
+ * Hence, the file is not accessed, and the access time does not need to be
+ * flushed back to disk.  This is sort of a "stealth" tail.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <sys/stat.h>
+#include "nls.h"
+
+static size_t filesize(const char *filename)
+{
+    struct stat sb;
+
+    if (!stat(filename, &sb)) return sb.st_size;
+    return 0;
+}
+
+static void tailf(const char *filename, int lines)
+{
+    char **buffer;
+    int  head = 0;
+    int  tail = 0;
+    FILE *str;
+    int  i;
+
+    if (!(str = fopen(filename, "r"))) {
+	fprintf(stderr, _("Cannot open \"%s\" for read\n"), filename);
+	perror("");
+	exit(1);
+    }
+
+    buffer = malloc(lines * sizeof(*buffer));
+    for (i = 0; i < lines; i++) buffer[i] = malloc(BUFSIZ + 1);
+
+    while (fgets(buffer[tail], BUFSIZ, str)) {
+	if (++tail >= lines) {
+	    tail = 0;
+	    head = 1;
+	}
+    }
+
+    if (head) {
+	for (i = tail; i < lines; i++) fputs(buffer[i], stdout);
+	for (i = 0; i < tail; i++)     fputs(buffer[i], stdout);
+    } else {
+	for (i = head; i < tail; i++)  fputs(buffer[i], stdout);
+    }
+    fflush(stdout);
+
+    for (i = 0; i < lines; i++) free(buffer[i]);
+    free(buffer);
+}
+
+int main(int argc, char **argv)
+{
+    char       buffer[BUFSIZ];
+    size_t     osize, nsize;
+    FILE       *str;
+    const char *filename;
+    int        count;
+
+    setlocale(LC_ALL, "");
+    bindtextdomain(PACKAGE, LOCALEDIR);
+    textdomain(PACKAGE);
+
+    if (argc != 2) {
+	fprintf(stderr, _("Usage: tailf logfile\n"));
+	exit(1);
+    }
+
+    filename = argv[1];
+
+    tailf(filename, 10);
+
+    for (osize = filesize(filename);;) {
+	nsize = filesize(filename);
+	if (nsize != osize) {
+	    if (!(str = fopen(filename, "r"))) {
+		fprintf(stderr, _("Cannot open \"%s\" for read\n"), filename);
+		perror(argv[0]);
+		exit(1);
+	    }
+	    if (!fseek(str, osize, SEEK_SET))
+                while ((count = fread(buffer, 1, sizeof(buffer), str)) > 0)
+                    fwrite(buffer, 1, count, stdout);
+	    fflush(stdout);
+	    fclose(str);
+	    osize = nsize;
+	}
+	usleep(250000);		/* 250mS */
+    }
+    return 0;
+}