Merge commit 'origin/master'

Conflicts: AUTHORS NEWS config/include-Makefile.am configure.ac mount/lomount.c po/POTFILES.in po/ca.po po/cs.po po/da.po po/de.po po/es.po po/et.po po/eu.po po/fi.po po/fr.po po/hu.po po/id.po po/it.po po/ja.po po/nl.po po/pl.po po/pt_BR.po po/ru.po po/sl.po po/sv.po po/tr.po po/uk.po po/util-linux-ng.pot po/vi.po po/zh_CN.po
author: LaMont Jones <lamont@debian.org> 2009-07-21 15:45:04 -0600
committer: LaMont Jones <lamont@debian.org> 2009-07-21 15:45:04 -0600
commit: 7a22bb9abcb56d1010cefd204709e3888f95f735 (patch)
tree: 5c38b4485f79ee8f6a9d5f9537e973f1f663f027
parent: 4e13a18f57a5b427c559f3b466b9655db14d28f8 (diff)
parent: 741064af10ec81635d708e9fb8373f96341246eb (diff)
download: util-linux-old-7a22bb9abcb56d1010cefd204709e3888f95f735.tar.gz
194 files changed, 13781 insertions, 5766 deletions
diff --git a/.gitignore b/.gitignore
index 5ab0d1d1..9f6d8b85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,6 @@ libtool
 !m4/ltsugar.m4
 !m4/ltversion.m4
 !m4/lt~obsolete.m4
+
+# libuuid depends on AX_TLS macro
+!m4/tls.m4
diff --git a/AUTHORS b/AUTHORS
index fdd93bb3..1aaec44b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ AUTHORS (merged projects & commands):
       ipcmk:           Hayden James <hayden.james@gmail.com>
       ldattach:        Tilman Schmidt <tilman@imap.cc>
       libblkid:        Theodore Ts'o <tytso@mit.edu>
+      libuuid:         Theodore Ts'o <tytso@mit.edu>
       lscpu:           Cai Qian <qcai@redhat.com>
       rtcwake:         David Brownell <david-b@pacbell.net>
                        Bernhard Walle <bwalle@suse.de>
@@ -28,6 +29,8 @@ AUTHORS (merged projects & commands):
       setarch:         Elliot Lee <sopwith@redhat.com>
                        Jindrich Novy <jnovy@redhat.com>
       simpleinit:      Richard Gooch <rgooch@atnf.csiro.au>
+      switch_root:     Peter Jones <pjones@redhat.com>
+                       Jeremy Katz <katzj@redhat.com>
 
 
 CONTRIBUTORS:
@@ -57,6 +60,7 @@ CONTRIBUTORS:
       Cliff Wickman <cpw@sgi.com>
       Clytie Siddall <clytie@riverland.net.au>
       Daisuke Yamashita <yamad@mb.infoweb.ne.jp>
+      Daniel Drake <dsd@laptop.org>
       Daniel Nylander <po@danielnylander.se>
       David Brownell <david-b@pacbell.net>
       David Miller <davem@davemloft.net>
@@ -79,7 +83,9 @@ CONTRIBUTORS:
       Jakob Unterwurzacher <jakobunt@gmail.com>
       James Youngman <jay@gnu.org>
       Jason Vas Dias <jvdias@redhat.com>
+      Jeff Mahoney <jeffm@suse.com>
       Jim Meyering <meyering@redhat.com>
+      John Keeping <john.keeping@lineone.net>
       Josep Puigdemont <josep.puigdemont@gmail.com>
       Justin B Rye <jbr@edlug.org.uk>
       KaiGai Kohei <kaigai@kaigai.gr.jp>
@@ -112,23 +118,27 @@ CONTRIBUTORS:
       Mike Frysinger <vapier@gentoo.org>
       Mikel Olasagasti <hey_neken@mundurat.net>
       Miklos Szeredi <mszeredi@suse.cz>
+      Milan Broz <mbroz@redhat.com>
       Moritz Muehlenhoff <jmm@inutil.org>
       Nicolas Provost <nprovost@quadriv.com>
       Nilgün Belma Bugüner <nilgun@buguner.name.tr>
       Norbert Buchmuller <norbi@nix.hu>
       Oliver Falk <oliver@linux-kernel.at>
+      Olivier Blin <blino@mandriva.com>
       Pádraig Brady <P@draigBrady.com>
       Pascal Terjan <pterjan@cmoi.fasmz.org>
       Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
       Pavel Maryanov <acid_jack@ukr.net>
       Pedro Ribeiro <p.m42.ribeiro@gmail.com>
       Peter Breitenlohner <peb@mppmu.mpg.de>
+      Peter Jones <pjones@redhat.com>
       Petr Pisar <petr.pisar@atlas.cz>
       Phan Vinh Thinh <teppi82@gmail.com>
       Rajeev V. Pillai <rajeevvp@gmail.com>
       Ram Pai <linuxram@us.ibm.com>
       Randy Dunlap <randy.dunlap@oracle.com>
       Ray Wang <wanglei1123@gmail.com>
+      Robert Förster <Dessa@gmake.de>
       Robert Millan <rmh@aybabtu.com>
       Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>
       Roy Peled <the.roy.peled@gmail.com>
@@ -148,7 +158,8 @@ CONTRIBUTORS:
       Theodore Ts'o <tytso@mit.edu>
       Tilman Schmidt <tilman@imap.cc>
       Tom Prince <tom.prince@ualberta.net>
-      Valerie Henson <val_henson@linux.intel.com>
+      Valerie Aurora <vaurora@redhat.com>
       Vincent Deffontaines <vincent@gryzor.com>
       Volker Schatz <oss@volkerschatz.com>
       Yu Zhiguo <yuzg@cn.fujitsu.com>
+      Zdenek Behan <rain@matfyz.cz>
diff --git a/DEPRECATED b/DEPRECATED
index 4bc79fed..a4236017 100644
--- a/DEPRECATED
+++ b/DEPRECATED
@@ -9,12 +9,6 @@ Why:	the option -s is in collision with the Loop-AES losetup dialect that is use
 
 --------------------------
 
-What:	raw(8) command
-When:	undefined yet; depends on kernel upstream
-Why:	O_DIRECT can be used instead
-
----------------------------
-
 What:	cryptoloop support in mount/losetup
 When:	undefined yet
 Why:	depreciated in favor of dm-crypt.
@@ -37,36 +31,30 @@ Why:	deprecated in favor of uname(1) or arch(1) from coreutils
 ----------------------------
 
 What:	kill(1) command
-When:	2.14 or 2.15
 Why:	deprecated in favor of kill from procps or bash build-in kill command
 
 ----------------------------
 
 What:	newgrp(1)
-When:	undefined yet
 Why:	deprecated in favor of newgrp from shadow-utils
 
 ----------------------------
 
 What:	vipw/vigr(8)
-When:	undefined yet
 Why:	deprecated in favor of vipw/vigr(8) from shadow-utils
 
 ----------------------------
 
 What:	last(1)
-Whan:	undefined yet
 Why:	nobody uses this implementation
 
 ----------------------------
 
 What:	shutdown(1)
-Whan:	undefined yet
 Why:	nobody uses this implementation
 
 ----------------------------
 
 What:	rdev(8), ramsize(8), vidmode(8) and  rootflags(8)
-What:	undefined yet
 Why:	i386 specific and probably useless
 
diff --git a/Makefile.am b/Makefile.am
index 8fea6fa6..0c8fb693 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = \
 	fdisk \
 	getopt \
 	lib \
-	libs \
+	shlibs \
 	login-utils \
 	misc-utils \
 	po \
diff --git a/NEWS b/NEWS
index baebb7c2..c34c4888 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
-util-linux-ng 2.15.1-rc1: May 27 2009
-* see docs/v2.15.1-ReleaseNotes or complete changelog at
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-rc1-ChangeLog
+util-linux-ng 2.16: Jul  2009
+* see docs/v2.16-ReleaseNotes or complete changelog at
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-ChangeLog
+
+util-linux-ng 2.16-rc2: Jul 2 2009
+* see docs/v2.16-ReleaseNotes or complete changelog at
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-rc2-ChangeLog
+
+util-linux-ng 2.16-rc1: Jun 28 2009
+* see docs/v2.16-ReleaseNotes or complete changelog at
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-rc1-ChangeLog
 
 util-linux-ng 2.15: May 5 2009
 * see docs/v2.15-ReleaseNotes or complete changelog at
diff --git a/README.devel b/README.devel
index 415bd330..d8135743 100644
--- a/README.devel
+++ b/README.devel
@@ -76,7 +76,7 @@ PATCHES:
      * for more details see:
 
        The perfect patch
-                http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
+                http://userweb.kernel.org/~akpm/stuff/tpp.txt
 
 CODING STYLE:
 
diff --git a/TODO b/TODO
index e9b518c2..44fb2f85 100644
--- a/TODO
+++ b/TODO
@@ -1,42 +1,81 @@
+libblkid
+--------
 
- * add to lib/blkdev.c code for /proc/partitions parsing -- unfortunate we
-   duplicate this code in many places. The parser has to support unlimited
-   size (or 4096 bytes) of partition name.
+ - add command line interface for blkid_probe_filter_types():
 
- * fdisk/* -- use off_t instead "long long"
+       # blkid -p -o udev --filter-type nofat
 
- * mkswap: use /proc/sys/kernel/random/uuid as a fallback solution for builds 
-   without libuuid
+ - (?) we need to ignore cache and config files when the files are writable
+   for non-root users and the library is linked with suid programs
 
- * add --without-libuuid to disable mkswap(8) and libblkid linking against 
-   libuuid
+ - add -<BE|LE> suffix to test images for native-endian filesystems (e.g. swap)
+   and add support for such functionality to tests/ts/blkid/low-probe
 
- * use TZ=UTC for tests
+ - do we really need to depend on libuuid? Maybe the default should be
+   use in-tree code rather and link against libuuid -- especially when we
+   need it for uuid_unparse() only.
 
- * add NLS and err.h stuff to schedutils (chrt.c, taskset.c)
+ - consolidate "getsize" stuff (see getsize.c and lib/blkdev.c)
 
- * move libblkid to util-linux-ng (see the topic/blkid branch)
+ - cleanup __attribute__ usage
 
- * add mllockall() and SCHED_FIFO to hwclock,
-   see http://lkml.org/lkml/2008/10/12/132
+ - add stripe size / alignment retrival support to libbkid for use
+   with mkfs.  This would allow to deprecate libdisk from xfsprogs (1)
+   in favour of a common libblkid.
+
+   [ -- Christoph Hellwig, 16 Feb 2009 ]
+   (1) http://git.kernel.org/?p=fs/xfs/xfsprogs-dev.git;a=tree;f=libdisk;
+
+ - use fstatat() in blkid__scan_dir()
+
+ - add values:
+
+	FSSIZE   -- filesystem size (klibc requirement)
+
+	SBOFFSET -- superblock offset; offset where SB was detected 
+                    (swapon requirement to check details from swap header)
+
+        MAGIC    -- magic string
+	MAGICLEN -- length of magic string
+
+fdisk(s)
+--------
+
+ * use off_t instead "long long"
+
+ * fdisk/* refactoring
+
+ * add GPT support
+
+misc
+----
+
+ * add a new command (unshare, clone, or so...) with all kinds of
+   clone(2) options.
+   http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/2178
+
+ * add to lib/blkdev.c code for /proc/partitions parsing -- unfortunate we
+   duplicate this code in many places. The parser has to support unlimited
+   size (or 4096 bytes) of partition name.
 
  * partx: copy sun.c, mac.c and dash.c from kpartx
    git://git.kernel.org/pub/scm/linux/storage/multipath-tools/.git
 
-   It would be nice to merge kpartx and partx to the one project. We duplicate
-   a lot of code (include losetup code in kpartx).
+ * mkswap: use /proc/sys/kernel/random/uuid as a fallback solution for builds 
+   without libuuid
 
  * swapon -s  -- LABELs support
 
    Although mkswap has recently been -L option to create a label nothing appears to
    have been change to swapon to display said labels. (rh#430386)
 
- * use canonicalize_file_name() when exist in glibc (see lib/canonicalize.v)
+ * use TZ=UTC for tests
 
- * try improve compilation against others libc:
-	- klibc
-	- ???
+ * add NLS and err.h stuff to schedutils (chrt.c, taskset.c)
 
+ * add mllockall() and SCHED_FIFO to hwclock,
+   see http://lkml.org/lkml/2008/10/12/132
+ 
  * use rpmatch() for all Y/N questions
 
  * mount -a -- reorder fstab entries by paths before mount (just idea only)
diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index d5da619a..f0077695 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -1,8 +1,3 @@
-# The original default vaues of bindir and sbindir:
-usrbinexecdir = ${exec_prefix}/bin
-usrsbinexecdir = ${exec_prefix}/sbin
-usrlibexecdir = ${exec_prefix}/$(libdirname)
-
 AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \
 	-DLOCALEDIR=\"$(localedir)\"
 AM_CFLAGS = -fsigned-char
@@ -16,10 +11,19 @@ dist_noinst_DATA = $(dist_man_MANS)
 
 # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
 #
-ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src
-ul_libblkid_builddir = $(top_builddir)/libs/blkid/src
-ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la
+# blkid
+ul_libblkid_srcdir = $(top_srcdir)/shlibs/blkid/src
+ul_libblkid_builddir = $(top_builddir)/shlibs/blkid/src
+ul_libblkid_la = $(top_builddir)/shlibs/blkid/src/libblkid.la
 
 $(ul_libblkid_la):
 	$(MAKE) -C $(ul_libblkid_builddir)
 
+# uuid
+ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
+ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
+ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
+
+$(ul_libuuid_la):
+	$(MAKE) -C $(ul_libuuid_builddir)
+
diff --git a/configure.ac b/configure.ac
index 97cda57b..8999826a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(util-linux-ng, 2.15.1-rc1, kzak@redhat.com)
+AC_INIT(util-linux-ng, 2.16, kzak@redhat.com)
 
 AC_PREREQ(2.60)
 
@@ -20,6 +20,17 @@ PACKAGE_VERSION_RELEASE=0
 dnl libblkid version
 LIBBLKID_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE"
 LIBBLKID_DATE="10-Feb-2009"
+LIBBLKID_LT_MAJOR=1
+LIBBLKID_LT_MINOR=1
+LIBBLKID_LT_MICRO=0
+LIBBLKID_VERSION_INFO=`expr $LIBBLKID_LT_MAJOR + $LIBBLKID_LT_MINOR`:$LIBBLKID_LT_MICRO:$LIBBLKID_LT_MINOR
+
+dnl libuuid version
+LIBUUID_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE"
+LIBUUID_LT_MAJOR=1
+LIBUUID_LT_MINOR=3
+LIBUUID_LT_MICRO=0
+LIBUUID_VERSION_INFO=`expr $LIBUUID_LT_MAJOR + $LIBUUID_LT_MINOR`:$LIBUUID_LT_MICRO:$LIBUUID_LT_MINOR
 
 # Check whether exec_prefix=/usr:
 case $exec_prefix:$prefix in
@@ -39,13 +50,20 @@ NONE:NONE | NONE:/usr | /usr:*)
   esac ;;
 esac
 
-# lib64
-case ${libdir} in
-  *lib64) libdirname=lib64 ;;
-  *) libdirname=lib
-esac
+libdirname=`basename "$libdir"`
 AC_SUBST([libdirname])
 
+# The original default values of {bin,sbin,lib}dir
+usrbin_execdir='${exec_prefix}/bin'
+AC_SUBST([usrbin_execdir])
+
+usrsbin_execdir='${exec_prefix}/sbin'
+AC_SUBST([usrsbin_execdir])
+
+usrlib_execdir='${exec_prefix}/'$libdirname
+AC_SUBST([usrlib_execdir])
+
+
 AC_PROG_CC_STDC
 AC_GNU_SOURCE
 AC_CANONICAL_HOST
@@ -84,9 +102,13 @@ AC_CHECK_HEADERS(
 	linux/tiocl.h \
 	linux/version.h \
 	locale.h \
-	stdlib.h \
+	stdint.h \
+	inttypes.h \
 	pty.h \
 	mntent.h \
+        net/if.h \
+	net/if_dl.h \
+        netinet/in.h \
 	rpcsvc/nfs_prot.h \
 	scsi/scsi.h \
 	stdlib.h \
@@ -94,12 +116,18 @@ AC_CHECK_HEADERS(
 	sys/disklabel.h \
 	sys/ioctl.h \
 	sys/io.h \
+	sys/time.h \
 	sys/mkdev.h \
 	sys/prctl.h \
 	sys/queue.h \
+	sys/sockio.h \
+	sys/file.h \
+	sys/ioctl.h \
 	sys/stat.h \
 	sys/types.h \
+	sys/un.h \
 	sys/user.h \
+	sys/resource.h \
 	unistd.h ])
 AC_CHECK_HEADERS([linux/raw.h],
 		 [AM_CONDITIONAL([HAVE_RAW], [true])],
@@ -115,16 +143,30 @@ AC_CHECK_FUNCS(
 	nanosleep \
 	personality \
 	updwtmp \
+	jrand48 \
 	lchown \
 	llseek \
 	lseek64 \
 	strtoull \
+	sysconf \
+	getdtablesize \
+	getrlimit \
+	srandom \
+	setresgid \
+	setresuid \
 	inotify_init \
 	prctl \
 	__secure_getenv \
 	rpmatch])
 AC_FUNC_FSEEKO
 
+AC_CHECK_FUNCS([openat fstatat unlinkat], [have_openat=yes], [have_openat=no])
+
+AC_CHECK_MEMBER(struct sockaddr.sa_len,
+		AC_DEFINE_UNQUOTED(HAVE_SA_LEN,1,[Define if struct sockaddr contains sa_len]),,
+	[#include <sys/types.h>
+	 #include <sys/socket.h>])
+
 dnl Static compilation
 m4_define([UTIL_STATIC_PROGRAMS], [losetup, mount, umount, fdisk, sfdisk, blkid])
 
@@ -147,6 +189,16 @@ m4_foreach([UTIL_PRG], m4_defn([UTIL_STATIC_PROGRAMS]), [
     [test "x$static_[]UTIL_PRG" = xyes])
 ])
 
+dnl UTIL_PKG_STATIC(VARIABLE, MODULES)
+dnl ----------------------------------
+AC_DEFUN([UTIL_PKG_STATIC], [
+  if AC_RUN_LOG([pkg-config --exists --print-errors "$2"]); then
+    $1=`pkg-config --libs --static "$2"`
+  else
+    AC_MSG_ERROR([pkg-config description of $2, needed for static build, is not available])
+  fi
+])
+
 dnl UTIL_CHECK_LIB(LIBRARY, FUNCTION, [VARSUFFIX = $1]))
 dnl The VARSUFFIX is optional and overrides the default behaviour. For example:
 dnl     UTIL_CHECK_LIB(yyy, func, xxx) generates have_xxx and HAVE_LIBXXX
@@ -178,6 +230,16 @@ AC_DEFUN([UTIL_RESTORE_FLAGS], [
   LDFLAGS="$old_LDFLAGS"
 ])
 
+
+AC_ARG_ENABLE([tls],
+  AS_HELP_STRING([--disable-tls], [disable use of thread local support]),
+  [], enable_tls=yes
+)
+if test "x$enable_tls" = xyes; then
+  AX_TLS
+fi
+
+
 AC_ARG_ENABLE([mount],
   AS_HELP_STRING([--disable-mount], [do not build mount utilities]),
   [], enable_mount=check
@@ -195,40 +257,79 @@ AM_CONDITIONAL(BUILD_MOUNT, test "x$build_mount" = xyes)
 
 
 AC_ARG_ENABLE([fsck],
-  AS_HELP_STRING([--enable-fsck], [do build fsck]),
-  [], enable_fsck=no
+  AS_HELP_STRING([--disable-fsck], [do not build fsck]),
+  [], enable_fsck=yes
 )
 AM_CONDITIONAL(BUILD_FSCK, test "x$enable_fsck" = xyes)
 
 
-UTIL_CHECK_LIB(uuid, uuid_is_null)
-if test "x$have_uuid" = xno; then
-  AC_MSG_WARN([uuid library is not found; mkswap(8) will not generate UUIDs])
+AC_ARG_ENABLE([libuuid],
+  AS_HELP_STRING([--disable-libuuid], [do not build libuuid and uuid utilities]),
+  [], enable_libuuid=yes
+)
+AC_SUBST([LIBUUID_VERSION])
+AC_SUBST([LIBUUID_VERSION_INFO])
+AM_CONDITIONAL(BUILD_LIBUUID, test "x$enable_libuuid" = xyes)
+have_uuid=yes
+
+if test "x$enable_libuuid" = xno; then
+  # Check for external (e2fsprogs) libuuid
+  PKG_CHECK_MODULES(UUID, uuid, [have_uuid=yes], [have_uuid=no])
+  if test "x$have_uuid" = xno; then
+    # system without pkg-config or so, try classic check
+    AC_CHECK_LIB(uuid, uuid_is_null, [have_uuid=yes], [have_uuid=no])
+  fi
+  if test "x$have_uuid" = xyes; then
+    UTIL_SET_FLAGS($UUID_CFLAGS, $UUID_CFLAGS, $UUID_LIBS)
+    AC_CHECK_HEADERS([uuid.h uuid/uuid.h], [break], [])
+    UTIL_RESTORE_FLAGS
+  fi
+else
+  # internal library
+  AC_DEFINE(HAVE_UUID_H, 1, [Define to 1 if you have the <uuid.h> header file.])
 fi
 
-UTIL_CHECK_LIB(util, openpty)
-UTIL_CHECK_LIB(termcap, tgetnum)
+if test "x$have_uuid" = xyes; then
+  AC_DEFINE(HAVE_LIBUUID, 1, [Define to 1 if you have the -luuid.])
+else
+  AC_MSG_WARN([uuid library is not found; mkswap(8) will not generate UUIDs])
+fi
+AM_CONDITIONAL(HAVE_UUID, test "x$have_uuid" = xyes)
+# default
+: ${UUID_LIBS='-luuid'}
 
 
-AC_ARG_WITH([fsprobe],
-  [AS_HELP_STRING([--with-fsprobe=LIB], [library to guess filesystems, LIB should be builtin|blkid|volume_id, default is blkid])],
-  [], [with_fsprobe=blkid]
+AC_ARG_ENABLE([uuidd],
+  AS_HELP_STRING([--disable-uuidd], [do not build the uuid daemon]),
+  [], enable_uuidd=auto
 )
 
-build_libblkid=no
-have_blkid=no
-have_volume_id=no
+case "$enable_uuidd:$have_uuid" in
+yes:no)
+  AC_MSG_ERROR([cannot enable uuidd when libuuid is disabled]) ;;
+auto:*)
+  enable_uuidd=$have_uuid ;;
+esac
+if test "x$enable_uuidd" = xyes; then
+  AC_DEFINE(HAVE_UUIDD, 1, [Define to 1 if you want to use uuid daemon.])
+fi
+AM_CONDITIONAL(BUILD_UUIDD, test "x$enable_uuidd" = xyes)
 
-if test "x$with_fsprobe" = xbuiltin; then
-  have_blkid=yes
-  build_libblkid=yes
-  AC_SUBST(LIBBLKID_VERSION)
-  AC_DEFINE_UNQUOTED(LIBBLKID_VERSION, "$LIBBLKID_VERSION", [libblkid version string])
-  AC_DEFINE_UNQUOTED(LIBBLKID_DATE, "$LIBBLKID_DATE", [libblkid date string])
-  AC_DEFINE(HAVE_BLKID_EVALUATE_TAG, 1, [Define to 1 if you have the blkid_evaluate_tag().])
-  AC_DEFINE(HAVE_BLKID_H, 1, [Define to 1 if you have the <blkid.h> header file.])
-elif test "x$build_mount" = xyes || test "x$enable_fsck" = xyes; then
-  if test "x$with_fsprobe" = xblkid; then
+
+AC_ARG_ENABLE([libblkid],
+  AS_HELP_STRING([--disable-libblkid], [do not build libblkid and blkid utilities]),
+  [], enable_libblkid=yes
+)
+AC_SUBST([LIBBLKID_VERSION])
+AC_SUBST([LIBBLKID_VERSION_INFO])
+AM_CONDITIONAL(BUILD_LIBBLKID, test "x$enable_libblkid" = xyes)
+AC_DEFINE_UNQUOTED(LIBBLKID_VERSION, "$LIBBLKID_VERSION", [libblkid version string])
+AC_DEFINE_UNQUOTED(LIBBLKID_DATE, "$LIBBLKID_DATE", [libblkid date string])
+have_blkid=yes
+
+if test "x$enable_libblkid" = xno; then
+  if test "x$build_mount" = xyes || test "x$enable_fsck" = xyes; then
+    # Check for external (e2fsprogs) libblkid
     PKG_CHECK_MODULES(BLKID, blkid, [have_blkid=yes], [have_blkid=no])
     if test "x$have_blkid" = xno; then
       # system without pkg-config or so, try classic check
@@ -239,57 +340,37 @@ elif test "x$build_mount" = xyes || test "x$enable_fsck" = xyes; then
       AC_CHECK_HEADERS([blkid.h blkid/blkid.h], [break], [])
       UTIL_RESTORE_FLAGS
     fi
-  elif test "x$with_fsprobe" = xvolume_id; then
-    PKG_CHECK_MODULES(VOLUME_ID, volume_id, [have_volume_id=yes], [have_volume_id=no])
-    if test "x$have_volume_id" = xno; then
-      # system without pkg-config or so, try classic check
-      AC_CHECK_LIB(volume_id, volume_id_probe_all, [have_volume_id=yes], [have_volume_id=no])
+    if test -n "$enable_static_programs"; then
+      # TODO check only when mount of fsck are requested
+      UTIL_PKG_STATIC([BLKID_LIBS_STATIC], [blkid])
     fi
   fi
+else
+  # internal library
+  AC_DEFINE(HAVE_BLKID_H, 1, [Define to 1 if you have the <blkid.h> header file.])
+  AC_DEFINE(HAVE_BLKID_EVALUATE_TAG, 1, [Define to 1 if you have the blkid_evaluate_tag().])
 fi
 
-if  test "x$have_blkid" = xyes; then
+if test "x$have_blkid" = xyes; then
   AC_DEFINE(HAVE_LIBBLKID, 1, [Define to 1 if you have the -lblkid.])
-elif test "x$have_volume_id" = xno; then
+else
   if test "x$build_mount" = xyes; then
-    AC_MSG_ERROR([libblkid or libvolume_id is needed to build util-linux-ng mount])
+    AC_MSG_ERROR([libblkid is needed to build util-linux-ng mount])
   fi
   if test "x$enable_fsck" = xyes; then
-    AC_MSG_ERROR([libblkid or libvoume_id is needed to build util-linux-ng fsck])
+    AC_MSG_ERROR([libblkid is needed to build util-linux-ng fsck])
   fi
 fi
-
 AM_CONDITIONAL(HAVE_BLKID, test "x$have_blkid" = xyes)
-AM_CONDITIONAL(HAVE_VOLUME_ID, test "x$have_volume_id" = xyes)
-AM_CONDITIONAL(BUILD_LIBBLKID, test "x$build_libblkid" = xyes)
-
-
-dnl UTIL_PKG_STATIC(VARIABLE, MODULES)
-dnl ----------------------------------
-AC_DEFUN([UTIL_PKG_STATIC], [
-  if AC_RUN_LOG([pkg-config --exists --print-errors "$2"]); then
-    $1=`pkg-config --libs --static "$2"`
-  else
-    AC_MSG_ERROR([pkg-config description of $2, needed for static build, is not available])
-  fi
-])
-
-# These default values should work in most cases:
+# default
 : ${BLKID_LIBS='-lblkid -luuid'}
-: ${VOLUME_ID_LIBS='-lvolume_id'}
-
-# ... but for static build, we need to consult pkg-config:
-if test -n "$enable_static_programs"; then
-  case $with_fsprobe in
-  blkid) UTIL_PKG_STATIC([BLKID_LIBS_STATIC], [blkid]) ;;
-  volume_id) UTIL_PKG_STATIC([VOLUME_ID_LIBS_STATIC], [libvolume_id]) ;;
-  esac
-fi
 
 AC_ARG_VAR([BLKID_LIBS_STATIC], [-l options for linking statically with blkid])
-AC_ARG_VAR([VOLUME_ID_LIBS_STATIC], [-l options for linking statically with volume_id])
 
 
+UTIL_CHECK_LIB(util, openpty)
+UTIL_CHECK_LIB(termcap, tgetnum)
+
 AM_GNU_GETTEXT_VERSION([0.14.1])
 AM_GNU_GETTEXT([external])
 if test -d "$srcdir/po"
@@ -566,6 +647,31 @@ fi
 AM_CONDITIONAL(BUILD_CRAMFS, test "x$build_cramfs" = xyes)
 
 
+AC_ARG_ENABLE([switch_root],
+  AS_HELP_STRING([--disable-switch_root], [do not build switch_root]),
+  [], enable_switch_root=check
+)
+
+if test "x$enable_switch_root" = xno; then
+  build_switch_root=no
+else
+  build_switch_root=yes
+  case $enable_switch_root:$linux_os in
+  yes:no) AC_MSG_ERROR([switch_root selected for non-linux system]);;
+  check:no) AC_MSG_WARN([non-linux system; do not build switch_root])
+            build_switch_root=no;;
+  esac
+  if test "x$build_switch_root" = xyes; then
+    case $enable_switch_root:$have_openat in
+    yes:no) AC_MSG_ERROR([switch_root selected but openat() function not found]);;
+    check:no) AC_MSG_WARN([openat() function not found; do not build switch_root])
+              build_switch_root=no;;
+    esac
+  fi
+fi
+AM_CONDITIONAL(BUILD_SWITCH_ROOT, test "x$build_switch_root" = xyes)
+
+
 AC_ARG_ENABLE([elvtune],
   AS_HELP_STRING([--enable-elvtune], [build elvtune (only works with 2.2 and 2.4 kernels)]),
   [], enable_elvtune=no
@@ -796,7 +902,6 @@ LIBS=""
 AC_CONFIG_HEADERS(config.h)
 
 AC_CONFIG_FILES([
-Makefile
 disk-utils/Makefile
 fdisk/Makefile
 fsck/Makefile
@@ -804,24 +909,29 @@ getopt/Makefile
 hwclock/Makefile
 include/Makefile
 lib/Makefile
-libs/Makefile
-libs/blkid/blkid.pc
-libs/blkid/Makefile
-libs/blkid/bin/Makefile
-libs/blkid/src/Makefile
-libs/blkid/src/probers/Makefile
 login-utils/Makefile
+Makefile
+misc-utils/chkdupexe:misc-utils/chkdupexe.pl
 misc-utils/Makefile
 mount/Makefile
 partx/Makefile
 po/Makefile.in
 schedutils/Makefile
+shlibs/blkid/blkid.pc
+shlibs/blkid/Makefile
+shlibs/blkid/src/Makefile
+shlibs/blkid/src/probers/Makefile
+shlibs/uuid/uuid.pc
+shlibs/uuid/Makefile
+shlibs/uuid/man/Makefile
+shlibs/uuid/src/Makefile
+shlibs/Makefile
 sys-utils/Makefile
-text-utils/Makefile
-tests/Makefile
-tests/helpers/Makefile
 tests/commands.sh
-misc-utils/chkdupexe:misc-utils/chkdupexe.pl
+tests/helpers/Makefile
+tests/Makefile
+text-utils/Makefile
 ])
 
+
 AC_OUTPUT
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 4854d5f6..6bd22bc5 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -12,15 +12,18 @@ sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs
 fsck_minix_SOURCES = fsck.minix.c minix.h
 mkfs_minix_SOURCES = mkfs.minix.c minix.h $(utils_common)
 mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common)
+
 mkswap_SOURCES = mkswap.c $(utils_common) ../lib/wholedisk.c ../lib/pttype.c
+mkswap_LDADD =
+mkswap_CFLAGS =
 
-usrbinexec_PROGRAMS = isosize
-usrsbinexec_PROGRAMS =
+usrbin_exec_PROGRAMS = isosize
+usrsbin_exec_PROGRAMS =
 
 if LINUX
 dist_man_MANS += fdformat.8 blockdev.8
 sbin_PROGRAMS += blockdev
-usrsbinexec_PROGRAMS += fdformat
+usrsbin_exec_PROGRAMS += fdformat
 blockdev_SOURCES = blockdev.c $(utils_common)
 endif
 
@@ -46,10 +49,14 @@ fsck_cramfs_LDADD = -lz
 mkfs_cramfs_LDADD = -lz
 endif
 
-mkswap_LDADD =
-
 if HAVE_UUID
-mkswap_LDADD += -luuid
+if BUILD_LIBUUID
+mkswap_LDADD += $(ul_libuuid_la)
+mkswap_CFLAGS += -I$(ul_libuuid_srcdir)
+else
+mkswap_LDADD += $(UUID_LIBS)
+mkswap_CFLAGS += $(UUID_CFLAGS)
+endif
 endif
 
 if HAVE_SELINUX
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 4acc73b2..bb97210e 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -57,7 +57,11 @@
 #include "wholedisk.h"
 
 #ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
+# ifdef HAVE_UUID_UUID_H
+#  include <uuid/uuid.h>
+#else
+# include <uuid.h>
+# endif
 #endif
 
 static char * program_name = "mkswap";
diff --git a/disk-utils/raw.8 b/disk-utils/raw.8
index babdbd44..72bb17c9 100644
--- a/disk-utils/raw.8
+++ b/disk-utils/raw.8
@@ -15,11 +15,6 @@ raw \- bind a Linux raw character device
 .PP
 .B raw
 .B \-qa
-.SH WARNING
-The rawio is a deprecated interface since Linux kernel 2.6.3. Please,
-modify your application to open the block device with the
-O_DIRECT flag.
-
 .SH DESCRIPTION
 .B raw
 is used to bind a Linux raw character device to a block device.  Any
diff --git a/disk-utils/raw.c b/disk-utils/raw.c
index bc64b349..f634b602 100644
--- a/disk-utils/raw.c
+++ b/disk-utils/raw.c
@@ -40,11 +40,11 @@ int	master_fd;
 int	raw_minor;
 
 void open_raw_ctl(void);
-int  query(int minor, int quiet);
+int  query(int minor, const char *raw_name, int quiet);
 int  bind (int minor, int block_major, int block_minor);
 
 
-static void usage(int err) 
+static void usage(int err)
 {
 	fprintf(stderr,
 		_("Usage:\n"
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
 		if (optind < argc)
 			usage(1);
 		for (i = 1; i < RAW_NR_MINORS; i++)
-			query(i, 1);
+			query(i, NULL, 1);
 		exit(0);
 	}
 
@@ -117,7 +117,10 @@ int main(int argc, char *argv[])
 	 * causes udev to *remove* /dev/rawctl
 	 */
 	rc = sscanf(raw_name, RAWDEVDIR "raw%d", &raw_minor);
-	if (rc == 1 && raw_minor == 0) {
+	if (rc != 1)
+		usage(1);
+
+	if (raw_minor == 0) {
 		fprintf (stderr,
 			_("Device '%s' is control raw dev "
 			"(use raw<N> where <N> is greater than zero)\n"),
@@ -125,28 +128,8 @@ int main(int argc, char *argv[])
 		exit(2);
 	}
 
-	err = stat(raw_name, &statbuf);
-	if (err) {
-		fprintf (stderr, _("Cannot locate raw device '%s' (%s)\n"),
-			 raw_name, strerror(errno));
-		exit(2);
-	}
-
-	if (!S_ISCHR(statbuf.st_mode)) {
-		fprintf (stderr, _("Raw device '%s' is not a character dev\n"),
-			 raw_name);
-		exit(2);
-	}
-	if (major(statbuf.st_rdev) != RAW_MAJOR) {
-		fprintf (stderr, _("Device '%s' is not a raw dev\n"),
-			 raw_name);
-		exit(2);
-	}
-
-	raw_minor = minor(statbuf.st_rdev);
-
 	if (do_query)
-		return query(raw_minor, 0);
+		return query(raw_minor, raw_name, 0);
 
 	/*
 	 * It's not a query, so we still have some parsing to do.  Have
@@ -208,12 +191,35 @@ void open_raw_ctl(void)
 	}
 }
 
-int query(int minor, int quiet)
+int query(int minor, const char *raw_name, int quiet)
 {
 	struct raw_config_request rq;
 	static int has_worked = 0;
 	int err;
 
+	if (raw_name) {
+		struct stat statbuf;
+
+		err = stat(raw_name, &statbuf);
+		if (err) {
+			fprintf (stderr, _("Cannot locate raw device '%s' (%s)\n"),
+				 raw_name, strerror(errno));
+			exit(2);
+		}
+
+		if (!S_ISCHR(statbuf.st_mode)) {
+			fprintf (stderr, _("Raw device '%s' is not a character dev\n"),
+				 raw_name);
+			exit(2);
+		}
+		if (major(statbuf.st_rdev) != RAW_MAJOR) {
+			fprintf (stderr, _("Device '%s' is not a raw dev\n"),
+				 raw_name);
+			exit(2);
+		}
+		minor = minor(statbuf.st_rdev);
+	}
+
 	rq.raw_minor = minor;
 	err = ioctl(master_fd, RAW_GETBIND, &rq);
 	if (err < 0) {
diff --git a/docs/v2.16-ReleaseNotes b/docs/v2.16-ReleaseNotes
new file mode 100644
index 00000000..b204c643
--- /dev/null
+++ b/docs/v2.16-ReleaseNotes
@@ -0,0 +1,182 @@
+
+Util-linux-ng 2.16 Release Notes (15-Jul-2009)
+==============================================
+
+Release highlights
+------------------
+
+libuuid, uuidgen(1) and uuidd(8):
+  - the libuuid library has been moved from e2fsprogs to util-linux-ng
+
+switch_root:
+  - this NEW COMMAND allows to switch to another filesystem as the root
+    of the mount tree.
+
+mount, umount, fsck:
+  - DOES NOT SUPPORT linking against obsolete libvolume_id (from udev)
+
+libblkid:
+  - development files (.so, .a, ...) have been moved from /lib to /usr/lib.
+
+
+Stable maintenance releases between v2.15 and v2.16
+---------------------------------------------------
+
+util-linux-ng 2.15.1 [10-Jun-2009]
+
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-ChangeLog
+
+
+ChangeLog between v2.15 and v2.16
+---------------------------------
+
+ For more details see ChangeLog files at:
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/
+
+
+build-sys:
+   - add --disable-libblkid, remove volume_id support  [Karel Zak]
+   - add --disable-switch_root  [Karel Zak]
+   - add --disable-tls  [Karel Zak]
+   - add --disable-uuidd  [Karel Zak]
+   - add UTIL_{SET,RESTORE}_FLAGS  [Karel Zak]
+   - check for openat() and linux for switch_root  [Karel Zak]
+   - cleanup libuuid stuff  [Karel Zak]
+   - complete /libs to /shlibs rename  [Karel Zak]
+   - enable fsck by default  [Karel Zak]
+   - fix "make -C" bug  [Karel Zak]
+   - fix --disable-uuidd  [Karel Zak]
+   - fix blkid.h include for old e2fsprogs  [Karel Zak]
+   - fix exec/data install hooks  [Karel Zak]
+   - fix headers in mkswap and libblkid  [Karel Zak]
+   - fix libuuid Makefile.am  [Karel Zak]
+   - fix libuuid and libblkid version-info  [Karel Zak]
+   - fix typo from 30688dde55f637c9b984809c685b61378b82805f  [Robert Förster]
+   - improve $libdirname definition  [Karel Zak]
+   - improve symlinks creation in shlibs/  [Karel Zak]
+   - release++ (v2.16-rc1)  [Karel Zak]
+   - release++ (v2.16-rc2)  [Karel Zak]
+   - rename /libs to /shlibs  [Karel Zak]
+   - rename to _execdir  [Karel Zak]
+   - reverse shlibs installation  [Kay Sievers]
+buildsys:
+   - move $usr{bin,sbin,lib}execdir definition to ./configure  [Karel Zak]
+cal:
+   - Highlight today even when month or year specified  [Rajeev V. Pillai]
+   - uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY.  [Tom Prince]
+chrt:
+   - don't assume SCHED_BATCH and SCHED_IDLE exist  [Aurelien Jarno]
+docs:
+   - add missing commands/projects to AUTHORS file  [Karel Zak]
+   - add v2.16 ReleaseNotes  [Karel Zak]
+   - refresh TODO list  [Karel Zak]
+   - remove example.files/rc[.local]  [Karel Zak]
+   - remove obsolete information from fstab example  [Karel Zak]
+   - update AUTHORS file  [Karel Zak]
+   - update v2.16 ReleaseNotes  [Karel Zak]
+   - update v2.16-ReleaseNotes  [Karel Zak]
+fdisk:
+   - (and cfdisk) fix to be consistent about maximum heads  [Chris Webb]
+   - add simple test for doslabel stuff  [Zdenek Behan]
+hwclock:
+   - fix mismatched popen/fclose.  [John Keeping]
+include:
+   - clean up _PATH_DEV_* macros  [Karel Zak]
+   - fix _PATH_DEV  [Karel Zak]
+ionice:
+   - Allow setting the none class  [Jakob Unterwurzacher]
+ldattach:
+   - add N_PPS support  [Tilman Schmidt]
+libblkid:
+   - add device-mapper snapshot cow device probe  [Milan Broz]
+   - add install-hook for libuuid.[a,so] devel files  [Karel Zak]
+   - add stdarg.h to blkidP.h  [Karel Zak]
+   - blkid_do_safeprobe() has to be tolerant to RAIDs  [Karel Zak]
+   - cleanup debug messages and return codes in blkid_do_probe()  [Karel Zak]
+   - don't require udev symlinks verification for non-root users  [Karel Zak]
+   - fix "hangs forever with partition type mdraid"  [Karel Zak]
+   - fix #ifdefs readability  [Karel Zak]
+   - fix $libdir in blkid.pc  [Karel Zak]
+   - fix LVM1 probe  [Milan Broz]
+   - fix reiserfs name  [Karel Zak]
+   - make libuuid optional  [Karel Zak]
+   - move to misc-utils/ directory  [Karel Zak]
+   - update man page  [Karel Zak]
+libuuid:
+   - add --disable-libuuid and LIBUUID_VERSION  [Karel Zak]
+   - add .gitignore  [Karel Zak]
+   - add info about u-l-ng to man pages  [Karel Zak]
+   - add install-hook for libuuid.[a,so] devel files  [Karel Zak]
+   - Don't run uuidd if it would fail due to permission problems  [Theodore Ts'o]
+   - fix $libdir in uuid.pc  [Karel Zak]
+   - fix parallel building  [Karel Zak]
+   - generate uuid_generate_{random,time}.3 man page links [Karel Zak]
+   - import UUID library from e2fsprogs  [Karel Zak]
+   - Make sure fd's 0, 1, and 2 are valid before exec'ing uuidd  [Theodore Ts'o]
+   - move clock state file from /var/lib to /var/run  [Karel Zak]
+libuuid, uuidd:
+   - Avoid infinite loop while reading from the socket fd  [Theodore Ts'o]
+losetup:
+   - add --set-capacity  [Karel Zak]
+   - fix return codes of functions arounf is_associated()  [Karel Zak]
+   - handle symlinks in /dev/loop/  [Mike Frysinger]
+   - suggest to use modprobe rather than insmod in losetup.8  [Karel Zak]
+lscpu:
+   - fix cpuid code on x86/PIC  [Mike Frysinger]
+mount:
+   - (and fsck) remove libvolume_id support  [Karel Zak]
+   - a little clean up info about loopdevs in man page  [Karel Zak]
+   - add ext4 to mount.8  [Karel Zak]
+   - add ext4 to the list of filesystems in mount.8  [Karel Zak]
+   - add info about obsolete vfat options to mount.8  [Karel Zak]
+   - allow loop suid umount  [Kay Sievers]
+   - cleanup notes about -l option in mount.8  [Karel Zak]
+   - fix undefined reference to `security_get_initial_context'  [Karel Zak]
+   - move MS_{PROPAGATION,BIND,MOVE} detection  [Karel Zak]
+   - use "none" fstype for MS_PROPAGATION mounts  [Karel Zak]
+   - use TAG parsing function from libblkid  [Karel Zak]
+   - when a remount to rw fails, quit and return an error  [Valerie Aurora]
+po:
+   - fix typo in French translation  [Olivier Blin]
+   - merge changes  [Karel Zak]
+   - refresh POTFILES.in  [Karel Zak]
+   - update cs.po (from translationproject.org)  [Petr Pisar]
+   - update fi.po (from translationproject.org)  [Lauri Nurmi]
+   - update fr.po (from translationproject.org)  [Nicolas Provost]
+   - update vi.po (from translationproject.org)  [Clytie Siddall]
+raw:
+   - Use the RAW_SETBIND ioctl without stat'ing the raw# file  [Jeff Mahoney]
+   - undeprecate raw  [Karel Zak]
+switch_root:
+   - add man page  [Karel Zak]
+   - add subroot support  [Daniel Drake]
+   - clean up argv[] usage, add -h and -V  [Karel Zak]
+   - do recursiveRemove after our root is moved to avoid races.  [Peter Jones]
+   - fix coding style  [Karel Zak]
+   - fork before cleaning up the filesystem.  [Peter Jones]
+   - new command  [Karel Zak]
+   - rewrite to use fstatat() and unlinkat()  [Karel Zak]
+   - use err.h, clean up return codes  [Karel Zak]
+   - use file descriptor instead of path for recursiveRemove()  [Peter Jones]
+   - use snprintf() rather tan str{cpy,cat}()  [Karel Zak]
+tests:
+   - add functions for work withdisk images  [Karel Zak]
+   - add mdraid libblkid test  [Karel Zak]
+   - don't run some mount tests for non-root users  [Karel Zak]
+   - fix 'delete extended partition' checksum  [Karel Zak]
+   - fix reiserfs test  [Karel Zak]
+   - fix script that creates lscpu dumps  [Karel Zak]
+   - move lscpu /proc and /sys dumps to tarballs  [Karel Zak]
+   - remove broken Xen dumps for lscpu  [Karel Zak]
+umount:
+   - clean up help output  [Karel Zak]
+uuidd:
+   - Avoid closing the server socket when calling create_daemon()  [Theodore Ts'o]
+   - fix $PIDFILE in uuidd.rc  [Karel Zak]
+   - init /var/run/uuidd, add option for on-demand mode to .rc file  [Karel Zak]
+   - move uuidd files from /var/lib/libuuid to /var/run/uuidd  [Karel Zak]
+   - move uuidd.rc to misc-utils directory  [Karel Zak]
+   - new command (UUID daemon from e2fsprogs)  [Karel Zak]
+uuidgen:
+   - new command (from e2fsprogs)  [Karel Zak]
diff --git a/example.files/fstab b/example.files/fstab
index 9f169dcd..eeb72f1d 100644
--- a/example.files/fstab
+++ b/example.files/fstab
@@ -3,15 +3,14 @@
 #
 # This file is not used by the kernel, but rather by mount(8) and umount(8)
 # (and some day fsck(8)).  Comment lines have "#" in the first column.
-# Entries that are to be ignored should have "none" in the directory field,
-# and have type "ignore" or options "xx".  Frequency and pass are numeric
-# fields for dump(8) and fsck(8) that are not used yet in Linux.  You can
-# leave them empty if want.
+#
+# For more information see fstab(5) man page.
+#
 
 # device	directory	type	options		freq pass
 /dev/sda2	/		ext2	defaults        1    1
 none		/proc		proc	defaults        0    0
-/dev/sdb1	none		swap	sw              0    0
+/dev/sdb1	none		swap	defaults        0    0
 /dev/sdb2	/var		ext2	defaults        1    1
 /dev/sdc1	/usr		ext2	defaults        1    1
 /dev/sdc3	/usr/src	ext2	defaults        1    1
diff --git a/example.files/rc b/example.files/rc
deleted file mode 100644
index 232afc35..00000000
--- a/example.files/rc
+++ /dev/null
@@ -1,79 +0,0 @@
-# rc file for The Linux BOGUS Release, version 1.0.1
-
-                                echo "Running /etc/rc. . ."
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin; export PATH
-
-# Update (bdflush) performs flushes dirty buffers back to disk and
-# performs a sync every 30 seconds.
-                                echo "Starting update"
-update &
-
-if [ -f /fastboot ]
-then
-                                echo "Skipping file system check"
-else
-                                echo "Performing file system check"
-    fsck -AV -a
-    # If there was a failure, drop into single-user mode.
-    # NOTE: This is not secure.  If security is needed, make sure than
-    #       /etc/securesingle exists and "reboot single".  simipleinit
-    #       will then prompt for root's password.
-    if [ $? -gt 1 ]
-    then
-        echo "Warning: fsck FAILED"
-        echo "         Starting single user shell"
-        echo "         Fix filesystem and REBOOT"
-        sh -si < /dev/console > /dev/console 2>&1
-    fi
-fi
-
-                                echo "Mounting file systems"
-# Remount the root filesystem in read-write mode
-mount -n -o rw,remount /
-
-# Remove the fastboot check file
-rm -f /fastboot
-
-# Remove /etc/mtab* so mount creates the /etc/mtab file
-rm -f /etc/mtab*
-
-# Mount all partitions specified in /etc/fstab
-mount -avt nonfs,nomsdos,nohpfs
-
-# Mount swap partition specified in /etc/fstab
-swapon -a
-
-                                echo -n "Initialization: "
-# Update ps database
-if [ -f /usr/sbin/psupdate -a -f /usr/src/linux/vmlinux ]; then
-                                echo -n "psdatabase "
-	/usr/sbin/psupdate /usr/src/linux/vmlinux
-fi
-
-# tmp and usr may be mounted, so we do these rm's after mount
-                                echo -n "locks "
-rm -f /var/lock/LCK*
-                                echo -n "pids "
-rm -f /var/run/*
-                                echo -n "/tmp "
-rm -rf /tmp; mkdir /tmp; chmod 1777 /tmp
-
-# Remove /var/adm/utmp and touch it
-                                echo -n "utmp "
-if [ ! -e /var ]; then mkdir /var; chmod 755 /var; fi
-if [ ! -e /var/adm ]; then mkdir /var/adm; chmod 755 /var/adm; fi
-rm -f /var/adm/utmp
-touch /var/adm/utmp
-chmod 644 /var/adm/utmp
-
-                                echo ""
-                                echo "Running rc.local. . ."
-sh /etc/rc.local
-
-# Allow logins
-                                echo "Allowing logins"
-rm -f /etc/nologin
-
-date
-exit 0
diff --git a/example.files/rc.local b/example.files/rc.local
deleted file mode 100644
index bf5fa11c..00000000
--- a/example.files/rc.local
+++ /dev/null
@@ -1,83 +0,0 @@
-# rc.local file for The Linux BOGUS Release, version 1.0.1
-
-                                echo -n "Local initialization: "
-
-# Set the host name.  You will probably want to change this.
-                                echo -n "hostname "
-hostname winter
-
-# Update the system time from the CMOS clock.
-# This assume that the CMOS clock is in local time, and that you have the
-# correct links in /usr/src/zoneinfo (see zic(8) for details.  (For example,
-# for the east coast of the US, do: zic -l US/Eastern -p America/NewYork)
-# Note: mount /usr BEFORE running rc.local!
-                                echo -n "clock "
-clock -a
-
-# Set screen blanker to 5 minutes.
-                                echo -n "screen-blanking "
-setterm -blank 5
-
-# Set modem for 57600 bps
-if [ -e /dev/modem ]
-then
-                                echo -n "high-speed-modem "
-    setserial /dev/modem spd_hi
-fi
-
-# Make CTRL-ALT-DEL do a controlled reboot (i.e., call reboot(8))
-                                echo -n "reboot "
-ctrlaltdel soft
-
-# Preserve elvis files in case of a crash
-                                echo -n "vi-files "
-elvprsv "-the system went down" /tmp/elv_*.*
-
-                                echo
-
-
-                                echo -n "Starting daemons: "
-
-# Make sure log files exist
-if [ -d /var/adm ]; then
-	if [ ! -e /var/adm/kernlog ];  then touch /var/adm/kernlog;  fi
-	if [ ! -e /var/adm/syslog ];   then touch /var/adm/syslog;   fi
-	if [ ! -e /var/adm/maillog ];  then touch /var/adm/maillog;  fi
-	if [ ! -e /var/adm/authlog ];  then touch /var/adm/authlog;  fi
-	if [ ! -e /var/adm/news ];     then touch /var/adm/news;     fi
-	if [ ! -e /var/adm/daemon ];   then touch /var/adm/daemon;   fi
-	if [ ! -e /var/adm/lpd-errs ]; then touch /var/adm/lpd-errs; fi
-	if [ ! -e /var/adm/sysdebug ]; then touch /var/adm/sysdebug; fi
-
-	# start up syslogd if it exists, but wait until AFTER HOSTNAME SET
-	if [ -f /usr/sbin/syslogd ]; then
-                                echo -n "syslogd "
-		/usr/sbin/syslogd
-	fi
-fi
-
-# Start up cron if it exists
-if [ -f /usr/sbin/cron ]
-then
-                                echo -n "cron "
-	/usr/sbin/cron
-fi
-
-                                echo
-
-# If you want networking turned on, then uncomment the following lines.
-if [ -f /etc/NETWORKING_IS_ON ]
-then
-        if [ -f /etc/rc.net ]
-        then
-                /bin/sh /etc/rc.net
-        fi
-fi
-
-                                echo "Mounting foreign file systems"
-mount -avt nfs,msdos,hpfs
-
-# Create a new issue file
-echo > /etc/issue
-echo "Welcome to `hostname`, an `uname -m` running BOGUS Release 1.0.1 `uname` `uname -r`" >> /etc/issue
-echo >> /etc/issue
diff --git a/fsck/Makefile.am b/fsck/Makefile.am
index abe6d5c3..567fee8b 100644
--- a/fsck/Makefile.am
+++ b/fsck/Makefile.am
@@ -8,7 +8,6 @@ fsck_SOURCES = base_device.c fsck.c fsck.h ../lib/ismounted.c \
 fsck_LDADD =
 fsck_CFLAGS =
 
-if HAVE_BLKID
 if BUILD_LIBBLKID
 fsck_LDADD += $(ul_libblkid_la)
 fsck_CFLAGS += -I$(ul_libblkid_srcdir)
@@ -16,9 +15,3 @@ else
 fsck_LDADD += $(BLKID_LIBS)
 fsck_CFLAGS += $(BLKID_CFLAGS)
 endif
-endif
-
-if HAVE_VOLUME_ID
-fsck_LDADD += $(VOLUME_ID_LIBS)
-fsck_CFLAGS += $(VOLUME_ID_CFLAGS)
-endif
diff --git a/getopt/Makefile.am b/getopt/Makefile.am
index 58ae7fc3..bd3e7942 100644
--- a/getopt/Makefile.am
+++ b/getopt/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-usrbinexec_PROGRAMS = getopt
+usrbin_exec_PROGRAMS = getopt
 dist_man_MANS = getopt.1
 
 exampledir = $(datadir)/getopt/
diff --git a/hwclock/hwclock.c b/hwclock/hwclock.c
index 6126a5fb..f691dfe5 100644
--- a/hwclock/hwclock.c
+++ b/hwclock/hwclock.c
@@ -676,7 +676,7 @@ interpret_date_string(const char *date_opt, time_t * const time_p) {
 				       date_opt, (long) *time_p);
 		}
 	}
-	fclose(date_child_fp);
+	pclose(date_child_fp);
 
 	return retcode;
 }
diff --git a/include/pathnames.h b/include/pathnames.h
index 0060a756..ead448e3 100644
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -19,7 +19,6 @@
 #undef _PATH_DEFPATH_ROOT
 #define	_PATH_DEFPATH_ROOT	"/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 
-#define _PATH_TTY		"/dev/tty"
 #define _PATH_SECURETTY		"/etc/securetty"
 #define _PATH_WTMPLOCK		"/etc/wtmplock"
 
@@ -94,6 +93,13 @@
 #define _PATH_MOUNTED_LOCK	_PATH_MOUNTED "~"
 #define _PATH_MOUNTED_TMP	_PATH_MOUNTED ".tmp"
 
+#ifndef _PATH_DEV
+# define _PATH_DEV		"/dev/"
+#endif
+
+#define _PATH_DEV_LOOP		"/dev/loop"
+#define _PATH_DEV_TTY		"/dev/tty"
+
 /* udev paths */
 #define _PATH_DEV_BYLABEL	"/dev/disk/by-label"
 #define _PATH_DEV_BYUUID	"/dev/disk/by-uuid"
diff --git a/lib/fsprobe.c b/lib/fsprobe.c
index c5fa8c63..b47de0ec 100644
--- a/lib/fsprobe.c
+++ b/lib/fsprobe.c
@@ -18,7 +18,9 @@
 #include "pathnames.h"
 #include "fsprobe.h"
 
-#if defined(HAVE_BLKID_EVALUATE_TAG) || defined(HAVE_LIBVOLUME_ID)
+static blkid_cache blcache;
+
+#ifdef HAVE_BLKID_EVALUATE_TAG
 /* ask kernel developers why we need such ugly open() method... */
 static int
 open_device(const char *devname)
@@ -45,35 +47,16 @@ open_device(const char *devname)
  * Parses NAME=value, returns -1 on parse error, 0 success. The success is also
  * when the 'spec' doesn't contain name=value pair (because the spec could be
  * a devname too). In particular case the pointer 'name' is set to NULL.
-
- * The result is a new allocated string (the 'name' pointer).
  */
 int
 fsprobe_parse_spec(const char *spec, char **name, char **value)
 {
-	char *vl, *tk, *cp;
-
 	*name = NULL;
 	*value = NULL;
 
-	if (!(cp = strchr(spec, '=')))
-		return 0;				/* no name= */
-
-	tk = strdup(spec);
-	vl = tk + (cp - spec);
-	*vl++ = '\0';
+	if (strchr(spec, '='))
+		return blkid_parse_tag_string(spec, name, value);
 
-	if (*vl == '"' || *vl == '\'') {
-		if (!(cp = strrchr(vl+1, *vl))) {
-			free(tk);
-			return -1;			/* parse error */
-		}
-		vl++;
-		*cp = '\0';
-	}
-
-	*name = tk;
-	*value = vl;
 	return 0;
 }
 
@@ -94,16 +77,14 @@ fsprobe_get_devname_by_spec(const char *spec)
 		else if (!strcmp(name,"UUID"))
 			nspec = fsprobe_get_devname_by_uuid(value);
 
-		free((void *) name);
+		free(name);
+		free(value);
 		return nspec;
 	}
 
 	return canonicalize_path(spec);
 }
 
-#ifdef HAVE_LIBBLKID
-static blkid_cache blcache;
-
 void
 fsprobe_init(void)
 {
@@ -266,129 +247,3 @@ fsprobe_get_uuid_by_devname(const char *devname)
 }
 
 #endif /* !HAVE_BLKID_EVALUATE_TAG */
-#else  /* !HAVE_LIBBLKID */
-
-/*
- * libvolume_id from udev
- * -- deprecated
- */
-#include <libvolume_id.h>
-
-enum probe_type {
-	VOLUME_ID_NONE,
-	VOLUME_ID_LABEL,
-	VOLUME_ID_UUID,
-	VOLUME_ID_TYPE,
-};
-
-static char
-*probe(const char *device, enum probe_type type)
-{
-	int fd;
-	uint64_t size;
-	struct volume_id *id;
-	const char *val;
-	char *value = NULL;
-	int retries = 0;
-
-	fd = open_device(devname);
-	if (fd < 0)
-		return NULL;
-	id = volume_id_open_fd(fd);
-	if (!id) {
-		close(fd);
-		return NULL;
-	}
-	if (blkdev_get_size(fd, &size) != 0)
-		size = 0;
-	if (volume_id_probe_all(id, 0, size) == 0) {
-		switch(type) {
-		case VOLUME_ID_LABEL:
-			if (volume_id_get_label(id, &val))
-				value  = strdup(val);
-			break;
-		case VOLUME_ID_UUID:
-			if (volume_id_get_uuid(id, &val))
-				value  = strdup(val);
-			break;
-		case VOLUME_ID_TYPE:
-			if (volume_id_get_type(id, &val))
-				value  = strdup(val);
-			break;
-		default:
-			break;
-		}
-	}
-	volume_id_close(id);
-	close(fd);
-	return value;
-}
-
-void
-fsprobe_init(void)
-{
-}
-
-void
-fsprobe_exit(void)
-{
-}
-
-int
-fsprobe_known_fstype(const char *fstype)
-{
-	if (volume_id_get_prober_by_type(fstype) != NULL)
-		return 1;
-	return 0;
-}
-
-char *
-fsprobe_get_uuid_by_devname(const char *devname)
-{
-	return probe(devname, VOLUME_ID_UUID);
-}
-
-char *
-fsprobe_get_label_by_devname(const char *devname)
-{
-	return probe(devname, VOLUME_ID_LABEL);
-}
-
-char *
-fsprobe_get_fstype_by_devname(const char *devname)
-{
-	return probe(devname, VOLUME_ID_TYPE);
-}
-
-char *
-fsprobe_get_devname_by_uuid(const char *uuid)
-{
-	char dev[PATH_MAX];
-	size_t len;
-
-	if (!uuid)
-		return NULL;
-
-	strcpy(dev, _PATH_DEV_BYUUID "/");
-	len = strlen(_PATH_DEV_BYUUID "/");
-	if (!volume_id_encode_string(uuid, &dev[len], sizeof(dev) - len))
-		return NULL;
-	return canonicalize_path(dev);
-}
-
-char *
-fsprobe_get_devname_by_label(const char *label)
-{
-	char dev[PATH_MAX];
-	size_t len;
-
-	if (!label)
-		return NULL;
-	strcpy(dev, _PATH_DEV_BYLABEL "/");
-	len = strlen(_PATH_DEV_BYLABEL "/");
-	if (!volume_id_encode_string(label, &dev[len], sizeof(dev) - len))
-		return NULL;
-	return canonicalize_path(dev);
-}
-
-#endif /* HAVE_LIBVOLUME_ID  */
diff --git a/libs/blkid/TODO b/libs/blkid/TODO
deleted file mode 100644
index 1d0a67ee..00000000
--- a/libs/blkid/TODO
+++ /dev/null
@@ -1,54 +0,0 @@
-
- TODO
- ----
-
- - add command line interface for blkid_probe_filter_types():
-
-       # blkid -p -o udev --filter-type nofat
-
- - (?) we need to ignore cache and config files when the files are writable
-   for non-root users and the library is linked with suid programs
-
- - add -<BE|LE> suffix to test images for native-endian filesystems (e.g. swap)
-   and add support for such functionality to tests/ts/blkid/low-probe
-
- - do we really need to depend on libuuid? Maybe the default should be
-   use in-tree code rather and link against libuuid -- especially when we
-   need it for uuid_unparse() only.
-
- - consolidate "getsize" stuff (see getsize.c and lib/blkdev.c)
-
- - cleanup __attribute__ usage
-
- - add stripe size / alignment retrival support to libbkid for use
-   with mkfs.  This would allow to deprecate libdisk from xfsprogs (1)
-   in favour of a common libblkid.
-
-   [ -- Christoph Hellwig, 16 Feb 2009 ]
-   (1) http://git.kernel.org/?p=fs/xfs/xfsprogs-dev.git;a=tree;f=libdisk;
-
-   [ .. or move whole libdisk to util-linux-ng and merge partx code to the 
-     library -- kzak ]
-
- - use /sys/block/<devname>/dm/name rather than scan /dev/mapper/ for the name
-   (see devname.c: probe_one()). The sysfs entry has been introduced by kernel
-   patch 784aae735d9b0bba3f8b9faef4c8b30df3bf0128.
-
- - in lib/fsprobe.c wrapper use blkid_parse_tag_string() rather than a local
-   parser implementation
-
- - use fstatat() in blkid__scan_dir()
-
- - add evaluate.c: blkid_evaluate_tag_to_buffer() (and add lib/canonicalize.c:
-   canonicalize_path_to_buffer())
-
- - add values:
-
-	FSSIZE   -- filesystem size (klibc requirement)
-
-	SBOFFSET -- superblock offset; offset where SB was detected 
-                    (swapon requirement to check details from swap header)
-
-        MAGIC    -- magic string
-	MAGICLEN -- length of magic string
-
diff --git a/libs/blkid/bin/Makefile.am b/libs/blkid/bin/Makefile.am
deleted file mode 100644
index ff992ace..00000000
--- a/libs/blkid/bin/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-AM_CPPFLAGS += -I$(ul_libblkid_srcdir)
-AM_LDFLAGS += $(ul_libblkid_la)
-
-sbin_PROGRAMS = blkid findfs
-dist_man_MANS = blkid.8 findfs.8
-
-if HAVE_STATIC_BLKID
-sbin_PROGRAMS += blkid.static
-blkid_static_SOURCES = $(blkid_SOURCES)
-blkid_static_LDFLAGS = "-all-static"		# libtool option
-blkid_static_LDADD = $(ul_libblkid_la)
-blkid_static_CFLAGS = -I$(ul_libblkid_srcdir)
-endif
diff --git a/libs/blkid/bin/blkid.sh.in b/libs/blkid/bin/blkid.sh.in
deleted file mode 100644
index 3e10add1..00000000
--- a/libs/blkid/bin/blkid.sh.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# libtool? Don't ask!
-
-BLKIDDIR=@SRCDIR@/libs/blkid
-BINARY=$BLKIDDIR/bin/blkid
-LD_LIBRARY_PATH=$BLKIDDIR/src/
-
-export LD_LIBRARY_PATH
-exec $BINARY $@
diff --git a/libs/blkid/bin/findfs.sh.in b/libs/blkid/bin/findfs.sh.in
deleted file mode 100644
index 37876c76..00000000
--- a/libs/blkid/bin/findfs.sh.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# libtool? Don't ask!
-
-BLKIDDIR=@SRCDIR@/libs/blkid
-BINARY=$BLKIDDIR/bin/findfs
-LD_LIBRARY_PATH=$BLKIDDIR/src/
-
-export LD_LIBRARY_PATH
-exec $BINARY $@
diff --git a/libs/blkid/src/Makefile.am b/libs/blkid/src/Makefile.am
deleted file mode 100644
index 805d0899..00000000
--- a/libs/blkid/src/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-SUBDIRS = probers .
-
-AM_CPPFLAGS += -I$(top_srcdir)/libs/blkid/src
-
-common_ldadd =
-
-if HAVE_UUID
-common_ldadd += -luuid	#TODO $(UUID_LIBS)
-endif
-
-# includes
-blkidincdir = $(includedir)/blkid
-blkidinc_HEADERS = blkid.h
-
-lib_LTLIBRARIES = libblkid.la
-libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c  \
-		     probe.c read.c resolve.c save.c tag.c version.c verify.c \
-		     encode.c blkid.h list.h blkidP.h probers/probers.h \
-		     config.c evaluate.c \
-		     $(blkidinc_HEADERS) \
-		     $(top_srcdir)/lib/blkdev.c \
-		     $(top_srcdir)/lib/linux_version.c \
-		     $(top_srcdir)/lib/canonicalize.c \
-		     $(top_srcdir)/lib/md5.c
-
-libblkid_la_LIBADD = probers/libblkid_probers.la $(common_ldadd)
-libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym
-
-# TODO: for unknown reason "make distcheck" requires
-#       full path to the version script
-libblkid_la_LDFLAGS = -Wl,--version-script=$(top_srcdir)/libs/blkid/src/blkid.sym \
-                      -version-info 1:0:0
-
-tests = test_cache test_config test_dev test_devname test_devno test_getsize \
-	test_read test_resolve test_save test_tag test_verify test_evaluate
-
-EXTRA_DIST = blkid.sym tst_types.c
-CLEANFILES = $(tests)
-
-tests: all $(tests)
-test_%: %.c
-	$(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ $(common_ldadd)
-
diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index 0386cee4..6d82f401 100644
--- a/login-utils/Makefile.am
+++ b/login-utils/Makefile.am
@@ -1,9 +1,9 @@
 include $(top_srcdir)/config/include-Makefile.am
 
 bin_PROGRAMS =
-usrbinexec_PROGRAMS =
+usrbin_exec_PROGRAMS =
 sbin_PROGRAMS =
-usrsbinexec_PROGRAMS =
+usrsbin_exec_PROGRAMS =
 dist_man_MANS =
 
 EXTRA_DIST = README.getty  README.modems-with-agetty  README.poeigl
@@ -30,15 +30,15 @@ endif
 endif
 
 if BUILD_LAST
-usrbinexec_PROGRAMS += last
+usrbin_exec_PROGRAMS += last
 dist_man_MANS += last.1
 endif
 
 if BUILD_LOGIN_UTILS
 
 bin_PROGRAMS += login
-usrbinexec_PROGRAMS += chfn chsh newgrp
-usrsbinexec_PROGRAMS += vipw
+usrbin_exec_PROGRAMS += chfn chsh newgrp
+usrsbin_exec_PROGRAMS += vipw
 dist_man_MANS += chfn.1 chsh.1 login.1 newgrp.1 vipw.8 vigr.8
 
 chfn_SOURCES = chfn.c $(chfn_chsh_common)
@@ -92,25 +92,25 @@ endif
 
 
 install-exec-hook::
-	cd $(DESTDIR)$(usrsbinexecdir) && ln -sf vipw vigr
+	cd $(DESTDIR)$(usrsbin_execdir) && ln -sf vipw vigr
 
 endif
 
 if BUILD_MESG
-usrbinexec_PROGRAMS += mesg
+usrbin_exec_PROGRAMS += mesg
 dist_man_MANS += mesg.1
 endif
 
 if BUILD_WALL
-usrbinexec_PROGRAMS += wall
+usrbin_exec_PROGRAMS += wall
 wall_SOURCES = wall.c ttymsg.c ttymsg.h
 dist_man_MANS += wall.1
 
 if USE_TTY_GROUP
 if MAKEINSTALL_DO_CHOWN
 install-exec-hook::
-	chgrp tty $(DESTDIR)$(usrbinexecdir)/wall
-	chmod g+s $(DESTDIR)$(usrbinexecdir)/wall
+	chgrp tty $(DESTDIR)$(usrbin_execdir)/wall
+	chmod g+s $(DESTDIR)$(usrbin_execdir)/wall
 endif
 endif
 endif
@@ -125,6 +125,8 @@ install-exec-hook::
 	cd $(DESTDIR)$(sbindir) && ln -sf initctl need
 	cd $(DESTDIR)$(sbindir) && ln -sf initctl display-services
 	cd $(DESTDIR)$(sbindir) && ln -sf initctl provide
+
+install-data-hook:
 	cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 need.8
 	cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 display-services.8
 	cd $(DESTDIR)$(mandir)/man8 && ln -sf initctl.8 provide.8
diff --git a/login-utils/login.c b/login-utils/login.c
index f3154259..7328edeb 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -378,7 +378,7 @@ main(int argc, char **argv)
     int ask, fflag, hflag, pflag, cnt, errsv;
     int quietlog, passwd_req;
     char *domain, *ttyn;
-    char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_TTY) + 10];
+    char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_DEV_TTY) + 10];
     char *termenv;
     char *childArgv[10];
     char *buff;
@@ -499,7 +499,7 @@ main(int argc, char **argv)
 
     if (ttyn == NULL || *ttyn == '\0') {
 	/* no snprintf required - see definition of tname */
-	sprintf(tname, "%s??", _PATH_TTY);
+	snprintf(tname, sizeof(tname), "%s??", _PATH_DEV_TTY);
 	ttyn = tname;
     }
 
diff --git a/m4/tls.m4 b/m4/tls.m4
new file mode 100644
index 00000000..5644ba70
--- /dev/null
+++ b/m4/tls.m4
@@ -0,0 +1,48 @@
+# from http://autoconf-archive.cryp.to/ax_tls.html
+#
+# This was licensed under the GPL with the following exception:
+#
+# As a special exception, the respective Autoconf Macro's copyright
+# owner gives unlimited permission to copy, distribute and modify the
+# configure scripts that are the output of Autoconf when processing
+# the Macro. You need not follow the terms of the GNU General Public
+# License when using or distributing such scripts, even though
+# portions of the text of the Macro appear in them. The GNU General
+# Public License (GPL) does govern all other use of the material that
+# constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the
+# Autoconf Macro released by the Autoconf Macro Archive. When you make
+# and distribute a modified version of the Autoconf Macro, you may
+# extend this special exception to the GPL to apply to your modified
+# version as well.
+#
+AC_DEFUN([AX_TLS], [
+  AC_MSG_CHECKING(for thread local storage (TLS) class)
+  AC_CACHE_VAL(ac_cv_tls, [
+    ax_tls_keywords="__thread __declspec(thread) none"
+    for ax_tls_keyword in $ax_tls_keywords; do
+       case $ax_tls_keyword in
+          none) ac_cv_tls=none ; break ;;
+          *)
+             AC_TRY_COMPILE(
+                [#include <stdlib.h>
+                 static void
+                 foo(void) {
+                 static ] $ax_tls_keyword [ int bar;
+                 exit(1);
+                 }],
+                 [],
+                 [ac_cv_tls=$ax_tls_keyword ; break],
+                 ac_cv_tls=none
+             )
+          esac
+    done
+])
+
+  if test "$ac_cv_tls" != "none"; then
+    dnl AC_DEFINE([TLS], [], [If the compiler supports a TLS storage class define it to that here])
+    AC_DEFINE_UNQUOTED([TLS], $ac_cv_tls, [If the compiler supports a TLS storage class define it to that here])
+  fi
+  AC_MSG_RESULT($ac_cv_tls)
+])
diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore
index 122b1920..2242b920 100644
--- a/misc-utils/.gitignore
+++ b/misc-utils/.gitignore
@@ -12,3 +12,7 @@ setterm
 whereis
 kill
 write
+uuidgen
+uuidd
+findfs
+blkid
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index 40610c14..a4f2f44e 100644
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -1,22 +1,53 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-EXTRA_DIST = README.flushb
+EXTRA_DIST = README.flushb uuidd.rc
 
 bin_PROGRAMS =
+sbin_PROGRAMS =
+usrsbin_exec_PROGRAMS =
 
-usrbinexec_PROGRAMS = cal ddate logger look mcookie \
+usrbin_exec_PROGRAMS = cal ddate logger look mcookie \
 	namei script whereis scriptreplay
 EXTRA_DIST += README.cal README.ddate README.namei README.namei2
 
 mcookie_SOURCES = mcookie.c ../lib/md5.c
 
-usrbinexec_SCRIPTS = chkdupexe
+usrbin_exec_SCRIPTS = chkdupexe
 
 CLEANFILES = chkdupexe
 
 dist_man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \
 	namei.1 script.1 whereis.1 scriptreplay.1
 
+if BUILD_LIBUUID
+usrbin_exec_PROGRAMS += uuidgen
+dist_man_MANS += uuidgen.1
+uuidgen_LDADD = $(ul_libuuid_la)
+uuidgen_CFLAGS = -I$(ul_libuuid_srcdir)
+if BUILD_UUIDD
+usrsbin_exec_PROGRAMS += uuidd
+dist_man_MANS += uuidd.8
+uuidd_LDADD = $(ul_libuuid_la)
+uuidd_CFLAGS = -I$(ul_libuuid_srcdir)
+endif
+endif
+
+if BUILD_LIBBLKID
+sbin_PROGRAMS += blkid findfs
+dist_man_MANS += blkid.8 findfs.8
+blkid_LDADD = $(ul_libblkid_la)
+blkid_CFLAGS = -I$(ul_libblkid_srcdir)
+findfs_LDADD = $(ul_libblkid_la)
+findfs_CFLAGS = -I$(ul_libblkid_srcdir)
+if HAVE_STATIC_BLKID
+sbin_PROGRAMS += blkid.static
+blkid_static_SOURCES = $(blkid_SOURCES)
+blkid_static_LDFLAGS = "-all-static"		# libtool option
+blkid_static_LDADD = $(ul_libblkid_la)
+blkid_static_CFLAGS = -I$(ul_libblkid_srcdir)
+endif
+endif
+
 if HAVE_TINFO
 cal_LDADD = -ltinfo @NCURSES_LIBS@
 else
@@ -35,7 +66,7 @@ endif
 
 if HAVE_NCURSES
 if LINUX
-usrbinexec_PROGRAMS += setterm
+usrbin_exec_PROGRAMS += setterm
 dist_man_MANS += setterm.1
 endif
 if HAVE_TINFO
@@ -52,19 +83,18 @@ dist_man_MANS += kill.1
 endif
 
 if BUILD_RENAME
-usrbinexec_PROGRAMS += rename
+usrbin_exec_PROGRAMS += rename
 dist_man_MANS += rename.1
 endif
 
 if BUILD_RESET
-dist_usrbinexec_SCRIPTS = reset
+dist_usrbin_exec_SCRIPTS = reset
 dist_man_MANS += reset.1
 endif
 EXTRA_DIST += README.reset reset.033c
 
 if BUILD_WRITE
-
-usrbinexec_PROGRAMS += write
+usrbin_exec_PROGRAMS += write
 dist_man_MANS += write.1
 write_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
 write_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
@@ -72,8 +102,8 @@ write_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 if USE_TTY_GROUP
 if MAKEINSTALL_DO_CHOWN
 install-exec-hook::
-	chgrp tty $(DESTDIR)$(usrbinexecdir)/write
-	chmod g+s $(DESTDIR)$(usrbinexecdir)/write
+	chgrp tty $(DESTDIR)$(usrbin_execdir)/write
+	chmod g+s $(DESTDIR)$(usrbin_execdir)/write
 endif
 endif
 endif
diff --git a/libs/blkid/bin/blkid.8 b/misc-utils/blkid.8
index ff8e8e57..ff8e8e57 100644
--- a/libs/blkid/bin/blkid.8
+++ b/misc-utils/blkid.8
diff --git a/libs/blkid/bin/blkid.c b/misc-utils/blkid.c
index 528e4a22..528e4a22 100644
--- a/libs/blkid/bin/blkid.c
+++ b/misc-utils/blkid.c
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index a8534b8c..bda3a963 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -162,7 +162,7 @@ char		*Hrow;		/* pointer to highlighted row in month */
 #define	FIRST_MISSING_DAY	639799		/* 3 Sep 1752 */
 #define	NUMBER_MISSING_DAYS	11		/* 11 day correction */
 
-#define	MAXDAYS			43		/* max slots in a month array */
+#define	MAXDAYS			42		/* slots in a month array */
 #define	SPACE			-1		/* used in day array */
 
 static int days_in_month[2][13] = {
@@ -170,30 +170,34 @@ static int days_in_month[2][13] = {
 	{0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
 };
 
-int sep1752[MAXDAYS] = {
+#define SEP1752_OFS		4		/* sep1752[4] is a Sunday */
+
+/* 1 Sep 1752 is represented by sep1752[6] and j_sep1752[6] */
+int sep1752[MAXDAYS+6] = {
+				SPACE,	SPACE,	SPACE,	SPACE,
 	SPACE,	SPACE,	1,	2,	14,	15,	16,
 	17,	18,	19,	20,	21,	22,	23,
 	24,	25,	26,	27,	28,	29,	30,
 	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
 	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
 	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
-	SPACE
-}, j_sep1752[MAXDAYS] = {
+	SPACE,	SPACE
+}, j_sep1752[MAXDAYS+6] = {
+				SPACE,	SPACE,	SPACE,	SPACE,
 	SPACE,	SPACE,	245,	246,	258,	259,	260,
 	261,	262,	263,	264,	265,	266,	267,
 	268,	269,	270,	271,	272,	273,	274,
 	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
 	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
 	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
-	SPACE
+	SPACE,	SPACE
 }, empty[MAXDAYS] = {
 	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
 	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
 	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
 	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
 	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
-	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,
-	SPACE
+	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE,	SPACE
 };
 
 #define	DAY_LEN		3		/* 3 spaces per day */
@@ -354,7 +358,7 @@ main(int argc, char **argv) {
 	day = month = year = 0;
 	switch(argc) {
 	case 3:
-		if ((day = atoi(*argv++)) < 1 || month > 31)
+		if ((day = atoi(*argv++)) < 1 || day > 31)
 			errx(1, _("illegal day value: use 1-%d"), 31);
 		/* FALLTHROUGH */
 	case 2:
@@ -629,10 +633,11 @@ day_array(int day, int month, int year, int *days) {
 	int *d_sep1752;
 
 	if (month == 9 && year == 1752) {
+		int sep1752_ofs = (weekstart + SEP1752_OFS) % 7;
 		d_sep1752 = julian ? j_sep1752 : sep1752;
-		memcpy(days, d_sep1752 + weekstart, MAXDAYS * sizeof(int));
+		memcpy(days, d_sep1752 + sep1752_ofs, MAXDAYS * sizeof(int));
 		for (dm=0; dm<MAXDAYS; dm++)
-			if (j_sep1752[dm] == day)
+			if (j_sep1752[dm + sep1752_ofs] == day)
 				days[dm] |= TODAY_FLAG;
 		return;
 	}
diff --git a/libs/blkid/bin/findfs.8 b/misc-utils/findfs.8
index e93fe542..e93fe542 100644
--- a/libs/blkid/bin/findfs.8
+++ b/misc-utils/findfs.8
diff --git a/libs/blkid/bin/findfs.c b/misc-utils/findfs.c
index 18608b47..18608b47 100644
--- a/libs/blkid/bin/findfs.c
+++ b/misc-utils/findfs.c
diff --git a/misc-utils/script.c b/misc-utils/script.c
index 12ea43a8..b877c312 100644
--- a/misc-utils/script.c
+++ b/misc-utils/script.c
@@ -371,7 +371,7 @@ doshell() {
 #if 0
 	int t;
 
-	t = open(_PATH_TTY, O_RDWR);
+	t = open(_PATH_DEV_TTY, O_RDWR);
 	if (t >= 0) {
 		(void) ioctl(t, TIOCNOTTY, (char *)0);
 		(void) close(t);
diff --git a/misc-utils/scriptreplay.c b/misc-utils/scriptreplay.c
index 8a254de9..e13edf37 100644
--- a/misc-utils/scriptreplay.c
+++ b/misc-utils/scriptreplay.c
@@ -163,7 +163,7 @@ main(int argc, char *argv[])
 				err(EXIT_FAILURE,
 					_("failed to read timing file %s"), tname);
 			errx(EXIT_FAILURE,
-				_("timings file %s: %lu: expected format"),
+				_("timings file %s: %lu: unexpected format"),
 				tname, line);
 		}
 		delay /= divi;
diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
new file mode 100644
index 00000000..67c6614a
--- /dev/null
+++ b/misc-utils/uuidd.8
@@ -0,0 +1,96 @@
+.\" -*- nroff -*-
+.\" Copyright 2007 by Theodore Ts'o.  All Rights Reserved.
+.\" This file may be copied under the terms of the GNU Public License.
+.\"
+.TH UUIDD 8 "May 2009" "Linux"
+.SH NAME
+uuidd \- UUID generation daemon
+.SH SYNOPSIS
+.B uuidd
+[
+.B \-d
+]
+[
+.B \-p
+.I pidfile
+]
+[
+.B \-s
+.I socketpath
+]
+[
+.B \-T
+.I timeout
+]
+
+.B uuidd
+[
+.B \-r
+|
+.B \-t
+]
+[
+.B \-n
+.I number
+]
+[
+.B \-s
+.I socketpath
+]
+
+.B uuidd \-k
+.SH DESCRIPTION
+The
+.B uuidd
+daemon is used by the UUID library to generate
+universally unique identifiers (UUIDs), especially time-based UUID's
+in a secure and guaranteed-unique fashion, even in the face of large
+numbers of threads trying to grab UUID's running on different CPU's.
+.SH OPTIONS
+.TP
+.B \-d
+Run
+.B uuidd
+in debugging mode.  This prevents uuidd from running as a daemon.
+.TP
+.B \-k
+If a currently uuidd daemon is running, kill it.
+.TP
+.BI \-n " number"
+When issuing a test request to a running uuidd, request a bulk response
+of
+.I number
+UUID's.
+.TP
+.BI \-p  " pidfile"
+Specify the pathname where the pid file should be written.  By default,
+the pid file is written to /var/run/uuidd/uuidd.pid.
+.TP
+.BI \-s " socketpath"
+Specify the pathname used for the unix-domain socket used by uuidd.  By
+default, the pathname used is /var/run/uuidd/request.  This is primarily
+for debugging purposes, since the pathname is hard-coded in the libuuid
+library.
+.TP
+.B \-r
+Test uuidd by trying to connect to a running uuidd daemon and
+request it to return a random-based UUID.
+.TP
+.B \-t
+Test uuidd by trying to connect to a running uuidd daemon and
+request it to return a time-based UUID.
+.TP
+.BI \-T " timeout"
+Specify a timeout for uuidd.  If specified, then uuidd will exit after
+.I timeout
+seconds of inactivity.
+.SH AUTHOR
+The
+.B uuidd
+daemon  was written by Theodore Ts'o <tytso@mit.edu>.
+.SH AVAILABILITY
+uuidd is part of the util-linux-ng package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+.SH "SEE ALSO"
+.BR libuuid (3),
+.BR uuidgen (1)
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
new file mode 100644
index 00000000..74bab693
--- /dev/null
+++ b/misc-utils/uuidd.c
@@ -0,0 +1,588 @@
+/*
+ * uuidd.c --- UUID-generation daemon
+ *
+ * Copyright (C) 2007  Theodore Ts'o
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
+ */
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <unistd.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <string.h>
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+extern int getopt(int argc, char * const argv[], const char *optstring);
+extern char *optarg;
+extern int optind;
+#endif
+
+#include "uuid.h"
+#include "uuidd.h"
+
+#include "nls.h"
+
+#ifdef __GNUC__
+#define CODE_ATTR(x) __attribute__(x)
+#else
+#define CODE_ATTR(x)
+#endif
+
+static void usage(const char *progname)
+{
+	fprintf(stderr, _("Usage: %s [-d] [-p pidfile] [-s socketpath] "
+			  "[-T timeout]\n"), progname);
+	fprintf(stderr, _("       %s [-r|t] [-n num] [-s socketpath]\n"),
+		progname);
+	fprintf(stderr, _("       %s -k\n"), progname);
+	exit(1);
+}
+
+static void die(const char *msg)
+{
+	perror(msg);
+	exit(1);
+}
+
+static void create_daemon(void)
+{
+	pid_t pid;
+	uid_t euid;
+
+	pid = fork();
+	if (pid == -1) {
+		perror("fork");
+		exit(1);
+	} else if (pid != 0) {
+	    exit(0);
+	}
+
+	close(0);
+	close(1);
+	close(2);
+	open("/dev/null", O_RDWR);
+	open("/dev/null", O_RDWR);
+	open("/dev/null", O_RDWR);
+
+	if (chdir("/")) {}	/* Silence warn_unused_result warning */
+	(void) setsid();
+	euid = geteuid();
+	if (setreuid(euid, euid) < 0)
+		die("setreuid");
+}
+
+static ssize_t read_all(int fd, char *buf, size_t count)
+{
+	ssize_t ret;
+	ssize_t c = 0;
+	int tries = 0;
+
+	memset(buf, 0, count);
+	while (count > 0) {
+		ret = read(fd, buf, count);
+		if (ret <= 0) {
+			if ((errno == EAGAIN || errno == EINTR || ret == 0) &&
+			    (tries++ < 5))
+				continue;
+			return c ? c : -1;
+		}
+		if (ret > 0)
+			tries = 0;
+		count -= ret;
+		buf += ret;
+		c += ret;
+	}
+	return c;
+}
+
+static int write_all(int fd, char *buf, size_t count)
+{
+	ssize_t ret;
+	int c = 0;
+
+	while (count > 0) {
+		ret = write(fd, buf, count);
+		if (ret < 0) {
+			if ((errno == EAGAIN) || (errno == EINTR))
+				continue;
+			return -1;
+		}
+		count -= ret;
+		buf += ret;
+		c += ret;
+	}
+	return c;
+}
+
+static const char *cleanup_pidfile, *cleanup_socket;
+
+static void terminate_intr(int signo CODE_ATTR((unused)))
+{
+	(void) unlink(cleanup_pidfile);
+	if (cleanup_socket)
+		(void) unlink(cleanup_socket);
+	exit(0);
+}
+
+static int call_daemon(const char *socket_path, int op, char *buf,
+		       int buflen, int *num, const char **err_context)
+{
+	char op_buf[8];
+	int op_len;
+	int s;
+	ssize_t ret;
+	int32_t reply_len = 0;
+	struct sockaddr_un srv_addr;
+
+	if (((op == 4) || (op == 5)) && !num) {
+		if (err_context)
+			*err_context = _("bad arguments");
+		errno = EINVAL;
+		return -1;
+	}
+
+	if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
+		if (err_context)
+			*err_context = _("socket");
+		return -1;
+	}
+
+	srv_addr.sun_family = AF_UNIX;
+	strncpy(srv_addr.sun_path, socket_path, sizeof(srv_addr.sun_path));
+	srv_addr.sun_path[sizeof(srv_addr.sun_path)-1] = '\0';
+
+	if (connect(s, (const struct sockaddr *) &srv_addr,
+		    sizeof(struct sockaddr_un)) < 0) {
+		if (err_context)
+			*err_context = _("connect");
+		close(s);
+		return -1;
+	}
+
+	if (op == 5) {
+		if ((*num)*16 > buflen-4)
+			*num = (buflen-4) / 16;
+	}
+	op_buf[0] = op;
+	op_len = 1;
+	if ((op == 4) || (op == 5)) {
+		memcpy(op_buf+1, num, sizeof(int));
+		op_len += sizeof(int);
+	}
+
+	ret = write_all(s, op_buf, op_len);
+	if (ret < op_len) {
+		if (err_context)
+			*err_context = _("write");
+		close(s);
+		return -1;
+	}
+
+	ret = read_all(s, (char *) &reply_len, sizeof(reply_len));
+	if (ret < 0) {
+		if (err_context)
+			*err_context = _("read count");
+		close(s);
+		return -1;
+	}
+	if (reply_len < 0 || reply_len > buflen) {
+		if (err_context)
+			*err_context = _("bad response length");
+		close(s);
+		return -1;
+	}
+	ret = read_all(s, (char *) buf, reply_len);
+
+	if ((ret > 0) && (op == 4)) {
+		if (reply_len >= (int) (16+sizeof(int)))
+			memcpy(buf+16, num, sizeof(int));
+		else
+			*num = -1;
+	}
+	if ((ret > 0) && (op == 5)) {
+		if (*num >= (int) sizeof(int))
+			memcpy(buf, num, sizeof(int));
+		else
+			*num = -1;
+	}
+
+	close(s);
+
+	return ret;
+}
+
+static void server_loop(const char *socket_path, const char *pidfile_path,
+			int debug, int timeout, int quiet)
+{
+	struct sockaddr_un	my_addr, from_addr;
+	struct flock		fl;
+	socklen_t		fromlen;
+	int32_t			reply_len = 0;
+	uuid_t			uu;
+	mode_t			save_umask;
+	char			reply_buf[1024], *cp;
+	char			op, str[37];
+	int			i, s, ns, len, num;
+	int			fd_pidfile, ret;
+
+	fd_pidfile = open(pidfile_path, O_CREAT | O_RDWR, 0664);
+	if (fd_pidfile < 0) {
+		if (!quiet)
+			fprintf(stderr, "Failed to open/create %s: %s\n",
+				pidfile_path, strerror(errno));
+		exit(1);
+	}
+	cleanup_pidfile = pidfile_path;
+	cleanup_socket = 0;
+	signal(SIGALRM, terminate_intr);
+	alarm(30);
+	fl.l_type = F_WRLCK;
+	fl.l_whence = SEEK_SET;
+	fl.l_start = 0;
+	fl.l_len = 0;
+	fl.l_pid = 0;
+	while (fcntl(fd_pidfile, F_SETLKW, &fl) < 0) {
+		if ((errno == EAGAIN) || (errno == EINTR))
+			continue;
+		if (!quiet)
+			fprintf(stderr, "Failed to lock %s: %s\n",
+				pidfile_path, strerror(errno));
+		exit(1);
+	}
+	ret = call_daemon(socket_path, 0, reply_buf, sizeof(reply_buf), 0, 0);
+	if (ret > 0) {
+		if (!quiet)
+			printf(_("uuidd daemon already running at pid %s\n"),
+			       reply_buf);
+		exit(1);
+	}
+	alarm(0);
+
+	if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
+		if (!quiet)
+			fprintf(stderr, _("Couldn't create unix stream "
+					  "socket: %s"), strerror(errno));
+		exit(1);
+	}
+
+	/*
+	 * Make sure the socket isn't using fd numbers 0-2 to avoid it
+	 * getting closed by create_daemon()
+	 */
+	while (!debug && s <= 2) {
+		s = dup(s);
+		if (s < 0) {
+			perror("dup");
+			exit(1);
+		}
+	}
+
+	/*
+	 * Create the address we will be binding to.
+	 */
+	my_addr.sun_family = AF_UNIX;
+	strncpy(my_addr.sun_path, socket_path, sizeof(my_addr.sun_path));
+	my_addr.sun_path[sizeof(my_addr.sun_path)-1] = '\0';
+	(void) unlink(socket_path);
+	save_umask = umask(0);
+	if (bind(s, (const struct sockaddr *) &my_addr,
+		 sizeof(struct sockaddr_un)) < 0) {
+		if (!quiet)
+			fprintf(stderr,
+				_("Couldn't bind unix socket %s: %s\n"),
+				socket_path, strerror(errno));
+		exit(1);
+	}
+	(void) umask(save_umask);
+
+	if (listen(s, 5) < 0) {
+		if (!quiet)
+			fprintf(stderr, _("Couldn't listen on unix "
+					  "socket %s: %s\n"), socket_path,
+				strerror(errno));
+		exit(1);
+	}
+
+	cleanup_socket = socket_path;
+	if (!debug)
+		create_daemon();
+	signal(SIGHUP, terminate_intr);
+	signal(SIGINT, terminate_intr);
+	signal(SIGTERM, terminate_intr);
+	signal(SIGALRM, terminate_intr);
+	signal(SIGPIPE, SIG_IGN);
+
+	sprintf(reply_buf, "%8d\n", getpid());
+	if (ftruncate(fd_pidfile, 0)) {} /* Silence warn_unused_result */
+	write_all(fd_pidfile, reply_buf, strlen(reply_buf));
+	if (fd_pidfile > 1)
+		close(fd_pidfile); /* Unlock the pid file */
+
+	while (1) {
+		fromlen = sizeof(from_addr);
+		if (timeout > 0)
+			alarm(timeout);
+		ns = accept(s, (struct sockaddr *) &from_addr, &fromlen);
+		alarm(0);
+		if (ns < 0) {
+			if ((errno == EAGAIN) || (errno == EINTR))
+				continue;
+			perror("accept");
+			exit(1);
+		}
+		len = read(ns, &op, 1);
+		if (len != 1) {
+			if (len < 0)
+				perror("read");
+			else
+				printf(_("Error reading from client, "
+					 "len = %d\n"), len);
+			goto shutdown_socket;
+		}
+		if ((op == 4) || (op == 5)) {
+			if (read_all(ns, (char *) &num, sizeof(num)) != 4)
+				goto shutdown_socket;
+			if (debug)
+				printf(_("operation %d, incoming num = %d\n"),
+				       op, num);
+		} else if (debug)
+			printf("operation %d\n", op);
+
+		switch(op) {
+		case UUIDD_OP_GETPID:
+			sprintf(reply_buf, "%d", getpid());
+			reply_len = strlen(reply_buf)+1;
+			break;
+		case UUIDD_OP_GET_MAXOP:
+			sprintf(reply_buf, "%d", UUIDD_MAX_OP);
+			reply_len = strlen(reply_buf)+1;
+			break;
+		case UUIDD_OP_TIME_UUID:
+			num = 1;
+			uuid__generate_time(uu, &num);
+			if (debug) {
+				uuid_unparse(uu, str);
+				printf(_("Generated time UUID: %s\n"), str);
+			}
+			memcpy(reply_buf, uu, sizeof(uu));
+			reply_len = sizeof(uu);
+			break;
+		case UUIDD_OP_RANDOM_UUID:
+			num = 1;
+			uuid__generate_random(uu, &num);
+			if (debug) {
+				uuid_unparse(uu, str);
+				printf(_("Generated random UUID: %s\n"), str);
+			}
+			memcpy(reply_buf, uu, sizeof(uu));
+			reply_len = sizeof(uu);
+			break;
+		case UUIDD_OP_BULK_TIME_UUID:
+			uuid__generate_time(uu, &num);
+			if (debug) {
+				uuid_unparse(uu, str);
+				printf(_("Generated time UUID %s and %d "
+					 "following\n"), str, num);
+			}
+			memcpy(reply_buf, uu, sizeof(uu));
+			reply_len = sizeof(uu);
+			memcpy(reply_buf+reply_len, &num, sizeof(num));
+			reply_len += sizeof(num);
+			break;
+		case UUIDD_OP_BULK_RANDOM_UUID:
+			if (num < 0)
+				num = 1;
+			if (num > 1000)
+				num = 1000;
+			if (num*16 > (int) (sizeof(reply_buf)-sizeof(num)))
+				num = (sizeof(reply_buf)-sizeof(num)) / 16;
+			uuid__generate_random((unsigned char *) reply_buf +
+					      sizeof(num), &num);
+			if (debug) {
+				printf(_("Generated %d UUID's:\n"), num);
+				for (i=0, cp=reply_buf+sizeof(num);
+				     i < num; i++, cp+=16) {
+					uuid_unparse((unsigned char *)cp, str);
+					printf("\t%s\n", str);
+				}
+			}
+			reply_len = (num*16) + sizeof(num);
+			memcpy(reply_buf, &num, sizeof(num));
+			break;
+		default:
+			if (debug)
+				printf(_("Invalid operation %d\n"), op);
+			goto shutdown_socket;
+		}
+		write_all(ns, (char *) &reply_len, sizeof(reply_len));
+		write_all(ns, reply_buf, reply_len);
+	shutdown_socket:
+		close(ns);
+	}
+}
+
+int main(int argc, char **argv)
+{
+	const char	*socket_path = UUIDD_SOCKET_PATH;
+	const char	*pidfile_path = UUIDD_PIDFILE_PATH;
+	const char	*err_context;
+	char		buf[1024], *cp;
+	char		str[37], *tmp;
+	uuid_t		uu;
+	uid_t		uid;
+	gid_t		gid;
+	int		i, c, ret;
+	int		debug = 0, do_type = 0, do_kill = 0, num = 0;
+	int		timeout = 0, quiet = 0, drop_privs = 0;
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	while ((c = getopt (argc, argv, "dkn:qp:s:tT:r")) != EOF) {
+		switch (c) {
+		case 'd':
+			debug++;
+			drop_privs = 1;
+			break;
+		case 'k':
+			do_kill++;
+			drop_privs = 1;
+			break;
+		case 'n':
+			num = strtol(optarg, &tmp, 0);
+			if ((num < 0) || *tmp) {
+				fprintf(stderr, _("Bad number: %s\n"), optarg);
+				exit(1);
+			}
+		case 'p':
+			pidfile_path = optarg;
+			drop_privs = 1;
+			break;
+		case 'q':
+			quiet++;
+			break;
+		case 's':
+			socket_path = optarg;
+			drop_privs = 1;
+			break;
+		case 't':
+			do_type = UUIDD_OP_TIME_UUID;
+			drop_privs = 1;
+			break;
+		case 'T':
+			timeout = strtol(optarg, &tmp, 0);
+			if ((timeout < 0) || *tmp) {
+				fprintf(stderr, _("Bad number: %s\n"), optarg);
+				exit(1);
+			}
+			break;
+		case 'r':
+			do_type = UUIDD_OP_RANDOM_UUID;
+			drop_privs = 1;
+			break;
+		default:
+			usage(argv[0]);
+		}
+	}
+	uid = getuid();
+	if (uid && drop_privs) {
+		gid = getgid();
+#ifdef HAVE_SETRESGID
+		if (setresgid(gid, gid, gid) < 0)
+			die("setresgid");
+#else
+		if (setregid(gid, gid) < 0)
+			die("setregid");
+#endif
+
+#ifdef HAVE_SETRESUID
+		if (setresuid(uid, uid, uid) < 0)
+			die("setresuid");
+#else
+		if (setreuid(uid, uid) < 0)
+			die("setreuid");
+#endif
+	}
+	if (num && do_type) {
+		ret = call_daemon(socket_path, do_type+2, buf,
+				  sizeof(buf), &num, &err_context);
+		if (ret < 0) {
+			printf(_("Error calling uuidd daemon (%s): %s\n"),
+			       err_context, strerror(errno));
+			exit(1);
+		}
+		if (do_type == UUIDD_OP_TIME_UUID) {
+			if (ret != sizeof(uu) + sizeof(num))
+				goto unexpected_size;
+
+			uuid_unparse((unsigned char *) buf, str);
+
+			printf(_("%s and subsequent %d UUID's\n"), str, num);
+		} else {
+			printf(_("List of UUID's:\n"));
+			cp = buf + 4;
+			if (ret != (int) (sizeof(num) + num*sizeof(uu)))
+				goto unexpected_size;
+			for (i=0; i < num; i++, cp+=16) {
+				uuid_unparse((unsigned char *) cp, str);
+				printf("\t%s\n", str);
+			}
+		}
+		exit(0);
+	}
+	if (do_type) {
+		ret = call_daemon(socket_path, do_type, (char *) &uu,
+				  sizeof(uu), 0, &err_context);
+		if (ret < 0) {
+			printf(_("Error calling uuidd daemon (%s): %s\n"),
+			       err_context, strerror(errno));
+			exit(1);
+		}
+		if (ret != sizeof(uu)) {
+		unexpected_size:
+			printf(_("Unexpected reply length from server %d\n"),
+			       ret);
+			exit(1);
+		}
+		uuid_unparse(uu, str);
+
+		printf("%s\n", str);
+		exit(0);
+	}
+
+	if (do_kill) {
+		ret = call_daemon(socket_path, 0, buf, sizeof(buf), 0, 0);
+		if ((ret > 0) && ((do_kill = atoi((char *) buf)) > 0)) {
+			ret = kill(do_kill, SIGTERM);
+			if (ret < 0) {
+				if (!quiet)
+					fprintf(stderr,
+						_("Couldn't kill uuidd running "
+						  "at pid %d: %s\n"), do_kill,
+						strerror(errno));
+				exit(1);
+			}
+			if (!quiet)
+				printf(_("Killed uuidd running at pid %d\n"),
+				       do_kill);
+		}
+		exit(0);
+	}
+
+	server_loop(socket_path, pidfile_path, debug, timeout, quiet);
+	return 0;
+}
diff --git a/misc-utils/uuidd.rc b/misc-utils/uuidd.rc
new file mode 100644
index 00000000..dbdd5f5c
--- /dev/null
+++ b/misc-utils/uuidd.rc
@@ -0,0 +1,71 @@
+#! /bin/sh -e
+### BEGIN INIT INFO
+# Provides:          uuidd
+# Required-Start:    $time $local_fs
+# Required-Stop:     $time $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: uuidd daemon
+# Description:       Init script for the uuid generation daemon
+### END INIT INFO
+#
+# Author:	"Theodore Ts'o" <tytso@mit.edu>
+#
+set -e
+
+# libuuid is able to execute the uuid daemon on-demand -- in such a case
+# the daemon binary must be setuid to an unprivileged user (e.g. uuidd:uuidd).
+#                                                    [-- kzak Jun 2009]
+UUIDD_ON_DEMAND_ONLY="no"
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/usr/sbin/uuidd
+UUIDD_USER=uuidd
+UUIDD_GROUP=uuidd
+UUIDD_DIR=/var/run/uuidd
+PIDFILE=$UUIDD_DIR/uuidd.pid
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+case "$1" in
+  start)
+	log_daemon_msg "Starting uuid generator" "uuidd"
+	if ! test -d $UUIDD_DIR; then
+		mkdir -p $UUIDD_DIR
+		chown -R $UUIDD_USER:$UUIDD_GROUP $UUIDD_DIR
+	fi
+	if test "$UUIDD_ON_DEMAND_ONLY" = yes; then
+		echo -n "(on demand only)"
+	else
+		start_daemon -p $PIDFILE $DAEMON
+	fi
+	log_end_msg $?
+    ;;
+  stop)
+	log_daemon_msg "Stopping uuidd generator" "uuidd"
+	killproc -p $PIDFILE $DAEMON
+	log_end_msg $?
+    ;;
+  status)
+	if pidofproc -p $PIDFILE $DAEMON >& /dev/null ; then
+	    echo "$DAEMON is running";
+	    exit 0;
+	else
+	    echo "$DAEMON is NOT running";
+	    if test -f $PIDFILE; then exit 2; fi
+	    exit 3;
+	fi
+    ;;
+  force-reload|restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "Usage: /etc/init.d/uuidd {start|stop|restart|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/misc-utils/uuidgen.1 b/misc-utils/uuidgen.1
new file mode 100644
index 00000000..13b13c42
--- /dev/null
+++ b/misc-utils/uuidgen.1
@@ -0,0 +1,62 @@
+.\" Copyright 1999 Andreas Dilger (adilger@enel.ucalgary.ca)
+.\"
+.\" This man page was created for libuuid.so.1.1 from e2fsprogs-1.14.
+.\"
+.\" This file may be copied under the terms of the GNU Public License.
+.\"
+.\" Created  Wed Mar 10 17:42:12 1999, Andreas Dilger
+.TH UUIDGEN 1 "May 2009" "Linux"
+.SH NAME
+uuidgen \- command\-line utility to create a new UUID value
+.SH SYNOPSIS
+.B uuidgen
+[
+.B \-r
+|
+.B \-t
+]
+.SH DESCRIPTION
+The
+.B uuidgen
+program creates (and prints)
+a new universally unique identifier (UUID) using the
+.BR libuuid (3)
+library.  The new UUID can reasonably be considered unique among
+all UUIDs created on the local system,
+and among UUIDs created on other systems in the past
+and in the future.
+.PP
+There are two types of UUID's which
+.B uuidgen
+can generate: time-based UUID's and random-based UUID's.  By
+default
+.B uuidgen
+will generate a random-based UUID if a high-quality random number
+generator is present.  Otherwise, it will chose a time-based UUID.  It
+is possible to force the generation of one of these two
+UUID types by using the
+.B \-r
+or
+.B \-t
+options.
+.SH OPTIONS
+.TP
+.B \-r
+Generate a random-based UUID.  This method creates a UUID consisting mostly
+of random bits.  It requires that the operating system have a high
+quality random number generator, such as
+.IR /dev/random .
+.TP
+.B \-t
+Generate a time-based UUID.  This method creates a UUID based on the system
+clock plus the system's ethernet hardware address, if present.
+.SH "CONFORMING TO"
+OSF DCE 1.1
+.SH AUTHOR
+.B uuidgen
+was written by Andreas Dilger for libuuid.
+.SH AVAILABILITY
+The uuidgen command is part of the util-linux-ng package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+.SH "SEE ALSO"
+.BR libuuid (3)
diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
new file mode 100644
index 00000000..3cf6ec91
--- /dev/null
+++ b/misc-utils/uuidgen.c
@@ -0,0 +1,77 @@
+/*
+ * gen_uuid.c --- generate a DCE-compatible uuid
+ *
+ * Copyright (C) 1999, Andreas Dilger and Theodore Ts'o
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
+ */
+
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+extern int getopt(int argc, char * const argv[], const char *optstring);
+extern char *optarg;
+extern int optind;
+#endif
+
+#include "uuid.h"
+#include "nls.h"
+
+#define DO_TYPE_TIME	1
+#define DO_TYPE_RANDOM	2
+
+static void usage(const char *progname)
+{
+	fprintf(stderr, _("Usage: %s [-r] [-t]\n"), progname);
+	exit(1);
+}
+
+int
+main (int argc, char *argv[])
+{
+	int    c;
+	int    do_type = 0;
+	char   str[37];
+	uuid_t uu;
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	while ((c = getopt (argc, argv, "tr")) != EOF)
+		switch (c) {
+		case 't':
+			do_type = DO_TYPE_TIME;
+			break;
+		case 'r':
+			do_type = DO_TYPE_RANDOM;
+			break;
+		default:
+			usage(argv[0]);
+		}
+
+	switch (do_type) {
+	case DO_TYPE_TIME:
+		uuid_generate_time(uu);
+		break;
+	case DO_TYPE_RANDOM:
+		uuid_generate_random(uu);
+		break;
+	default:
+		uuid_generate(uu);
+		break;
+	}
+
+	uuid_unparse(uu, str);
+
+	printf("%s\n", str);
+
+	return 0;
+}
diff --git a/mount/Makefile.am b/mount/Makefile.am
index 91860d23..5628cc0e 100644
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -71,7 +71,6 @@ losetup_static_LDFLAGS = $(ldflags_static)
 losetup_static_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
 endif
 
-if HAVE_BLKID
 if BUILD_LIBBLKID
 ldadd_common += $(ul_libblkid_la)
 ldadd_static += $(ul_libblkid_la)
@@ -81,13 +80,6 @@ ldadd_common += $(BLKID_LIBS)
 ldadd_static += $(BLKID_LIBS_STATIC)
 cflags_common += $(BLKID_CFLAGS)
 endif
-endif
-
-if HAVE_VOLUME_ID
-ldadd_common += $(VOLUME_ID_LIBS)
-ldadd_static += $(VOLUME_ID_LIBS_STATIC)
-cflags_common += $(VOLUME_ID_CFLAGS)
-endif
 
 if HAVE_SELINUX
 mount_LDADD += $(SELINUX_LIBS)
diff --git a/mount/fstab.c b/mount/fstab.c
index 13dda871..82e90f3a 100644
--- a/mount/fstab.c
+++ b/mount/fstab.c
@@ -404,6 +404,7 @@ getfs_by_spec (const char *spec) {
 			mc = getfs_by_uuid (value);
 
 		free(name);
+		free(value);
 		return mc;
 	}
 
diff --git a/mount/lomount.c b/mount/lomount.c
index 2768ea37..fd12ce29 100644
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@ -65,8 +65,6 @@ loop_info64_to_old(const struct loop_info64 *info64, struct loop_info *info)
         return 0;
 }
 
-#define DEV_LOOP_PATH		"/dev/loop"
-#define DEV_PATH		"/dev"
 #define LOOPMAJOR		7
 #define NLOOPS_DEFAULT		8	/* /dev/loop[0-7] */
 
@@ -148,10 +146,10 @@ looplist_open(struct looplist *ll, int flag)
 	ll->flag = flag;
 	ll->ncur = -1;
 
-	if (stat(DEV_PATH, &st) == -1 || (!S_ISDIR(st.st_mode)))
+	if (stat(_PATH_DEV, &st) == -1 || (!S_ISDIR(st.st_mode)))
 		return -1;			/* /dev doesn't exist */
 
-	if (stat(DEV_LOOP_PATH, &st) == 0 && S_ISDIR(st.st_mode))
+	if (stat(_PATH_DEV_LOOP, &st) == 0 && S_ISDIR(st.st_mode))
 		ll->flag |= LLFLG_SUBDIR;	/* /dev/loop/ exists */
 
 	if ((ll->flag & LLFLG_USEDONLY) &&
@@ -184,8 +182,8 @@ looplist_open_dev(struct looplist *ll, int lnum)
 	/* create a full device path */
 	snprintf(ll->name, sizeof(ll->name),
 		ll->flag & LLFLG_SUBDIR ?
-			DEV_LOOP_PATH "/%d" :
-			DEV_PATH "/loop%d",
+			_PATH_DEV_LOOP "/%d" :
+			_PATH_DEV "loop%d",
 		lnum);
 
 	fd = open(ll->name, O_RDONLY);
@@ -336,8 +334,8 @@ looplist_next(struct looplist *ll)
 	 */
 	if (!ll->minors) {
 		ll->nminors = (ll->flag & LLFLG_SUBDIR) ?
-			loop_scandir(DEV_LOOP_PATH, &ll->minors, 0) :
-			loop_scandir(DEV_PATH, &ll->minors, 1);
+			loop_scandir(_PATH_DEV_LOOP, &ll->minors, 0) :
+			loop_scandir(_PATH_DEV, &ll->minors, 1);
 		ll->ncur = -1;
 	}
 	for (++ll->ncur; ll->ncur < ll->nminors; ll->ncur++) {
@@ -354,6 +352,28 @@ done:
 #ifdef MAIN
 
 static int
+set_capacity(const char *device)
+{
+	int errsv;
+	int fd = open(device, O_RDONLY);
+
+	if (fd == -1)
+		goto err;
+
+	if (ioctl(fd, LOOP_SET_CAPACITY) != 0)
+		goto err;
+
+	return 0;
+err:
+	errsv = errno;
+	fprintf(stderr, _("loop: can't set capacity on device %s: %s\n"),
+					device, strerror (errsv));
+	if (fd != -1)
+		close(fd);
+	return 2;
+}
+
+static int
 show_loop_fd(int fd, char *device) {
 	struct loop_info loopinfo;
 	struct loop_info64 loopinfo64;
@@ -483,8 +503,7 @@ show_associated_loop_devices(char *filename, unsigned long long offset, int isof
 /* check if the loopfile is already associated with the same given
  * parameters.
  *
- * returns: -1 error
- *           0 unused
+ * returns:  0 unused / error
  *           1 loop device already used
  */
 static int
@@ -499,17 +518,15 @@ is_associated(int dev, struct stat *file, unsigned long long offset, int isoff)
 	            file->st_ino == linfo64.lo_inode &&
 		    (isoff == 0 || offset == linfo64.lo_offset))
 			ret = 1;
-		return ret;
-	}
-	if (ioctl(dev, LOOP_GET_STATUS, &linfo) == 0) {
+
+	} else if (ioctl(dev, LOOP_GET_STATUS, &linfo) == 0) {
 		if (file->st_dev == linfo.lo_device &&
 	            file->st_ino == linfo.lo_inode &&
 		    (isoff == 0 || offset == linfo.lo_offset))
 			ret = 1;
-		return ret;
 	}
 
-	return errno == ENXIO ? 0 : -1;
+	return ret;
 }
 
 /* check if the loop file is already used with the same given
@@ -555,18 +572,14 @@ loopfile_used_with(char *devname, const char *filename, unsigned long long offse
 	if (!is_loop_device(devname))
 		return 0;
 
-	if (stat(filename, &statbuf) == -1) {
-		perror(filename);
-		return -1;
-	}
+	if (stat(filename, &statbuf) == -1)
+		return 0;
 
 	fd = open(devname, O_RDONLY);
-	if (fd == -1) {
-		perror(devname);
-		return -1;
-	}
-	ret = is_associated(fd, &statbuf, offset, 1);
+	if (fd == -1)
+		return 0;
 
+	ret = is_associated(fd, &statbuf, offset, 1);
 	close(fd);
 	return ret;
 }
@@ -950,6 +963,7 @@ usage(void) {
   " %1$s -a | --all                              list all used\n"
   " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
   " %1$s -f | --find                             find unused\n"
+  " %1$s -c | --set-capacity <loopdev>           resize\n"
   " %1$s -j | --associated <file> [-o <num>]     list all associated with <file>\n"
   " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"),
 		progname);
@@ -976,7 +990,7 @@ int
 main(int argc, char **argv) {
 	char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc;
 	char *keysize;
-	int delete, find, c, all;
+	int delete, find, c, all, capacity;
 	int res = 0;
 	int showdev = 0;
 	int ro = 0;
@@ -986,6 +1000,7 @@ main(int argc, char **argv) {
 	unsigned long long off, slimit;
 	struct option longopts[] = {
 		{ "all", 0, 0, 'a' },
+		{ "set-capacity", 0, 0, 'c' },
 		{ "detach", 0, 0, 'd' },
 		{ "encryption", 1, 0, 'e' },
 		{ "find", 0, 0, 'f' },
@@ -1007,7 +1022,7 @@ main(int argc, char **argv) {
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-	delete = find = all = 0;
+	capacity = delete = find = all = 0;
 	off = 0;
         slimit = 0;
 	assoc = offset = sizelimit = encryption = passfd = NULL;
@@ -1017,12 +1032,15 @@ main(int argc, char **argv) {
 	if ((p = strrchr(progname, '/')) != NULL)
 		progname = p+1;
 
-	while ((c = getopt_long(argc, argv, "ade:E:fhj:k:No:p:rsv",
+	while ((c = getopt_long(argc, argv, "acde:E:fhj:k:No:p:rsv",
 				longopts, NULL)) != -1) {
 		switch (c) {
 		case 'a':
 			all = 1;
 			break;
+		case 'c':
+			capacity = 1;
+			break;
 		case 'r':
 			ro = 1;
 			break;
@@ -1070,16 +1088,20 @@ main(int argc, char **argv) {
 		usage();
 	} else if (delete) {
 		if (argc < optind+1 || encryption || offset || sizelimit ||
-				find || all || showdev || assoc || ro)
+		    capacity || find || all || showdev || assoc || ro)
 			usage();
 	} else if (find) {
-		if (all || assoc || argc < optind || argc > optind+1)
+		if (capacity || all || assoc || argc < optind || argc > optind+1)
 			usage();
 	} else if (all) {
 		if (argc > 2)
 			usage();
 	} else if (assoc) {
-		if (encryption || showdev || passfd || ro)
+		if (capacity || encryption || showdev || passfd || ro)
+			usage();
+	} else if (capacity) {
+		if (argc != optind + 1 || encryption || offset || sizelimit ||
+		    showdev || ro)
 			usage();
 	} else {
 		if (argc < optind+1 || argc > optind+2)
@@ -1118,6 +1140,8 @@ main(int argc, char **argv) {
 	if (delete) {
 		while (optind < argc)
 			res += del_loop(argv[optind++]);
+	} else if (capacity) {
+		res = set_capacity(device);
 	} else if (file == NULL)
 		res = show_loop(device);
 	else {
diff --git a/mount/loop.h b/mount/loop.h
index 60688529..64df3391 100644
--- a/mount/loop.h
+++ b/mount/loop.h
@@ -22,6 +22,8 @@
 #define LOOP_GET_STATUS		0x4C03
 #define LOOP_SET_STATUS64	0x4C04
 #define LOOP_GET_STATUS64	0x4C05
+/* #define LOOP_CHANGE_FD	0x4C06 */
+#define LOOP_SET_CAPACITY	0x4C07
 
 /* Flags for loop_into{64,}->lo_flags */
 enum {
diff --git a/mount/losetup.8 b/mount/losetup.8
index 11b692db..3d22b85c 100644
--- a/mount/losetup.8
+++ b/mount/losetup.8
@@ -48,7 +48,14 @@ Setup loop device:
 .RB [ \-r ]
 .RB { \-f [ \-\-show ] | \fIloopdev\fP }
 .I file
+.sp
 .in -13
+Resize loop device:
+.sp
+.in +5
+.B "losetup \-c"
+.I loopdev
+.in -5
 .ad b
 .SH DESCRIPTION
 .B losetup
@@ -75,6 +82,8 @@ and finds the module that knows how to perform that encryption.
 .SH OPTIONS
 .IP "\fB\-a, \-\-all\fP"
 show status of all loop devices
+.IP "\fB\-c, \-\-set-capacity\fP \fIloopdev\fP
+force loop driver to reread size of the file associated with the specified loop device
 .IP "\fB\-d, \-\-detach\fP \fIloopdev\fP [\fIloopdev\fP ...]" 
 detach the file or device associated with the specified loop device(s)
 .IP "\fB\-e, \-E, \-\-encryption \fIencryption_type\fP"
@@ -134,12 +143,12 @@ from determining the status of the device.
 If you are using the loadable module you must have the module loaded
 first with the command
 .IP
-# insmod loop.o
+# modprobe loop
 .LP
 Maybe also encryption modules are needed.
 .IP
-# insmod des.o
-# insmod cryptoloop.o
+# modprobe des
+# modprobe cryptoloop
 .LP
 The following commands can be used as an example of using the loop device.
 .nf
diff --git a/mount/mount.8 b/mount/mount.8
index cee784bc..0e16bfbe 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -98,7 +98,7 @@ prints a version string
 .BI "mount [-l] [-t" " type" ]
 lists all mounted file systems (of type
 .IR type ).
-The option \-l adds the (ext2, ext3 and XFS) labels in this listing.
+The option \-l adds the labels in this listing.
 See below.
 .RE
 
@@ -409,9 +409,9 @@ exists (with regular non-fake mount, this check is done by kernel).
 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
+Add the labels in the mount output. Mount must have
 permission to read the disk device (e.g. be suid root) for this to work.
-One can set such a label for ext2 or ext3 using the
+One can set such a label for ext2, ext3 or ext4 using the
 .BR e2label (8)
 utility, or for XFS using
 .BR xfs_admin (8),
@@ -442,10 +442,12 @@ Mount the file system read-only. A synonym is
 .BR "\-o ro" .
 
 Note that, depending on the filesystem type, state and kernel behavior, the
-system may still write to the device. For example, Ext3 will replay its journal
-if the filesystem is dirty. To prevent this kind of write access, you may want
-to set the block device to read-only mode, see command
-.BR blockdev (8).
+system may still write to the device. For example, Ext3 or ext4 will replay its
+journal if the filesystem is dirty. To prevent this kind of write access, you
+may want to mount ext3 or ext4 filesystem with "ro,noload" mount options or
+set the block device to read-only mode, see command
+.BR blockdev (8)
+.
 .TP
 .B \-w
 Mount the file system read/write. This is the default. A synonym is
@@ -480,6 +482,7 @@ currently supported include:
 .IR ext ,
 .IR ext2 ,
 .IR ext3 ,
+.IR ext4 ,
 .IR hfs ,
 .IR hfsplus ,
 .IR hpfs ,
@@ -1252,7 +1255,105 @@ manual page.
 Enable POSIX Access Control Lists. See the
 .BR acl (5)
 manual page.
- 
+
+.SH "Mount options for ext4"
+The `ext4' is an an advanced level of the ext3 filesystem which incorporates
+scalability and reliability enhancements for supporting large filesystem.
+
+The options
+.B journal_dev, noload, data, commit, orlov, oldalloc, [no]user_xattr
+.B [no]acl, bsddf, minixdf, debug, errors, data_err, grpid, bsdgroups, nogrpid
+.B sysvgroups, resgid, resuid, sb, quota, noquota, grpquota, usrquota
+and
+.B [no]bh
+are backwardly compatible with ext3 or ext2.
+.TP
+.BR journal_checksum
+Enable checksumming of the journal transactions.  This will allow the recovery
+code in e2fsck and the kernel to detect corruption in the kernel.  It is a
+compatible change and will be ignored by older kernels.
+.TP
+.BR journal_async_commit
+Commit block can be written to disk without waiting for descriptor blocks. If
+enabled older kernels cannot mount the device. This will enable
+'journal_checksum' internally.
+.TP
+.BR journal=update
+Update the ext4 file system's journal to the current format.
+.TP
+.BR barrier=0 " / "  barrier=1 " / " barrier " / " nobarrier
+This enables/disables the use of write barriers in the jbd code.  barrier=0
+disables, barrier=1 enables.  This also requires an IO stack which can support
+barriers, and if jbd gets an error on a barrier write, it will disable again
+with a warning.  Write barriers enforce proper on-disk ordering of journal
+commits, making volatile disk write caches safe to use, at some performance
+penalty.  If your disks are battery-backed in one way or another, disabling
+barriers may safely improve performance.  The mount options "barrier" and
+"nobarrier" can also be used to enable or disable barriers, for consistency
+with other ext4 mount options.
+.TP
+.BI inode_readahead= n
+This tuning parameter controls the maximum number of inode table blocks that
+ext4's inode table readahead algorithm will pre-read into the buffer cache.
+The default value is 32 blocks.
+.TP
+.BI stripe= n
+Number of filesystem blocks that mballoc will try to use for allocation size
+and alignment. For RAID5/6 systems this should be the number of data disks *
+RAID chunk size in file system blocks.
+.TP
+.BR delalloc
+Deferring block allocation until write-out time.
+.TP
+.BR nodelalloc
+Disable delayed allocation. Blocks are allocation when data is copied from user
+to page cache.
+.TP
+.BI max_batch_time= usec
+Maximum amount of time ext4 should wait for additional filesystem operations to
+be batch together with a synchronous write operation. Since a synchronous
+write operation is going to force a commit and then a wait for the I/O
+complete, it doesn't cost much, and can be a huge throughput win, we wait for a
+small amount of time to see if any other transactions can piggyback on the
+synchronous write. The algorithm used is designed to automatically tune for
+the speed of the disk, by measuring the amount of time (on average) that it
+takes to finish committing a transaction. Call this time the "commit time".
+If the time that the transactoin has been running is less than the commit time,
+ext4 will try sleeping for the commit time to see if other operations will join
+the transaction. The commit time is capped by the max_batch_time, which
+defaults to 15000us (15ms). This optimization can be turned off entirely by
+setting max_batch_time to 0.
+.TP
+.BI min_batch_time= usec
+This parameter sets the commit time (as described above) to be at least
+min_batch_time. It defaults to zero microseconds. Increasing this parameter
+may improve the throughput of multi-threaded, synchronous workloads on very
+fast disks, at the cost of increasing latency.
+.TP
+.BI journal_ioprio= prio
+The I/O priority (from 0 to 7, where 0 is the highest priorty) which should be
+used for I/O operations submitted by kjournald2 during a commit operation.
+This defaults to 3, which is a slightly higher priority than the default I/O
+priority.
+.TP
+.BR auto_da_alloc " / " noauto_da_alloc
+Many broken applications don't use fsync() when noauto_da_alloc
+replacing existing files via patterns such as
+
+fd = open("foo.new")/write(fd,..)/close(fd)/ rename("foo.new", "foo")
+
+or worse yet
+
+fd = open("foo", O_TRUNC)/write(fd,..)/close(fd).
+
+If auto_da_alloc is enabled, ext4 will detect the replace-via-rename and
+replace-via-truncate patterns and force that any delayed allocation blocks are
+allocated such that at the next journal commit, in the default data=ordered
+mode, the data blocks of the new file are forced to disk before the rename()
+operation is commited.  This provides roughly the same level of guarantees as
+ext3, and avoids the "zero-length" problem that can happen when a system
+crashes before the delayed allocation blocks are forced to disk.
+
 .SH "Mount options for fat"
 (Note:
 .I fat
@@ -1264,7 +1365,7 @@ and
 filesystems.)
 .TP
 .BR blocksize=512 " / " blocksize=1024 " / " blocksize=2048
-Set blocksize (default 512).
+Set blocksize (default 512). This option is obsolete.
 .TP
 \fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP
 Set the owner and group of all files.
@@ -1362,7 +1463,7 @@ Programs that do computed lseeks won't like in-kernel text conversion.
 Several people have had their data ruined by this translation. Beware!
 
 For file systems mounted in binary mode, a conversion tool
-(fromdos/todos) is available.
+(fromdos/todos) is available. This option is obsolete.
 .RE
 .TP
 .BI cvf_format= module
@@ -1370,9 +1471,10 @@ Forces the driver to use the CVF (Compressed Volume File) module
 .RI cvf_ module
 instead of auto-detection. If the kernel supports kmod, the
 cvf_format=xxx option also controls on-demand CVF module loading.
+This option is obsolete.
 .TP
 .BI cvf_option= option
-Option passed to the CVF module.
+Option passed to the CVF module. This option is obsolete.
 .TP
 .B debug
 Turn on the
@@ -1691,7 +1793,7 @@ and 1 a byteswapped bigendian encoding.
 .B posix=[0|1]
 If enabled (posix=1), the file system distinguishes between
 upper and lower case. The 8.3 alias names are presented as
-hard links instead of being suppressed.
+hard links instead of being suppressed. This option is obsolete.
 .TP
 \fBuid=\fP\fIvalue\fP, \fBgid=\fP\fIvalue\fP and \fBumask=\fP\fIvalue\fP
 Set the file permission on the filesystem.
@@ -2298,7 +2400,7 @@ One further possible type is a mount via the loop device. For example,
 the command
 
 .nf
-.B "  mount /tmp/fdimage /mnt -t msdos -o loop=/dev/loop3,blocksize=1024"
+.B "  mount /tmp/fdimage /mnt -t vfat -o loop=/dev/loop3
 .fi
 
 will set up the loop device
@@ -2323,16 +2425,16 @@ If no explicit loop device is mentioned
 (but just an option `\fB\-o loop\fP' is given), then
 .B mount
 will try to find some unused loop device and use that.
-If you are not so unwise as to make
-.I /etc/mtab
-a symbolic link to
-.I /proc/mounts
+
+Since Linux 2.6.25 is supported auto-destruction of loop devices and 
 then any loop device allocated by
 .B mount
 will be freed by
-.BR umount .
-You can also free a loop device by hand, using `losetup -d', see
-.BR losetup (8).
+.B umount
+independently on
+.I /etc/mtab .
+
+You can also free a loop device by hand, using `losetup -d' or `umount -d`.
 
 .SH RETURN CODES
 .B mount
diff --git a/mount/mount.c b/mount/mount.c
index a43fad56..bd883391 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -907,9 +907,6 @@ guess_fstype_and_mount(const char *spec, const char *node, const char **types,
    if (*types && strcasecmp (*types, "auto") == 0)
       *types = NULL;
 
-   if (flags & (MS_BIND | MS_MOVE))
-      *types = "none";
-
    if (!*types && !(flags & MS_REMOUNT)) {
       *types = guess_fstype_by_devname(spec);
       if (*types) {
@@ -1317,6 +1314,9 @@ try_mount_one (const char *spec0, const char *node0, const char *types0,
   if (loop)
       opt_loopdev = loopdev;
 
+  if (flags & (MS_BIND | MS_MOVE | MS_PROPAGATION))
+      types = "none";
+
   /*
    * Call mount.TYPE for types that require a separate mount program.
    * For the moment these types are ncpfs and smbfs. Maybe also vxfs.
@@ -1538,6 +1538,10 @@ mount_retry:
 	  error (_("mount: %s%s is write-protected but explicit `-w' flag given"),
 		 bd, spec);
 	  break;
+      } else if (flags & MS_REMOUNT) {
+	  error (_("mount: cannot remount %s%s read-write, is write-protected"),
+		 bd, spec);
+	  break;
       } else {
 	 opts = opts0;
 	 types = types0;
diff --git a/mount/umount.c b/mount/umount.c
index 9901a809..a695f0c6 100644
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -14,6 +14,7 @@
 #include "mount_constants.h"
 #include "sundries.h"
 #include "getusername.h"
+#include "pathnames.h"
 #include "lomount.h"
 #include "loop.h"
 #include "fstab.h"
@@ -393,9 +394,9 @@ static struct option longopts[] =
 static void
 usage (FILE *fp, int n)
 {
-  fprintf (fp, _("Usage: umount [-hV]\n"
-	       "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-	       "       umount [-f] [-r] [-n] [-v] special | node...\n"));
+  fprintf (fp, _("Usage: umount -h | -V\n"
+	       "       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+	       "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"));
   exit (n);
 }
 
@@ -406,7 +407,7 @@ static int
 contains(const char *list, const char *s) {
 	int n = strlen(s);
 
-	while (*list) {
+	while (list && *list) {
 		if (strncmp(list, s, n) == 0 &&
 		    (list[n] == 0 || list[n] == ','))
 			return 1;
@@ -423,7 +424,7 @@ get_value(const char *list, const char *s) {
 	const char *t;
 	int n = strlen(s);
 
-	while (*list) {
+	while (list && *list) {
 		if (strncmp(list, s, n) == 0) {
 			s = t = list+n;
 			while (*s && *s != ',')
@@ -432,6 +433,44 @@ get_value(const char *list, const char *s) {
 		}
 		while (*list && *list++ != ',') ;
 	}
+	return NULL;
+}
+
+/* check if @mc contains a loop device which is associated
+ * with the @file in fs
+ */
+static int
+is_valid_loop(struct mntentchn *mc, struct mntentchn *fs)
+{
+	unsigned long long offset = 0;
+	char *p;
+
+	/* check if it begins with /dev/loop */
+	if (strncmp(mc->m.mnt_fsname, _PATH_DEV_LOOP,
+				sizeof(_PATH_DEV_LOOP) - 1))
+		return 0;
+
+	/* check for loop option in fstab */
+	if (!contains(fs->m.mnt_opts, "loop"))
+		return 0;
+
+	/* check for offset option in fstab */
+	p = get_value(fs->m.mnt_opts, "offset=");
+	if (p)
+		offset = strtoull(p, NULL, 10);
+
+	/* check association */
+	if (loopfile_used_with((char *) mc->m.mnt_fsname,
+				fs->m.mnt_fsname, offset) == 1) {
+		if (verbose > 1)
+			printf(_("device %s is associated with %s\n"),
+			       mc->m.mnt_fsname, fs->m.mnt_fsname);
+		return 1;
+	}
+
+	if (verbose > 1)
+		printf(_("device %s is not associated with %s\n"),
+		       mc->m.mnt_fsname, fs->m.mnt_fsname);
 	return 0;
 }
 
@@ -516,12 +555,15 @@ umount_file (char *arg) {
 		   the pair (dev,file) in fstab. */
 		fs = getfs_by_devdir(mc->m.mnt_fsname, mc->m.mnt_dir);
 		if (!fs) {
-			if (!getfs_by_spec (file) && !getfs_by_dir (file))
+			fs = getfs_by_dir(file);
+			if (!fs && !getfs_by_spec(file))
 				die (2,
 				     _("umount: %s is not in the fstab "
 				       "(and you are not root)"),
 				     file);
-			else
+
+			/* spec could be a file which is loop mounted */
+			if (fs && !is_valid_loop(mc, fs))
 				die (2, _("umount: %s mount disagrees with "
 					  "the fstab"), file);
 		}
diff --git a/partx/Makefile.am b/partx/Makefile.am
index 5fc5db6c..238f3228 100644
--- a/partx/Makefile.am
+++ b/partx/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/include-Makefile.am
 
 if BUILD_PARTX
 
-usrsbinexec_PROGRAMS = addpart delpart partx
+usrsbin_exec_PROGRAMS = addpart delpart partx
 partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c \
 		efi.h gpt.h crc32.h partx.h dos.h ../lib/blkdev.c
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2fdad95e..96655a7e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,61 +39,6 @@ lib/ismounted.c
 lib/linux_version.c
 lib/md5.c
 lib/pttype.c
-libs/blkid/bin/blkid.c
-libs/blkid/bin/findfs.c
-libs/blkid/src/cache.c
-libs/blkid/src/config.c
-libs/blkid/src/dev.c
-libs/blkid/src/devname.c
-libs/blkid/src/devno.c
-libs/blkid/src/encode.c
-libs/blkid/src/evaluate.c
-libs/blkid/src/getsize.c
-libs/blkid/src/llseek.c
-libs/blkid/src/probe.c
-libs/blkid/src/probers/adaptec_raid.c
-libs/blkid/src/probers/btrfs.c
-libs/blkid/src/probers/cramfs.c
-libs/blkid/src/probers/ddf_raid.c
-libs/blkid/src/probers/ext.c
-libs/blkid/src/probers/gfs.c
-libs/blkid/src/probers/hfs.c
-libs/blkid/src/probers/highpoint_raid.c
-libs/blkid/src/probers/hpfs.c
-libs/blkid/src/probers/iso9660.c
-libs/blkid/src/probers/isw_raid.c
-libs/blkid/src/probers/jfs.c
-libs/blkid/src/probers/jmicron_raid.c
-libs/blkid/src/probers/linux_raid.c
-libs/blkid/src/probers/lsi_raid.c
-libs/blkid/src/probers/luks.c
-libs/blkid/src/probers/lvm.c
-libs/blkid/src/probers/minix.c
-libs/blkid/src/probers/netware.c
-libs/blkid/src/probers/ntfs.c
-libs/blkid/src/probers/nvidia_raid.c
-libs/blkid/src/probers/ocfs.c
-libs/blkid/src/probers/promise_raid.c
-libs/blkid/src/probers/reiserfs.c
-libs/blkid/src/probers/romfs.c
-libs/blkid/src/probers/silicon_raid.c
-libs/blkid/src/probers/squashfs.c
-libs/blkid/src/probers/swap.c
-libs/blkid/src/probers/sysv.c
-libs/blkid/src/probers/udf.c
-libs/blkid/src/probers/ufs.c
-libs/blkid/src/probers/vfat.c
-libs/blkid/src/probers/via_raid.c
-libs/blkid/src/probers/vxfs.c
-libs/blkid/src/probers/xfs.c
-libs/blkid/src/probers/zfs.c
-libs/blkid/src/read.c
-libs/blkid/src/resolve.c
-libs/blkid/src/save.c
-libs/blkid/src/tag.c
-libs/blkid/src/tst_types.c
-libs/blkid/src/verify.c
-libs/blkid/src/version.c
 lib/setproctitle.c
 lib/wholedisk.c
 login-utils/agetty.c
@@ -113,8 +58,10 @@ login-utils/simpleinit.c
 login-utils/ttymsg.c
 login-utils/vipw.c
 login-utils/wall.c
+misc-utils/blkid.c
 misc-utils/cal.c
 misc-utils/ddate.c
+misc-utils/findfs.c
 misc-utils/kill.c
 misc-utils/logger.c
 misc-utils/look.c
@@ -125,6 +72,8 @@ misc-utils/rename.c
 misc-utils/script.c
 misc-utils/scriptreplay.c
 misc-utils/setterm.c
+misc-utils/uuidd.c
+misc-utils/uuidgen.c
 misc-utils/whereis.c
 misc-utils/write.c
 mount/devname.c
@@ -149,6 +98,71 @@ partx/unixware.c
 schedutils/chrt.c
 schedutils/ionice.c
 schedutils/taskset.c
+shlibs/blkid/src/cache.c
+shlibs/blkid/src/config.c
+shlibs/blkid/src/dev.c
+shlibs/blkid/src/devname.c
+shlibs/blkid/src/devno.c
+shlibs/blkid/src/encode.c
+shlibs/blkid/src/evaluate.c
+shlibs/blkid/src/getsize.c
+shlibs/blkid/src/llseek.c
+shlibs/blkid/src/probe.c
+shlibs/blkid/src/probers/adaptec_raid.c
+shlibs/blkid/src/probers/btrfs.c
+shlibs/blkid/src/probers/cramfs.c
+shlibs/blkid/src/probers/ddf_raid.c
+shlibs/blkid/src/probers/ext.c
+shlibs/blkid/src/probers/gfs.c
+shlibs/blkid/src/probers/hfs.c
+shlibs/blkid/src/probers/highpoint_raid.c
+shlibs/blkid/src/probers/hpfs.c
+shlibs/blkid/src/probers/iso9660.c
+shlibs/blkid/src/probers/isw_raid.c
+shlibs/blkid/src/probers/jfs.c
+shlibs/blkid/src/probers/jmicron_raid.c
+shlibs/blkid/src/probers/linux_raid.c
+shlibs/blkid/src/probers/lsi_raid.c
+shlibs/blkid/src/probers/luks.c
+shlibs/blkid/src/probers/lvm.c
+shlibs/blkid/src/probers/minix.c
+shlibs/blkid/src/probers/netware.c
+shlibs/blkid/src/probers/ntfs.c
+shlibs/blkid/src/probers/nvidia_raid.c
+shlibs/blkid/src/probers/ocfs.c
+shlibs/blkid/src/probers/promise_raid.c
+shlibs/blkid/src/probers/reiserfs.c
+shlibs/blkid/src/probers/romfs.c
+shlibs/blkid/src/probers/silicon_raid.c
+shlibs/blkid/src/probers/squashfs.c
+shlibs/blkid/src/probers/swap.c
+shlibs/blkid/src/probers/sysv.c
+shlibs/blkid/src/probers/udf.c
+shlibs/blkid/src/probers/ufs.c
+shlibs/blkid/src/probers/vfat.c
+shlibs/blkid/src/probers/via_raid.c
+shlibs/blkid/src/probers/vxfs.c
+shlibs/blkid/src/probers/xfs.c
+shlibs/blkid/src/probers/zfs.c
+shlibs/blkid/src/read.c
+shlibs/blkid/src/resolve.c
+shlibs/blkid/src/save.c
+shlibs/blkid/src/tag.c
+shlibs/blkid/src/tst_types.c
+shlibs/blkid/src/verify.c
+shlibs/blkid/src/version.c
+shlibs/uuid/src/clear.c
+shlibs/uuid/src/compare.c
+shlibs/uuid/src/copy.c
+shlibs/uuid/src/gen_uuid.c
+shlibs/uuid/src/gen_uuid_nt.c
+shlibs/uuid/src/isnull.c
+shlibs/uuid/src/pack.c
+shlibs/uuid/src/parse.c
+shlibs/uuid/src/tst_uuid.c
+shlibs/uuid/src/unpack.c
+shlibs/uuid/src/unparse.c
+shlibs/uuid/src/uuid_time.c
 sys-utils/arch.c
 sys-utils/ctrlaltdel.c
 sys-utils/cytune.c
@@ -166,6 +180,7 @@ sys-utils/renice.c
 sys-utils/rtcwake.c
 sys-utils/setarch.c
 sys-utils/setsid.c
+sys-utils/switch_root.c
 sys-utils/tunelp.c
 text-utils/col.c
 text-utils/colcrt.c
diff --git a/po/ca.po b/po/ca.po
index 4bf3418f..f345caca 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre3\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2005-09-17 13:40+0200\n"
 "Last-Translator: Josep Puigdemont <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -209,7 +209,7 @@ msgstr "forma d'ús: %s [ -n ] dispositiu\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -944,7 +944,7 @@ msgstr "no es pot fer \"stat\" al dispositiu %s"
 msgid "%s is not a block special device"
 msgstr "%s no es un dispositiu de bloc especial"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "%s no es pot obrir"
@@ -1282,7 +1282,7 @@ msgstr "no s'ha pogut cercar durant la comprovació de blocs"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Hi ha valors estranys a do_check: probablement hi ha errors\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "no s'ha pogut cercar a check_blocks"
 
@@ -1356,174 +1356,174 @@ msgstr "no s'intentarà crear cap sistema de fitxers a '%s'"
 msgid "number of blocks too small"
 msgstr "Nombre de sectors"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "La mida de la pàgina que ha especificat l'usuari, %d, no és correcte\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, fuzzy, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "S'està fent servir la mida de la pàgina %d especificada per l'usuari, en "
 "comptes dels valors del sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 "La mida de la capçalera d'intercanvi és errònia, no s'ha escrit cap "
 "etiqueta.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "S'ha truncat l'etiqueta.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "sense etiqueta, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "sense uuid\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Forma d'ús: %s [-c] [-v0|-v1] [-pMIDAPÀG] [-L etiqueta] /dev/_nom_ [blocs]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "hi ha massa pàgines incorrectes"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "S'ha esgotat la memòria"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "una pàgina incorrecta\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu pàgines incorrectes\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "no s'ha pogut rebobinar el dispositiu d'intercanvi"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "no s'ha pogut netejar el sector d'arrencada"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   imprimeix la taula de particions BSD"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   mostra totes les etiquetes del disc"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: error: versió desconeguda %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "S'ha produït un error en tancar el fitxer\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: error: no es pot especificar l'espai d'intercanvi enlloc?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: error: la mida %lu es més gran que a la mida del dispositiu %lu\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: error: l'espai d'intercanvi ha de tenir com a mínim %ldkB\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: avís: l'espai d'intercanvi s'ha truncat a %ldkB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "No s'intentarà crear cap dispositiu d'intercanvi a '%s'"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s ja està muntat; no s'hi crearà cap sistema de fitxers."
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "No s'ha pogut configurar l'espai d'intercanvi: no es pot llegir"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "S'està configurant l'espai d'intercanvi versió %d, mida = %llu kB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "no s'ha pogut escriure la pàgina de la signatura"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "no s'ha pogut fer fsync"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "no es pot fer stat per a %s"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "no s'ha pogut escriure els nodes d'identificació"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "no s'ha pogut tornar a nomenar %s per %s: %s\n"
@@ -1535,53 +1535,53 @@ msgid ""
 "  %s "
 msgstr "Forma d'ús:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "no es pot fer \"stat\" al dispositiu %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: no és un dispositiu de caràcter"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s no es un dispositiu de bloc especial"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "No s'ha pogut blocar el fitxer de blocat %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Avís: %s no és un dispositiu de blocs\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "no es pot fer \"stat\" al dispositiu %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "no es pot fer \"stat\" al dispositiu %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: no és un dispositiu de caràcter"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s no es un dispositiu de bloc especial"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "s'ha produït un error en aturar el servei: \"%s\""
@@ -6842,16 +6842,6 @@ msgstr ""
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "No s'ha pogut executar ioctl(RTC_EPOCH_SET) a %s"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "no es pot obrir %s"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6998,8 +6988,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM ha fallat; s'està avortant: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Contrasenya: "
 
@@ -7911,6 +7901,16 @@ msgstr "forma d'ús: %s [+format] [dia mes any]\n"
 msgid "St. Tib's Day"
 msgstr "Dia de Sant Tibb"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "no es pot obrir %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8427,6 +8427,146 @@ msgstr "No s'ha pogut obrir %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM no està definit.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+"forma d'ús: last [-#] [-f fitxer] [-t tty] [-h nom_ordinador] [usuari ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ senyal ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: argument -l incorrecte %s.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "connector nfs"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "connexió nfs"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Escriu"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "s'ha llegit %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "No s'ha pogut obrir %s: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "No s'ha pogut obrir %s: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "s'ha produït un error en llegir %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "identificador invàlid"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: valor incorrecte\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8497,42 +8637,42 @@ msgstr "avís: no s'ha pogut obrir %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: no s'ha pogut obrir %s; s'usarà %s\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "no s'ha pogut crear el fitxer de blocat %s: %s (useu el senyalador -n per a "
 "modificar aquest valor)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "no s'ha pogut enllaçar el fitxer de blocat %s: %s (useu el senyalador -n per "
 "a modificar aquest valor)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "no s'ha pogut obrir el fitxer de blocat %s: %s (useu el senyalador -n per a "
 "modificar aquest valor)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "No s'ha pogut blocar el fitxer de blocat %s: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "no s'ha pogut blocar al fitxer de blocat %s: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "s'ha exhaurit el temps d'espera"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8541,83 +8681,88 @@ msgstr ""
 "No s'ha pogut crear l'enllaç %s\n"
 "Potser hi ha un fitxer de blocat obsolet?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "no s'ha pogut obrir %s (%s) - no s'ha actualitzat mtab"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "s'ha produït un error en escriure %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "no s'ha pogut tornar a nomenar %s per %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: no s'ha pogut obtenir informació sobre el dispositiu %s: %s\n"
+
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", desplaçament %d"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", límit de mida %lld"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", xifratge %s (tipus %d)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", desplaçament %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", tipus de xifratge %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: no s'ha pogut obtenir informació sobre el dispositiu %s: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: no s'ha pogut obrir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: l'usuari \"%s\" no existeix.\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: no teniu permisos per llegir /dev/loop#"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: no s'ha trobat cap dispositiu loop lliure"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8627,54 +8772,54 @@ msgstr ""
 "       no reconegui els dispositius loop? (Si es així, recompileu-lo o feu\n"
 "       «modprobe loop».)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr ""
 "S'ha esgotat la memòria en augmentar la mida de la memòria intermèdia.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "El sector %d ja està assignat\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "mount: %s%s està protegit contra escriptura; es muntarà en només lectura"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "No s'ha pogut blocar en memòria, s'està sortint.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): èxit\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): èxit\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: no s'ha pogut suprimir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Aquest mount s'ha compilat sense suport per a loop. Recompileu-lo.\n"
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8683,6 +8828,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8693,7 +8839,7 @@ msgstr ""
 "  %s -f                                                # cerca no usats\n"
 "  %s [ -e xifratge ] [ -o desplaçament ] {-f|disp_loop} fitxer # configura\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8709,22 +8855,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: no s'ha pogut obrir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: dispositiu ocupat"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8756,7 +8902,7 @@ msgstr "mount: segons mtab, %s està muntat a %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: no s'ha pogut obrir %s per a escriptura: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: s'ha produït un error en escriure %s: %s"
@@ -8776,7 +8922,7 @@ msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: no s'ha pogut bifurcar: %s"
@@ -8806,88 +8952,88 @@ msgstr "       i sembla que això és espai d'intercanvi\n"
 msgid "       I will try type %s\n"
 msgstr "       Provaré amb el tipus %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s sembla espai d'intercanvi - no s'ha muntat"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "no s'ha estat possible muntar"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: només l'usuari root pot muntar %s a %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: el dispositiu loop està especificat dues vegades"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: el tipus està especificat dues vegades"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: s'està ometent la configuració d'un dispositiu loop\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: segons mtab, %s ja està muntat a %s"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: s'usarà el dispositiu loop %s\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: no ha estat possible configurar el dispositiu loop\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: s'ha configurat el dispositiu loop amb èxit\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: no s'ha trobat %s; s'està creant...\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: no s'ha pogut obrir %s: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: l'argument a -p o --pass-fd ha de ser un nombre"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: no s'ha pogut obrir %s per establir-ne la velocitat"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: segons mtab, %s ja està muntat a %s"
@@ -9088,23 +9234,28 @@ msgstr ""
 "mount : %s%s està protegit contra escriptura però se li ha donat el "
 "senyalador explícit «-w»"
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount : no s'ha pogut muntar %s%s com a només de lectura"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 "mount: %s%s està protegit contra escriptura; es muntarà en només lectura"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: no s'ha trobat %s; s'està creant...\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s ja està muntat a %s\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9114,24 +9265,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: no s'ha especificat cap tipus; s'assumirà nfs per als dos punts\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: no s'ha especificat cap tipus; s'assumirà smb a causa del prefix //\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ja està muntat a %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9191,19 +9342,19 @@ msgstr ""
 "Altres opcions: [-nfFrsvw] [-o opcions] [-p dfcontrasenya].\n"
 "Per a més detalls, consulteu «man 8 mount».\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: només l'usuari root pot fer això"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "no s'ha muntat res"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: no s'ha trobat aquesta partició"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: no s'ha pogut trobar %s a %s o %s"
@@ -9385,42 +9536,42 @@ msgstr "No sou el superusuari.\n"
 msgid "%s: swapoff failed"
 msgstr "la cerca ha fallat"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: està compilat sense suport per a -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: no s'ha pogut bifurcar: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositiu de blocs no vàlid"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: no està muntat"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: no s'ha pogut escriure el superbloc"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9428,112 +9579,122 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: no s'ha trobat"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: haureu de ser superusuari per poder usar umount"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: dispositius de blocs no permesos en el sistema de fitxers"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existeix, s'està provant amb umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ocupat - s'ha tornat a muntar de només lectura\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: no s'ha pogut tornar a muntar %s de només lectura\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmuntat\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: no s'ha pogut trobar la llista dels sistemes de fitxers a desmuntar"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Forma d'ús: umount [-hV]\n"
 "            umount -a [-f] [-r] [-n] [-v] [-t  tipus_sist._fitx._virtuals]\n"
 "                   [-O opcions]\n"
 "            umount [-f] [-r] [-n] [-v] especial | node...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "El sector %d ja està assignat\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "El sector %d ja està assignat\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "No s'ha pogut desmuntar «»\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "S'està intentant desmuntar %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "No s'ha pogut trobar %s a mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no està muntat (segons mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: sembla que %s s'ha muntat diverses vegades"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s no està al fstab (i no sou el root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: el muntatge de %s no concorda amb el fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: només %s pot desmuntar %s des de %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: només el root pot fer això"
 
@@ -9649,7 +9810,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9660,16 +9821,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "%s no es pot obrir"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "no s'ha pogut executar exec\n"
@@ -10562,65 +10727,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id invàlid : %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "identificador invàlid"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id invàlid : %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s no es un dispositiu de bloc especial"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "no es pot obtenir la mida de %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "no es pot obtenir la mida de %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "No s'ha pogut cercar a la unitat de disc"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "no es pot obtenir la mida de %s"
@@ -11806,9 +11971,6 @@ msgstr ""
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "s'està esperant cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "s'ha llegit %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "s'està llegint el nom d'entrada\n"
 
@@ -11842,9 +12004,6 @@ msgstr ""
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "s'ha produït un error en llegir %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr ""
 #~ "no s'ha pogut llegir %s, i no s'ha pogut efectuar un bolcat d'ioctl\n"
@@ -12002,9 +12161,6 @@ msgstr ""
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: valor incorrecte per a hp->h_length?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "connector nfs"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -12017,9 +12173,6 @@ msgstr ""
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "s'està usant el port %d per al dimoni de nfs\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "connexió nfs"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "no es reconeix el valor de retorn de l'estat de nfs: %d"
 
diff --git a/po/cs.po b/po/cs.po
index 752026f6..d3bf9839 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-ng 2.15-rc2\n"
+"Project-Id-Version: util-linux-ng 2.16-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
-"PO-Revision-Date: 2009-04-20 13:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
+"PO-Revision-Date: 2009-07-02 23:36+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -210,7 +210,7 @@ msgstr "Použití: %s [-n] ZAŘÍZENÍ\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -406,7 +406,7 @@ msgstr "chybné umístění i-uzlu"
 
 #: disk-utils/fsck.cramfs.c:538
 msgid "file inode has zero offset and non-zero size"
-msgstr "i-uzek souboru má nulovou pozici a nenulovou velikost"
+msgstr "i-uzel souboru má nulovou pozici a nenulovou velikost"
 
 #: disk-utils/fsck.cramfs.c:541
 msgid "file inode has zero size and non-zero offset"
@@ -919,7 +919,7 @@ msgstr "volání stat pro zařízení %s selhalo"
 msgid "%s is not a block special device"
 msgstr "%s není blokovým zařízením"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "%s nelze otevřít"
@@ -1256,7 +1256,7 @@ msgstr "chyba při posunu ukazovátka v průběhu kontroly bloků"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Nesprávné hodnoty v do_check: pravděpodobně chyby\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "chyba při posunu ukazovátka v check_blocks"
 
@@ -1326,169 +1326,169 @@ msgstr "nebudu se pokoušet vytvořit systém souborů na „%s“"
 msgid "number of blocks too small"
 msgstr "počet bloků je příliš malý"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Zadaná velikost stránky (%d) je chybná.\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr "Používám zadanou velikost stránky %d místo systémové hodnoty %d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Chybná velikost hlavičky odkládacího souboru, jmenovka nezapsána.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Jmenovka byla zkrácena.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "žádná jmenovka, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "žádné UUID\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Použití: %s [-c] [-pVELIKOST_STRÁNKY] [-L JMENOVKA] [-U UUID] ZAŘÍZENÍ "
 "[BLOKY]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "příliš mnoho chybných stránek"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "chybných stránek: 1\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "chybných stránek: %lu\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "odkládací prostor nelze převinout"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 msgid "unable to erase bootbits sectors"
 msgstr "zaváděcí bloky nelze smazat"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr "%s: %s: varování: nemažte zaváděcí sektory\n"
 
 # Continuation of previous message
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr "        (nalezena tabulka rozdělení disku typu %s). "
 
 # Alternate continuation of previous message
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, c-format
 msgid "        on whole disk. "
 msgstr "        na celém disku. "
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr "%1$s: varování: ignoruji -U (%1$s nepodporuje UUID)\n"
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: nepodporuje odkládací prostor verze %d.\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr "chyba: rozbor UUID selhal"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: chyba: Kde mám vytvořit odkládací prostor?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: chyba: velikost %llu KiB je větší než velikost zařízení %llu KiB\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: chyba: odkládacího prostor potřebuje aspoň %ld KiB\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: varování: zkracuji odkládací prostor na %llu KiB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: chyba: Nebudu se pokoušet vytvořit odkládací zařízení na „%s“\n"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: chyba: %s je připojeno; odkládací prostor zde nevytvořím.\n"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Odkládací prostor nelze nastavit: nečitelné"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Vytvářím odkládací prostor verze 1, velikost = %llu KiB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: stránku se signaturou nelze zapsat: %s"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "volání fsync selhalo"
 
 # selinux file label - selinuxová nálepka/značka/štítek souboru?
 # Upřednostňuji značku
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: nelze získat selinuxovou značku souboru: %s\n"
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr "matchpathcon() nelze provést"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr "nový kontext selinuxu nelze vytvořit"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr "nedokáži vypočíst kontext selinuxu"
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s nelze změnit jmenovku z %s na %s: %s\n"
@@ -1502,7 +1502,7 @@ msgstr ""
 "Použití:\n"
 "  %s "
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
@@ -1510,47 +1510,47 @@ msgstr ""
 "Zařízení „%s“ je řídicí syrové zařízení (použijte raw<N>, kde <N> je větší "
 "než nula)\n"
 
-#: disk-utils/raw.c:130
-#, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "Syrové zařízení „%s“ nelze nalézt (%s)\n"
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "Syrové zařízení „%s“ není znak znakovým zařízením\n"
-
-#: disk-utils/raw.c:141
-#, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "Zařízení „%s“ není syrovým zařízením\n"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Blokové zařízení „%s“ nelze nalézt (%s)\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Zařízení „%s“ není blokovým zařízením\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, c-format
 msgid "Cannot open master raw device '"
 msgstr "Hlavní syrové zařízení nelze otevřít „"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "Syrové zařízení „%s“ nelze nalézt (%s)\n"
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "Syrové zařízení „%s“ není znak znakovým zařízením\n"
+
+#: disk-utils/raw.c:216
+#, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "Zařízení „%s“ není syrovým zařízením\n"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr "Chyba při dotazování se na syrové zařízené (%s)\n"
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr "raw%d:\tnapojeno na hlavní %d, vedlejší %d\n"
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "Chyba při nastavování syrového zařízení (%s)\n"
@@ -6732,16 +6732,6 @@ msgstr "Ovladač jádra pro %s nepodporuje RTC_EPOCH_SET ioctl.\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "volání ioctl(RTC_EPOCH_SET) pro %s selhalo"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr "Použití: %s JMENOVKA=<JMENOVKA>|UUID=<UUID>\n"
-
-#: libs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "„%s“ nelze přeložit"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6886,8 +6876,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: chyba PAM, končím: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Heslo: "
 
@@ -7787,6 +7777,16 @@ msgstr "Použití: %s [+FORMÁT] [DEN MĚSÍC ROK]\n"
 msgid "St. Tib's Day"
 msgstr "Den svatého Tiba"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr "Použití: %s JMENOVKA=<JMENOVKA>|UUID=<UUID>\n"
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "„%s“ nelze přeložit"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8311,6 +8311,143 @@ msgstr "%s nelze načíst\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: proměnná TERM není nastavena.\n"
 
+#: misc-utils/uuidd.c:46
+#, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr "Použití: %s [-d] [-p PID_SOUBOR] [-s CESTA_K_SOCKETU] [-t LIMIT]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr "       %s [-r|t] [-n POČ] [-s CESKA_K_SOCKETU]\n"
+
+#: misc-utils/uuidd.c:50
+#, c-format
+msgid "       %s -k\n"
+msgstr "       %s -k\n"
+
+#: misc-utils/uuidd.c:152
+msgid "bad arguments"
+msgstr "chybné argumenty"
+
+#: misc-utils/uuidd.c:159
+msgid "socket"
+msgstr "socket"
+
+#: misc-utils/uuidd.c:170
+msgid "connect"
+msgstr "připojování"
+
+#: misc-utils/uuidd.c:189
+msgid "write"
+msgstr "zápis"
+
+#: misc-utils/uuidd.c:197
+msgid "read count"
+msgstr "načtení počtu"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr "chybná délka odpovědi"
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr "Démon uuidd již běží pod PID %s\n"
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr "Nebylo možné vytvořit unixový proudový socket: %s"
+
+#: misc-utils/uuidd.c:305
+#, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "Nebylo možné se přilepit na unixový socket %s: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "Nebylo možné zahájit naslouchání na unixovém socketu %s: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Chyba při čtení z klienta, délka = %d\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr "operace %d, příchozí počet = %d\n"
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr "Vygenerované časové UUID: %s\n"
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr "Vygenerované náhodné UUID: %s\n"
+
+# TODO: plurals
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr "Vygenerované časové UUID %s a %d následujících\n"
+
+# TODO: plurals
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr "Vygenerováno UUID: %d:\n"
+
+#: misc-utils/uuidd.c:427
+#, c-format
+msgid "Invalid operation %d\n"
+msgstr "Neplatná operace %d\n"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, c-format
+msgid "Bad number: %s\n"
+msgstr "Chybné číslo: %s\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "Chyba při volání démona uuidd (%s): %s\n"
+
+# TODO: plurals
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr "%s a následující %d UUID\n"
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr "Seznam UUID:\n"
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr "Neočekávaná délka odpovědi od serveru %d\n"
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr "Zabít uuidd běžícího pod PID %d nebylo možné: %s\n"
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr "uuidd běžící pod PID %d byl zabit\n"
+
+#: misc-utils/uuidgen.c:32
+#, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Použití: %s [-r] [-t]\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8381,42 +8518,42 @@ msgstr "varování: %s nelze otevřít: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s nelze otevřít - používám %s\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, 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:614
+#: mount/fstab.c:615
 #, 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:630
+#: mount/fstab.c:631
 #, 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:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Zamykací soubor %s nelze zamknout: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Zamykací soubor %s nelze zamknout: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "vypršel čas"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8425,83 +8562,88 @@ msgstr ""
 "Odkaz %s nelze vytvořit.\n"
 "Není někde zastaralý zamykací soubor?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "nelze otevřít %s (%s) - mtab nebyl aktualizován"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "chyba při zápisu %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "chyba při změně módu %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "chyba při změně vlastníka %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s nelze přejmenovat na %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: zařízení %s nelze nastavit kapacitu: %s\n"
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", odsazení %<PRIu64>"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", velikostní limit %<PRIu64>"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", šifrování %s (typ %<PRIu32>)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", odsazení %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", šifrovací typ %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, 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:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: zařízení %s nelze otevřít: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: adresář /dev neexistuje."
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: chybí oprávnění na prohlédnutí /dev/loop%s<N>"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: žádné volné loop zařízení nelze najít"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8511,51 +8653,51 @@ msgstr ""
 "       nezná loop zařízení? (Pokud je tomu tak, pak jej znovu přeložte,\n"
 "       či zkuste „modprobe loop“.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr "Během čtení hesla došla paměť"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "varování: %s je již spojeno s %s\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "varování: %s: je chráněno proti zápisu, připojuji pouze pro čtení.\n"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Nelze zamknout v paměti. Končím.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "selhalo ioctl LOOP_SET_FD: %s\n"
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): úspěch\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): úspěch\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: zařízení %s nelze smazat: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 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:875
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8564,6 +8706,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8572,13 +8715,14 @@ msgstr ""
 "Použití:\n"
 " %1$s LOOP_ZAŘÍZENÍ                                 vypíše informace\n"
 " %1$s -a | --all                                    vypíše všechna použitá\n"
-" %1$s -d | --detach LOOP_ZAŘÍZENÍ [LOOP_ZAŘÍZENÍ…]  smaže zařízení %1$s -f | "
-"--find                                   najde nepoužitá\n"
+" %1$s -d | --detach LOOP_ZAŘÍZENÍ [LOOP_ZAŘÍZENÍ…]  smaže zařízení\n"
+" %1$s -f | --find                                   najde nepoužitá\n"
+" %1$s -c | --set-capacity LOOP_ZAŘÍZENÍ             změní velikost\n"
 " %1$s -j | --associated SOUBOR [-o ČÍSLO]           vypíše spojená se "
 "SOUBOREM\n"
-" %1$s [PŘEPÍNAČE] {-f|--find|LOOP_ZAŘÍZENÍ} SOUBOR  nastaví\n"
+" %1$s [PŘEPÍNAČE] {-f|--find|LOOP_ZAŘÍZENÍ} SOUBOR  sestrojí zařízení\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8605,22 +8749,22 @@ msgstr ""
 " -v | --verbose           upovídaný režim\n"
 "\n"
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Loop zařízení %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "ukradený loop=%s… zkouším znovu\n"
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: zařízení se právě používá"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Podpora pro loop nebyla při překladu zadána. Přeložte program znovu.\n"
@@ -8650,7 +8794,7 @@ msgstr "mount: podle mtab je %s připojeno na %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s nelze otevřít pro zápis: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: chyba při zápisu %s: %s"
@@ -8670,7 +8814,7 @@ msgstr "mount: číslo skupiny (GID) nelze nastavit: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: číslo uživatele (UID) nelze nastavit: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: volání fork selhalo: %s"
@@ -8700,88 +8844,88 @@ msgstr "       a vypadá to, že se jedná o odkládací prostor\n"
 msgid "       I will try type %s\n"
 msgstr "       Vyzkouším typ %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s vypadá jako odkládací prostor - nepřipojeno"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "připojení se nezdařilo"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, 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:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: zařízení loop bylo zadáno dvakrát"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: typ byl zadán dvakrát"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: přeskakuji nastavení loop zařízení\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: podle mtab je %s již připojeno na %s jako loop"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, 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:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr "mount: ukradený loop=%s … zkouším znovu\n"
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: ukradený loop=%s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: nepodařilo se nastavit zařízení loop\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: zařízení loop bylo korektně nastaveno\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nebylo nalezeno - vytvářím jej..\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s nelze otevřít: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument přepínačů -p a --pass-fd musí být číslo"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: %s nelze otevřít za účelem nastavení rychlosti"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: rychlost nelze nastavit: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: podle mtab je %s již připojeno do %s\n"
@@ -8973,22 +9117,27 @@ msgstr "umount: %s%s nelze připojit v režimu pouze pro čtení"
 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:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "umount: %s%s nelze připojit v režimu pouze pro čtení"
+
+#: mount/mount.c:1542
 #, 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:1548
+#: mount/mount.c:1552
 #, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: v %s nenalezeno žádné médium… zkouším znovu\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: v %s nenalezeno žádné médium"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9005,22 +9154,22 @@ msgstr ""
 "       přistoupit na tento systém souborů. Další rady lze nalézt\n"
 "       v restorecon(8) a mount(8).\n"
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: nebyl zadán typ - budu používat nfs kvůli dvojtečce\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: nebyl zadán typ - budu předpokládat cifs kvůli předponě //\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s je již připojeno na %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9093,19 +9242,19 @@ msgstr ""
 "Další přepínače: [-nfFrsvw] [-o VOLBY] [-p DESKRIPTOR_S_HESLEM].\n"
 "Mnoho dalších informací získáte příkazem „man 8 mount“.\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: toto může provést pouze superuživatel"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "nebyl připojen žádný diskový oddíl"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: žádný odpovídající diskový oddíl nebyl nalezen"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s nelze nalézt v %s ani %s"
@@ -9311,42 +9460,42 @@ msgstr "Nejste superuživatel."
 msgid "%s: swapoff failed"
 msgstr "%s: swapoff selhal"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount byl přeložen bez podpory pro -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: číslo skupiny (GID) nelze nastavit: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: číslo uživatele (UID) nelze nastavit: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: volání fork selhalo: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: blokové zařízení %s je chybné"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s není připojeno"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: superblok nelze na %s zapsat"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9357,111 +9506,121 @@ msgstr ""
 "        (V některých případech lze získat užitečné informace o procesech,\n"
 "        které se zařízením pracují, pomocí nástrojů lsof(8) a fuser(1).)"
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s nelze najít"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: musíte být superuživatelem, abyste mohl odpojit %s"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: bloková zařízení nejsou na systému souborů povolena"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nenalezl jsem umount2, zkouším umount…\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 "umount: %s je právě používáno - znovu připojeno v režimu pro pouze čtení\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s nelze znovu připojit v režimu pouze pro čtení\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s odpojeno\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: seznam systémů souborů na odpojení nelze nalézt"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
-"Použití: umount [-hV]\n"
-"         umount -a [-f] [-r] [-n] [-v] [-t TYPY_VFS] [-O VOLBY]\n"
-"         umount [-f] [-r] [-n] [-v] SPECIÁLNÍ_SOUBOR | UZEL…\n"
+"Použití: umount -h | -V\n"
+"         umount -a [-d] [-f] [-r] [-n] [-v] [-t TYPY_VFS] [-O VOLBY]\n"
+"         umount [-d] [-f] [-r] [-n] [-v] SPECIÁLNÍ_SOUBOR | UZEL…\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, c-format
+msgid "device %s is associated with %s\n"
+msgstr "zařízení %s je spojeno s %s\n"
+
+#: mount/umount.c:472
+#, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "zařízení %s není spojeno s %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
-msgstr "\"\" nelze odpojit\n"
+msgstr "„“ nelze odpojit\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Zkouším odpojit %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr "umount: analýza mtab dává matoucí výsledky"
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr "umount: %s nelze odpojit – %s je přes něj připojen na stejné místo."
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s nelze v mtab najít\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: podle mtab není %s připojeno"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: zdá se, že %s je připojeno více než jednou"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s není ve fstab (a vy nejste root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: připojení %s neodpovídá fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "unmount: pouze uživatel %s může odpojit %s ze %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: toto může provést pouze uživatel root"
 
@@ -9603,7 +9762,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9617,8 +9776,8 @@ msgstr ""
 "\n"
 "Přepínače:\n"
 "  -n <DATA_TŘÍDY>     data třídy (0–7, menší číslo znamená vyšší prioritu)\n"
-"  -c <class>          plánovací třída\n"
-"                      1: reálný čas, 2: best-effort, 3: zahálení [idle]\n"
+"  -c <class>          plánovací třída: 0 – žádná, 1 – reálný čas, \n"
+"                      2 – best-effort, 3 – zahálení [idle]\n"
 "  -t                  ignorovat selhání\n"
 "  -h                  tato nápověda\n"
 "\n"
@@ -9628,16 +9787,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "číslo „%s„ nelze rozebrat"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr "u třídy žádná se ignorují zadaná data třídy"
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr "u třídy zahálení [idle] se ignorují zadaná data třídy"
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr "chybná plánovací třída %d"
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 msgid "execvp failed"
 msgstr "funkce execvp selhala"
 
@@ -10532,7 +10695,7 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10541,7 +10704,7 @@ msgstr ""
 "\n"
 "Použití: %s [-dhV78neo12] [-s RYCHLOST] LDISC ZAŘÍZENÍ\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10549,50 +10712,50 @@ msgstr ""
 "\n"
 "Známá jména LDISC (disciplíny linky):\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "chybná rychlost: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach z %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "neplatný přepínač"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "neplatná disciplína linky: %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s není sériovou linkou"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "nelze zjistit vlastnosti terminálu %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "rychlost %d nepodporována"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "vlastnosti terminálu %s nelze nastavit"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "disciplínu linky nelze nastavit"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "nelze se démonizovat"
 
@@ -11809,9 +11972,6 @@ msgstr "Nedostatek paměti pro rostoucí buffer.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "čekám na cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "přečteno %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "čtu přihlašovací jméno\n"
 
@@ -11851,9 +12011,6 @@ msgstr "Nedostatek paměti pro rostoucí buffer.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "časový limit = %d, klid = %d, restart = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Chyba při čtení %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "nelze číst %s a nelze provést dump pomocí volání ioctl\n"
 
@@ -12022,9 +12179,6 @@ msgstr "Nedostatek paměti pro rostoucí buffer.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: špatné hp->h_length?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "nfs soket"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -12037,9 +12191,6 @@ msgstr "Nedostatek paměti pro rostoucí buffer.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "používám port %d pro nfs server\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs connect"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "návratová hodnota nfs status %d je neznámá"
 
diff --git a/po/da.po b/po/da.po
index f9f5a485..eedc2b4d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11y\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2005-08-15 21:00+0200\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -209,7 +209,7 @@ msgstr "brug: %s [ -n ] enhed\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -927,7 +927,7 @@ msgstr "kunne ikke finde enheden %s"
 msgid "%s is not a block special device"
 msgstr "%s er ikke en blokenhed"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "kunne ikke �bne %s"
@@ -1258,7 +1258,7 @@ msgstr "s�gning fejlede under test af blokke"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Mystiske v�rdier i do_check: sandsynligvis programfejl\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "s�gning mislykkedes i check_blocks"
 
@@ -1330,170 +1330,170 @@ msgstr "vil ikke fors�ge at oprette filsystem p� '%s'"
 msgid "number of blocks too small"
 msgstr "Antal sektorer"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Ugyldig sidest�rrelse '%d' angivet af bruger\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, fuzzy, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Benytter bruger-bestemt sidest�rrelse %d i stedet for systemv�rdierne %d/%d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Ugyldig st�relse p� swap-hovede, skrev ikke noget m�rke.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "M�rke afkortet.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "intet m�rke, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "ingen uuid\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Brug: %s [-c] [-v0|-v1] [-pSIDESTR] [-L m�rke] /dev/navn [blokke]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "for mange ugyldige sider"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Hukommelse opbrugt"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "en ugyldig side\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu ugyldige sider\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "kunne ikke spole tilbage p� swap-enheden"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "kunne ikke slette opstartssektor"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p    vis BSD-partitionstabel"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s    vis hele diskm�rkatet"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: fejl: ukendt version %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Fejl ved lukning af fil\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fejl: Ingen steder at ops�tte swap?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: fejl: st�rrelsen %lu er st�rre end enhedsst�rrelsen %lu\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: fejl: swap-omr�de skal mindst v�re p� %ldkB\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: fejl: afkorter swap-omr�det til %ldkB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "Vil ikke fors�ge at oprette swap-enhed p� '%s'"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s er monteret; vil ikke oprette et filsystem her!"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Kunne ikke klarg�re swap-omr�de: ul�seligt"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Klarg�rer swap-omr�de version %d, st�rrelse = %llu kB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "kunne ikke skrive signatur-side"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync mislykkedes"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "kunne ikke finde %s"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "kunne ikke skrive inodes"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "kunne ikke omd�be %s til %s: %s\n"
@@ -1505,53 +1505,53 @@ msgid ""
 "  %s "
 msgstr "Brug:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "kunne ikke finde enheden %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: ikke en tegnenhed"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s er ikke en blokenhed"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Kunne ikke l�se l�sefilen %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Advarsel: %s er ikke en blokenhed\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "kunne ikke finde enheden %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "kunne ikke finde enheden %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: ikke en tegnenhed"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s er ikke en blokenhed"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "fejl ved fors�g p� at stoppe tjenesten: \"%s\""
@@ -6696,16 +6696,6 @@ msgstr "Kernens enheds-driver for %s har ikke en RTC_EPOCH_SET ioctl.\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) til %s mislykkedes"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "kunne ikke �bne %s"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6850,8 +6840,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM-fejl, afbryder: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Adgangskode: "
 
@@ -7747,6 +7737,16 @@ msgstr "brug: %s [+format] [dag m�ned �r]\n"
 msgid "St. Tib's Day"
 msgstr "St. Tibs-dag"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "kunne ikke �bne %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8261,6 +8261,145 @@ msgstr "Kunne ikke �bne %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM er ikke defineret.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr "brug: last [-#] [-f fil] [-t tty] [-h v�rt] [bruger ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ signal ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: ugyldigt -l parameter %s.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "NFS-sokkel"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "NFS-forbindelse"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Skriv"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "l�s %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "Kunne ikke �bne %s: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "Kunne ikke �bne %s: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Fejl ved l�sning af %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "ugyldigt id"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: ugyldig v�rdi\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "fejl ved �ndring af filtilstand for %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Brug: %s [tilvalg] enhed ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8331,36 +8470,36 @@ msgstr "advarsel: kunne ikke �bne %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: kunne ikke �bne %s - bruger %s i stedet\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, 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:614
+#: mount/fstab.c:615
 #, 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:630
+#: mount/fstab.c:631
 #, 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:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Kunne ikke l�se l�sefilen %s: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "kunne ikke l�se l�sefilen %s: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "tidsoverl�b"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8369,83 +8508,88 @@ msgstr ""
 "Kunne ikke oprette l�nken %s\n"
 "M�ske er der en efterladt l�sefil?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "kunne ikke �bne %s (%s) - mtab ikke opdateret"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "fejl ved skrivning af %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "fejl ved �ndring af filtilstand for %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "fejl ved �ndring af filtilstand for %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "kunne ikke omd�be %s til %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: kunne ikke f� oplysninger om enheden %s: %s\n"
+
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", forskydning %d"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", st�rrelsesgr�nse %lld"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", kryptering %s (type %d)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", forskydning %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", krypteringstype %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: kunne ikke f� oplysninger om enheden %s: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kunne ikke �bne enheden %s: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: bruger \"%s\" eksisterer ikke.\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: har ikke rettigheder til at kigge i /dev/loop#"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: kunne ikke finde nogen ledig loop-enhed"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8454,53 +8598,53 @@ msgstr ""
 "%s: Kunne ikke finde nogen loop-enhed. M�ske kender denne kerne ikke til\n"
 "       loop-enheder? (I s� fald, genovers�t eller 'modprobe loop.o'.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "L�b t�r for hukommelse under forst�rring af buffer.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor %d er allerede allokeret\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s er skrivebeskyttet, monterer skrivebeskyttet"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kunne ikke l�se ind i hukommelsen, afslutter.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): lykkedes\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): lykkedes\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: kunne ikke slette enheden %s: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Denne 'mount' er oversat uden loop-underst�ttelse. Genovers�t venligst.\n"
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8509,6 +8653,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8519,7 +8664,7 @@ msgstr ""
 "  %s -f                                                  # find ubenyttet\n"
 "  %s [ -e kryptering ] [ -o forskydning ] {-f|loop_enhed} fil # klarg�r\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8535,22 +8680,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: kunne ikke �bne enheden %s: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: enhed optaget"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8582,7 +8727,7 @@ msgstr "mount: if�lge mtab er %s monteret som %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kunne ikke �bne %s for skrivning: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fejl ved skrivning til %s: %s"
@@ -8602,7 +8747,7 @@ msgstr "mount: kunne ikke s�tte hastigheden: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: kunne ikke s�tte hastigheden: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kunne ikke forgrene: %s"
@@ -8632,88 +8777,88 @@ msgstr "       og det ser ud til, at dette er swapomr�de\n"
 msgid "       I will try type %s\n"
 msgstr "       Jeg vil fors�ge type %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ligner et swap-omr�de - ikke monteret"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "montering mislykkedes"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: kun root kan montere %s som %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: loop-enheden angivet to gange"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: type angivet to gange"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: dropper ops�tning af loop-enhed\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: if�lge mtab er %s allerede monteret som %s"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, 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:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: klarg�ring af loop-enhed mislykkedes\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: klarg�ringen af loop-enhed lykkedes\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ingen %s fundet - opretter den..\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kunne ikke �bne %s: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argumentet til -p eller --pass-fd skal v�re et tal"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: kunne ikke �bne %s for at s�tte hastigheden"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kunne ikke s�tte hastigheden: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: if�lge mtab er %s allerede monteret som %s"
@@ -8907,22 +9052,27 @@ msgstr "mount: kunne ikke montere %s%s skrivebeskyttet"
 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:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: kunne ikke montere %s%s skrivebeskyttet"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s er skrivebeskyttet, monterer skrivebeskyttet"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: ingen %s fundet - opretter den..\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s er allerede monteret som %s\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8932,24 +9082,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: ingen type blev angive - Jeg antager nfs p� grund af kolonnet\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: ingen type blev angivet - Jeg antager smbfs p.g.a. det "
 "foranstillede //\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s er allerede monteret som %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9007,19 +9157,19 @@ msgstr ""
 "Andre tilvalg: [-nfFrsvw] [-o tilvalg] [-p adgangskodefd].\n"
 "se mange flere detaljer med 'man 8 mount'.\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: dette kan kun root g�re"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "intet blev monteret"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: fandt ingen s�dan partition"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kunne ikke finde %s i %s eller %s"
@@ -9201,42 +9351,42 @@ msgstr "Ikke superbruger.\n"
 msgid "%s: swapoff failed"
 msgstr "forgrening mislykkedes\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: oversat uden underst�ttelse af tilvalget -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: kunne ikke s�tte hastigheden: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: kunne ikke s�tte hastigheden: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kunne ikke forgrene: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ugyldig blokenhed"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ikke monteret"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kunne ikke skrive superblok"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9244,111 +9394,121 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ikke fundet"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: skal v�re superbruger for at afmontere"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blokenheder tillades ikke p� dette fs"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, fors�ger umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s optaget - genmonteret skrivebeskyttet\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kunne ikke montere %s skrivebeskyttet\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s afmonteret\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: kunne ikke finde listen over filsystemer, der skulle afmonteres"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Brug: umount [-hV]\n"
 "      umount -a [-f] [-r] [-n] [-v] [-t vfstyper] [-O tilvalg]\n"
 "      umount [-f] [-r] [-n] [-v] speciel | knude...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektor %d er allerede allokeret\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektor %d er allerede allokeret\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Kan ikke afmontere \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Fors�ger at afmontere %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunne ikke finde %s i mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s er ikke monteret (if�lge mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: det lader til, at %s er monteret flere gange"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s er ikke i fstab (og du er ikke root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s montering stemmer ikke med fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: kun %s kan afmontere %s fra %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: dette kan kun root g�re"
 
@@ -9464,7 +9624,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9475,16 +9635,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "kunne ikke �bne %s"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "programk�rsel mislykkedes\n"
@@ -10366,65 +10530,65 @@ msgstr "zantal"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ugyldigt id: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s fra %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "ugyldigt id"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ugyldigt id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s er ikke en blokenhed"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "Kan ikke f� st�rrelsen af %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "Kan ikke f� st�rrelsen af %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Kan ikke s�ge p� drev"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "Kan ikke f� st�rrelsen af %s"
@@ -11599,9 +11763,6 @@ msgstr "L�b t�r for hukommelse under forst�rring af buffer.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "venter p� cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "l�s %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "l�ser loginnavn\n"
 
@@ -11635,9 +11796,6 @@ msgstr "L�b t�r for hukommelse under forst�rring af buffer.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "tidsudl�b = %d, stille = %d, genstart = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Fejl ved l�sning af %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "kunne hverken l�se %s eller udf�re ioctl dump\n"
 
@@ -11790,9 +11948,6 @@ msgstr "L�b t�r for hukommelse under forst�rring af buffer.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: fik ugyldig hp->h_length?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "NFS-sokkel"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -11805,9 +11960,6 @@ msgstr "L�b t�r for hukommelse under forst�rring af buffer.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "bruger port %d til NFS-d�monen\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "NFS-forbindelse"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "ukendt NFS-statusv�rdi: %d"
 
diff --git a/po/de.po b/po/de.po
index dc1d1560..4051d763 100644
--- a/po/de.po
+++ b/po/de.po
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2008-01-09 17:38+0200\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -239,7 +239,7 @@ msgstr "Aufruf: %s [ -n ] Gerät\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -960,7 +960,7 @@ msgstr "kann nicht auf Gerät %s zugreifen"
 msgid "%s is not a block special device"
 msgstr "%s ist kein blockorientiertes Gerät"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "es ist nicht möglich, %s zu öffnen"
@@ -1295,7 +1295,7 @@ msgstr "Seek fehlgeschlagen während Blocküberprüfung"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Merkwürdige Werte in do_check: wahrscheinlich Fehler\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "Seek fehlgeschlagen in check_blocks"
 
@@ -1368,172 +1368,172 @@ msgstr "Es wird nicht versucht, ein Dateisystem auf „%s“ zu erzeugen"
 msgid "number of blocks too small"
 msgstr "Anzahl der Sektoren"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Ungültige nutzerdefinierte Seitengröße %d\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr "Benutze nutzerdefinierte Seitengröße %d anstelle der Systemwerte %d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Ungültige Swap-Headergröße, kein Label geschrieben.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Label wurde abgeschnitten.\n"
 
 # dito
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "kein Label, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "keine UUID\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Aufruf: %s [-c] [-v0|-v1] [-pSEITENGRÖSSE] [-L Label] /dev/Name [Blöcke]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "Zu viele beschädigte „Seiten“"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Speicher ist aufgebraucht"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "Eine beschädigte „Seite“\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu beschädigte Seiten\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "kann Swap-Gerät nicht zurückspulen"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "kann Bootsektor nicht löschen"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   Die BSD-Partitionstabelle anzeigen"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   komplettes Disklabel zeigen"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: Fehler: unbekannte Version %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Fehler beim Schließen von Datei\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 "%s: Es wurde nicht angegeben, wo der Swapbereich angelegt werden soll.\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 "%s: Fehler: Die angegebene Größe %lu ist größer als die des Gerätes: %lu\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: Fehler: Der Swapbereich muss mindestens %ldkB groß sein\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: Warnung: Der Swapbereich wird nur mit der Größe %ldkB angelegt\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: Fehler: Es wird nicht versucht, Swap auf ‚%s‘ anzulegen\n"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: Fehler: %s ist eingehängt; es wird hier kein Swap angelegt.\n"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Es ist nicht möglich, einen Swapbereich einzurichten: nicht lesbar"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Swapbereich Version %d wird angelegt, Größe %llu KBytes\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "kann Signaturseite nicht schreiben"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "Aufruf von „fsync“ fehlgeschlagen"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "kann kein „stat“ auf %s anwenden"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr "kann keinen neuen SE-Linux-Kontext anlegen"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr "konnte SE-Linux-Kontext nicht berechnen"
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: konnte %s nicht in %s umbenennen: %s\n"
@@ -1545,55 +1545,55 @@ msgid ""
 "  %s "
 msgstr "Aufruf:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "kann nicht auf Gerät %s zugreifen"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s ist kein zeichenorientiertes Gerät"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s ist kein blockorientiertes Gerät"
-
 # This one should be merged with the next one by using
 # error() instead of printf()
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Konnte die Lock-Datei %s nicht sperren: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Warnung: %s ist kein blockorientiertes Gerät\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "kann nicht auf Gerät %s zugreifen"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "kann nicht auf Gerät %s zugreifen"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s ist kein zeichenorientiertes Gerät"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s ist kein blockorientiertes Gerät"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "Fehler beim Stoppen des Service „%s“"
@@ -6917,16 +6917,6 @@ msgstr "Der Kernel-Gerätetreiber für %s hat keinen RTC_EPOCH_SET-Ioctl.\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) auf %s fehlt"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "kann %s nicht öffnen"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -7074,8 +7064,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM-Fehlschlag, breche ab: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Passwort: "
 
@@ -7994,6 +7984,16 @@ msgstr "Aufruf: %s [+Format] [Tag Monat Jahr]\n"
 msgid "St. Tib's Day"
 msgstr "St. Tib’s Day"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "kann %s nicht öffnen"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8515,6 +8515,145 @@ msgstr "Konnte %s nicht öffnen\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: Die Umgebungsvariable TERM ist nicht gesetzt.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr "Aufruf: last [-#] [-f datei] [-t tty] [-h hostame] [nutzer …]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "        %s -l [ Signal ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: Ungültiges Argument %s für die Option „-l“.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "NFS-Socket"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "NFS-Verbindung"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Schreib."
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "read %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "Konnte %s nicht öffnen: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "Konnte %s nicht öffnen: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Fehler beim Lesen von %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "ungültige ID"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: Ungültiger Wert\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Aufruf: %s [Optionen] gerät …\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8585,21 +8724,21 @@ msgstr "Warnung: Konnte %s nicht öffnen: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: Konnte %s nicht öffnen – benutze %s stattdessen\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, 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:614
+#: mount/fstab.c:615
 #, 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:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
@@ -8608,22 +8747,22 @@ msgstr ""
 
 # This one should be merged with the next one by using
 # error() instead of printf()
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Konnte die Lock-Datei %s nicht sperren: %s\n"
 
 # sperren
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Konnte die Lock-Datei %s nicht sperren: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "Zeitüberschreitung"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8632,85 +8771,90 @@ msgstr ""
 "Konnte Verknüpfung %s nicht anlegen\n"
 "Vielleicht gibt es noch eine abgelaufene Lock-Datei?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "Konnte %s nicht öffnen (%s) – mtab nicht aktualisiert"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "Konnte %s nicht in %s umbenennen: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: Konnte keine Informationen über das Gerät %s erhalten: %s\n"
+
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", Offset %d"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", Größenbeschränkung %lld"
 
 # Verschlüsselungstyp
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", Verschlüsselungsmethode %s (Typ %d)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", Offset %d"
 
 # Verschlüsselungstyp
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", Verschlüsselungstyp %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, 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:414
+#: mount/lomount.c:434
 #, 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:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: Nutzer „%s“ existiert nicht.\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: Keine Zugriffsrechte, um auf /dev/loop# zu schauen"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: Konnte kein freies „loop“-Gerät finden"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8720,56 +8864,56 @@ msgstr ""
 "       kein „loop“-Gerät? (Wenn dies der Fall ist, dann sollten Sie den\n"
 "       Kernel neu kompilieren oder „modprobe loop“ ausführen.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor %d wird bereits benutzt\n"
 
 # That sounds somehow dumb.
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s ist schreibgeschützt, wird eingehängt im Nur-Lese-Modus"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Konnte kein Lock im Speicher bekommen, beende.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): Erfolg\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): Erfolg\n"
 
 # this is actually an open()…
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, 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:840
+#: mount/lomount.c:853
 #, c-format
 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:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8778,6 +8922,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8792,7 +8937,7 @@ msgstr ""
 "  Setup:\n"
 "    %s [ -e Verschlüsselung ] [ -o Offset ] {-f|loop-Gerät} Datei\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8808,12 +8953,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: Konnte das Gerät %s nicht öffnen: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
@@ -8822,12 +8967,12 @@ msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
 # libc.po:
 # "Device or resource busy"
 # "Das Gerät oder die Ressource ist belegt"
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: Das Gerät wird momentan noch benutzt"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8859,7 +9004,7 @@ msgstr "mount: Laut mtab ist %s auf %s eingehängt"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: Konnte %s nicht zum Schreiben öffnen: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: Fehler beim Schreiben von %s: %s"
@@ -8879,7 +9024,7 @@ msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: Kann keinen neuen Prozess erzeugen: %s"
@@ -8916,88 +9061,88 @@ msgstr "       und es sieht so aus, als sei dies Swap-Bereich\n"
 msgid "       I will try type %s\n"
 msgstr "       Werde den Typ %s versuchen\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s sieht wie ein Swap-Bereich aus – nicht eingehängt"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "mount ist fehlgeschlagen"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: nur „root“ kann %s auf %s einhängen"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: das „loop“-Gerät wurde zweimal angegeben"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: der Typ wurde doppelt angegeben"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: überspringe Aufsetzen des „loop“-Geräts\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: Laut mtab ist %s schon auf %s eingehängt"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, 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:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: loop=%s gestohlen"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: Aufsetzen des „loop“-Geräts fehlgeschlagen\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: „loop“-Gerät erfolgreich aufgesetzt\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nicht gefunden – Erzeuge sie…\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: Konnte %s nicht öffnen: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: Argument für -p oder --pass-fd muss eine Zahl sein"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: Kann %s nicht zum Setzen der Geschwindigkeit öffnen"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: Laut mtab ist %s schon auf %s eingehängt\n"
@@ -9201,23 +9346,28 @@ msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s ist schreibgeschützt, doch Option „-w“ ist explizit gegeben"
 
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: Konnte %s%s nicht im Nur-Lese-Modus einhängen"
+
 # That sounds somehow dumb.
-#: mount/mount.c:1538
+#: mount/mount.c:1542
 #, 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:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s ist bereits auf %s eingehängt\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9227,24 +9377,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: kein Typ angegeben – aufgrund des Doppelpunkts wird NFS angenommen\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: kein Typ angegeben – aufgrund des //-Präfixes wird cifs angenommen\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ist bereits auf %s eingehängt\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9313,19 +9463,19 @@ msgstr ""
 "Weitere Optionen: [-nfFrsvw] [-o optionen] [-p passwdfd].\n"
 "Für viele weitere Details: man 8 mount.\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: Nur „root“ kann dies tun"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "nichts wurde eingehängt"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: keine passende Partition gefunden"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: Konnte %s nicht in %s oder %s finden"
@@ -9511,42 +9661,42 @@ msgstr "Nicht Superuser.\n"
 msgid "%s: swapoff failed"
 msgstr "„seek“ gescheitert."
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: Die Unterstützung für -f wurde nicht mit übersetzt\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: Kann keinen neuen Prozess erzeugen: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: kein gültiges blockorientiertes Gerät"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s ist nicht eingehängt"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: Konnte den „Superblock“ nicht schreiben"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9554,111 +9704,121 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: Nicht gefunden"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: nur der Superuser kann umount durchführen"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: Blockgeräte auf Dateisystem nicht erlaubt"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "kein umount2, versuche umount…\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 "umount: %s wird momentan noch benutzt – im Nur-Lese-Modus wiedereingehängt\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: konnte %s nicht im Nur-Lese-Modus wieder einhängen\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s ausgehängt\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: Kann die Liste der Dateisysteme zum Aushängen nicht finden"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Aufruf: umount [-hV]\n"
 "        umount -a [-f] [-r] [-n] [-v] [-t VFS-Typen] [-O optionen]\n"
 "        umount [-f] [-r] [-n] [-v] Spezialdatei | Verzeichnis …\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektor %d wird bereits benutzt\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektor %d wird bereits benutzt\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Kann \"\" nicht aushängen\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Versuche, %s auszuhängen\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Konnte %s nicht in „mtab“ finden\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ist laut „mtab“ nicht eingehängt"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s scheint mehrfach eingehängt zu sein"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: fstab enthält %s nicht (Nur root kann es aushängen)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount und fstab stimmen nicht überein"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: Nur %s kann %s von %s unmounten"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: Nur „root“ kann dies tun"
 
@@ -9774,7 +9934,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9785,16 +9945,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "es ist nicht möglich, %s zu öffnen"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "„exec“ fehlgeschlagen\n"
@@ -10687,67 +10851,67 @@ msgstr "zcount"
 msgid "pid"
 msgstr "Pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ungültige ID: %s\n"
 
 # "mkfs aus util-linux-2.10d"
 # "mkfs von util-linux-2.10d"
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s von %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "ungültige ID"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ungültige ID: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ist kein blockorientiertes Gerät"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Konnte „seek()“ nicht auf der Festplatte benutzen"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
@@ -11943,9 +12107,6 @@ msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "waiting for cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "read %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "reading login name\n"
 
@@ -11979,9 +12140,6 @@ msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Fehler beim Lesen von %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "konnte %s nicht lsesn, und kann Ioctl-Dump nicht durchführen\n"
 
@@ -12143,9 +12301,6 @@ msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: ungültige hp->h_length bekommen?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "NFS-Socket"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "NFS-bindresvport"
 
@@ -12158,9 +12313,6 @@ msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "benutze Port %d für NFS-Dämonen\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "NFS-Verbindung"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "unbekannter NFS-Status-Rückgabewert: %d"
 
diff --git a/po/es.po b/po/es.po
index eaaff06b..721bccca 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.12m\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2004-12-22 01:31+0100\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -209,7 +209,7 @@ msgstr "uso: %s [ -n ] dispositivo\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, fuzzy, c-format
 msgid "%s (%s)\n"
@@ -940,7 +940,7 @@ msgstr "No se puede efectuar `stat' sobre el dispositivo %s"
 msgid "%s is not a block special device"
 msgstr "%s no es un dispositivo de bloques"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "no se puede abrir %s"
@@ -1279,7 +1279,7 @@ msgstr "Error de b�squeda durante comprobaci�n de bloques"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores extra�os en do_check: probablemente existan errores\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "Error de b�squeda en check_blocks"
 
@@ -1353,172 +1353,172 @@ msgstr "No se intentar� crear el sistema de ficheros en '%s'"
 msgid "number of blocks too small"
 msgstr "N�mero de sectores"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "El tama�o de p�gina %d especificado por el usuario es incorrecto\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, fuzzy, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Se utiliza el tama�o de p�gina %d especificado por el usuario,\n"
 "en lugar de los valores del sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "etiqueta"
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c] [-v0|-v1] [-pTAMP�G] /dev/nombre [bloques]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "Hay demasiadas p�ginas incorrectas"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "No queda memoria"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "Una p�gina incorrecta\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu p�ginas incorrectas\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "No se puede rebobinar el dispositivo de intercambio"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "No se puede borrar el sector de inicio"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   Imprime la tabla de particiones BSD"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   Muestra la etiqueta del disco completa"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: error: versi�n desconocida %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Error al cerrar el fichero\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 "%s: error: no se ha especificado d�nde configurar el espacio de intercambio\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: error: el tama�o %lu es superior al tama�o del dispositivo %lu\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: error: el �rea de intercambio debe tener como m�nimo %ldkB\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: atenci�n: el �rea de intercambio se trunca a %ldkB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "No se intentar� crear el dispositivo de intercambio en '%s'"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s est� montado; no se crear� un sistema de ficheros aqu�"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "No se puede configurar el espacio de intercambio: no se puede leer"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Configurando espacio de intercambio versi�n %d, tama�o = %llu kB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "No se puede escribir la p�gina de firma"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync ha fallado"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "No se puede ejecutar `stat' sobre %s"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "No se pueden escribir los nodos-i"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "No se puede cambiar el nombre %s por %s: %s\n"
@@ -1530,53 +1530,53 @@ msgid ""
 "  %s "
 msgstr "Uso:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "No se puede efectuar `stat' sobre el dispositivo %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: no es un dispositivo de caracteres"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s no es un dispositivo de bloques"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "No se puede bloquear el fichero de bloqueo %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Atenci�n: %s no es un dispositivo de bloques\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "No se puede efectuar `stat' sobre el dispositivo %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "No se puede efectuar `stat' sobre el dispositivo %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: no es un dispositivo de caracteres"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s no es un dispositivo de bloques"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "error al detener el servicio: \"%s\""
@@ -6850,16 +6850,6 @@ msgstr ""
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "Error de ioctl(RTC_EPOCH_SET) de %s"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "No se puede abrir %s"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -7007,8 +6997,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: error de PAM; anulando: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Contrase�a: "
 
@@ -7917,6 +7907,16 @@ msgstr "uso: %s [+formato] [d�a mes a�o]\n"
 msgid "St. Tib's Day"
 msgstr "D�a de San Tibb"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "No se puede abrir %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8433,6 +8433,145 @@ msgstr "No se ha podido abrir %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM no est� definido.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr "uso: last [-#] [-f fichero] [-t tty] [-h nombrehost] [usuario ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ se�al ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: argumento -l incorrecto %s.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "nfs socket"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "nfs connect"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Escribir"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "read %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "No se puede abrir %s: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "No se puede abrir %s: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Error al leer %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "identificador inv�lido"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "N�mero inv�lido: %s\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "Error al cambiar el modo de %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Uso: %s [opciones] dispositivo ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8504,42 +8643,42 @@ msgstr "atenci�n: no se puede abrir %s: %s"
 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"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, 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:614
+#: mount/fstab.c:615
 #, 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:630
+#: mount/fstab.c:631
 #, 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:645
+#: mount/fstab.c:646
 #, 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:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "No se puede bloquear el fichero de bloqueo %s: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "Tiempo de espera excedido"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8548,83 +8687,88 @@ msgstr ""
 "No se puede crear enlace %s\n"
 "Puede que haya un fichero de bloqueo obsoleto.\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "No se puede abrir %s (%s) - mtab no actualizado"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "Error al escribir %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "Error al cambiar el modo de %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "Error al cambiar el modo de %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, 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:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: no se puede obtener informaci�n sobre el dispositivo %s: %s\n"
+
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", desplazamiento %d"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", tama�o l�mite %lld"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", cifrado %s (tipo %d)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", desplazamiento %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", tipo de cifrado %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, 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:414
+#: mount/lomount.c:434
 #, 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:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: el usuario \"%s\" no existe.\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: no existe permiso para mirar en /dev/loop#"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: no se ha encontrado ning�n dispositivo de bucle libre"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8635,55 +8779,55 @@ msgstr ""
 "a\n"
 "       realizar la compilaci�n o `modprobe loop'.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "El sector %d ya est� asignado\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "mount: %s%s est� protegido contra escritura; se monta como s�lo lectura"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "No se pudo bloquear en memoria, saliendo.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): ejecuci�n correcta\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): ejecuci�n correcta\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, 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:840
+#: mount/lomount.c:853
 #, c-format
 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:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8692,6 +8836,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8703,7 +8848,7 @@ msgstr ""
 "usados\n"
 "  %s [ -e cifrado ] [ -o despl ] {-f|disp_bucle} fichero # configurar\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8719,22 +8864,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: no se puede abrir el dispositivo %s: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: dispositivo ocupado"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8766,7 +8911,7 @@ msgstr "mount: seg�n mtab, %s est� montado en %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: no se puede abrir %s para escritura: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: error al escribir %s: %s"
@@ -8786,7 +8931,7 @@ msgstr "mount: no se puede establecer la velocidad: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: no se puede bifurcar (fork): %s"
@@ -8816,88 +8961,88 @@ msgstr "       y parece que sea un espacio de intercambio\n"
 msgid "       I will try type %s\n"
 msgstr "       Se probar� con el tipo %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s parece espacio de intercambio - no montado"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "montaje err�neo"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, 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:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: dispositivo de bucle especificado dos veces"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: tipo especificado dos veces"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: omitiendo la configuraci�n de un dispositivo de bucle\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: seg�n mtab, %s ya est� montado en %s"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, 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:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: error al configurar dispositivo de bucle\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configuraci�n correcta de dispositivo de bucle\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: no se ha encontrado %s; se est� creando...\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: no se puede abrir %s: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: el argumento para -p o --pass-fd debe ser un n�mero"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: no se puede abrir %s para establecer la velocidad"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: seg�n mtab, %s ya est� montado en %s"
@@ -9096,23 +9241,28 @@ 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:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "umount: no se puede montar %s%s de s�lo lectura"
+
+#: mount/mount.c:1542
 #, 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:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: no se ha encontrado %s; se est� creando...\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s ya est� montado en %s\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9122,26 +9272,26 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: no se ha especificado ning�n tipo; se presupone nfs por los dos "
 "puntos\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: no se ha especificado ning�n tipo; se presupone smbfs por el "
 "prefijo //\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ya est� montado en %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9201,19 +9351,19 @@ msgstr ""
 "Otras opciones: [-nfFrsvw] [-o opciones] [-p passwdfd].\n"
 "Escriba man 8 mount para saber mucho m�s.\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: s�lo el usuario root puede efectuar esta acci�n"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "no se ha montado nada"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: no se ha encontrado esta partici�n"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: no se puede encontrar %s en %s o %s"
@@ -9396,42 +9546,42 @@ msgstr "No es el superusuario.\n"
 msgid "%s: swapoff failed"
 msgstr "Error de b�squeda"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilado sin soporte para -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: no se puede bifurcar (fork): %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo de bloques inv�lido"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: no montado"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: no se puede escribir el superbloque"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9439,112 +9589,122 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: no se ha encontrado"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: debe ser superusuario para utilizar umount"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: dispositivos de bloques no permitidos en sistema de ficheros"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existe; se est� probando con umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ocupado; se ha vuelto a montar como de s�lo lectura\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: no se ha podido volver a montar %s como de s�lo lectura\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "Se ha ejecutado umount en %s\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: no se puede encontrar lista de sistemas de ficheros para desmontar"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Uso:   umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opciones]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "El sector %d ya est� asignado\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "El sector %d ya est� asignado\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "No se puede desmontar \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Se est� intentando ejecutar umount en %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "No se puede encontrar %s en mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no est� montado (seg�n mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s se ha montado varias veces"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s no est� en fstab (y usted no es el usuario root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montaje de %s no concuerda con fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: s�lo %s puede desmontar %s desde %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: s�lo el usuario root puede efectuar esta acci�n"
 
@@ -9659,7 +9819,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9670,16 +9830,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "no se puede abrir %s"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "La ejecuci�n (exec) ha fallado\n"
@@ -10571,65 +10735,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "identificador inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "identificador inv�lido"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "identificador inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s no es un dispositivo de bloques"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "no se puede obtener el tama�o de %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "no se puede obtener el tama�o de %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "No se puede buscar en la unidad de disco"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "no se puede obtener el tama�o de %s"
@@ -11826,9 +11990,6 @@ msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "waiting for cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "read %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "reading login name\n"
 
@@ -11862,9 +12023,6 @@ msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Error al leer %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "No se ha podido leer %s y no se puede efectuar vuelco de ioctl\n"
 
@@ -12026,9 +12184,6 @@ msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: �valor incorrecto para hp->h_length?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "nfs socket"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -12042,9 +12197,6 @@ msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "Utilizando puerto %d para daemon de nfs\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs connect"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "Valor de retorno de nfs status desconocido: %d"
 
diff --git a/po/et.po b/po/et.po
index 38617197..398f6187 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11r\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+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"
@@ -204,7 +204,7 @@ msgstr "Kasutamine: %s [ -n ] seade\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, fuzzy, c-format
 msgid "%s (%s)\n"
@@ -914,7 +914,7 @@ msgstr "stat(%s) ei �nnestunud"
 msgid "%s is not a block special device"
 msgstr "%s pole plokkseade"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "ei suuda avada seadet %s"
@@ -1222,7 +1222,7 @@ msgstr "seek ei �nnestunud plokkide testimisel"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Imelikud v��rtused funktsioonis do_check - ilmselt bugid\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "seek ei �nnestunud plokkide kontrollimisel"
 
@@ -1295,168 +1295,168 @@ msgstr "ei �rita luua failis�steemi seadmele `%s'"
 msgid "number of blocks too small"
 msgstr "Sisetage sektorite arv"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Vigane kasutaja poolt m��ratud lehek�lje suurus %d\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, fuzzy, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr "Kasutan etteantud lehek�lje suurust %d, mitte s�steemseid %d/%d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr ""
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Kasutamine: %s [-c] [-v0|-v1] [-pLKSUURUS] /dev/nimi [plokke]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "liiga palju vigaseid lehek�lgi"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "M�lu sai otsa"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "�ks vigane lehek�lg\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d vigast lehek�lge\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "ei suuda tagasi kerida saalimisseadet"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "ei suuda puhastada boot-sektorit"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   n�idata BSD partitsioonitabelit"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   n�idata t�ielikku partitsioonitabelit"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: Viga - tundmatu versioon %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr "Viga %s sulgemisel\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: Viga - ei ole �eldud, kuhu saalimisala tekitada\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: Viga - suurus %ld on suurem kui seadme maht %d\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: Viga - saalimisala peab olema v�hemalt %ldkB\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: Hoiatus - piiran saalimisala %ld kB-ga\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "ei �rita luua saalimisala seadmele `%s'"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s on monteeritud - siia failis�steemi ei tee!"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Ei suuda saalimisala tekitada: seade pole loetav"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Tekitan saalimisala versiooniga %d, suurus = %lu KiB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "ei suuda kirjutada signatuuriga lehek�lge"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync ei �nnestunud"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
 # XXX stat'ida
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "ei suuda stat'ida seadet %s"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "ei suuda kirjutada i-kirjeid"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: %s �mber nimetamine %s -ks ei �nnestnud: %s\n"
@@ -1468,53 +1468,53 @@ msgid ""
 "  %s "
 msgstr "kasutamine:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "stat(%s) ei �nnestunud"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s pole s�mbolseade"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s pole plokkseade"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "%s pole flopiseade\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Hoiatus: %s pole plokkseade\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "stat(%s) ei �nnestunud"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "stat(%s) ei �nnestunud"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s pole s�mbolseade"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s pole plokkseade"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "viga teenuse peatamisel: %s"
@@ -6638,16 +6638,6 @@ msgstr "Tuuma draiver %s jaoks ei toeta RTC_EPOCH_SET ioctl'i\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "%s ioctl(RTC_EPOCH_SET) ei �nnestunud"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "ei suuda avada seadet %s"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6794,8 +6784,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM viga, katkestan: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Parool: "
 
@@ -7688,6 +7678,16 @@ msgstr "Kasutamine: %s[+formaat] [kuup�ev kuu aasta]\n"
 msgid "St. Tib's Day"
 msgstr "P�ha Tib'i p�ev"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "ei suuda avada seadet %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8199,6 +8199,144 @@ msgstr "Ei suutnud avada %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr "Kasutamine: [-#] [-f fail] [-t tty] [-h hostinimi] [kasutaja ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "             %s -l [ signaal ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "%s: Tundmatu argument: %s\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "Ploki suurus: %d\n"
+
+#: misc-utils/uuidd.c:170
+msgid "connect"
+msgstr ""
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "salvesta (W)"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "lugesin %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "Ei suutnud avada %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "Ei suutnud avada %s\n"
+
+#: misc-utils/uuidd.c:351
+#, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "vigane identifikaator"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: lugemise viga failis %s\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8271,170 +8409,175 @@ msgstr ""
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr ""
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr ""
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr ""
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr ""
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "stat(%s) ei �nnestunud"
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: Kasutajat \"%s\" pole olemas\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, fuzzy, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s pole flopiseade\n"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8443,12 +8586,13 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8464,22 +8608,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "Seade: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8509,7 +8653,7 @@ msgstr ""
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
@@ -8529,7 +8673,7 @@ msgstr "fork ei �nnestunud"
 msgid "mount: cannot set user id: %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
@@ -8559,88 +8703,88 @@ msgstr ""
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr ""
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: ei suuda avada seadet %s kiiruse seadmiseks"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr ""
@@ -8821,22 +8965,27 @@ msgstr ""
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: ei suuda avada seadet %s kiiruse seadmiseks"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8846,22 +8995,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8898,19 +9047,19 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -9090,42 +9239,42 @@ msgstr ""
 msgid "%s: swapoff failed"
 msgstr "seek ei �nnestunud"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9133,108 +9282,118 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektor%d on juba kasutusel\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektor%d on juba kasutusel\n"
+
+#: mount/umount.c:485
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -9348,7 +9507,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9359,16 +9518,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "ei suuda avada seadet %s"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "exec ei �nnestunud\n"
@@ -10215,65 +10378,65 @@ msgstr ""
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "vigane kiirus: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s paketist %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "vigane identifikaator"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "vigane arv: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s pole plokkseade"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Ei suuda kettal seekida"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
@@ -11323,9 +11486,6 @@ msgstr ""
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "ootan reavahetust (CR+LF)\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "lugesin %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "loen kasutajanime\n"
 
diff --git a/po/eu.po b/po/eu.po
index 00b52324..f79bcccf 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2005-08-15 18:45+0200\n"
 "Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -202,7 +202,7 @@ msgstr "erabilera: %s [ -n] gailua\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -886,7 +886,7 @@ msgstr ""
 msgid "%s is not a block special device"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -1192,7 +1192,7 @@ msgstr ""
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr ""
 
@@ -1263,164 +1263,164 @@ msgstr ""
 msgid "number of blocks too small"
 msgstr ""
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "etiketa gabea, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "uuid-rik ez\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "orri txar gehiegi"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Memoriarik ez"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr ""
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "Inprimatu taula sektore bidez ordenatua"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr ""
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, c-format
 msgid "        on whole disk. "
 msgstr ""
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr ""
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr ""
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync-ek huts egin du"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr ""
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr ""
@@ -1432,53 +1432,53 @@ msgid ""
 "  %s "
 msgstr "Erabilera:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "Ezin da '%s' fitxategia ireki"
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr ""
-
-#: disk-utils/raw.c:141
-#, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr ""
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr ""
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "Ezin da disko unitatea ireki"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "Ezin da '%s' fitxategia ireki"
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr ""
+
+#: disk-utils/raw.c:216
+#, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr ""
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr ""
@@ -6214,16 +6214,6 @@ msgstr ""
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr ""
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr ""
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6364,8 +6354,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr ""
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Pasahitza: "
 
@@ -7234,6 +7224,16 @@ msgstr ""
 msgid "St. Tib's Day"
 msgstr ""
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr ""
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7739,6 +7739,143 @@ msgstr ""
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:46
+#, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, c-format
+msgid "       %s -k\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "orri txar gehiegi"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "Gailua: %s\n"
+
+#: misc-utils/uuidd.c:170
+msgid "connect"
+msgstr ""
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Idatzi"
+
+#: misc-utils/uuidd.c:197
+msgid "read count"
+msgstr ""
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:313
+#, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:351
+#, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, c-format
+msgid "Invalid operation %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, c-format
+msgid "Bad number: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "erabilera: %s [ -n] gailua\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -7809,171 +7946,176 @@ msgstr ""
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr ""
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr ""
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr ""
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr ""
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr ""
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr ""
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Memoriarik ez buffer-a hazterakoan.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -7982,12 +8124,13 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8003,22 +8146,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "Gailua: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8048,7 +8191,7 @@ msgstr ""
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
@@ -8068,7 +8211,7 @@ msgstr ""
 msgid "mount: cannot set user id: %s"
 msgstr ""
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
@@ -8098,88 +8241,88 @@ msgstr ""
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr ""
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr ""
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr ""
@@ -8360,22 +8503,27 @@ msgstr ""
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr ""
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr ""
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8385,22 +8533,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8437,19 +8585,19 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -8629,42 +8777,42 @@ msgstr ""
 msgid "%s: swapoff failed"
 msgstr "fsync-ek huts egin du"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr ""
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr ""
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -8672,107 +8820,117 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, c-format
+msgid "device %s is associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:472
+#, c-format
+msgid "device %s is not associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8884,7 +9042,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -8895,16 +9053,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "fsync-ek huts egin du"
@@ -9751,64 +9913,64 @@ msgstr ""
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "Gailua: %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Ezin da bilatu disko unitatean"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 643d7c5d..ba49ad99 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17,10 +17,10 @@
 # ***
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-ng 2.14.1-rc2\n"
+"Project-Id-Version: util-linux-ng 2.16-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
-"PO-Revision-Date: 2009-03-08 14:17+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
+"PO-Revision-Date: 2009-07-04 14:59+0300\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -211,7 +211,7 @@ msgstr "käyttö: %s [ -n ] laite\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -270,9 +270,9 @@ msgid "ioctl failed: unable to determine device size: %s"
 msgstr "%s: varoitus--tiedostojärjestelmän kokoa ei voi määrittää \n"
 
 #: disk-utils/fsck.cramfs.c:181
-#, fuzzy, c-format
+#, c-format
 msgid "not a block device or file: %s"
-msgstr "%s ei ole lohkolaite eikä tiedosto\n"
+msgstr "ei ole lohkolaite eikä tiedosto: %s"
 
 #: disk-utils/fsck.cramfs.c:185 disk-utils/fsck.cramfs.c:227
 #, fuzzy
@@ -281,9 +281,9 @@ msgstr "%s: virheellinen cramfs--tiedosto on liian lyhyt\n"
 
 #: disk-utils/fsck.cramfs.c:190 disk-utils/fsck.cramfs.c:198
 #: disk-utils/fsck.cramfs.c:259 disk-utils/fsck.cramfs.c:279
-#, fuzzy, c-format
+#, c-format
 msgid "read failed: %s"
-msgstr "(Seuraava tiedosto: %s)"
+msgstr "lukeminen epäonnistui: %s"
 
 #: disk-utils/fsck.cramfs.c:208
 msgid "superblock magic not found"
@@ -304,9 +304,9 @@ msgid "zero file count"
 msgstr ""
 
 #: disk-utils/fsck.cramfs.c:230
-#, fuzzy, c-format
+#, c-format
 msgid "warning: file extends past end of filesystem\n"
-msgstr "Varoitus: osio %s jatkuu levyn lopun yli\n"
+msgstr "varoitus: tiedosto jatkuu tiedostojärjestelmän lopun yli\n"
 
 #: disk-utils/fsck.cramfs.c:234
 #, c-format
@@ -324,12 +324,10 @@ msgid "malloc failed"
 msgstr "malloc epäonnistui"
 
 #: disk-utils/fsck.cramfs.c:298
-#, fuzzy
 msgid "crc error"
-msgstr ", virhe"
+msgstr "crc-virhe"
 
 #: disk-utils/fsck.cramfs.c:365
-#, fuzzy
 msgid "root inode is not directory"
 msgstr "juuren i-solmu ei ole hakemisto"
 
@@ -348,9 +346,9 @@ msgid "decompression error %p(%d): %s"
 msgstr ""
 
 #: disk-utils/fsck.cramfs.c:416
-#, fuzzy, c-format
+#, c-format
 msgid "  hole at %ld (%zd)\n"
-msgstr "  reikä kohdassa %ld (%d)\n"
+msgstr "  reikä kohdassa %ld (%zd)\n"
 
 #: disk-utils/fsck.cramfs.c:424 disk-utils/fsck.cramfs.c:596
 #, c-format
@@ -358,34 +356,34 @@ msgid "  uncompressing block at %ld to %ld (%ld)\n"
 msgstr "  puretaan paikkaan %2$ld lohkoa %1$ld (%3$ld)\n"
 
 #: disk-utils/fsck.cramfs.c:430
-#, fuzzy, c-format
+#, c-format
 msgid "non-block (%ld) bytes"
-msgstr "%s: Ei-lohko (%ld) tavua\n"
+msgstr "ei-lohko (%ld) tavua"
 
 #: disk-utils/fsck.cramfs.c:434
-#, fuzzy, c-format
+#, c-format
 msgid "non-size (%ld vs %ld) bytes"
-msgstr "%s: Ei-koko (%ld vs %ld) tavua\n"
+msgstr "ei-koko (%ld vs %ld) tavua"
 
 #: disk-utils/fsck.cramfs.c:440
-#, fuzzy, c-format
+#, c-format
 msgid "write failed: %s"
-msgstr "(Seuraava tiedosto: %s)"
+msgstr "kirjoittaminen epäonnistui: %s"
 
 #: disk-utils/fsck.cramfs.c:453
-#, fuzzy, c-format
+#, c-format
 msgid "lchown failed: %s"
-msgstr "liittäminen epäonnistui"
+msgstr "lchown epäonnistui: %s"
 
 #: disk-utils/fsck.cramfs.c:459
-#, fuzzy, c-format
+#, c-format
 msgid "chown failed: %s"
-msgstr "liittäminen epäonnistui"
+msgstr "chown epäonnistui: %s"
 
 #: disk-utils/fsck.cramfs.c:466
-#, fuzzy, c-format
+#, c-format
 msgid "utime failed: %s"
-msgstr "virheellinen aikakatkaisuarvo: %s"
+msgstr "utime epäonnistui: %s"
 
 #: disk-utils/fsck.cramfs.c:481
 #, c-format
@@ -393,9 +391,9 @@ msgid "directory inode has zero offset and non-zero size: %s"
 msgstr ""
 
 #: disk-utils/fsck.cramfs.c:495
-#, fuzzy, c-format
+#, c-format
 msgid "mkdir failed: %s"
-msgstr "/dev: chdir() epäonnistui: %m"
+msgstr "mkdir epäonnistui: %s"
 
 #: disk-utils/fsck.cramfs.c:512
 msgid "filename length is zero"
@@ -427,9 +425,9 @@ msgid "symbolic link has zero size"
 msgstr ""
 
 #: disk-utils/fsck.cramfs.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "size error in symlink: %s"
-msgstr "%s: kokovirhe symlinkissä \"%s\"\n"
+msgstr "kokovirhe symlinkissä: %s"
 
 #: disk-utils/fsck.cramfs.c:602
 #, fuzzy, c-format
@@ -457,9 +455,9 @@ msgid "bogus mode: %s (%o)"
 msgstr "%1$s: virheellinen tila (%3$o) polussa \"%2$s\"\n"
 
 #: disk-utils/fsck.cramfs.c:647
-#, fuzzy, c-format
+#, c-format
 msgid "mknod failed: %s"
-msgstr "liittäminen epäonnistui"
+msgstr "mknod epäonnistui: %s"
 
 #: disk-utils/fsck.cramfs.c:683
 #, c-format
@@ -484,9 +482,8 @@ msgid "failed to allocate outbuffer"
 msgstr "Puskuria ei voi varata.\n"
 
 #: disk-utils/fsck.cramfs.c:728
-#, fuzzy
 msgid "compiled without -x support"
-msgstr "%s: käännetty ilman -x -tukea\n"
+msgstr "käännetty ilman -x-tukea"
 
 #: disk-utils/fsck.minix.c:210
 #, c-format
@@ -598,9 +595,8 @@ msgid "Unable to allocate buffer for inode map"
 msgstr "I-solmukartalle ei voi varata puskuria"
 
 #: disk-utils/fsck.minix.c:626
-#, fuzzy
 msgid "Unable to allocate buffer for zone map"
-msgstr "I-solmukartalle ei voi varata puskuria"
+msgstr "Vyöhykekartalle ei voi varata puskuria"
 
 #: disk-utils/fsck.minix.c:631
 msgid "Unable to allocate buffer for inodes"
@@ -931,7 +927,7 @@ msgstr "laitteen %s tilaa ei voi lukea"
 msgid "%s is not a block special device"
 msgstr "%s ei ole lohkolaite"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "laitetta %s ei voi avata"
@@ -942,18 +938,18 @@ msgid "cannot get size of %s"
 msgstr "laitteen %s kokoa ei voi hakea"
 
 #: disk-utils/mkfs.bfs.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "blocks argument too large, max is %llu"
-msgstr "blocks-argumentti on liian suuri, maksimi on %lu"
+msgstr "blocks-argumentti on liian suuri, maksimi on %llu"
 
 #: disk-utils/mkfs.bfs.c:203
 msgid "too many inodes - max is 512"
 msgstr "liian monta i-solmua – maksimi on 512"
 
 #: disk-utils/mkfs.bfs.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "not enough space, need at least %llu blocks"
-msgstr "tila ei riitä, vaaditaan vähintään %lu lohkoa"
+msgstr "tila ei riitä, vaaditaan vähintään %llu lohkoa"
 
 #: disk-utils/mkfs.bfs.c:224 fdisk/fdisk.c:2345
 #, c-format
@@ -981,14 +977,14 @@ msgid "Inodes: %d (in 1 block)\n"
 msgstr "I-solmuja: %d (1 lohkossa)\n"
 
 #: disk-utils/mkfs.bfs.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "Inodes: %d (in %lld blocks)\n"
-msgstr "I-solmuja: %d (%ld lohkossa)\n"
+msgstr "I-solmuja: %d (%lld lohkossa)\n"
 
 #: disk-utils/mkfs.bfs.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Blocks: %lld\n"
-msgstr "Lohkot: %ld\n"
+msgstr "Lohkot: %lld\n"
 
 #: disk-utils/mkfs.bfs.c:235
 #, c-format
@@ -1266,7 +1262,7 @@ msgstr "siirtyminen epäonnistui lohkojen testauksen aikana"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Outoja arvoja funktiossa do_check: todennäköisesti ohjelmistovikoja\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "siirtyminen epäonnistui funktiossa check_blocks"
 
@@ -1339,226 +1335,228 @@ msgstr "ei yritetä luoda tiedostojärjestelmää kohteeseen ”%s”"
 msgid "number of blocks too small"
 msgstr "Sektorien määrä"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Käyttäjän antama sivukoko %d on virheellinen\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Käytetään käyttäjän antamaa sivukokoa %d järjestelmän arvon %d sijaan\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Virheellinen sivutusotsakkeen koko, nimiötä ei kirjoitettu.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Nimiötä lyhennettiin.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "ei nimiötä, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "ei uuid:tä\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Käyttö: %s [-c] [-v0|-v1] [-pSIVUKOKO] [-L nimiö] [-U UUID] /dev/nimi "
 "[lohkot]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "liian monta viallista sivua"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Muisti lopussa"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "yksi viallinen sivu\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu viallista sivua\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "sivutuslaitteella ei voi siirtyä taaksepäin"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "käynnistyssektorin tyhjentäminen ei onnistu"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p    näytä BSD-osiotaulu"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s    näytä täydellinen levynimiö"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: virhe: tuntematon versio %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr "virhe: UUID:n jäsennys epäonnistui"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: virhe: Sivutustilan kohde?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: virhe: koko %lu KiB on suurempi kuin laitteen koko %lu KiB\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: virhe: sivutusalueen on oltava vähintään %ld KiB:n kokoinen\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: varoitus: typistetään sivutusalue kokoon %ld KiB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: virhe: ei yritetä luoda sivutuslaitetta kohteeseen ”%s”\n"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: virhe: %s on liitetty; ei tehdä sivutustilaa.\n"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Sivutustilaa ei voi luoda: ei luettavissa"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Asetetaan sivutustila, versio %d, koko = %llu KiB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: allekirjoitussivua ei voi kirjoittaa: %s"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync epäonnistui"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: selinux-tiedostonimiön hakeminen ei onnistu: %s\n"
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "tiedoston %s tilaa ei voi lukea"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr "uuden selinux-kontekstin luominen ei onnistu"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr "selinux-kontekstin laskeminen ei onnistunut"
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
-msgstr "%s: uudelleennimeäminen %s -> %s ei onnistu: %s\n"
+msgstr "%s: uudelleennimeäminen %s → %s ei onnistu: %s\n"
 
 #: disk-utils/raw.c:50
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage:\n"
 "  %s "
-msgstr "Käyttö:\n"
+msgstr ""
+"Käyttö:\n"
+"  %s "
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "laitteen %s tilaa ei voi lukea"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: ei ole merkkilaite"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s ei ole lohkolaite"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Lukkotiedostoa %s ei voi lukita: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Varoitus: %s ei ole lohkolaite\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "laitteen %s tilaa ei voi lukea"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "laitteen %s tilaa ei voi lukea"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: ei ole merkkilaite"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s ei ole lohkolaite"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "virhe pysäytettäessä palvelua: ”%s”"
@@ -1853,13 +1851,12 @@ msgid "Wrote partition table to disk"
 msgstr "Osiotaulu kirjoitettiin levylle"
 
 #: fdisk/cfdisk.c:1923
-#, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
 "(8) or reboot to update table."
 msgstr ""
-"Osiotaulu kirjoitettiin, mutta uudelleenluku epäonnistui. Tietokone on "
-"käynnistettävä uudelleen, jotta taulu päivittyy."
+"Osiotaulu kirjoitettiin, mutta uudelleenluku epäonnistui. Aja partprobe(8), "
+"kpartx(8) tai käynnistä tietokone uudelleen, jotta taulu päivittyy."
 
 #: fdisk/cfdisk.c:1933
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
@@ -2764,7 +2761,7 @@ msgstr "raidalta raidalle siirtyminen"
 #: fdisk/fdiskbsdlabel.c:529
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
-msgstr "Esilatausohjelma: %sboot -> boot%s (%s): "
+msgstr "Esilatausohjelma: %sboot → boot%s (%s): "
 
 #: fdisk/fdiskbsdlabel.c:554
 #, c-format
@@ -3398,11 +3395,9 @@ msgstr ""
 "\n"
 
 #: fdisk/fdisk.c:1785
-#, fuzzy, c-format
+#, c-format
 msgid "Done.\n"
-msgstr ""
-"Valmis\n"
-"\n"
+msgstr "Valmis.\n"
 
 #: fdisk/fdisk.c:1813
 #, c-format
@@ -3496,15 +3491,15 @@ msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Looginen osio %d ei ole kokonaan osiossa %d\n"
 
 #: fdisk/fdisk.c:2007
-#, fuzzy, c-format
+#, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr ""
-"Varattujen sektoreiden kokonaismäärä %ld on suurempi kuin maksimi %lld\n"
+"Varattujen sektoreiden kokonaismäärä %llu on suurempi kuin maksimi %llu\n"
 
 #: fdisk/fdisk.c:2010
-#, fuzzy, c-format
+#, c-format
 msgid "%lld unallocated %d-byte sectors\n"
-msgstr "%lld varaamatonta sektoria\n"
+msgstr "%lld varaamatonta %d-tavuista sektoria\n"
 
 #: fdisk/fdisk.c:2025 fdisk/fdisksgilabel.c:633 fdisk/fdisksunlabel.c:416
 #, c-format
@@ -3524,7 +3519,7 @@ msgstr "Ei vapaita sektoreita käytettävissä\n"
 #: fdisk/fdisk.c:2112
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
-msgstr ""
+msgstr "Viimeinen %1$s, +%2$s tai +koko{K,M,G}"
 
 #: fdisk/fdisk.c:2178
 #, c-format
@@ -3606,7 +3601,7 @@ msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kutsutaan osiotaulun uudelleen lukeva ioctl().\n"
 
 #: fdisk/fdisk.c:2296
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "WARNING: Re-reading the partition table failed with error %d: %s.\n"
@@ -3615,8 +3610,8 @@ msgid ""
 msgstr ""
 "\n"
 "VAROITUS: Osiotaulun uudelleenluku epäonnistui, virhe %d: %s.\n"
-"Ydin käyttää edelleen vanhaa taulua.\n"
-"Uutta taulua käytetään seuraavasta käynnistyksestä alkaen.\n"
+"Ydin käyttää edelleen vanhaa taulua. Uusi taulu tulee käyttöön seuraavassa\n"
+"käynnistyksessä, tai ajamalla partprobe(8) tai kpartx(8)\n"
 
 #: fdisk/fdisk.c:2304
 #, c-format
@@ -4294,13 +4289,13 @@ msgstr ""
 "Poista/kutista joitakin ennen uutta yritystä.\n"
 
 #: fdisk/fdisksunlabel.c:449
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
 "and is of type `Whole disk'\n"
 msgstr ""
-"On erittäin suositeltavaa, että yhdestoista osio\n"
-"kattaa koko levyn ja on tyyppiä ”SGI volume”\n"
+"On erittäin suositeltavaa, että kolmas osio kattaa koko levyn ja\n"
+"on tyyppiä ”Koko levy”\n"
 
 #: fdisk/fdisksunlabel.c:477
 #, c-format
@@ -4662,9 +4657,8 @@ msgid "Darwin boot"
 msgstr "Darwin boot"
 
 #: fdisk/i386_sys_types.c:74
-#, fuzzy
 msgid "HFS / HFS+"
-msgstr "OS/2 HPFS"
+msgstr "HFS / HFS+"
 
 #: fdisk/i386_sys_types.c:75
 msgid "BSDI fs"
@@ -4925,14 +4919,14 @@ msgid "Re-reading the partition table ...\n"
 msgstr "Luetaan osiotaulu uudelleen...\n"
 
 #: fdisk/sfdisk.c:827
-#, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
 "before using mkfs\n"
 msgstr ""
 "Osiotaulun uudelleenlukukomento epäonnistui\n"
-"Käynnistä järjestelmä uudelleen nyt, ennen mkfs:n käyttöä\n"
+"Aja partprobe(8), kpartx(8) tai käynnistä järjestelmä\n"
+"uudelleen nyt, ennen mkfs:n käyttöä\n"
 
 #: fdisk/sfdisk.c:833
 #, c-format
@@ -4954,11 +4948,13 @@ msgid "# partition table of %s\n"
 msgstr "# %s:n osiotaulu\n"
 
 #: fdisk/sfdisk.c:934
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "unit: sectors\n"
 "\n"
-msgstr "SunOS alt sectors"
+msgstr ""
+"yksikkö: sektorit\n"
+"\n"
 
 #: fdisk/sfdisk.c:944
 #, c-format
@@ -5809,9 +5805,9 @@ msgstr ""
 "[koko]\n"
 
 #: fsck/fsck.c:1099
-#, fuzzy, c-format
+#, c-format
 msgid "%s: too many devices\n"
-msgstr "%s: %s ei ole lp-laite.\n"
+msgstr "%s: liian monta laitetta\n"
 
 #: fsck/fsck.c:1110
 #, fuzzy, c-format
@@ -6234,7 +6230,7 @@ msgstr ""
 #: hwclock/hwclock.c:805
 #, c-format
 msgid "\tUTC: %s\n"
-msgstr ""
+msgstr "\tUTC: %s\n"
 
 #: hwclock/hwclock.c:852
 #, c-format
@@ -6401,7 +6397,7 @@ msgid "%s from %s\n"
 msgstr "%s – %s\n"
 
 #: hwclock/hwclock.c:1313
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -6444,41 +6440,51 @@ msgstr ""
 "Käyttö: hwclock [toiminto] [valitsimet...]\n"
 "\n"
 "Toiminnot:\n"
-"  --help        näyttää tämän ohjeen\n"
-"  --show        lukee laitteistokellon ja näyttää tulokset\n"
-"  --set         asettaa laitteistokellon --date:lla määrättyyn aikaan\n"
-"  --hctosys     asettaa järjestelmäkellon ajan laitteistokellon mukaan\n"
-"  --systohc     asettaa laitteistokellon nykyiseen järjestelmän aikaan\n"
-"  --adjust      säätää laitteistokellon huomioimaan systemaattisen "
-"poikkeaman\n"
-"                edellisen asetuksen tai säädön jälkeen\n"
-"  --getepoch    näyttää ytimen epoch-arvon laitteistokellolle\n"
-"  --setepoch    asettaa ytimen epoch-arvon laitteistokellolle --epoch:illa\n"
-"                määrättyyn arvoon\n"
-"  --version     näyttää hwclockin versionumeron vakiotulosteeseen\n"
+"  -h | --help         näyttää tämän ohjeen\n"
+"  -r | --show         lukee laitteistokellon ja näyttää tuloksen\n"
+"       --set          asettaa laitteistokellon --date:lla määrättyyn aikaan\n"
+"  -s | --hctosys      asettaa järjestelmäkellon ajan laitteistokellon "
+"mukaan\n"
+"  -w | --systohc      asettaa laitteistokellon nykyiseen järjestelmän "
+"aikaan\n"
+"       --systz        asettaa järjestelmäkellon ajan nykyisen "
+"aikavyöhykkeen\n"
+"                      mukaan\n"
+"       --adjust       säätää laitteistokellon huomioimaan systemaattisen\n"
+"                      poikkeaman edellisen asetuksen tai säädön jälkeen\n"
+"       --getepoch     näyttää ytimen epoch-arvon laitteistokellolle\n"
+"       --setepoch     asettaa ytimen epoch-arvon laitteistokellolle\n"
+"                      --epoch:illa määrättyyn arvoon\n"
+"  -v | --version      näyttää hwclockin versionumeron vakiotulosteeseen\n"
 "\n"
 "Valitsimet: \n"
-"  --utc         laitteistokello on kansainvälisessä ajassa (UTC)\n"
-"  --localtime   laitteistokello on paikallisesssa ajassa\n"
-"  --rtc=polku   käytä muuta kuin tavallista laitetta, /dev/...\n"
-"  --directisa   käytä ISA-väylää suoraan, ei laitteen %s kautta\n"
-"  --badyear     ei huomioida laitteistokellon vuotta, koska BIOS on rikki\n"
-"  --date        aika, johon laitteistokello asetetaan\n"
-"  --epoch=vuosi 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"
-"  --adjfile=polku hienosäätötiedoston polku (oletus on /etc/adjtime)\n"
+"  -u | --utc          laitteistokello on kansainvälisessä ajassa (UTC)\n"
+"       --localtime    laitteistokello on paikallisesssa ajassa\n"
+"  -f | --rtc=polku    käytä muuta kuin tavallista laitetta, /dev/...\n"
+"       --directisa    käytä ISA-väylää suoraan, ei laitteen %s kautta\n"
+"       --badyear      ei huomioida laitteistokellon vuotta, koska BIOS on\n"
+"                      rikki\n"
+"       --date         aika, johon laitteistokello asetetaan\n"
+"       --epoch=vuosi  vuosi, joka on laitteistokellon\n"
+"                      epoch-arvon nollakohta\n"
+"       --noadjfile    ei käytetä tiedostoa /etc/adjtime. Vaatii joko\n"
+"                      valitsimen --utc tai --localtime käyttämistä\n"
+"       --adjfile=polku hienosäätötiedoston polku (oletus on /etc/adjtime)\n"
+"       --test         tee kaikki muu paitsi laitteistokellon tai minkään\n"
+"                      muun varsinainen päivittäminen\n"
+"  -D | --debug        vianetsintätila\n"
+"\n"
 
 #: hwclock/hwclock.c:1348
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "       tell hwclock the type of alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
-"  --jensen, --arc, --srm, --funky-toy\n"
-"                kertoo hwclockille Alphan tyypin (ks. hwclock(8))\n"
+"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"       kertoo hwclockille Alphan tyypin (ks. hwclock(8))\n"
+"\n"
 
 #: hwclock/hwclock.c:1435
 #, c-format
@@ -6714,16 +6720,6 @@ msgstr "Ytimen laiteajurissa laitteelle %s ei ole ioctl:ää RTC_EPOCH_SET.\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) laitteelle %s epäonnistui"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "laitetta %s ei voi avata"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6871,8 +6867,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM-virhe, keskeytetään: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Salasana: "
 
@@ -7600,19 +7596,19 @@ msgid "no TERM or cannot stat tty\n"
 msgstr "TERM-muuttujaa ei ole tai päätteen tilaa ei voi lukea\n"
 
 #: login-utils/simpleinit.c:938
-#, fuzzy, c-format
+#, c-format
 msgid "error stopping service: \"%s\"\n"
-msgstr "virhe pysäytettäessä palvelua: ”%s”"
+msgstr "virhe pysäytettäessä palvelua: ”%s”\n"
 
 #: login-utils/simpleinit.c:950
-#, fuzzy, c-format
+#, c-format
 msgid "Stopped service: %s\n"
-msgstr "virhe pysäytettäessä palvelua: ”%s”"
+msgstr "Pysäytetään palvelua: ”%s”\n"
 
 #: login-utils/simpleinit.c:1070
-#, fuzzy, c-format
+#, c-format
 msgid "error running programme: \"%s\"\n"
-msgstr "virhe ajettaessa finalprogia\n"
+msgstr "Virhe ajettaessa ohjelmaa: ”%s”\n"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7772,6 +7768,16 @@ msgstr "käyttö: %s [+muoto] [päivä kuukausi vuosi]\n"
 msgid "St. Tib's Day"
 msgstr "St. Tib's Day"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "laitetta %s ei voi avata"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7852,9 +7858,8 @@ msgstr "Tiedostosta %2$s saatiin %1$d tavua\n"
 
 #: misc-utils/namei.c:144 misc-utils/namei.c:198 misc-utils/namei.c:220
 #: misc-utils/namei.c:227 misc-utils/namei.c:248
-#, fuzzy
 msgid "out of memory?"
-msgstr "muisti lopussa?\n"
+msgstr "muisti lopussa?"
 
 #: misc-utils/namei.c:189
 #, fuzzy, c-format
@@ -7867,20 +7872,22 @@ msgid "could not stat '%s'"
 msgstr "laitteen %s tilaa ei voi lukea"
 
 #: misc-utils/namei.c:411
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Usage: %s [options] pathname [pathname ...]\n"
-msgstr "käyttö: namei [-mx] polku [polku ...]\n"
+msgstr ""
+"\n"
+"Käyttö: %s [valitsimet] polku [polku ...]\n"
 
 #: misc-utils/namei.c:412
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 "\n"
-"%d osiota:\n"
+"Valitsimet:\n"
 
 #: misc-utils/namei.c:415
 #, c-format
@@ -7895,13 +7902,13 @@ msgid ""
 msgstr ""
 
 #: misc-utils/namei.c:423
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 "\n"
-"Lisätietoja manuaalisivulla setarch(8).\n"
+"Lisätietoja manuaalisivulla namei(1).\n"
 
 #: misc-utils/namei.c:484
 #, fuzzy, c-format
@@ -7921,7 +7928,7 @@ msgstr "%s: muisti lopussa\n"
 #: misc-utils/rename.c:56
 #, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr "%s: uudelleennimeäminen %s -> %s epäonnistui: %s\n"
+msgstr "%s: uudelleennimeäminen %s → %s epäonnistui: %s\n"
 
 #: misc-utils/rename.c:86
 #, c-format
@@ -8288,6 +8295,146 @@ msgstr "Tiedostoa %s ei voitu avata\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM ei ole määritelty.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+"käyttö: last [-#] [-f tiedosto] [-t tty] [-h konenimi] [käyttäjä ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ signaali ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: virheellinen -l -argumentti %s.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "nfs socket"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "nfs connect"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Kirjoita"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "luettiin %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "Laitetta %s ei voi avata: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "Laitetta %s ei voi avata: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Virhe luettaessa %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "virheellinen valitsin"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: virheellinen arvo\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "virhe muutettaessa tiedoston %s tilaa: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Käyttö: %s [valitsimet] laite ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8361,36 +8508,36 @@ msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 "mount: tiedostoa %s ei voitu avata – käytetään tiedostoa %s sen sijaan\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr "lukkotiedostoa %s ei voi luoda: %s (käytä lippua -n ohittaaksesi)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr "lukkotiedostoa %s ei voi linkittää: %s (käytä lippua -n ohittaaksesi)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr "lukkotiedostoa %s ei voi avata: %s (käytä lippua -n ohittaaksesi)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Lukkotiedostoa %s ei voi lukita: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "lukkotiedostoa %s ei voi lukita: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "aikakatkaistu"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8399,83 +8546,88 @@ msgstr ""
 "Linkkiä %s ei voi luoda\n"
 "Ehkä jossakin on vanhentunut lukkotiedosto?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "hakemistoa %s ei voi avata (%s) – mtabi-tiedostoa ei päivitetty"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "virhe kirjoitettaessa %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "virhe muutettaessa tiedoston %s tilaa: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "virhe muutettaessa tiedoston %s omistajaa: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr "nimeäminen %s -> %s ei onnistu: %s\n"
+msgstr "nimeäminen %s → %s ei onnistu: %s\n"
+
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: laitteen %s tietoja ei voi hakea: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", siirtymä %<PRIu64>"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", kokoraja %<PRIu64>"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", salaus %s (tyyppi %<PRIu32>)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", siirtymä %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", salaustyyppi %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: laitteen %s tietoja ei voi hakea: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: laitetta %s ei voi avata: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: /dev-hakemistoa ei ole olemassa."
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: ei oikeuksia laitteeseen /dev/loop#"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: ei löytynyt yhtään vapaata loop-laitetta"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8485,52 +8637,52 @@ msgstr ""
 "       loop-laitteista?\n"
 "       (Jos näin on, käännä uudelleen tai suorita ”modprobe loop”.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektori %d on jo varattu\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s on kirjoitussuojattu, liitetään vain luku -tilassa"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Muistia ei voitu lukita, poistutaan.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD epäonnistui: %s\n"
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): onnistui\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): onnistui\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: laitetta %s ei voi poistaa: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 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:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8539,6 +8691,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8549,7 +8702,7 @@ msgstr ""
 "  %s -f                                                # etsi vapaa\n"
 "  %s [ -e salaus ] [ -o siirtymä ] loop-laite tiedosto # aseta\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8565,22 +8718,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: laitetta %s ei voi avata: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: laite on varattu"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Loop-tukea ei ollut käännöksen aikana. Käännä uudelleen.\n"
@@ -8610,7 +8763,7 @@ msgstr "mount: mtab-tiedoston mukaan %s on liitetty pisteeseen %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: tiedostoa %s ei voi avata kirjoittamista varten: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: virhe kirjoitettaessa %s: %s"
@@ -8630,7 +8783,7 @@ msgstr "mount: ryhmä-id:tä voi asettaa: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: käyttäjä-id:tä ei voi asettaa: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: haarauttaminen ei onnistu: %s"
@@ -8660,89 +8813,89 @@ msgstr "       ja tämä näyttää olevan sivutustilaa\n"
 msgid "       I will try type %s\n"
 msgstr "       Kokeillaan tyyppiä %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s vaikuttaa olevan sivutustilaa – ei liitetä"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "liittäminen epäonnistui"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: vain root voi liittää %s pisteeseen %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: loop-laite annettu kahdesti"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: tyyppi annettu kahdesti"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: ohitetaan loop-laitteen asettaminen\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 "mount: mtab-tiedoston mukaan %s on jo liitetty pisteeseen %s loop-laitteena"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: aiotaan käyttää loop-laitetta %s\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop-laitteen asettaminen epäonnistui\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop-laite asetettiin onnistuneesti\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ei löytynyt %s – luodaan se..\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: tiedostoa %s ei voi avata: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argumentin valitsimelle -p tai --pass-fd on oltava luku"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: tiedostoa %s ei voi avata nopeuden asetusta varten"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: nopeutta ei voi asettaa: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: mtabin mukaan %s on jo liitetty pisteeseen %s\n"
@@ -8940,22 +9093,27 @@ msgstr "mount: ei voi liittää %s%s vain luku -tilassa"
 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:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: ei voi liittää %s%s vain luku -tilassa"
+
+#: mount/mount.c:1542
 #, 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:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: ei löytynyt %s – luodaan se..\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s on jo liitetty paikkaan %s\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8965,26 +9123,26 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: tyyppiä ei annettu – kaksoispisteen perusteella sen oletetaan olevan "
 "nfs\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: tyyppiä ei annettu – //-alkuliitteen perusteella sen oletetaan olevan "
 "cifs\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s on jo liitetty paikkaan %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9053,19 +9211,19 @@ msgstr ""
 "Muut valitsimet: [-nfFrsvw] [-o valitsimet] [-p kahva].\n"
 "Paljon lisätietoja komennolla:  man 8 mount .\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: vain root voi tehdä tuon"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "mitään ei liitetty"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: osiota ei löydy"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s ei löydy tiedostosta %s, eikä %s"
@@ -9264,42 +9422,42 @@ msgstr "Et ole pääkäyttäjä.\n"
 msgid "%s: swapoff failed"
 msgstr "%s epäonnistui.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: käännetty ilman tukea valitsimelle -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: ryhmä-id:tä ei voi asettaa: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: käyttäjä-id:tä ei voi asettaa: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: haarauttaminen ei onnistu: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: virheellinen lohkolaite"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ei ole liitettynä"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superlohkoa ei voi kirjoittaa"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9307,112 +9465,122 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ei löydy"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: vaaditaan pääkäyttäjän oikeudet"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: lohkolaitteita ei sallita tiedostojärjestelmässä"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ohjelmaa umount2 ei ole, kokeillaan ohjelmaa umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s on varattu – uudelleenliitettiin vain luku -tilassa\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 "umount: kohteen %s uudelleenliittäminen vain luku -tilassa epäonnistui\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s irrotettu\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: irrotettavien tiedostojärjestelmien listaa ei löydy"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Käyttö: umount [-hV]\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:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektori %d on jo varattu\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektori %d on jo varattu\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Kohdetta ”” ei voi irrottaa\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Yritetään irrottaa %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s ei löytynyt tiedostosta mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ei ole liitetty (mtab-tiedoston mukaan)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s vaikuttaa olevan liitettynä useita kertoja"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s ei ole tiedostossa fstab (etkä ole root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s on ristiriidassa tiedoston fstab kanssa"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: vain %s voi irrottaa laitteen %s paikasta %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: vain root voi tehdä tämän"
 
@@ -9528,7 +9696,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9539,16 +9707,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "laitetta %s ei voi avata"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "käynnistys epäonnistui\n"
@@ -9800,7 +9972,7 @@ msgstr "virheellinen id: %s\n"
 #: sys-utils/ipcrm.c:84
 #, fuzzy, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr "nimeäminen %s -> %s ei onnistu: %s\n"
+msgstr "nimeäminen %s → %s ei onnistu: %s\n"
 
 #: sys-utils/ipcrm.c:99
 #, c-format
@@ -10427,64 +10599,64 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "virheellinen nopeus: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach – %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "virheellinen valitsin"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "virheellinen id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ei ole lohkolaite"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "laitteen %s kokoa ei voi hakea"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Levyasemalla ei voi siirtyä"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "laitetta %s ei voi avata"
@@ -10523,9 +10695,8 @@ msgid "error: uname failed"
 msgstr "virhe: UUID:n jäsennys epäonnistui"
 
 #: sys-utils/lscpu.c:491
-#, fuzzy
 msgid "error: malloc failed"
-msgstr "malloc epäonnistui"
+msgstr "virhe: malloc epäonnistui"
 
 #: sys-utils/lscpu.c:506
 msgid "error: /sys filesystem is not accessable."
@@ -11645,9 +11816,6 @@ msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "odotetaan cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "luettiin %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "luetaan käyttäjätunnus\n"
 
@@ -11687,9 +11855,6 @@ msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "aikaraja = %d, hiljaisuus = %d, uudelleenkäynnistys = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Virhe luettaessa %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "tiedostoa %s ei voitu lukea, eikä dump-ioctl onnistu\n"
 
@@ -11857,9 +12022,6 @@ msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: saatiin virheellinen hp->h_length?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "nfs socket"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -11872,9 +12034,6 @@ msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "käytetään porttia %d nfs-palvelimelle\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs connect"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "tuntematon nfs status -paluuarvo: %d"
 
diff --git a/po/fr.po b/po/fr.po
index a4032cc1..07beaf5a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,4 +1,4 @@
-# Messages fran�ais pour util-linux.
+# Messages fran�ais pour util-linux-ng.
 # Copyright � 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the util-linux-ng package.
 # Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-ng 2.15-rc2\n"
+"Project-Id-Version: util-linux-ng 2.16-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
-"PO-Revision-Date: 2009-04-19 22:13+0100\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
+"PO-Revision-Date: 2009-07-05 22:36+0100\n"
 "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -210,7 +210,7 @@ msgstr "Utilisation : %s [ -n ] p�riph�rique\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -931,7 +931,7 @@ msgstr "impossible d'�valuer par stat() le p�riphique %s"
 msgid "%s is not a block special device"
 msgstr "%s n'est pas un p�riph�rique sp�cial de blocs"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
@@ -1274,7 +1274,7 @@ msgstr "�chec de positionnement durant le test des blocs"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valeurs �tranges dans do_check: probablement un bug\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "�chec de positionnement dans check_blocks"
 
@@ -1345,175 +1345,175 @@ msgstr "abandon de la cr�ation d'un syst�me de fichiers sur � %s �"
 msgid "number of blocks too small"
 msgstr "nombre de blocs trop petit"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Taille de page sp�cifi�e par l'utilisateur erron�e %d\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Utilise la taille de page sp�cifi�e par l'usager %d, au lieu de la valeur "
 "syst�me %d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Taille erron�e d'ent�te de swap, aucune �tiquette n'a �t� �crite.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "L'�tiquette a �t� tronqu�e.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "pas d'�tiquette, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "pas d'uuid\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Usage : %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocs]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "trop de pages corrompues"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "M�moire �puis�e"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "une page corrompue\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu pages corrompues\n"
 
 # disk-utils/mkswap.c:612
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "Impossible de r�initialiser le p�riph�rique d'�change"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 msgid "unable to erase bootbits sectors"
 msgstr "impossible d'effacer le secteur d'amor�age"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr "%s : %s : attention, ne pas effacer les secteurs de d�marrage\n"
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr "        (%s table de partitions d�tect�e). "
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, c-format
 msgid "        on whole disk. "
 msgstr "        tout le disque."
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 "%1$s: attention: option -U ignor�e (les UUID ne sont pas support�s par %1"
 "$s)\n"
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s : ne supporte pas cette version d'espace d'�change %d.\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr "erreur : �chec d'analyse de l'UUID"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: erreur: aucun endroit pour d�finir un espace d'�change ?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 "%s : erreur : taille %llu Ko sup�rieure � la taille du p�riph�rique %llu Ko\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr ""
 "%s: erreur : la zone d'�change (swap) doit �tre au moins de taille %ld Ko\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: AVERTISSEMENT : troncage de la zone d'�change (swap) � %llu Ko\n"
 
 # disk-utils/mkswap.c:566
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: impossible de cr�er une zone d'�change sur \"%s\"\n"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr ""
 "%s: erreur - %s est mont� ; impossible de cr�er une zone d'�change ici.\n"
 
 # disk-utils/mkswap.c:605
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Impossible d'initialiser l'espace d'�change : illisible"
 
 # disk-utils/mkswap.c:606
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Configure l'espace d'�change (swap) en version 1, taille = %llu Ko\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s : %s : impossible d'�crire la page de signature %s"
 
 # disk-utils/mkswap.c:623
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "�chec de la synchronisation du syst�me de fichiers par fsync"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: impossible d'obtenir l'�tiquette du fichier selinux : %s\n"
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr "matchpathcon() inutilisable"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr "impossible de cr�er un nouveau contexte selinux"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr "impossible d'�valuer le contexte selinux"
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: impossible d'�tiqueter de %s en %s: %s\n"
@@ -1527,7 +1527,7 @@ msgstr ""
 "Usage :\n"
 "  %s "
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
@@ -1535,48 +1535,48 @@ msgstr ""
 "Le p�riph. '%s' est un p�riph. de contr�le physique (utiliser raw<N> o� N "
 "est plus grand que z�ro)\n"
 
-#: disk-utils/raw.c:130
+#: disk-utils/raw.c:145
+#, c-format
+msgid "Cannot locate block device '%s' (%s)\n"
+msgstr "Impossible de localiser le p�riph�rique par blocs '%s' (%s)\n"
+
+#: disk-utils/raw.c:151
+#, c-format
+msgid "Device '%s' is not a block dev\n"
+msgstr "'%s' n'est pas un p�riph�rique par blocs\n"
+
+#: disk-utils/raw.c:186
+#, c-format
+msgid "Cannot open master raw device '"
+msgstr "Impossible d'ouvrir le p�riph. physique ma�tre '"
+
+#: disk-utils/raw.c:205
 #, c-format
 msgid "Cannot locate raw device '%s' (%s)\n"
 msgstr "Impossible de localiser le p�riph�rique physique '%s' (%s)\n"
 
-#: disk-utils/raw.c:136
+#: disk-utils/raw.c:211
 #, c-format
 msgid "Raw device '%s' is not a character dev\n"
 msgstr ""
 "Le p�riph�rique physique '%s' n'est pas un p�riph�rique de caract�res\n"
 
-#: disk-utils/raw.c:141
+#: disk-utils/raw.c:216
 #, c-format
 msgid "Device '%s' is not a raw dev\n"
 msgstr "'%s' n'est pas un p�riph�rique physique\n"
 
-#: disk-utils/raw.c:162
-#, c-format
-msgid "Cannot locate block device '%s' (%s)\n"
-msgstr "Impossible de localiser le p�riph�rique par blocs '%s' (%s)\n"
-
-#: disk-utils/raw.c:168
-#, c-format
-msgid "Device '%s' is not a block dev\n"
-msgstr "'%s' n'est pas un p�riph�rique par blocs\n"
-
-#: disk-utils/raw.c:203
-#, c-format
-msgid "Cannot open master raw device '"
-msgstr "Impossible d'ouvrir le p�riph. physique ma�tre '"
-
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr "Erreur d'interrogation du p�riph�rique physique (%s)\n"
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr "p�riph. phys. %d :\t associ� � n� majeur %d, n� mineur %d\n"
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "Erreur de configuration du p�riph. physique (%s)\n"
@@ -6894,16 +6894,6 @@ msgstr ""
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "�chec de ioctl(RTC_EPOCH_SET) vers %s"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr "Usage : %s LABEL=<label>|UUID=<uuid>\n"
-
-#: libs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "impossible de r�soudre '%s'"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -7050,8 +7040,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: �chec de login PAM, fin d'ex�cution : %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Mot de passe: "
 
@@ -7952,6 +7942,16 @@ msgstr "Utilisation : %s [+format] [jour mois ann�e]\n"
 msgid "St. Tib's Day"
 msgstr "Jour de la St. Tib"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr "Usage : %s LABEL=<label>|UUID=<uuid>\n"
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "impossible de r�soudre '%s'"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8477,6 +8477,140 @@ msgstr "Impossible de lire %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM n'est pas d�fini.\n"
 
+#: misc-utils/uuidd.c:46
+#, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr "Utilisation : %s [-d] [-p fichierpid] [-s cheminsocket] [-T timeout]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr "       %s [-r|t] [-n num] [-s socketpath]\n"
+
+#: misc-utils/uuidd.c:50
+#, c-format
+msgid "       %s -k\n"
+msgstr "       %s -k\n"
+
+#: misc-utils/uuidd.c:152
+msgid "bad arguments"
+msgstr "arguments erron�s"
+
+#: misc-utils/uuidd.c:159
+msgid "socket"
+msgstr "socket"
+
+#: misc-utils/uuidd.c:170
+msgid "connect"
+msgstr "connexion"
+
+#: misc-utils/uuidd.c:189
+msgid "write"
+msgstr "�criture"
+
+#: misc-utils/uuidd.c:197
+msgid "read count"
+msgstr "nb de lectures"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr "mauvaise longueur de r�ponse"
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr "d�mon uuidd d�j� en route avec pid %s\n"
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr "Impossible de cr�er un socket de flux unix: %s"
+
+#: misc-utils/uuidd.c:305
+#, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "Association de socket (bind) impossible %s : %s\n"
+
+#: misc-utils/uuidd.c:313
+#, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "Impossible de lire le slot unix (socket) %s : %s\n"
+
+#: misc-utils/uuidd.c:351
+#, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Erreur lecture du client, longueur=%d\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr "op�ration %d, num. entrant = %d\n"
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr "Heure UUID g�n�r�e : %s\n"
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr "Nbr al�atoire UUID g�n�r� : %s\n"
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr "Heure UUID g�n�r�e %s et %d suiv.\n"
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr "%d UUIDs g�n�r�s :\n"
+
+#: misc-utils/uuidd.c:427
+#, c-format
+msgid "Invalid operation %d\n"
+msgstr "Op�ration non valide %d\n"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, c-format
+msgid "Bad number: %s\n"
+msgstr "Nombre non valide : %s\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "Erreur d'appel du d�mon UUIDd (%s) : %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr "%s et %d suivants UUIDs\n"
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr "Liste des UUID : \n"
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr "Longueur de r�ponse serveur inattendue %d\n"
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr "Impossible de tuer l'UUIDd de pid %d : %s\n"
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr "UUIDd de pid %d tu�\n"
+
+#: misc-utils/uuidgen.c:32
+#, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Utilisation : %s [-r] [-t]\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8547,39 +8681,39 @@ msgstr "AVERTISSEMENT: ne peut ouvrir %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: ne peut ouvrir %s - on utilise %s � la place\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "ne peut cr�er le fichier verrou %s: %s (utiliser l'option -n pour l'�craser)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "ne peut lier le fichier verrou %s: %s (utiliser l'option  -n pour l'�craser)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "ne peut ouvrir le fichier verrou %s: %s (utiliser l'option -n pour l'�craser)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Ne peut verrrouiller le fichier verrou %s: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "ne peut verrouiller le fichier verrou %s: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "expiration du d�lai"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8588,83 +8722,88 @@ msgstr ""
 "Ne peut cr�er le lien %s\n"
 "Peut-�tre y-a-t-il un fichier verrouill� en panne?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "ne peut ouvrir %s (%s) - mtab n'est pas � jour"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "erreur d'�criture %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "erreur de changement de mode de %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "erreur de changement de propri�taire de %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "ne peut renommer %s � %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop : impossible de fixer la capacit� p�riph�rique %s : %s\n"
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", d�calage %<PRIu64>"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", taille limite %<PRIu64>"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", cryptage %s (type %<PRIu32>)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", d�calage %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", encryptage type %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: ne peut obtenir les infos sur le p�riph�rique %s: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: ne peut ouvrir le p�riph�rique %s: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: le r�pertoire /dev n'existe pas."
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s : pas de permission pour observer /dev/loop%s<N>"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: ne peut trouver un p�riph�rique de type loop libre"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8674,53 +8813,53 @@ msgstr ""
 "       ne supporte pas le type loop de p�riph�rique? (si oui, recompiler ou "
 "utiliser `modprobe loop')."
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr "M�moire �puis�e lors de la lecture de la phrase secr�te"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "attention : %s est d�j� associ�(e) avec %s\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "attention: %s est prot�g� en �criture, mont� en lecture seule.\n"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Ne peut verrouiller en m�moire, fin d'ex�cution.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "�chec de ioctl LOOP_SET_FD : %s\n"
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu) : succ�s\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): succ�s\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: ne peut d�truire le p�riph�rique %s: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Cette version de mount a �t� compil�e sans support de boucle. SVP "
 "recompiler.\n"
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8729,6 +8868,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8739,11 +8879,12 @@ msgstr ""
 " %1$s -a | --all                      lister les p�riph. utilis�s\n"
 " %1$s -d | --detach <p�riph> [<p�riph.> ...] supprimer\n"
 " %1$s -f | --find                      trouver les p�riph. inutilis�s\n"
+" %1$s -c | --set-capacity <p�riph>         redimensionner\n"
 " %1$s -j | --associated <fichier> [-o <num>]  lister ceux associ�s � "
 "<fichier>\n"
 " %1$s [ options ] {-f|--find|loopdev} <fichier>  configurer\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8775,22 +8916,22 @@ msgstr ""
 " -v | --verbose                   mode verbeux\n"
 "\n"
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "P�riph�rique boucle (loop) : %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "p�riph. boucle perdu (loop)=%s...nouvel essai\n"
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: p�riph�rique occup�"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8822,7 +8963,7 @@ msgstr "mount: selon mtab %s est mont� sur %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: ne peut ouvrir %s en �criture: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: erreur d'�criture %s: %s"
@@ -8842,7 +8983,7 @@ msgstr "mount : impossible de fixer l'id de groupe : %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount : impossible de fixer l'id d'utilisateur : %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ne peut �tablir un relais fork(): %s"
@@ -8873,89 +9014,89 @@ msgstr "       et il semble que c'est un espace de swap\n"
 msgid "       I will try type %s\n"
 msgstr "       Je vais essayer le type %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ressemble � un esapce de swap - n'a pas �t� mont�"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "�chec de mount"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: seul l'usager ROOT peut monter %s sur %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: p�riph�rique de type loop sp�cifi� deux fois"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: type sp�cifi� deux fois"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: escamotage du setup du p�riph�rique de type loop\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount : selon mtab %s est d�j� mont� sur %s en tant que \"loop\""
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: on se pr�pare � utiliser le p�riph�rique de type loop %s\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 "mount : p�riph. r�cup�r� par un autre processus=%s... nouvelle tentative\n"
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount : p�riph. repris par un autre processus=%s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: �chec d'initialisation du p�riph�rique de type loop\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: r�ussite d'initialisation du p�riph�rique de type loop\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s n'a pas �t� rep�r� - on le cr�e..\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: ne peut ouvrir %s: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument � -p ou --pass-fd doit �tre un nombre"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: ne peut ouvrir %s pour ajuster la vitesse"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ne peut initialiser la vitesse: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount : selon mtab %s est d�j� mont� sur %s\n"
@@ -9158,22 +9299,27 @@ msgstr "mount: ne peut monter %s%s en lecture seulement"
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s est prot�g� en �criture mais l'option � -w � a �t� fournie"
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: ne peut monter %s%s en lecture seulement"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s est prot�g� en �criture, on le monte en lecture seulement"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount : media non pr�sent dans %s ...nouvel essai\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: aucun media trouv� dans %s"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9189,26 +9335,26 @@ msgstr ""
 "       acc�der aux fichiers. Pour des d�tails, voir restorecon(8) et mount"
 "(8).\n"
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: aucun type n'a �t� donn� - ja vais assumer nfs en raison du � : �\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: aucun type n'a �t� fourni - je vais assumer cifs en raison du "
 "pr�fixe //\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s est d�j� mont� sur %s\n"
 
 # mount/mount.c:1323
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9278,19 +9424,19 @@ msgstr ""
 "Autres options: [-nfFrsvw] [-o options] [-p descr_fic_mots_passe].\n"
 "Pour plus de d�tails, tapez \"man 8 mount\".\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: seul l'usager ROOT peut faire cela"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "rien n'a �t� mont�"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: pas de telle partition rep�r�e"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: ne peut rep�rer %s dans %s ou %s"
@@ -9494,42 +9640,42 @@ msgstr "Vous n'�tes pas le super-utilisateur (root)."
 msgid "%s: swapoff failed"
 msgstr "%s : �chec de la fonction \"swapoff\""
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compil� sans support pour -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount : impossible de fixer l'id de groupe : %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount : impossible de fixer l'id d'utilisateur : %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: ne peut faire un fork(): %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: p�riph�rique de type bloc invalide"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: n'est pas mont�"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: ne peut �crire sur le super bloc"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9540,111 +9686,121 @@ msgstr ""
 "       (Dans certains cas, des infos sur les processus l'utilisant\n"
 "        sont r�cup�rables par lsof(8) ou fuser(1))"
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: n'a pas �t� trouv�"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: doit �tre le super usager pour utiliser umount"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: p�riph�rique de type bloc non autoris� sur le syst�me de fichiers"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "pas de umount2, tentative avec umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s est occup� - remont� en lecture seulement\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ne peut remonter %s en lecture seulement\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s d�mont�\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ne peut rep�rer la liste des syst�mes de fichiers � d�monter"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
-"Utilisation : umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t type-vfs] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] sp�cial | noeud...\n"
+"Utilisation : umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t typevfs] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] sp�cial | noeud...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, c-format
+msgid "device %s is associated with %s\n"
+msgstr "p�riph�rique %s d�j� associ� avec %s\n"
+
+#: mount/umount.c:472
+#, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "p�riph�rique %s non associ� avec %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Ne peut d�monter \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentative pour d�monter %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr "umount : probl�me � l'analyse de mtab"
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr "umount : impossible de d�monter %s -- %s est mont� au m�me endroit."
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Ne peut rep�rer %s dans mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s n'est pas mont� (selon mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: il semble que %s ait �t� mont� plusieurs fois"
 
-#: mount/umount.c:521
+#: 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 fstab (et vous n'�tes pas l'usager ROOT)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount est en d�saccord avec fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: seul %s peut d�monter %s de %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: seul l'usager ROOT peut ex�cuter la commande"
 
@@ -9779,7 +9935,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9795,7 +9951,8 @@ msgstr ""
 "Options :\n"
 "  -n <classe>      classe (0-7, plus petit=priorit� plus grande)\n"
 "  -c <classe>      classe d'ex�cution\n"
-"                      1: temps r�el, 2: meilleur effort, 3: veille\n"
+"                      0: aucune, 1: temps r�el, 2: meilleur effort, 3: "
+"veille\n"
 "  -t                  ignore les �checs\n"
 "  -h                  cette aide\n"
 "\n"
@@ -9805,16 +9962,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "impossible d'analyser le nombre '%s'"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr "classe ignor�e pour la priorit� \"aucune\""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr "classe de veille sp�cifi�e ignor�e"
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr "mauvaise classe de priorit� %d"
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 msgid "execvp failed"
 msgstr "�chec de \"execvp\""
 
@@ -10715,7 +10876,7 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10724,7 +10885,7 @@ msgstr ""
 "\n"
 "Utilisation : %s [ -dhV78neo12 ] [ -s <vitesse> ] <ldisque> <p�riph�rique>\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10732,50 +10893,50 @@ msgstr ""
 "\n"
 "Noms <ldisque> connus :\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "vitesse non valide : %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ex�cution de \"ldattach\" depuis %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "option non valide"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "discipline (configuration) de ligne non valide : %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s n'est pas une ligne s�rie"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "impossible d'obtenir les attributs du terminal %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "vitesse %d non support�e"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "impossible de sp�cifier les attributs du terminal %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "impossible de sp�cifier la discipline (configuration) de ligne"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "�chec de transformation en d�mon"
 
@@ -11984,9 +12145,6 @@ msgstr "M�moire �puis�e lors de l'accroissement du tampon.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "en attente de cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "lire %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "lecture du nom de login\n"
 
@@ -12023,9 +12181,6 @@ msgstr "M�moire �puis�e lors de l'accroissement du tampon.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "expiration du d�lai = %d, silencieux = %d, r�amor�age = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Erreur de lecture %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "ne peut lire %s et ne peut peut faire un dump via ioctl()\n"
 
@@ -12215,9 +12370,6 @@ msgstr "M�moire �puis�e lors de l'accroissement du tampon.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: a obtenu un hp->h_length erron�?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "socket nfs"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "bindresvport nfs"
 
@@ -12230,9 +12382,6 @@ msgstr "M�moire �puis�e lors de l'accroissement du tampon.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "utilisation du port %d pour le d�mon nfs\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "connexion nfs"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "valeur d'�tat retourn�e nfs inconnue: %d"
 
diff --git a/po/hu.po b/po/hu.po
index 4c66cd4e..be1eba7e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.14-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2008-05-21 18:25+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -203,7 +203,7 @@ msgstr "Használat: %s [-n] eszköz\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -921,7 +921,7 @@ msgstr "a(z) „%s” eszköz nem érhető el"
 msgid "%s is not a block special device"
 msgstr "a(z) %s nem egy speciális blokkos eszköz"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "a(z) %s nem nyitható meg"
@@ -1259,7 +1259,7 @@ msgstr "a pozicionálás meghiúsult a blokkok tesztelése közben"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Szokatlan értékek a do_check-ben: ez valószínűleg hibát jelez\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "a pozicionálás meghiúsult a check_blocks-ban"
 
@@ -1330,173 +1330,173 @@ msgstr "a(z) „%s” eszközön nem történik kísérlet a fájlrendszer létr
 msgid "number of blocks too small"
 msgstr "a blokkok száma túl kicsi"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Hibás felhasználó által megadott lapméret: %d\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "A felhasználó által megadott %d lapméret használata a rendszer %d értéke "
 "helyett\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "A swap fejlécmérete hibás, nem került kiírásra címke.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "A címke csonkítva.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "nincs címke, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "nincs uuid\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Használat: %s [-c] [-v0|-v1] [-pLAPMÉRET] [-L címke] [-U UUID] /dev/név "
 "[blokkok]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "túl sok hibás lap"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Nincs elég memória"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "egy hibás lap\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu hibás lap\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "nem lehet visszaállítani a lapozóterület-eszközt"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "a rendszerindító szektort nem lehet törölni"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   BSD partíciós tábla kiírása"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   a teljes lemezcímke mutatása"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 "%1$s: figyelmeztetés: a -U figyelmen kívül marad (a(z) %1$s nem támogatja az "
 "UUID-ket)\n"
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: hiba: a(z) %d verziószám ismeretlen\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr "hiba: az UUID feldolgozás meghiúsult"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s hiba: Nem állítja be sehová a lapozóterületet?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: hiba: a(z) %lu KiB méret nagyobb mint az eszköz %lu KiB mérete\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s hiba: a lapozóterületnek legalább %ld KiB méretűnek kell lennie\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: figyelmeztetés: a lapozóterület %ld KiB méretre lesz csonkítva\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr ""
 "%s: hiba: a lapozóeszköz létrehozására nem történik kísérlet a(z) „%s” "
 "eszközön\n"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr ""
 "%s: hiba: a(z) %s csatolva van, a lapozóterület nem kerül létrehozásra.\n"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "A lapozóterület nem állítható be: olvashatatlan"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "%d verziójú lapozóterület beállítása, mérete: %llu kiB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: nem lehet írni az aláíráslapra: %s"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "az fsync meghiúsult"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: a selinux fájlcímke nem kérhető le: %s\n"
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr "nem hajtható végre a matchpathcon() hívás"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr "nem hozható létre új selinux kontextus"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr "nem számítható ki a selinux kontextus"
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: %s nem címkézhető át (erre: %s): %s\n"
@@ -1508,53 +1508,53 @@ msgid ""
 "  %s "
 msgstr "Használat:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "a(z) „%s” eszköz nem érhető el"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: nem egy karaktereszköz"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s nem soros vonal"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Nem lehet zárolni a(z) %s zárolási fájlt: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Figyelmeztetés: a(z) %s nem blokkeszköz\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "a(z) „%s” eszköz nem érhető el"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "a(z) „%s” eszköz nem érhető el"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: nem egy karaktereszköz"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s nem soros vonal"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "hiba a szolgáltatás leállításakor: „%s”"
@@ -6775,16 +6775,6 @@ msgstr "A rendszermag %s eszközmeghajtójában nincs RTC_EPOCH_SET ioctl.\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "a(z) %s ioctl(RTC_EPOCH_SET) hívása meghiúsult"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "%s nem nyitható meg"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6933,8 +6923,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: jelszó-hitelesítési (PAM) hiba, megszakítva: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Jelszó: "
 
@@ -7838,6 +7828,16 @@ msgstr "Használat: %s [+formátum] [nap hónap év]\n"
 msgid "St. Tib's Day"
 msgstr "Szent Tib napja"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "%s nem nyitható meg"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8354,6 +8354,146 @@ msgstr "Nem olvasható a következő: %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: A $TERM nincs megadva.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+"Használat: last [-#] [-f fájl] [-t terminál] [-h gépnév] [felhasználó ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ jelzés ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: hibás -l kapcsoló: %s.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "Blokkméret: %d\n"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "n.szám"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Kiírás"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "időtúllépés"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "%s nem nyitható meg: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "%s nem nyitható meg: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "érvénytelen kapcsoló"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: hibás érték\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "hiba a(z) %s módjának módosításakor: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8425,42 +8565,42 @@ msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 "mount: a(z) %s nem nyitható meg - helyette a(z) %s kerül felhasználásra\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "a(z) %s zárolási fájl nem hozható létre: %s (használja a -n kapcsolót a "
 "felülbíráláshoz)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "a(z) %s zárolási fájlra nem hozható létre link: %s (használja a -n kapcsolót "
 "a felülbíráláshoz)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "a(z) %s zárolási fájl nem nyitható meg: %s (használja a -n kapcsolót a "
 "felülbíráláshoz)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Nem lehet zárolni a(z) %s zárolási fájlt: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Nem lehet zárolni a(z) %s zárolási fájlt: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "időtúllépés"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8469,83 +8609,88 @@ msgstr ""
 "Nem lehet létrehozni a(z) %s linket\n"
 "Lehet, hogy egy elárvult a zárolási fájl miatt?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "nem nyitható meg a(z) %s fájl (%s) - az mtab nem frissült"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "hiba a(z) %s írásakor: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "hiba a(z) %s módjának módosításakor: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "hiba a(z) %s tulajdonosának módosításakor: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s nem nevezhető át %s névre: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: nem kaphatók információk a(z) %s eszközről: %s\n"
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", eltolás: %<PRIu64>"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", méretkorlát: %<PRIu64>"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", %s titkosítás (típus: %<PRIu32>)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", eltolás: %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", titkosítástípus: %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: nem kaphatók információk a(z) %s eszközről: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: nem nyitható meg a(z) %s eszköz: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: a /dev könyvtár nem létezik."
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: nincs jogosultsága a /dev/loop# megjelenítéséhez"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: nem található szabad hurokeszköz"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8555,54 +8700,54 @@ msgstr ""
 "       ismeri a hurokeszközt?. (fordítsa újra a rendszermagot vagy\n"
 "       adja ki a „modprobe loop” parancsot.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Elfogyott a memória a puffer növelésekor.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "figyelmeztetés: a(z) %s már társítva van a következőhöz: %s\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: a(z) %2$s%1$s írásvédett, csatolás csak olvashatóként"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Nem lehet zárolni a memóriába, kilépés.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "A LOOP_SET_FD ioctl meghiúsult: %s\n"
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): siker\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): siker\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: nem törölhető a(z) %s eszköz: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Ez a „mount” parancs hurokeszköz-támogatás nélkül lett lefordítva. Fordítsa "
 "újra.\n"
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8611,6 +8756,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8625,7 +8771,7 @@ msgstr ""
 "felsorolása\n"
 " %1$s [ kapcsolók ] {-f|--find|hurokeszköz} fájl   beállítás\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8653,23 +8799,23 @@ msgstr ""
 " -v | --verbose            részletes mód\n"
 "\n"
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: nem nyitható meg a(z) %s eszköz: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 "mount: a(z) %s hurokeszközt egy másik folyamat ellopta... újrapróbálom\n"
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "mount: a(z) %s foglalt"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8701,7 +8847,7 @@ msgstr "mount: az mtab alapján a(z) %s a következő alá van csatolva: %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: a(z) %s nem nyitható meg írásra: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: hiba a(z) %s írásakor: %s"
@@ -8721,7 +8867,7 @@ msgstr "mount: nem állítható be a csoportazonosító: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: nem állítható be a felhasználóazonosító: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: nem indítható a program: %s"
@@ -8752,91 +8898,91 @@ msgstr "      és úgy tűnik, ez egy lapozóterület\n"
 msgid "       I will try type %s\n"
 msgstr "      Kísérlet a(z) %s típussal\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s lapozóterületnek tűnik - nem került csatolásra"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "a csatolás meghiúsult"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: csak a rendszergazda csatolhatja a(z) %s eszközt a(z) %s helyre"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: a hurokeszközt kétszer adta meg"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: a típust kétszer adta meg"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: a hurokeszköz beállításának kihagyása\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 "mount: az mtab alapján a(z) %s már csatolva van hurokeszközként a "
 "következőn: %s"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: a(z) %s hurokeszköz kerül felhasználásra\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 "mount: a(z) %s hurokeszközt egy másik folyamat ellopta... újrapróbálom\n"
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: a(z) %s hurokeszközt egy másik folyamat ellopta"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: a hurokeszköz beállítása meghiúsult\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: a hurokeszköz beállítása sikerült\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nem található a(z) %s - létrehozás...\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: a(z) %s nem nyitható meg: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: a -p vagy --pass-fd argumentumának számnak kell lennie"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: a(z) %s nem nyitható meg a sebesség beállításához"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: nem állítható be a sebesség: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: az mtab alapján a(z) %s már csatolva van a következőn: %s\n"
@@ -9035,23 +9181,28 @@ msgstr "mount: a(z) %2$s%1$s nem csatolható írásvédettként"
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: a(z) %2$s%1$s írásvédett, de megadásra került a „-w” kapcsoló"
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: a(z) %2$s%1$s nem csatolható írásvédettként"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: a(z) %2$s%1$s írásvédett, csatolás csak olvashatóként"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr ""
 "mount: a(z) %s hurokeszközt egy másik folyamat ellopta... újrapróbálom\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: a(z) %s már csatolva van a(z) %s alá\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9061,24 +9212,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: nem adott meg típust - a kettőspont miatt nfs típust feltételezek\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: nem adott meg típust - a // előtag miatt cifs típust feltételezek\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: a(z) %s már csatolva van a(z) %s alá\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9154,19 +9305,19 @@ msgstr ""
 "Egyéb kapcsolók: [-nfFrsvw] [-o kapcsolók].\n"
 "További információkért adja ki a „man 8 mount” parancsot.\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: ezt csak a rendszergazda teheti meg"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "semmi nem lett csatolva"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: nincs ilyen partíció"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: a(z) %s nem található a(z) %s vagy a(z) %s alatt"
@@ -9376,42 +9527,42 @@ msgstr "Nem rendszergazda.\n"
 msgid "%s: swapoff failed"
 msgstr "%s meghiúsult.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: a program a -f kapcsoló támogatása nélkül lett lefordítva\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: nem állítható be a csoportazonosító: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: nem állítható be a felhasználóazonosító: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: nem indítható program: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s érvénytelen blokkeszköz"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s nincs csatolva"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s szuperblokkja nem írható"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9422,112 +9573,122 @@ msgstr ""
 "        (Egyes esetekben az eszközt használó folyamatokról hasznos\n"
 "         információkat talál az lsof(8) vagy fuser(1))"
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s nem található"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s leválasztásához rendszergazdai jog szükséges"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: a blokkeszközök nem engedélyezettek ezen a fájlrendszeren (%s)"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nem található az umount2, kísérlet az umount használatára...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: a(z) %s foglalt - újracsatolva csak olvashatóként\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: nem csatolható újra csak olvashatóként a következő: %s\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s leválasztva\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: nem található a leválasztandó fájlrendszerek listája"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Használat: umount [-hV]\n"
 "           umount -a [-f] [-r] [-n] [-v] [-t fájlrendszertípus] [-O "
 "kapcsolók]\n"
 "           umount [-f] [-r] [-n] [-v] speciális | csomópont...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "figyelmeztetés: a(z) %s már társítva van a következőhöz: %s\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "figyelmeztetés: a(z) %s már társítva van a következőhöz: %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Nem választható le: „”\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Kísérlet a következő leválasztására: %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "A(z) %s nem található az mtab fájlban\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: a(z) %s nincs csatolva (az mtab fájl alapján)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: úgy tűnik, hogy a(z) %s többször került csatolásra"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: a(z) %s nincs az fstab fájlban (és Ön nem rendszergazda)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: a(z) %s csatolás nem egyezik az fstab tartalmával"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 "umount: csak a(z) %s felhasználó választhatja le a(z) %s eszközt a(z) %s alól"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: ezt csak a rendszergazda teheti meg"
 
@@ -9643,7 +9804,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9654,16 +9815,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "a(z) %s nem nyitható meg"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "a végrehajtás meghiúsult\n"
@@ -10557,7 +10722,7 @@ msgstr "z.szám"
 msgid "pid"
 msgstr "f.az"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10566,7 +10731,7 @@ msgstr ""
 "\n"
 "Használat: %s [ -dhV78neo12 ] [ -s <sebesség> ] <llemez> <eszköz>\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10574,51 +10739,51 @@ msgstr ""
 "\n"
 "Ismert <llemez> nevek:\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "érvénytelen sebesség: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach innen: %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "érvénytelen kapcsoló"
 
 # fixme: mi ez?
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "érvénytelen sorelv: %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s nem soros vonal"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "a(z) %s terminálattribútumai nem kérhetők le"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "a sebesség (%d) nem támogatott"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "a(z) %s terminálattribútumai nem állíthatók be"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "nem állítható be a sorelv"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "nem démonizálható"
 
diff --git a/po/id.po b/po/id.po
index fa1f70d5..dbade960 100644
--- a/po/id.po
+++ b/po/id.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.15-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2009-04-20 09:00+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -206,7 +206,7 @@ msgstr "penggunaan: %s [ -n ] perangkat\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -915,7 +915,7 @@ msgstr "tidak dapat memperoleh statistik perangkat %s"
 msgid "%s is not a block special device"
 msgstr "%s bukan sebuah perangkat block spesial"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "tidak dapat membuka %s"
@@ -1253,7 +1253,7 @@ msgstr "seek gagal selama pengetesan blocks"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Nilai aneh dalam do_check: mungkin bugs\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "seek gagal dalam check_blocks"
 
@@ -1323,166 +1323,166 @@ msgstr "tidak akan mencoba untuk membuat filesystem pada '%s'"
 msgid "number of blocks too small"
 msgstr "Jumlah dari blok terlalu kecil"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Ukuran page %d yang dispesifikasikan pengguna tidak baik\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Menggunakan ukuran page %d yang dispesifikasikan pengguna, dari pada "
 "menggunakan ukuran system %d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Ukuran swap header tidak baik, label tidak akan ditulis.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Label telah dipotong.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "tidak terdapat label, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "tidak ada uuid\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Penggunaan: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blok]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "terlalu banyak pages yang buruk"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Kekurangan memory"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "sebuah page buruk\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu page buruk\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "tidak dapat merewind perangkat swap"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 msgid "unable to erase bootbits sectors"
 msgstr "tidak dapat menghapus sektor bootbits"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr "%s: %s: peringatan: jangan hapus sektor bootbits\n"
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr "        (%s tabel partisi terdeteksi). "
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, c-format
 msgid "        on whole disk. "
 msgstr "        diseluruh disk. "
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr "%1$s: peringatan: mengabaikan -U (UUIDs tidak didukung oleh %1$s)\n"
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: tidak mendukung versi swapsapce %d.\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr "error: UUID parsing gagal"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: error: Tidak ada tempat untuk menset swap?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 "%s: error: ukuran %llu KiB lebih besar dari ukuran perangkat %llu KiB\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: error: daerah swap membutuhkan setidaknya %ld kiB\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: peringatan: memotong daerah swap menjadi %llu kiB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: error: Tidak akan mencoba untuk membuat perangkat swap di '%s'\n"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: error: %s ter-mount; tidak akan membuat swapspace.\n"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Tidak dapat men set-up swap-space: tidak dapat dibaca"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Membuat swapspace versi 1, ukuran = %llu kiB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: tidak dapat menulis page signature: %s"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync gagal"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: tidak dapat memperoleh selinux file label: %s\n"
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr "tidak dapat melakukan matchpathcon()"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr "tidak dapat membuat context selinux baru"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr "tidak dapat menentukan context selinux"
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: tidak dapat mengganti nama %s menjadi %s: %s\n"
@@ -1496,7 +1496,7 @@ msgstr ""
 "Penggunaan:\n"
 "  %s "
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
@@ -1504,47 +1504,47 @@ msgstr ""
 "Perangkat '%s' adalah perangkat kontrol raw (gunakan raw<N> dimana <N> lebih "
 "besar dari nol)\n"
 
-#: disk-utils/raw.c:130
-#, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "tidak dapat mengalokasikan perangkat raw '%s' (%s)\n"
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "Perangkat raw '%s' bukan sebuah perangkat karakter\n"
-
-#: disk-utils/raw.c:141
-#, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "Perangkat '%s' bukan sebuah perangkat raw\n"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Tidak dapat melokasikan perangkat blok '%s' (%s)\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Perangkat '%s' bukan sebuah perangkat blok\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, c-format
 msgid "Cannot open master raw device '"
 msgstr "Tidak dapat membuka perangkat master raw '"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "tidak dapat mengalokasikan perangkat raw '%s' (%s)\n"
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "Perangkat raw '%s' bukan sebuah perangkat karakter\n"
+
+#: disk-utils/raw.c:216
+#, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "Perangkat '%s' bukan sebuah perangkat raw\n"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr "Error menanyakan perangkat raw (%s)\n"
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr "raw%d:\tterikat ke major %d, minor %d\n"
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "Error mengkonfigurasi perangkat raw (%s)\n"
@@ -6777,16 +6777,6 @@ msgstr "Kernel device driver untuk %s tidak memiliki ioctl RTC_EPOCH_SET.\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) ke %s gagal"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr "Penggunaan: %s LABEL=<nama>|UUID=<uuid>\n"
-
-#: libs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "tidak dapat menentukan '%s'"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6931,8 +6921,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM Gagal, membatalkan: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Password: "
 
@@ -7832,6 +7822,16 @@ msgstr "penggunaan: %s [+format] [hari bulan tahun]\n"
 msgid "St. Tib's Day"
 msgstr "St. Tib's Day"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr "Penggunaan: %s LABEL=<nama>|UUID=<uuid>\n"
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "tidak dapat menentukan '%s'"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8356,6 +8356,147 @@ msgstr "Tidak dapat membaca %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM tidak didefinisikan.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+"penggunaan: last [-#] [-f file] [-t tty] [-h hostname] [pengguna ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ signal ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: argumen %s untuk pilihan -l tidak baik.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "nfs socket"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "nfs terhubung"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Tulis"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "membaca %c\n"
+
+#: misc-utils/uuidd.c:203
+#, fuzzy
+msgid "bad response length"
+msgstr "panjang nama berkas buruk"
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "Tidak dapat membuka %s: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "Tidak dapat membuka %s: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Error dalam membaca %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "pilihan tidak valid"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: angka buruk: %s\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "error mengubah mode dari %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Penggunaan: %s [pilihan]\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8426,42 +8567,42 @@ msgstr "peringatan: tidak dapat membuka %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: tidak dapat membuka %s - menggunakan %s\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "tidak dapat membuat file kunci %s: %s (gunakan pilihan -n untuk memaksa "
 "menjalankan)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "tidak dapat menlink file kunci %s: %s (gunakan pilihan -n untuk memaksa "
 "menjalankan)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "tidak dapat membuka file kunci %s: %s (gunakan pilihan -n untuk memaksa "
 "menjalankan)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Tidak dapat mengunci file kunci %s: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "tidak dapat mengunci file kunci %s: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "waktu habis"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8470,83 +8611,88 @@ msgstr ""
 "Tidak dapt membuat link %s\n"
 "Mungkin disana ada sebuah file kunci yang masih ada?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "tidak dapat membuka %s (%s) - mtab tidak diupdate"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "error menulis %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "error mengubah mode dari %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "error mengubah kepemilikan dari %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "tidak dapat mengganti nama %s menjadi %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: tidak dapat memperoleh info di perangkat %s: %s\n"
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", offset %<PRIu64>"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", sizelimit %<PRIu64>"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", enkripsi %s (tipe %<PRIu32>)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", offset %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", encryption type %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: tidak dapat memperoleh info di perangkat %s: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: tidak dapat membuka perangkat %s: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: /dev direktori tidak ada."
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: tidak ada ijin untuk melihat di /dev/loop%s<N>"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: tidak dapat menemukan perangkat loop yang tidak dipakai"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8556,53 +8702,53 @@ msgstr ""
 "mengetahui\n"
 "    mengenai perangkat loop? (Jika demikian, recompile atau `modprobe loop'.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr "Kehabisan memori ketika membaca kata sandi"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "peringatan: %s sudah diasosiasikan dengan %s\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "peringatan: %s: memiliki proteksi untuk ditulis, menggunakan baca-saja.\n"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Tidak dapat mengunci ke memory, keluar.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD gagal: %s\n"
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu, %llu): berhasil\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): berhasil\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: tidak dapat menghapus perangkat %s: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Mount ini telah dikompile tanpa layanan loop. Tolong di rekompile.\n"
 
-#: mount/lomount.c:875
-#, c-format
+#: mount/lomount.c:888
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage:\n"
@@ -8610,6 +8756,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8624,7 +8771,7 @@ msgstr ""
 "<berkas>\n"
 " %1$s [ pilihan ] {-f|--find|loopdev} <berkas> konfigurasi\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8652,22 +8799,22 @@ msgstr ""
 " -v | --verbose           mode verbose\n"
 "\n"
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Perangkat loop adalah %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "tercuri loop=%s ...mencoba lagi\n"
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: perangkat sedang sibuk"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Layanan loop tidak ada pada waktu dikompile. Tolong di rekompile.\n"
@@ -8697,7 +8844,7 @@ msgstr "mount: menurut mtab, %s telah di mount di %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: tidak dapat membuka %s untuk menulis: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: error dalam menulis %s: %s"
@@ -8717,7 +8864,7 @@ msgstr "mount tidak dapat menset grup id: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: tidak dapat menset id pengguna: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: tidak dapat melakukan fork: %s"
@@ -8748,88 +8895,88 @@ msgstr "       dan ini sepertinya merupakan sebuah swapspace\n"
 msgid "       I will try type %s\n"
 msgstr "       Saya akan mencoba tipe %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s kelihatannya seperti swapspace - tidak di mount"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "mount gagal"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: hanya root yang dapat melakukan mount %s di %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: perangkat loop dispesifikasikan dua kali"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: tipe dispesifikasikan dua kali"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: melewatkan setup dari perangkat loop\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: menurut mtab, %s telah dimount di %s sebagai loop"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: akan menggunakan perangkat loop %s\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr "mount: tercuri loop=%s ...mencoba lagi\n"
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: tercuri loop=%s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: gagal menset-up perangkat loop\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: setup perangkat loop telah berhasil\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s tidak ditemukan - membuatnya..\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: tidak dapat membuka %s: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument untuk -p atau --pass-fd harus berupa sebuah nomor"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: tidak dapat membuka %s untuk menset kecepatan"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount tidak dapat menset kecepatan: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: menurut mtab, %s telah dimount di %s\n"
@@ -9034,22 +9181,27 @@ msgstr ""
 "mount: %s%s memiliki proteksi untuk ditulis tetapi secara eksplisit pilihan "
 "`-w' diberikan"
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: tidak dapat me-mount %s%s hanya-baca"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s memiliki proteksi untuk ditulis, memount secara hanya-baca"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: tidak ada media ditemukan di %s ...mencoba lagi\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: tidak ada media ditemukan di %s"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9066,26 +9218,26 @@ msgstr ""
 "       sistem berkas ini. Untuk lebih lengkapnya lihat restorecon(8) dan "
 "mount(8).\n"
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: tipe tidak diberikan - Saya akan mengasumsikan nfs karena adanya "
 "colon\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: tipe tidak diberikan - Saya akan mengasumsikan cifs karena adanya "
 "awalan //\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s telah dimount di %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9157,19 +9309,19 @@ msgstr ""
 "uuid. Pilihan lain: [-nfFrsvw] [-o pilihan] [-p passwdfd].\n"
 "Untuk informasi lebih detail, lihat man 8 mount.\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: hanya root yang dapat melakukan itu"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "tidak ada yang telah dimount"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: partisi seperti itu tidak ditemukan"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: tidak dapat menemukan %s dalam %s atau %s"
@@ -9370,42 +9522,42 @@ msgstr "Bukan superuser."
 msgid "%s: swapoff failed"
 msgstr "%s: gagal swapoff"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: dikompilasi tanpa disupport untuk -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: tidak dapat menset id grup: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: tidak dapat menset id pengguna: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: tidak dapat melakukan fork: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: perangkat block tidak valid"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: tidak dimount"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: tidak dapat menulis superblock"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9417,110 +9569,120 @@ msgstr ""
 "digunakan\n"
 "         oleh perangkat dapat ditemukan oleh lsof(8) atau fuser(1))"
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: tidak ditemukan"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: harus superuser untuk melakukan umount"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: perangkat block tidak diijinkan di fs"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "tidak ada umount2, mencoba umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s sibuk - di mount lagi secara hanya-baca\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: tidak dapat melakukan mount %s secara hanya-baca\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s sudah tidak dimount\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: tidak dapat mencari daftar dari filesystems untuk di unmount"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Penggunaan: umount [-hV]\n"
 "            umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "            umount [-f] [-r] [-n] [-v] special | titik...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "peringatan: %s sudah diasosiasikan dengan %s\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "peringatan: %s sudah diasosiasikan dengan %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Tidak dapat umount \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Mencoba untuk umount %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr "umount: bingung ketika menganalisa mtab"
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr "umount: tidak dapat umount %s -- %s telah dipasang di titik yang sama."
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Tidak dapat mencari %s dalam mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s tidak di mount (menurut catatan di mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: kelihatannya %s telah di mount beberapa kali"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s tidak ada dalam fstab (dan anda bukan root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount tidak cocok dengan catatan di fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: hanya %s yang dapat unmount %s dari %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: hanya root yang dapat melakukan itu"
 
@@ -9644,7 +9806,7 @@ msgid "ioprio_set failed"
 msgstr "ioprio_set gagal"
 
 #: schedutils/ionice.c:81
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "ionice - sets or gets process io scheduling class and priority.\n"
@@ -9656,7 +9818,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9682,16 +9844,21 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "tidak dapat mendapatkan angka '%s'"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+#, fuzzy
+msgid "ignoring given class data for none class"
+msgstr "mengabaikan data kelas yang diberikan untuk kelas kosong"
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr "mengabaikan data kelas yang diberikan untuk kelas kosong"
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr "prioritas kelas %d buruk"
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 msgid "execvp failed"
 msgstr "gagal eksekusi"
 
@@ -10587,7 +10754,7 @@ msgstr "zcound"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10596,7 +10763,7 @@ msgstr ""
 "\n"
 "Penggunaan: %s [ -dhV78neo12 ] [ -s <kecepatan> ] <ldisc> <perangkat>\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10604,50 +10771,50 @@ msgstr ""
 "\n"
 "Nama <ldisc> dikenal:\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "kecepatan tidak valid: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach dari %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "pilihan tidak valid"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "baris disiplin tidak valid: %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s bukan sebuah baris serial"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "tidak dapat memperoleh atribut terminal %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "kecepatan %d tidak didukung"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "tidak dapat menset atribut terminal untuk %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "Tidak dapat menset baris disiplin"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "tidak dapat daemonize"
 
@@ -11841,9 +12008,6 @@ msgstr "Kehabisan memori ketika meningkatkan buffer.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "menunggu untuk cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "membaca %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "membaca nama login\n"
 
@@ -11880,9 +12044,6 @@ msgstr "Kehabisan memori ketika meningkatkan buffer.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Error dalam membaca %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "tidak dapat membaca %s, dan tidak dapat melakukan ioctl dump\n"
 
@@ -12065,9 +12226,6 @@ msgstr "Kehabisan memori ketika meningkatkan buffer.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: memperoleh hp->h_length yang buruk?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "nfs socket"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -12080,9 +12238,6 @@ msgstr "Kehabisan memori ketika meningkatkan buffer.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "menggunakan port %d untuk nfs daemon\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs terhubung"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "nilai status balik nfs tidak diketahui: %d"
 
diff --git a/po/it.po b/po/it.po
index 468739f5..5f00ed35 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2008-04-18 13:44+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -202,7 +202,7 @@ msgstr "Uso:  %s [ -n ] dispositivo\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -923,7 +923,7 @@ msgstr "impossibile eseguire stat sul dispositivo %s"
 msgid "%s is not a block special device"
 msgstr "%s non è un dispositivo speciale a blocchi"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "impossibile aprire %s"
@@ -1239,7 +1239,7 @@ msgstr "ricerca non riuscita durante il controllo dei blocchi"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valori strani in do_check: probabilmente sono presenti dei bug\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "ricerca in check_blocks non riuscita"
 
@@ -1311,171 +1311,171 @@ msgstr "non si tenterà di creare un filesystem su '%s'"
 msgid "number of blocks too small"
 msgstr "Numero di settori"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "dimensione pagina %d specificata dall'utente non corretta\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Utilizzo la dimensione pagina %d specificata dall'utente, al posto del "
 "valore di sistema %d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "L'etichetta è stata troncata.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "nessuna etichetta, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "nessun uuid\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Uso: %s [-c] [-v0|-v1] [-pDIMPAGINA] [-L etichetta] /dev/nome [blocchi]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "troppe pagine danneggiate"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "una pagina danneggiata\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu pagine danneggiate\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "impossibile riavvolgere il dispositivo swap"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "impossibile cancellare il settore di boot"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   stampa della tabella delle partizioni BSD"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   visualizzazione del disklabel completo"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: errore: versione sconosciuta %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Errore durante la chiusura del file\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: errore: non è possibile impostare swap in nessuna posizione?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 "%s: errore: la dimensione %lu è maggiore di quella del dispositivo %lu\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: errore: l'area di swap deve equivalere almeno a %ldkB\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: attenzione: troncamento area swap a %ldkB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: errore: Non si cercherà di creare uno swapdevice su '%s'\n"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: errore: %s è montata; qui non verrà creato uno spazio di swap.\n"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Impossibile impostare lo spazio-swap: non leggibile"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Impostazione spazio di swap versione %d, dimensione = %llu kB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "impossibile scrivere sulla pagina di firma"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync non riuscito "
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr "impossibile fare matchpathcon()"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr "impossibile creare un nuovo contesto selinux"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: impossibile rinominare %s in %s: %s\n"
@@ -1487,53 +1487,53 @@ msgid ""
 "  %s "
 msgstr "Uso:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "impossibile eseguire stat sul dispositivo %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: non è un dispositivo di caratteri"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s non è un dispositivo speciale a blocchi"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Impossibile fare il lock del file di lock %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Attenzione: %s non è un dispositivo a blocchi\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "impossibile eseguire stat sul dispositivo %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "impossibile eseguire stat sul dispositivo %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: non è un dispositivo di caratteri"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s non è un dispositivo speciale a blocchi"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "errore fermando il servizio \"%s\""
@@ -6751,16 +6751,6 @@ msgstr ""
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "Non riuscito ioctl(RTC_EPOCH_SET) su %s"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "impossibile aprire %s"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6907,8 +6897,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "chsh: errore PAM, interruzione in corso: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Password: "
 
@@ -7808,6 +7798,16 @@ msgstr "Uso: %s [+formato] [giorno mese anno]\n"
 msgid "St. Tib's Day"
 msgstr "Giorno di S.Tiberio"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "impossibile aprire %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8324,6 +8324,145 @@ msgstr "Impossibile aprire %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM non è definito.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr "Uso: last [-#] [-f file] [-t tty] [-h hostname] [utente ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ segnale ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: argomento -l non valido per %s.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "nfs socket"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "nfs connect"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Scrivi"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "lettura di %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "Impossibile aprire %s: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "Impossibile aprire %s: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Errore durante la lettura di %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "id non valido"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: valore non valido\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "errore durante il cambiamento della modalità di %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Uso: %s [opzioni] dispositivo...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8394,38 +8533,38 @@ msgstr "attenzione: impossibile aprire %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: impossibile aprire %s - si sta utilizzando al suo posto %s\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "impossibile creare un file di lock %s: %s (usare il flag -n per cambiare)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "impossibile collegare il file di lock %s: %s  (usare il flag -n per cambiare)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr "impossibile aprire il file di lock %s: %s (usare flag -n per cambiare)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Impossibile fare il lock del file di lock %s: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "impossibile fare il lock del file di lock %s: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "scaduto"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8434,85 +8573,90 @@ msgstr ""
 "Impossibile creare il collegamento %s\n"
 "Forse c'è un vecchio file di lock?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "impossibile aprire %s (%s) - mtab non aggiornato"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "errore durante la scrittura di %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "impossibile rinominare %s in %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: impossibile ottenere informazioni sul device %s: %s\n"
+
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", offset %d"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", cifratura %s (tipo %d)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", offset %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", tipo di cifratura %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, 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:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: impossibile aprire il device %s: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: l'utente \"%s\" non esiste.\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
 # FIXME
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: impossibile trovare un loop device libero"
 
 # FIXME: loop device
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8522,52 +8666,52 @@ msgstr ""
 "       non è a conoscenza del loop device (se è questo il caso,\n"
 "       occorre ricompilare o eseguire \"modprobe loop\")."
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Il settore %d è già allocato\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s è protetto da scrittura, viene montato in sola lettura"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): riuscito\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): riuscito\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: impossibile eliminare il device %s: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Questo mount è stato compilato senza supporto per loop. Ricompilare.\n"
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8576,12 +8720,13 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8597,22 +8742,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: impossibile aprire il device %s: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: device occupato"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8642,7 +8787,7 @@ msgstr "mount: secondo mtab, %s è montato su %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: impossibile aprire %s in scrittura: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: errore durante la scrittura di %s: %s"
@@ -8662,7 +8807,7 @@ msgstr "mount: impossibile impostare l'id di gruppo: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: impossibile impostare l'id utente: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: impossibile effettuare il fork: %s"
@@ -8692,88 +8837,88 @@ msgstr "      e sembra che questo sia swapspace\n"
 msgid "       I will try type %s\n"
 msgstr "      Proverò il tipo %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s assomigla a swapspace - non montato"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "mount non riuscito"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: solamente root può montare %s su %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: loop device specificato due volte"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: tipo specificato due volte"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: si ignora l'impostazione di un loop device\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: secondo mtab, %s è già montato su %s"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, 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:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: mancata impostazione del loop device\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: impostazione del loop device riuscita\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nessun %s trovato - creazione in corso...\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: impossibile aprire %s: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: l'argomento di -p o --pass-fd deve essere un numero"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: impossibile aprire %s per impostare la velocità"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: impossibile impostare la velocità: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: secondo mtab, %s è già montato su %s\n"
@@ -8967,22 +9112,27 @@ msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s è protetto da scrittura, ma l'opzione '-w' è stata indicata"
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: impossibile montare %s%s in sola lettura"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s è protetto da scrittura, viene montato in sola lettura"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: nessun %s trovato - creazione in corso...\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s già montato su %s\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8992,23 +9142,23 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: non è stato dato il tipo - Si presume nfs perché ci sono i due punti\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: non è stato dato il tipo - Si assume cifs per il prefisso //\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s già montato su %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9045,19 +9195,19 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: è possibile solo per root"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "non è stato montato niente"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: non si è trovata tale partizione"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: impossibile trovare %s in %s o %s"
@@ -9238,42 +9388,42 @@ msgstr "Non superutente.\n"
 msgid "%s: swapoff failed"
 msgstr "%s non riuscito.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilato senza supporto per -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: impossibile impostare l'id di gruppo: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: impossibile impostare l'id utente: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: impossibile fare il fork: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo di blocchi non valido"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: non montato"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: impossibile scrivere superblock"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9281,110 +9431,120 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: non trovato"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: bisogna essere superuser per eseguire umount"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: i dispositivi di blocchi non sono permessi su fs"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nessun umount2, tentativo di umount in corso...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s occupato - rimontato sola lettura\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: impossibile rimontare %s di sola lettura\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "eseguito umount di %s\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: impossibile trovare l'elenco dei filesystem da smontare"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Uso: umount [-hV]\n"
 "     umount -a [-f] [-r] [-n] [-v] [-t tipofs] [-O opzioni]\n"
 "     umount [-f] [-r] [-n] [-v] speciale | nodo...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Il settore %d è già allocato\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Il settore %d è già allocato\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Impossibile smontare \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentativo di eseguire umount di %s in corso\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Impossibile trovare %s in mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s non è montato (secondo mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: sembra che %s sia stato montato diverse volte"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s non si trova in fstab (e non si è root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount non coerente con fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: solo %s può smontare %s da %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr " umount: solo root può farlo"
 
@@ -9500,7 +9660,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9511,16 +9671,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "impossibile aprire %s"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "exec fallita\n"
@@ -10407,65 +10571,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id non valido: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s da %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "id non valido"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id non valido: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s non è un dispositivo speciale a blocchi"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "impossibile ottenere la dimensione di %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Ricerca sull'unità disco impossibile"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "impossibile aprire %s"
@@ -11593,9 +11757,6 @@ msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "in attesa di cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "lettura di %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "lettura del nome di login\n"
 
@@ -11636,9 +11797,6 @@ msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Errore durante la lettura di %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "impossibile leggere %s  e impossibile eseguire ioctl sul dump\n"
 
@@ -11795,9 +11953,6 @@ msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: ottenuto un hp->h_length non valido?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "nfs socket"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -11807,9 +11962,6 @@ msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "utilizzo della porta %d per il demone nfs\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs connect"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "valore riportato di stato nfs sconosciuto: %d"
 
diff --git a/po/ja.po b/po/ja.po
index 92dc277a..331bf169 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.14.2-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2009-01-28 16:54+0900\n"
 "Last-Translator: Makoto Kato <makoto.kt@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -205,7 +205,7 @@ msgstr "使い方: %s [ -n ] デバイス\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -922,7 +922,7 @@ msgstr "デバイス %s を stat できません"
 msgid "%s is not a block special device"
 msgstr "%s はブロックスペシャルデバイスではありません"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "%s を open できません"
@@ -1250,7 +1250,7 @@ msgstr "ブロックのテスト中にシークが失敗しました"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check に変な値があります: 多分バグでしょう\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "check_blocks でのシークに失敗しました"
 
@@ -1321,167 +1321,167 @@ msgstr "'%s' 上にファイルシステムを作らないようにします"
 msgid "number of blocks too small"
 msgstr "ブロックの数が少なすぎます"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "不正なユーザ指定ページサイズ %d\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, fuzzy, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "システムのページサイズ値 %2$d/%3$d の代わりに、ユーザ指定値 %1$d を使います\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "ラベル"
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "使い方: %s [-c] [-v0|-v1] [-pページサイズ] /dev/name [ブロック数]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "不正ページが多すぎます"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "メモリが足りません"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "不正なページ数\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "不正なページ数 %lu\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "スワップデバイスを巻き戻せません"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "ブートセクタをクリアできません"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   BSD 領域テーブルを表示する"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   完全なディスクラベルを表示する"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: エラー: 不明なバージョン %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr "エラー: UUID の解析に失敗"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: エラー: スワップを有効にするための場所がない？\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 "%s: エラー: サイズ %lu KiB がデバイスのサイズ %lu KiB よりも大きいです\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: エラー: スワップ領域は少なくとも %ld KiB 必要です\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: 警告: スワップ領域を %ld KiB に切り詰めました\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "'%s' にはスワップデヴァイスを作らないようにします"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s はマウントされています -- ここにはファイルシステムをつくれません！"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "スワップ空間を設定できません: 読込めません"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "スワップ空間バージョン %d を設定します、サイズ = %llu KiB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: 署名ページを書き込めません: %s"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync に失敗"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "%s の状態を取得できません"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr "新規の selinux コンテキストを作成できません"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr "selinux コンテキストを計算できません"
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: %s の名前を %s に変更できません: %s\n"
@@ -1493,53 +1493,53 @@ msgid ""
 "  %s "
 msgstr "使い方:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "デバイス %s を stat できません"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: キャラクタデバイスではありません"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s はブロックスペシャルデバイスではありません"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "ロックファイル %s をロックできません: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "警告: %s はブロックデバイスではありません\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "デバイス %s を stat できません"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "デバイス %s を stat できません"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: キャラクタデバイスではありません"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s はブロックスペシャルデバイスではありません"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "エラーによりサービスを停止します: \"%s\""
@@ -6674,16 +6674,6 @@ msgstr "%s のカーネルドライバは RTC_EPOCH_SET ioctl を持っていま
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "%s への ioctl(RTC_EPOCH_SET) が失敗しました"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "%s を開けません"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6829,8 +6819,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM 失敗。中断します: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "パスワード: "
 
@@ -7725,6 +7715,16 @@ msgstr "使い方: %s [+書式] [日 月 年]\n"
 msgid "St. Tib's Day"
 msgstr "聖 Tib の日"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "%s を開けません"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8241,6 +8241,145 @@ msgstr "%s を読み込むことができません\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM が定義されていません。\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr "使い方: last [-#] [-f ファイル] [-t 端末] [-h ホスト名] [ユーザ ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "        %s -l [ シグナル ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: 不正な -l の引数 %s です。\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "nfs ソケット"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "nfs 接続"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "書き込み"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "%c を読込み\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "%s を開けません: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "%s を開けません: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "%s の読込みエラー\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "不正なオプション"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "不正な数: %s\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "%s のモード変更エラー: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "使い方: %s [オプション] デバイス名...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8311,36 +8450,36 @@ msgstr "警告: %s がオープンできません: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s をオープンできませんでした -- 代りに %s を使います\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr "ロックファイル %s を作成できません: %s (-n フラグを使ってください)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr "ロックファイル %s をリンクできません: %s (-n フラグを使ってください)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr "ロックファイル %s を開けません: %s (-n フラグを使ってください)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "ロックファイル %s をロックできません: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "ロックファイル %s をロックできません: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "タイムアウト"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8349,83 +8488,88 @@ msgstr ""
 "リンク %s を作成できません\n"
 "多分、ゴミと化したロックファイルがあるのでは ?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "%s を開けません (%s) -- mtab は更新されません"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "%s への書き込みエラー: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "%s のモード変更エラー: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "%s のモード変更エラー: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s の名前を %s に変更できません: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: デバイス %s の情報を取得できません: %s\n"
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", offset %<PRIu64>"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", sizelimit %<PRIu64>"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", 暗号 %s (タイプ %<PRIu32>)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", オフセット %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", 暗号タイプ %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: デバイス %s の情報を取得できません: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: デバイス %s をオープンできません: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: /dev ディレクトリは存在しません。"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: dev/loop# の権限を見ることができません"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: 空いている loop デバイスが見つかりません"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8435,54 +8579,54 @@ msgstr ""
 "いないかもしれません。\n"
 "       (そうであれば、再コンパイルするか `insmod loop.o' して下さい。)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "バッファを拡大するときにメモリが足りなくなりました。\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "警告: %s は既に %s に関連づけされています\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "警告: %s: は書き込み禁止です、読込み専用でマウントします\n"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "メモリに格納できませんでしたので、終了します。\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD 失敗: %s\n"
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): 成功\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): 成功\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: デバイス %s を削除できません: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "この mount は loop のサポートなしでコンパイルされました。\n"
 "再コンパイルしてください。\n"
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8491,6 +8635,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8505,7 +8650,7 @@ msgstr ""
 "                                              一覧を表示\n"
 " %1$s [オプション] {-f|--find|loopdev} <file> setup\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8521,22 +8666,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Loop: デバイス は %s です\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: デバイスを使用中です"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8568,7 +8713,7 @@ msgstr "mount: mtab によると、%s は %s にマウントされています"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s を書き込み用にオープンできません: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: %s の書き込みエラー: %s"
@@ -8588,7 +8733,7 @@ msgstr "mount: グループ ID を設定できません: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: ユーザー id を設定できません: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: fork できません: %s"
@@ -8618,88 +8763,88 @@ msgstr "       そして、それはスワップ空間の様です。\n"
 msgid "       I will try type %s\n"
 msgstr "       タイプ %s を試してみます\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s はスワップ空間のようですね -- マウントしません"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "マウントに失敗しました"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: root だけが %s を %s にマウントできます"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: loop デバイスが 2 回指定されました"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: タイプが 2 回指定されました"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: loop デバイスの設定をスキップします\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: mtab によると、%s は loop として %s にマウント済です"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: loop デバイス %s を使います\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: stolen loop=%s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop デバイスの設定に失敗しました\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop デバイスの設定に成功しました\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s が見つかりません -- 作成します..\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s がオープンできません: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: -p または --pass-fd 引数は数字でなければなりません"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: %s を速度設定用にオープンできません"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: 速度の設定ができません: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: mtab によると、%s は %s にマウント済です\n"
@@ -8890,22 +9035,27 @@ msgstr "mount: %s%s を読込み専用でマウントできません"
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s は書き込み禁止ですが、`-w' フラグが明示的に与えられました"
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: %s%s を読込み専用でマウントできません"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s は書き込み禁止です、読込み専用でマウントします"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: %s が見つかりません -- 作成します..\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s は %s にマウント済です\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8915,22 +9065,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: タイプが与えられていません -- コロンがあるので nfs の様ですが\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: タイプが与えられていません -- // があるので cifs の様ですが\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s は %s にマウント済です\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8999,19 +9149,19 @@ msgstr ""
 "その他のオプション: [-nfFrsvw] [-o オプション] [-p passwdfd]\n"
 "もっと詳しいことを知りたければ、man 8 mount と唱えてみましょう。\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: root だけがそれを行なえます"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "何もマウントされませんでした"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: そのようなパーティションは見つかりません"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %2$s や %3$s 内に %1$s を見つけられません"
@@ -9218,42 +9368,42 @@ msgstr "スーパーユーザーではありません\n"
 msgid "%s: swapoff failed"
 msgstr "%s は失敗しました。\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "mount: -f オプションのサポート無しでコンパイルされています\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: グループ id をセットできません: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: ユーザー id をセットできません: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: 子プロセスを起動できません: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s は不正なブロックデバイスです"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: マウントされていません"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: スーパーブロックに書き込めません"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9261,111 +9411,121 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: 見つかりません"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: アンマウントするにはスーパーユーザでなければなりません"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: ブロックデバイスはファイルシステム上で許可されません"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 がありません、umount してみます...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s は使用中です -- 読込み専用として再マウントします\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s を読込み専用で再マウントできませんでした\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s はアンマウントされました\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: アンマウントのためのファイルシステムリストを見つけられません"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "使い方: umount [-hV]\n"
 "        umount -a [-f] [-r] [-n] [-v] [-t vfsタイプ] [-O オプション]\n"
 "        umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "警告: %s は既に %s に関連づけされています\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "警告: %s は既に %s に関連づけされています\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "\"\" をアンマウントできません\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s をアンマウントします\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab に %s が見つかりません\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s マウントされていません (mtab によると)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s は複数マウントされているようです"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 "umount: %s は fstab にありません (さらに、あなたは root ではありません)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s は fstab と一致しないマウントです"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: %s だけが %s を %s からアンマウントできます"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: root だけがそれを行なえます"
 
@@ -9480,7 +9640,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9491,16 +9651,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "%s を open できません"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "実行に失敗\n"
@@ -10386,64 +10550,64 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "不正な id: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s from %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "不正なオプション"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "不正な id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s はブロックスペシャルデバイスではありません"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "%s のサイズを取得できません"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "ディスクドライブ上で seek できません"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "%s を open できません"
@@ -11575,9 +11739,6 @@ msgstr "バッファを拡大するときにメモリが足りなくなりまし
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "cr-lf を待っています\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "%c を読込み\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "ログイン名を読込めません\n"
 
@@ -11614,9 +11775,6 @@ msgstr "バッファを拡大するときにメモリが足りなくなりまし
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "%s の読込みエラー\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "%s を読めません、そして ioctl ダンプができません\n"
 
@@ -11794,9 +11952,6 @@ msgstr "バッファを拡大するときにメモリが足りなくなりまし
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: 不正な hp->h_length 値を取得？\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "nfs ソケット"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -11809,9 +11964,6 @@ msgstr "バッファを拡大するときにメモリが足りなくなりまし
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "nfs デーモンのために %d 番ポートを利用\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs 接続"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "不明な nfs ステータス値を返しました: %d"
 
diff --git a/po/nl.po b/po/nl.po
index 0caefc85..7cdc7949 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng-2.14.2-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2009-01-31 20:52+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -210,7 +210,7 @@ msgstr "Gebruik:  %s [ -n ] apparaat\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -927,7 +927,7 @@ msgstr "kan apparaat %s niet vinden"
 msgid "%s is not a block special device"
 msgstr "%s is geen blok-apparaat"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "kan %s niet openen"
@@ -1272,7 +1272,7 @@ msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 "Vreemde waarden in do_check(): waarschijnlijk een interne programmafout\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "'seek' is mislukt in check_blocks()"
 
@@ -1342,171 +1342,171 @@ msgstr "zal niet proberen een bestandssysteem te maken op '%s'"
 msgid "number of blocks too small"
 msgstr "aantal blokken is te klein"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Ongeldige door gebruiker aangegeven paginagrootte %d\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "De opgegeven paginagrootte %d wordt gebruikt, in plaats van systeemwaarde %"
 "d.\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 "Onjuiste grootte van kop van wisselgeheugen; er is geen label geschreven.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Label is afgekapt.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "geen label, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "geen UUID\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Gebruik:  %s [-c] [-v0|-v1] [-ppaginagrootte]           [-L label] [-U "
 "UUID]  /dev/naam  [blokken]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "te veel slechte pagina's"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Onvoldoende geheugen beschikbaar"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "één slechte pagina\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu slechte pagina's\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "terugspoelen van wisselgeheugenapparaat is mislukt"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "wissen van opstartsector is mislukt"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p      BSD-partitietabel weergeven"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s      complete schijflabel weergeven"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 "%1$s: waarschuwing: optie '-U' wordt genegeerd\n"
 "(UUID's worden door %1$s niet ondersteund)\n"
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: fout: onbekende versie %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr "fout: kan UUID niet ontleden"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fout: Nergens om wisselgeheugen op in te stellen?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: fout: grootte %lu KiB is groter dan apparaatgrootte van %lu KiB\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: fout: wisselgeheugen moet minstens %ld KiB zijn\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: waarschuwing: wisselgeheugen is afgekapt tot %ld KiB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: fout: zal niet proberen wisselgeheugen te maken op '%s'\n"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: fout: %s is aangekoppeld; zal hier geen wisselgeheugen maken\n"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Instellen van wisselgeheugen is mislukt: onleesbaar"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Instellen van wisselgeheugen, versie %d, grootte = %llu KiB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: schrijven van vingerafdrukpagina is mislukt: %s"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync() is mislukt"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: kan geen SELinux-bestandslabel verkrijgen: %s\n"
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr "kan uit het pad geen context bepalen"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr "kan geen nieuwe SELinux-context aanmaken"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr "kan geen nieuwe SELinux-context berekenen"
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: kan %s niet herlabelen naar %s: %s\n"
@@ -1518,53 +1518,53 @@ msgid ""
 "  %s "
 msgstr "Gebruik:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "kan apparaat %s niet vinden"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: is geen byte-apparaat"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s is geen seriële lijn"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "kan vergrendelingsbestand %s niet vergrendelen: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Waarschuwing: %s is geen blok-apparaat\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "kan apparaat %s niet vinden"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "kan apparaat %s niet vinden"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: is geen byte-apparaat"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s is geen seriële lijn"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "fout bij stoppen van service: \"%s\""
@@ -6768,16 +6768,6 @@ msgstr "Het kernelstuurprogramma voor %s heeft geen ioctl(RTC_EPOCH_SET).\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) op %s is mislukt"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "openen van %s is mislukt"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6922,8 +6912,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM-fout -- gestopt: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Wachtwoord: "
 
@@ -7822,6 +7812,16 @@ msgstr "Gebruik:  %s [+opmaak] [dag maand jaar]\n"
 msgid "St. Tib's Day"
 msgstr "Sint Tibs"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "openen van %s is mislukt"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8338,6 +8338,146 @@ msgstr "Kan %s niet lezen\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM is niet gedefinieerd.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+"Gebruik:  last [-#] [-f bestand] [-t tty] [-h hostnaam] [gebruiker ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "          %s -l [ signaal ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: ongeldig argument '%s' van '-l'\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "socket: %s.\n"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "verbinding: %s.\n"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "W:schrijven"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "duurde te lang"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "Kan %s niet openen: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "Kan %s niet openen: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "ongeldige optie"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: ongeldige waarde\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "fout bij wijzigen van modus van %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Gebruik:  %s [opties] apparaat ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8408,42 +8548,42 @@ msgstr "waarschuwing: kan %s niet openen: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: kan %s niet openen -- %s wordt gebruikt\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "kan vergrendelingsbestand %s niet aanmaken: %s  (gebruik optie '-n' om te "
 "forceren)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "kan vergrendelingsbestand %s niet koppelen: %s  (gebruik optie '-n' om te "
 "forceren)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "kan vergrendelingsbestand %s niet openen: %s  (gebruik optie '-n' om te "
 "forceren)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "kan vergrendelingsbestand %s niet vergrendelen: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "kan vergrendelingsbestand %s niet vergrendelen: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "duurde te lang"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8452,83 +8592,88 @@ msgstr ""
 "Kan koppeling %s niet maken.\n"
 "Mogelijk is er nog een oud vergrendelingsbestand?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "kan %s niet openen (%s) -- mtab is niet bijgewerkt"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "fout bij schrijven van %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "fout bij wijzigen van modus van %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "fout bij wijzigen van eigenaar van %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "kan %s niet hernoemen tot %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: kan geen informatie verkrijgen over apparaat %s: %s\n"
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", beginpunt %<PRIu64>"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", maximale grootte %<PRIu64>"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", codering %s (soort %<PRIu32>)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", beginpunt %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", coderingssoort %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: kan geen informatie verkrijgen over apparaat %s: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kan apparaat %s niet openen: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: map '/dev' bestaat niet."
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: geen toegangsrechten tot /dev/loop#"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: kan geen vrij lus-apparaat vinden"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8538,55 +8683,55 @@ msgstr ""
 "        lus-apparaat?  (Dan moet u de kernel opnieuw compileren,\n"
 "        of misschien een 'modprobe loop' doen?)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr "Onvoldoende geheugen beschikbaar tijdens lezen van wachtwoord"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "waarschuwing: %s is al gerelateerd aan %s\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "waarschuwing: %s is schrijfbeveiligd en wordt als alleen-lezen "
 "aangekoppeld.\n"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kan pagina's niet vastzetten in het geheugen -- gestopt\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl(LOOP_SET_FD) is mislukt: %s\n"
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu) is gelukt\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "lus-apparaat %s is uitgeschakeld\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "kan lus-apparaat %s niet uitschakelen: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Deze versie van 'mount' is gecompileerd zonder lus-ondersteuning.\n"
 "Hercompilatie is nodig.\n"
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8595,6 +8740,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8608,7 +8754,7 @@ msgstr ""
 "  %1$s -j | --associated <bestand> [-o <nummer>]      gerelateerden tonen\n"
 "  %1$s [opties] {-f|--find|<lus-apparaat>} <bestand>  instellen\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8635,22 +8781,22 @@ msgstr ""
 "       --show                apparaatnaam tonen (bij '-f <bestand>')\n"
 "  -v | --verbose             gedetailleerde uitvoer produceren\n"
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Lus-apparaat is %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "afgepakt lus-apparaat=%s; ... nieuwe poging\n"
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: apparaat %s is bezig"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8682,7 +8828,7 @@ msgstr "mount: volgens mtab is %s aangekoppeld op %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kan %s niet openen om te schrijven: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fout bij schrijven van %s: %s"
@@ -8702,7 +8848,7 @@ msgstr "mount: kan groep-ID niet instellen: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: kan gebruiker-ID niet instellen: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kan geen nieuw proces starten: %s"
@@ -8732,89 +8878,89 @@ msgstr "       het lijkt erop dat dit wisselgeheugen is\n"
 msgid "       I will try type %s\n"
 msgstr "       soort %s wordt geprobeerd\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ziet er uit als wisselgeheugen -- niet aangekoppeld"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "aankoppelen is mislukt"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: alleen root kan %s aankoppelen op %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: lus-apparaat is twee keer aangegeven"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: soort is twee keer aangegeven"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: instellen van lus-apparaat wordt overgeslagen\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: volgens mtab is %s al als lus-apparaat aangekoppeld op %s"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: lus-apparaat %s zal worden gebruikt\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 "mount: lus-apparaat %s is door ander proces afgepakt; ... nieuwe poging\n"
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: lus-apparaat %s is door ander proces afgepakt"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: instellen van lus-apparaat is mislukt\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: lus-apparaat is succesvol ingesteld\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: geen %s gevonden -- wordt nu aangemaakt...\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kan %s niet openen: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument van '-p' of '--pass-fd' moet een getal zijn"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: kan %s niet openen om snelheid in te stellen"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kan snelheid niet instellen: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: volgens mtab is %s al aangekoppeld op %s\n"
@@ -9014,22 +9160,27 @@ msgstr "mount: kan %s%s niet aankoppelen voor alleen-lezen"
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s is schrijfbeveiligd, maar expliciete optie '-w' is gegeven"
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: kan %s%s niet aankoppelen voor alleen-lezen"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s is schrijfbeveiligd en wordt als alleen-lezen aangekoppeld"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: geen medium gevonden op %s; ... nieuwe poging\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: geen medium gevonden op %s"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9047,23 +9198,23 @@ msgstr ""
 "bestandssysteem\n"
 "    kunnen krijgen.  Voor meer details zie restorecon(8) en mount(8).\n"
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: geen soort gegeven -- NFS aangenomen, vanwege de dubbele punt\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: geen soort gegeven -- CIFS aangenomen, vanwege het //-voorvoegsel\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s is al aangekoppeld op %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9136,19 +9287,19 @@ msgstr ""
 "wachtwoordbestandsdescriptor].\n"
 "Voor meer informatie, zie man mount(8).\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: alleen root kan dat doen"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "er is niets aangekoppeld"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: die partitie is niet gevonden"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kan %s niet vinden in %s noch in %s"
@@ -9359,42 +9510,42 @@ msgstr "U bent niet root.\n"
 msgid "%s: swapoff failed"
 msgstr "%s is mislukt.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: gecompileerd zonder ondersteuning voor '-f'\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: kan groep-ID niet instellen: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: kan gebruiker-ID niet instellen: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kan geen nieuw proces starten: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ongeldig blok-apparaat"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: niet aangekoppeld"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kan niet naar superblok schrijven"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9405,110 +9556,120 @@ msgstr ""
 "        (Welke processen het apparaat gebruiken kan mogelijk\n"
 "         gevonden worden met behulp van lsof(8) of fuser(1).)"
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: niet gevonden"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: u moet root zijn om te kunnen ontkoppelen"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blok-apparaten niet toegestaan op bestandssysteem"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "geen umount2 aanwezig; poging met gewone umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s is bezig -- als alleen-lezen heraangekoppeld\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kan %s niet als alleen-lezen heraankoppelen\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s is ontkoppeld\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan geen lijst vinden met bestandssystemen om te ontkoppelen"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Gebruik:  umount [-dfnlrv] map|apparaat ...\n"
 "          umount -a [-dfnlrv] [-t bestandssysteemsoorten] [-O opties]\n"
 "          umount [-hV]\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "waarschuwing: %s is al gerelateerd aan %s\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "waarschuwing: %s is al gerelateerd aan %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "kan niet \"\" ontkoppelen\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Poging tot ontkoppelen van %s...\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kan %s niet vinden in mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s is niet aangekoppeld (volgens mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: het lijkt erop dat %s meerdere keren is aangekoppeld"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s staat niet in fstab (en u bent niet root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: aankoppeling op %s komt niet overeen met fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: alleen %s kan %s ontkoppelen van %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: alleen root kan dat doen"
 
@@ -9624,7 +9785,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9635,16 +9796,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "kan %s niet openen"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "uitvoeren is mislukt\n"
@@ -10536,7 +10701,7 @@ msgstr "zcount"
 msgid "pid"
 msgstr "PID"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10545,7 +10710,7 @@ msgstr ""
 "\n"
 "Gebruik:  %s [-dhV78neo12] [-s <snelheid>] <lijnprotocol> <apparaat>\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10553,50 +10718,50 @@ msgstr ""
 "\n"
 "Mogelijke lijnprotocollen zijn:\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "ongeldige snelheid: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach (%s)\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "ongeldige optie"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "ongeldig lijnprotocol: %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s is geen seriële lijn"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "kan terminaleigenschappen van %s niet bepalen"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "snelheid %d is niet mogelijk"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "kan terminaleigenschappen van %s niet instellen"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "kan lijnprotocol niet instellen"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "kan er geen achtergrondservice van maken"
 
diff --git a/po/pl.po b/po/pl.po
index 7c04f106..5bf58ad3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2006-12-22 00:25+0100\n"
 "Last-Translator: Andrzej Krzysztofowicz <ankry@mif.pg.gda.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -199,7 +199,7 @@ msgstr "u�ycie: %s [ -n ] urz�dzenie\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -903,7 +903,7 @@ msgstr ""
 msgid "%s is not a block special device"
 msgstr "%s nie jest specjalnym urz�dzeniem blokowym"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "nie mo�na otworzy� %s"
@@ -1211,7 +1211,7 @@ msgstr ""
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr ""
 
@@ -1281,164 +1281,164 @@ msgstr ""
 msgid "number of blocks too small"
 msgstr ""
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr ""
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr ""
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr ""
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr ""
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "nie mo�na odczytac superbloku"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr ""
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, c-format
 msgid "        on whole disk. "
 msgstr ""
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr ""
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr ""
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr ""
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr ""
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr ""
@@ -1450,53 +1450,53 @@ msgid ""
 "  %s "
 msgstr "U�ycie:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr ""
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr ""
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s nie jest specjalnym urz�dzeniem blokowym"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "%s: nie jest to urz�dzenie blokowe\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "%s: nie jest to urz�dzenie blokowe\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "nie mo�na otworzy� %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr ""
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr ""
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s nie jest specjalnym urz�dzeniem blokowym"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr ""
@@ -6219,16 +6219,6 @@ msgstr ""
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr ""
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "nie mo�na otworzy� '%s'"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6369,8 +6359,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: nie uda�o si� otworzy�: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr ""
 
@@ -7239,6 +7229,16 @@ msgstr ""
 msgid "St. Tib's Day"
 msgstr ""
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "nie mo�na otworzy� '%s'"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7744,6 +7744,142 @@ msgstr ""
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:46
+#, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, c-format
+msgid "       %s -k\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "%s wymaga argumentu\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "RozmiarBloku: %d\n"
+
+#: misc-utils/uuidd.c:170
+msgid "connect"
+msgstr ""
+
+#: misc-utils/uuidd.c:189
+msgid "write"
+msgstr ""
+
+#: misc-utils/uuidd.c:197
+msgid "read count"
+msgstr ""
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "nie mo�na otworzy� '%s'"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "nie mo�na otworzy� '%s'"
+
+#: misc-utils/uuidd.c:351
+#, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, c-format
+msgid "Invalid operation %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: b��d odczytu na %s\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "u�ycie: %s [ -n ] urz�dzenie\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -7814,170 +7950,175 @@ msgstr ""
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr ""
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr ""
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr ""
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr ""
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr ""
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: b��dny katalog: '.' nie jest na pocz�tku\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -7986,12 +8127,13 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8007,22 +8149,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "Urz�dzenie: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8052,7 +8194,7 @@ msgstr ""
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
@@ -8072,7 +8214,7 @@ msgstr ""
 msgid "mount: cannot set user id: %s"
 msgstr "nie mo�na pobra� rozmiaru %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
@@ -8102,88 +8244,88 @@ msgstr ""
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr ""
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr ""
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr ""
@@ -8364,22 +8506,27 @@ msgstr ""
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr ""
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr ""
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8389,22 +8536,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8441,19 +8588,19 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -8630,42 +8777,42 @@ msgstr ""
 msgid "%s: swapoff failed"
 msgstr ""
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr ""
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "nie mo�na pobra� rozmiaru %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -8673,107 +8820,117 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, c-format
+msgid "device %s is associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "%s nie jest specjalnym urz�dzeniem blokowym"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8885,7 +9042,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -8896,16 +9053,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "nie mo�na otworzy� %s"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 msgid "execvp failed"
 msgstr ""
 
@@ -9748,64 +9909,64 @@ msgstr ""
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "Urz�dzenie: %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s nie jest specjalnym urz�dzeniem blokowym"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "nie mo�na pobra� rozmiaru %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "nie mo�na pobra� rozmiaru %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "nie mo�na pobra� rozmiaru %s"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "nie mo�na pobra� rozmiaru %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2432fe85..862144a3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11b\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+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"
@@ -213,7 +213,7 @@ msgstr "Uso: %s [ -n ] dispositivo\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, fuzzy, c-format
 msgid "%s (%s)\n"
@@ -927,7 +927,7 @@ msgstr "n�o foi poss�vel verificar status de dispositivo %s"
 msgid "%s is not a block special device"
 msgstr "%s n�o � um dispositivo de blocos especial"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "n�o foi poss�vel abrir %s"
@@ -1236,7 +1236,7 @@ msgstr "busca falhou durante teste de blocos"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores estranhos em do_check: provavelmente erros\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "busca falhou em check_blocks"
 
@@ -1310,169 +1310,169 @@ msgstr "n�o ser� tentado criar sistema de arquivos em '%s'"
 msgid "number of blocks too small"
 msgstr "N�mero de setores"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Tamanho de p�gina especificado pelo usu�rio %d inv�lido\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, fuzzy, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Usando tamanho de p�gina especificado pelo usu�rio %d, em vez dos valores do "
 "sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "r�tulo"
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c] [-v0|-v1] [-pTamP�g] dispositivo [blocos]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "n�mero excessivo de p�ginas inv�lidas"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Mem�ria insuficiente"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "uma p�gina inv�lida\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d p�ginas inv�lidas\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "N�o foi poss�vel rebobinar o dispositivo de permuta (swap)"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "n�o foi poss�vel limpar o setor de boot"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   mostra a tabela de parti��es BSD"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   mostra o r�tulo do disco completo"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s - erro: vers�o %d desconhecida\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr "Erro no fechamento de %s\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s - erro: nenhum lugar para ativar permuta (swap)?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: erro - tamanho %ld � maior do que o tamanho do dispositivo %d\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s - erro: a �rea de permuta (swap) precisa ter pelo menos %ld kB\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s -- aviso: reduzindo �rea de permuta (swap) para %ld kB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "N�o ser� tentado criar dispositivo de permuta (swap) em '%s'"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s est� montado; n�o criar� um sistema de arquivos aqui!"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "N�o foi poss�vel configurar espa�o de permuta (swap): ileg�vel"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Configurando espa�o de permuta (swap) vers�o %d, tamanho = %ld bytes\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "N�o foi poss�vel gravar a p�gina de assinatura"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync falhou"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "n�o foi poss�vel stat %s"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "n�o foi poss�vel gravar inodes"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "n�o foi poss�vel renomear %s para %s: %s\n"
@@ -1484,53 +1484,53 @@ msgid ""
 "  %s "
 msgstr "Uso:"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "n�o foi poss�vel verificar status de dispositivo %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s n�o � um dispositivo de caracteres"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s n�o � um dispositivo de blocos especial"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "N�o foi poss�vel bloquear o arquivo de bloqueio %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Aviso: %s n�o � um dispositivo de blocos\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "n�o foi poss�vel verificar status de dispositivo %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "n�o foi poss�vel verificar status de dispositivo %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s n�o � um dispositivo de caracteres"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s n�o � um dispositivo de blocos especial"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "erro ao gravar %s: %s"
@@ -6765,16 +6765,6 @@ msgstr ""
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) para %s falhou"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "n�o foi poss�vel abrir %s"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6919,8 +6909,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: falha de PAM; abortando: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Senha:"
 
@@ -7817,6 +7807,16 @@ msgstr "Uso: %s [+formato] [dia m�s ano]\n"
 msgid "St. Tib's Day"
 msgstr "Dia de S�o Tib"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "n�o foi poss�vel abrir %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8332,6 +8332,145 @@ msgstr "N�o foi poss�vel abrir %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM indefinido.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr "Uso: last [-#] [-f arquivo] [-t tty] [-h nome_host] [usu�rio ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ sinal ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: argumento inv�lido para -l %s.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "nfs socket"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "nfs connect"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Gravar"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "read %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "N�o foi poss�vel abrir %s: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "N�o foi poss�vel abrir %s: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Erro ao ler %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "id inv�lido: %s\n"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "N�mero inv�lido: %s\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "erro ao alterar o modo de %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Uso: %s [op��es] dispositivo ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8402,42 +8541,42 @@ msgstr "Aviso: n�o foi poss�vel abrir %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: n�o foi poss�vel abrir %s - usando %s\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, 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:614
+#: mount/fstab.c:615
 #, 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:630
+#: mount/fstab.c:631
 #, 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:645
+#: mount/fstab.c:646
 #, 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:659
+#: mount/fstab.c:660
 #, 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:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "tempo esgotado"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8446,83 +8585,88 @@ msgstr ""
 "N�o foi poss�vel criar o v�nculo %s\n"
 "Talvez haja um arquivo de bloqueio vencido?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, 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:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "erro ao gravar %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "erro ao alterar o modo de %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "erro ao alterar o modo de %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, 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:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: n�o foi poss�vel obter informa��es sobre o dispositivo %s: %s\n"
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr "Tipo de criptografia n�o suportado: %s\n"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, fuzzy, c-format
 msgid ", encryption type %d\n"
 msgstr "Tipo de criptografia n�o suportado: %s\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, 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:414
+#: mount/lomount.c:434
 #, 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:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: usu�rio \"%s\" n�o existe.\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, fuzzy, c-format
 msgid "%s: could not find any free loop device"
 msgstr "mount: n�o foi poss�vel localizar nenhum dispositivo de la�o livre"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, fuzzy, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8533,52 +8677,52 @@ msgstr ""
 "       este kernel n�o conhece o dispositivo de la�o\n"
 "       (se for este o caso, recompile ou use `insmod loop.o')."
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Falta mem�ria quando o buffer cresce.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "O setor %d j� est� alocado\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s � protegido contra grava��o; montando somente para leitura"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "N�o � poss�vel bloquear (lock) na mem�ria, saindo\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%d): sucesso\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): sucesso\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, 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:840
+#: mount/lomount.c:853
 #, c-format
 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:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8587,6 +8731,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8599,7 +8744,7 @@ msgstr ""
 "  %s [ -e criptografia ] [ -o deslocamento ] dispositivo_la�o arquivo # "
 "configura��o\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8615,22 +8760,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: n�o foi poss�vel abrir o dispositivo %s: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: o dispositivo est� ocupado"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "N�o havia suporte a la�o dispon�vel quando da compila��o. Recompile.\n"
@@ -8660,7 +8805,7 @@ msgstr "mount: de acordo com mtab, %s est� montado em %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: n�o foi poss�vel abrir %s para grava��o: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: erro ao gravar %s: %s"
@@ -8680,7 +8825,7 @@ msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: n�o foi poss�vel realizar fork: %s"
@@ -8710,88 +8855,88 @@ msgstr "       e parece ser um espa�o de permuta\n"
 msgid "       I will try type %s\n"
 msgstr "       experimentarei o tipo %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s parece espa�o de permuta - n�o montado"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "mount falhou"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: somente o root pode montar %s em %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: dispositivo de la�o especificado duas vezes"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: tipo especificado duas vezes"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: ignorando a configura��o de um dispositivo de la�o\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: de acordo com mtab, %s j� est� montado em %s"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, 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:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: falha ao configurar dispositivo de la�o\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configura��o de dispositivo de la�o realizada com sucesso\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nenhum %s encontrado - criando-o...\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: n�o foi poss�vel abrir %s: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, 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:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: de acordo com mtab, %s j� est� montado em %s"
@@ -8985,22 +9130,27 @@ msgstr "mount: n�o foi poss�vel montar %s%s somente para leitura"
 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:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: n�o foi poss�vel montar %s%s somente para leitura"
+
+#: mount/mount.c:1542
 #, 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:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: nenhum %s encontrado - criando-o...\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s j� montado em %s\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9010,24 +9160,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: nenhum tipo foi fornecido - supondo nfs por causa dos dois-pontos\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: nenhum tipo foi fornecido - supondo nfs por causa dos dois-pontos\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s j� montado em %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9085,19 +9235,19 @@ msgstr ""
 "Outras op��es: [-nfFrsvw] [-o op��es].\n"
 "Para mais detalhes, consulte `man 8 mount'.\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: opera��o exclusiva de root"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: tal parti��o n�o foi encontrada"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, 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"
@@ -9278,42 +9428,42 @@ msgstr "N�o definido\n"
 msgid "%s: swapoff failed"
 msgstr "busca falhou"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilado sem suporte a -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: n�o foi poss�vel realizar fork: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo de blocos inv�lido"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: n�o montado"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: n�o foi poss�vel gravar superbloco"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9321,114 +9471,124 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: n�o encontrado"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: precisa ser superusu�rio para desmontar"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 "umount: %s: dispositivos de blocos n�o permitidos no sistema de arquivos"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "n�o existe umount2, tentando umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s est� ocupado - remontado somente para leitura\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: n�o foi poss�vel remontar %s somente para leitura\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmontado\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: n�o foi poss�vel localizar a lista de sistemas de arquivos a "
 "desmontar"
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Uso: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t tipos_sist_arq_virt]\n"
 "       umount [-f] [-r] [-n] [-v] especial | n�...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "O setor %d j� est� alocado\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "O setor %d j� est� alocado\n"
+
+#: mount/umount.c:485
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentando desmontar %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "N�o foi poss�vel localizar %s em mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s n�o est� montado (de acordo com mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s est� montado m�ltiplas vezes"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s n�o est� na fstab (e voc� n�o � root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, 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:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: somente %s pode desmontar %s de %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: opera��o exclusiva de root"
 
@@ -9543,7 +9703,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9554,16 +9714,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "n�o foi poss�vel abrir %s"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "exec falhou\n"
@@ -10452,65 +10616,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s n�o � um dispositivo de blocos especial"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "N�o foi poss�vel realizar busca na unidade de disco"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
@@ -11686,9 +11850,6 @@ msgstr "Falta mem�ria quando o buffer cresce.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "waiting for cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "read %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "reading login name\n"
 
@@ -11722,9 +11883,6 @@ msgstr "Falta mem�ria quando o buffer cresce.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Erro ao ler %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr ""
 #~ "n�o foi poss�vel ler %s e n�o � poss�vel realizar ioctl da descarga\n"
@@ -11875,9 +12033,6 @@ msgstr "Falta mem�ria quando o buffer cresce.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: obtido hp->h_length inv�lido?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "nfs socket"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -11887,9 +12042,6 @@ msgstr "Falta mem�ria quando o buffer cresce.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "usando porta %d para o daemon do nfs\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs connect"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "valor de retorno de status de nfs desconhecido: %d"
 
diff --git a/po/ru.po b/po/ru.po
index c294e370..c3491a1d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2006-03-07 12:42+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -204,7 +204,7 @@ msgstr "�������������: %s [ -n ] ����������\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -923,7 +923,7 @@ msgstr "���������� ���������� ��������� ���������� %s"
 msgid "%s is not a block special device"
 msgstr "%s �� �������� ������ ������� �����������"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "���������� ������� %s"
@@ -1262,7 +1262,7 @@ msgstr "����� �� ����� �������� ������ ���������� ��������"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "���������� �������� � do_check: �������� ����\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "����� � check_blocks ���������� ��������"
 
@@ -1334,174 +1334,174 @@ msgstr "������� ������� �������� ������� �� '%s' ��������� �� �����"
 msgid "number of blocks too small"
 msgstr "���������� ��������"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "�������� ������ �������� %d, ��������� �������������\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, fuzzy, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "������������ �������� ������������� ������ �������� %d, ������ ��������� "
 "�������� %d/%d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "�������� ������ swap-���������, ����� �� ��������.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "����� ���� ���������.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "��� �����, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "��� uuid\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "�������������: %s [-c] [-v0|-v1] [-pPAGESZ] [-L �����] /dev/��� [�����]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "������� ����� ������ �������"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "�� ������� ������"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "���� ������ ��������\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu ������ �������\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "���������� ���������� ���������� ��� ��������"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "���������� �������� ����������� ������"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   ����� ������� �������� BSD"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   ����������� ������ ����� �����"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: ������: ����������� ������ %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "������ �������� �����\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: ������: ����� �� ���������� ���� ��������?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: ������: ������ %lu ������, ��� ������ ���������� %lu\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr ""
 "%s: ������: ������������ ��� �������� ������ ���� �� ������� ���� %ld��\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: ��������������: ������������ ��� �������� ����������� �� %ld��\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "������� ������� ���������� ��� �������� �� '%s' ��������� �� �����"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s �������������; �� ���������� ����� �������� �������!"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "���������� ���������� ������������ ��� ��������: ����������"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr ""
 "��������������� ������������ ��� �������� ������ %d, ������ = %llu ��\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "���������� �������� �������� � ����������"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync ���������� ��������"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "���������� ���������� ��������� %s"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "���������� �������� inode'�"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "���������� ������������� %s � %s: %s\n"
@@ -1513,53 +1513,53 @@ msgid ""
 "  %s "
 msgstr "�������������:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "���������� ���������� ��������� ���������� %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: ��������� ����������"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s �� �������� ������ ������� �����������"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "���������� ������������� ���� ���������� %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "��������������: %s �� �������� ������� �����������\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "���������� ���������� ��������� ���������� %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "���������� ���������� ��������� ���������� %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: ��������� ����������"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s �� �������� ������ ������� �����������"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "������ ��������� �������: \"%s\""
@@ -6784,16 +6784,6 @@ msgstr "������� ���������� ���� ��� %s �� ����� RTC_EPOCH_SET ioctl.\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) � %s ���������� ��������"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "���������� �������%s"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6941,8 +6931,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: ���� PAM, ����������� ����������: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "������: "
 
@@ -7841,6 +7831,16 @@ msgstr "�������������: %s [+������] [���� ����� ���]\n"
 msgid "St. Tib's Day"
 msgstr "���� ��. ��������"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "���������� �������%s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8356,6 +8356,147 @@ msgstr "���������� ������� %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: ���������� $TERM �� ����������.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+"�������������: last [-#] [-f ����] [-t tty] [-h ���_�����] "
+"[������������ ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ ������ ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: �������� �������� -l %s.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "����� nfs"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "nfs �����������"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "������"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "������ %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "���������� ������� %s: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "���������� ������� %s: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "������ ������ %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "�������� id"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: �������� ��������\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "������ ����� ������ %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "�������������: %s [�����] ����������...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8426,42 +8567,42 @@ msgstr "��������������: ���������� ������� %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: ���������� ������� %s - ������ ����� ������������ %s\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "���������� ������� ���� ���������� %s: %s (����������� ���� -n ��� "
 "���������������)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "���������� ������� ������ �� ���� ���������� %s: %s (����������� ���� -n ��� "
 "���������������)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "���������� ������� ���� ���������� %s: %s (����������� ���� -n ��� "
 "���������������)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "���������� ������������� ���� ���������� %s: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "���������� ������������� ���� ���������� %s: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "����� �������� �������"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8470,83 +8611,88 @@ msgstr ""
 "���������� ������� ������ %s\n"
 "��������, ���������� ���������� ���� ����������?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "���������� ������� %s (%s) - mtab �� ��������"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "������ ������ %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "������ ����� ������ %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "������ ����� ������ %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "���������� ������������� %s � %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: ���������� �������� ���������� �� ���������� %s: %s\n"
+
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", �������� %d"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", ����������� �� ������ %lld"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", ���������� %s (��� %d)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", �������� %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", ��� ���������� %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: ���������� �������� ���������� �� ���������� %s: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: ���������� ������� ���������� %s: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: ������������ \"%s\" �� ����������.\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: ��� ���������� �� �������� /dev/loop#"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: ���������� ����� �� ������ ���������� ���������� �������� �����"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8556,54 +8702,54 @@ msgstr ""
 "    ��� ���� �� ����� �� ����������� �������� �����. (� ���� ������\n"
 "    ���������������� ���� ��� ��������� `modprobe loop.o'.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "�� ������� ������ ��� ���������� ������.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "������ %d ��� �������\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s ������� �� ������, ����������� ������ ��� ������"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "���������� ������������� � ������, ���������� ������.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): ������� ��������\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): ������� ��������\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: ���������� ������� ���������� %s: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "��� ������ mount ���� ��������������� ��� ��������� loop. ����������, "
 "��������� �������������.\n"
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8612,6 +8758,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8624,7 +8771,7 @@ msgstr ""
 "��������������\n"
 "  %s [ -e ���������� ] [ -o �������� ] loop_���������� ���� # ���������\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8640,22 +8787,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: ���������� ������� ���������� %s: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: ���������� ������"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8687,7 +8834,7 @@ msgstr "mount: �������� mtab, %s ������������� �� %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: ���������� ������� %s ��� ������: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: ������ ������ %s: %s"
@@ -8707,7 +8854,7 @@ msgstr "mount: ���������� ���������� ��������: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ���������� ������� �������� �������: %s"
@@ -8737,88 +8884,88 @@ msgstr "       � �� �������� ��� ������������ ��� ��������\n"
 msgid "       I will try type %s\n"
 msgstr "       � �������� ��� %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s �������� ��� ������������ ��� �������� - �� �������������"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "mount ���������� ��������"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: ������ root ����� ����������� %s �� %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: ���������� �������� ����� ������� ������"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: ��� ������ ������"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: ������������ ��������� ���������� �������� �����\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: �������� mtab, %s ��� ������������� �� %s"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: ���������� � ������������� ���������� �������� ����� %s\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: ��������� ���������� �������� ����� ����������� ��������\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: ��������� ���������� �������� ����� ������� �����������\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s �� ������ - ���������...\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: ���������� ������� %s: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: �������� ��� -p ��� --pass-fd ������ ���� ������"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: ���������� ������� %s ��� ��������� ��������"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: �������� mtab, %s ��� ������������� �� %s"
@@ -9019,22 +9166,27 @@ msgstr "mount: ���������� �������������� %s%s ������ ��� ������"
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s ������� �� ������, �� ���� ������ ���� `-w'"
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: ���������� �������������� %s%s ������ ��� ������"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s ������� �� ������, ����������� ������ ��� ������"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: %s �� ������ - ���������...\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s ��� ������������� �� %s\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9044,23 +9196,23 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: �� ��� ������ ��� - ����� ��������������� nfs ��-�� ���������\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: �� ��� ������ ��� - ����� ��������������� cifs ��-�� �������� //\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ��� ������������� �� %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9120,19 +9272,19 @@ msgstr ""
 "������ �����: [-nfFrsvw] [-o �����] [-p passwdfd].\n"
 "��� ��������� ����� ���������� �������� ��������  man 8 mount .\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: ������ root ����� ������� ���"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "������ �� ���� ��������������"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: ����� ������ �� ������"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: ���������� ����� %s � %s ��� %s"
@@ -9315,42 +9467,42 @@ msgstr "�� �����������������.\n"
 msgid "%s: swapoff failed"
 msgstr "����� ���������� ��������"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: �������������� ��� ��������� -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: ���������� ������� �������� �������: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: �������� ������� ����������"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: �� �������������"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: ���������� �������� ���������"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9358,111 +9510,121 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: �� ������"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 "umount: %s: ���������� ����� ����� ����������������� ��� ���������������"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: ������� ���������� �� fs ���������"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "��� umount2, ����������� ������� umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ����� - �������������� ������ ��� ������\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ���������� ��������������� %s ������ ��� ������\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s �������������\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ���������� ����� ������ �������� ������ ��� ���������������"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "�������������: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t ����_��] [-O �����]\n"
 "       umount [-f] [-r] [-n] [-v] ����������� | ����...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "������ %d ��� �������\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "������ %d ��� �������\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "���������� �������������� \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "����������� ������� �������������� %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "���������� ����� %s � mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s �� ������������� (�������� mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: ������, ��� %s ������������� ��������� ���"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s �� � fstab (� �� �� root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: ������������ %s ������������ fstab'�"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: ������ %s ����� �������������� %s �� %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: ������ root ����� ������� ���"
 
@@ -9578,7 +9740,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9589,16 +9751,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "���������� ������� %s"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "���������� ����������� ��������\n"
@@ -10486,65 +10652,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "�������� id: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s �� %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "�������� id"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "�������� id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s �� �������� ������ ������� �����������"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "���������� �������� ������ %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "���������� �������� ������ %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "���������� ����� �� �������� ����������"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "���������� �������� ������ %s"
@@ -11728,9 +11894,6 @@ msgstr "�� ������� ������ ��� ���������� ������.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "��������� cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "������ %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "�������� ��� ������������\n"
 
@@ -11764,9 +11927,6 @@ msgstr "�� ������� ������ ��� ���������� ������.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "����-��� = %d, �������� = %d, ������������ = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "������ ������ %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "���������� ��������� %s, � ���������� ������� ���� ioctl\n"
 
@@ -11921,9 +12081,6 @@ msgstr "�� ������� ������ ��� ���������� ������.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: ������� �������� hp->h_length?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "����� nfs"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -11936,9 +12093,6 @@ msgstr "�� ������� ������ ��� ���������� ������.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "��� ������ nfs ������������ ���� %d\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs �����������"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "����������� ������������ �������� ��������� nfs: %d"
 
diff --git a/po/sl.po b/po/sl.po
index 0fb32d1f..e69cdebb 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre6\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2006-03-05 12:29+0200\n"
 "Last-Translator: Simon Mihevc <simonmihevc@email.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -211,7 +211,7 @@ msgstr "uporaba: %s [ -n ] naprava\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, fuzzy, c-format
 msgid "%s (%s)\n"
@@ -931,7 +931,7 @@ msgstr "stanja naprave %s ni mogo�e dobiti"
 msgid "%s is not a block special device"
 msgstr "%s ni posebna blo�na naprava"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "ni mogo�e odpreti %s"
@@ -1268,7 +1268,7 @@ msgstr "iskanje med testiranjem blokov ni uspelo"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Nenavadne vrednosti v do_check: verjetno programska napaka\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "iskanje v check_blocks ni uspelo"
 
@@ -1341,170 +1341,170 @@ msgstr "na '%s' ne bo poskusa narediti datote�ni sistem"
 msgid "number of blocks too small"
 msgstr "�tevilo sektorjev"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Podana velikost strani ni dobra%d\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, fuzzy, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Uporabljamo podano velikost strani %d namesto sistemske vrednosti %d/%d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Po�kodovana velikost glava izmenjalnega prostora, oznaka ni zapisana\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Oznaka je bila skraj�ana\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "ni oznake"
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "ni uuid-a\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Uporaba: %s [-c] [-v0|-v1] [-p vel. strani] /dev/ime [bloki]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "preve� po�kodovanih strani"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "ena po�kodovana stran\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu po�kodovanih strani\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "izmenjalne naprave ni mogo�e previti"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "zagonskega sektorja ni mogo�e po�istiti"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   izpi�i BSD-jevo tabelo razdelkov"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   prika�i celostno oznako diska"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: napaka: neznana razli�ica %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Napaka pri zapiranju datoteke\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: napaka: izmenjalnega prostora ni mo�no nikamor namestiti?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: napaka: velikost %lu je ve�ja od velikosti naprave %lu\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: napaka: velikost izmenjalnega prostora mora biti vsaj %ld KB\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: opozorilo: meja izmenjalnega prostora postavljena na %ldKB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "Naprava izmenjalnega prostora ne bo ustvarjena na ,%s`"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s je priklopljen; dat. sistema zato ne bo narejen!"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Izmenjalnega prostora ni mogo�e nastaviti: neberljiv"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Pripravljamo izmenjalni prostor razli�ice %d, velikost = %llu kB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "strani s podpisom ni mogo�e zapisati"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync ni uspel"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "stanja %s ni mogo�e dobiti"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "zapis inodov ni uspel"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "ni mogo�e preimenovati %s v %s: %s\n"
@@ -1516,53 +1516,53 @@ msgid ""
 "  %s "
 msgstr "Uporaba:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "stanja naprave %s ni mogo�e dobiti"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: ni znakovna naprava"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s ni posebna blo�na naprava"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Omejitvene datoteke %s ni mogo�e zakleniti: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Opozorilo: %s ni blokovna naprava\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "stanja naprave %s ni mogo�e dobiti"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "stanja naprave %s ni mogo�e dobiti"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: ni znakovna naprava"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s ni posebna blo�na naprava"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "napaka pri zaustavljanju storitve: \"%s\""
@@ -6725,16 +6725,6 @@ msgstr "Gonilnik jedra za %s nima RTC_EPOCH_SET ioctl.\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) k %s ni uspel"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "ni mogo�e odpreti %s"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6881,8 +6871,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM ni uspel, prekinjam: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Geslo: "
 
@@ -7779,6 +7769,16 @@ msgstr "uporaba: %s [+format] [dan mesec leto]\n"
 msgid "St. Tib's Day"
 msgstr "Dan st. Tiba"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "ni mogo�e odpreti %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8294,6 +8294,146 @@ msgstr "Ni mogo�e odpreti %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM ni dolo�en.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+"uporaba: last [-#] [-f dat] [-t tty] [-h ime gostitelja] [uporabnik ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "\t%s -l [signal ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: slab argument -l: %s.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "nfs kanal"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "nfs povezava"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Zapi�i"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "beri %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "%s ni mogo�e odpreti: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "%s ni mogo�e odpreti: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Napaka pri branju %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "neveljaven id"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: slaba vrednost\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "Napaka pri spreminjanju na�ina %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Uporaba: %s [izbire] naprava ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8364,37 +8504,37 @@ msgstr "opozorilo: ne morem odpreti %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: ni mogo�e odpreti %s - uporabljam %s namesto tega\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "ni mogo�e ustvariti omejitvene datoteke %s: %s (za povozitev uporabi -n)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr "omejitvene datoteke %s ni mogo�e vezati : %s (za povozitev uporabi -n)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr "omejitvene datoteke %s ni mogo�e odpreti: %s (za povozitev uporabi -n)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Omejitvene datoteke %s ni mogo�e zakleniti: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "omejitvene datoteke %s ni mogo�e zakleniti: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "�as se je iztekel"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8403,83 +8543,88 @@ msgstr ""
 "Povezave %s ni mogo�e ustvariti\n"
 "Mogo�e obstaja neveljavna zaklepna datoteka?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "%s ni mogo�e odpreti (%s) - mtab ni a�uriran"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "napaka pri pisanju %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "Napaka pri spreminjanju na�ina %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "Napaka pri spreminjanju na�ina %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "ni mogo�e preimenovati %s v %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: informacij o napravi %s ni mogo�e dobiti: %s\n"
+
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", odmik %d"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", omejitev_velikosti %lld"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", �ifriranje %s (tip %d)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", odmik %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", �ifrirni tip %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: informacij o napravi %s ni mogo�e dobiti: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: ni mogo�e odpreti naprave %s: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: uporabnik \"%s\" ne obstja.\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: za vpogled v /dev/loop# ni dovoljenja"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, fuzzy, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: iskanje proste loop naprave ni bilo uspe�no\n"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8489,54 +8634,54 @@ msgstr ""
 "\tte vrste. (�e je to res, ponovno prevedi jedro ali si pomagaj z `modprobe "
 "loop'.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Pri pove�evanju medpomnilnika je zmanjkalo pomnilnika.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor %d je �e dodeljen\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s je za��itena pred pisanjem, priklapljam samo za branje"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "V pomnilnik ni mogo�e zakleniti, kon�ujem.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): uspeh\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): uspeh\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: naprave %s ni mogo�e zbrisati: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Program mount je bil preveden brez podpore za loop. Poskusite ponovno "
 "prevesti mount.\n"
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8545,6 +8690,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8555,7 +8701,7 @@ msgstr ""
 "  %s -f\t\t\t\t\t\t# najdi neuporabljene\n"
 "  %s [-e �ifriranje] [-o odmik] {-f|loop_naprava} dat. # nastavitev\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8571,22 +8717,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: ni mogo�e odpreti naprave %s: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: naprava je zaposlena"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8618,7 +8764,7 @@ msgstr "mount: po evidenci mtab je %s priklopljeno na %s<"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: enote %s ni mo� odpreti za pisanje: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: napaka pri pisanju na %s: %s"
@@ -8638,7 +8784,7 @@ msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ni mogo�e vejiti: %s"
@@ -8668,88 +8814,88 @@ msgstr "\tin izgleda kot da je izmenjalni prostor\n"
 msgid "       I will try type %s\n"
 msgstr "\tUporabljen bo tip %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s je podoben izmenjalnemu prostoru, zato ne bo priklopljen"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "priklop ni uspel"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: samo sistemski skrbnik lahko priklopi %s na %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: loop naprava je podana dvakrat"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: tip je podan dvakrat"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: nastavitev loop naprave bo presko�ena\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: po evidenci mtab je %s �e priklopljeno na %s"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: loop naprava %s bo uporabljena\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: nastavitev loop naprave ni uspela\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: nastavitev loop naprave je uspela\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s bo ustvarjen, ker ga nisem na�el\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s ni mogo�e odpreti: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument pri -p ali --pass-fd mora biti �tevilka"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: %s ni mogo�e odpreti za nastavitev hitrosti"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: po evidenci mtab je %s �e priklopljeno na %s"
@@ -8945,22 +9091,27 @@ msgstr "mount: %s%s ni mo� priklopiti samo za branje"
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s je za��itena pred pisanjem ampak podana je `-w' zastavica"
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: %s%s ni mo� priklopiti samo za branje"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s je za��itena pred pisanjem, priklapljam samo za branje"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: %s bo ustvarjen, ker ga nisem na�el\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s je �e priklopljen v %s\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8970,22 +9121,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: tip ni bil podan - predpostavlja se nfs zaradi dvopi�ja\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: tip ni bil podan - predpostavlja se smbfs zaradi predpone // \n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s je �e priklopljen v %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9050,19 +9201,19 @@ msgstr ""
 "Druge izbire: [-nfFrsvw] [-o izbire].\n"
 "Podrobnosti lahko poi��ete v priro�niku z ukazom: man 8 mount\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: to lahko izvede samo sistemski skrbnik"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "ni� ni bilo priklopljeno"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: takega razdelka nisem na�el"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s ni mogo�e najti v %s ali %s"
@@ -9244,42 +9395,42 @@ msgstr "Niste sistemski skrbnik.\n"
 msgid "%s: swapoff failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: prevajanje je potekalo brez podpore za -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: vejitev ni mogo�a: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: neveljavna blo�na naprava"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ni priklopljena"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superbloka ni mogo�e zapisati"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9287,111 +9438,121 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: neuspe�no iskanje"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: samo sistemski skrbnik lahko odklaplja"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: na dat. sist. blo�ne naprave niso dovoljene"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ni umount2, posku�am z umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s je zaposlena - ponovno priklapljam samo za branje\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ponovni priklop %s samo za branje ni mogo�\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s je odklopljen\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: seznama dat. sist. za odklop ni mogo�e najti"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Uporaba: umount [-hV]\n"
 "\t  umount -a [-f] [-r] [-n] [-v] [-t tip nav. dat. sist.] [-O izbire]\n"
 "\t  umount [-f] [-r] [-n] [-v] posebno | vozli��e...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektor %d je �e dodeljen\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektor %d je �e dodeljen\n"
+
+#: mount/umount.c:485
 #, fuzzy
 msgid "Cannot umount \"\"\n"
 msgstr "ni mogo�e odklopiti \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s posku�am odklopiti\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s ni mogo�e najti v mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ni priklopljen (glede na mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: izgleda kot da je %s ve�krat priklopljen"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s ni v fstab (in vi niste sistemski skrbnik)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: priklop %s je v nasprotju z fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, fuzzy, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "mount: samo sistemski skrbnik lahko odklopi %s na %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: samo sistemski skrbnik naredi to"
 
@@ -9507,7 +9668,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9518,16 +9679,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "ni mogo�e odpreti %s"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "zagon ni uspel\n"
@@ -10409,65 +10574,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "neveljavni id: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s iz %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "neveljaven id"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "neveljavni id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ni posebna blo�na naprava"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "ni mogo�e dobiti velikosti %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "ni mogo�e dobiti velikosti %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Iskanje na disku ni mogo�e"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "ni mogo�e dobiti velikosti %s"
@@ -11646,9 +11811,6 @@ msgstr "Pri pove�evanju medpomnilnika je zmanjkalo pomnilnika.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "�akam na cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "beri %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "berem prijavno ime\n"
 
@@ -11682,9 +11844,6 @@ msgstr "Pri pove�evanju medpomnilnika je zmanjkalo pomnilnika.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "�asovna omejitev = %d, ti�ina = %d, ponovni zagon = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Napaka pri branju %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "no mogo�e brati %s in ni mogo�e dobiti izpisa ioctl\n"
 
@@ -11838,9 +11997,6 @@ msgstr "Pri pove�evanju medpomnilnika je zmanjkalo pomnilnika.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: po�kodovan hp->h_length?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "nfs kanal"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -11853,9 +12009,6 @@ msgstr "Pri pove�evanju medpomnilnika je zmanjkalo pomnilnika.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "uporabljajo se %d vrata za demona nfs\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs povezava"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "nfs-jeva povratna vrednost stanja ni znana: %d "
 
diff --git a/po/sv.po b/po/sv.po
index 95fec771..696ceb61 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2007-11-14 09:20+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -204,7 +204,7 @@ msgstr "användning: %s [ -n ] enhet\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -921,7 +921,7 @@ msgstr "kan inte ta status på enheten %s"
 msgid "%s is not a block special device"
 msgstr "%s är ingen blockspecialenhet"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
@@ -1258,7 +1258,7 @@ msgstr "sökning misslyckades under test av block"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Konstiga värden i \"do_check\": troligtvis programfel\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "sökning misslyckades i \"check_blocks\""
 
@@ -1330,167 +1330,167 @@ msgstr "kommer inte att försöka skapa filsystem på \"%s\""
 msgid "number of blocks too small"
 msgstr "Antal sektorer"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Användardefinierade sidstorleken %d är felaktig\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Använder användardefinierade sidstorleken %d istället för systemvärdet %d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Felaktig storlek på växlingshuvud, ingen etikett skrevs.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Etiketten var avkapad.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "ingen etikett, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "inget uuid\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Användning: %s [-c] [-v0|-v1] [-pSIDSTORLEK] [-L etikett] /dev/namn [block]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "för många felaktiga sidor"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "en felaktig sida\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu felaktiga sidor\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "kan inte spola tillbaka växlingsenheten"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "kan inte tömma startsektor"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   skriv ut BSD-partitionstabell"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   visa fullständig disketikett"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: fel: version %d är okänd\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr "Fel vid stängning av fil\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: fel: Ingenstans att skapa växlingsutrymme?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: fel: storleken %lu är större än enhetsstorleken %lu\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: fel: växlingsutrymmet måste vara minst %ld kB\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: varning: avkortar växlingsutrymmet till %ld kB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: fel: kommer inte att försöka skapa växlingsenhet på \"%s\"\n"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: fel: %s är monterad; kommer inte att skapa växlingsutrymme.\n"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Kan inte ställa in växlingsutrymme: oläsbart"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Ställer in växlingsutrymme version %d, storlek = %llu kB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "kan inte skriva signatursida"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync misslyckades"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: kunde inte få selinux-filetikett: %s\n"
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr "kunde inte matchpathcon()"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr "kunde inte skapa nytt selinux-sammanhang"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr "kunde inte beräkna selinux-sammanhang"
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: kan inte byta etikett på %s till %s: %s\n"
@@ -1502,53 +1502,53 @@ msgid ""
 "  %s "
 msgstr "Användning:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "kan inte ta status på enheten %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: ingen teckenenhet"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s är ingen blockspecialenhet"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Kan inte låsa låsfilen %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Varning: %s är ingen blockenhet\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "kan inte ta status på enheten %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "kan inte ta status på enheten %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: ingen teckenenhet"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s är ingen blockspecialenhet"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "fel vid stoppande av tjänst: \"%s\""
@@ -6773,16 +6773,6 @@ msgstr "Kärndrivrutinen för %s har inte RTC_EPOCH_SET-ioctl:en.\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) på %s misslyckades"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "kan inte öppna %s"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6929,8 +6919,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "chsh: PAM-fel, avbryter: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Lösenord: "
 
@@ -7840,6 +7830,16 @@ msgstr "användning: %s [+format] [dag månad år]\n"
 msgid "St. Tib's Day"
 msgstr "St. Tibs Dag"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "kan inte öppna %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8357,6 +8357,146 @@ msgstr "Kunde inte öppna %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM är inte angiven.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+"användning: last [-#] [-f fil] [-t tty] [-h värdnamn] [användare ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ signal ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: felaktigt argument %s till -l.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "nfs-uttag"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "nfs-anslut"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Skriv"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "läste %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "Kan inte öppna %s: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "Kan inte öppna %s: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Fel vid läsning av %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "ogiltigt id"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: felaktigt värde\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "fel vid byte av rättigheter på %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Användning: %s [flaggor] enhet ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8427,36 +8567,36 @@ msgstr "varning: kan inte öppna %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: kunde inte öppna %s - använder %s istället\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, 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:614
+#: mount/fstab.c:615
 #, 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:630
+#: mount/fstab.c:631
 #, 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:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Kan inte låsa låsfilen %s: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "kan inte låsa låsfilen %s: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "gjorde time-out"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8465,83 +8605,88 @@ msgstr ""
 "Kan inte skapa länken %s\n"
 "Det finns kanske en kvarglömd låsfil?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "kan inte öppna %s (%s) - mtab uppdaterades inte"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "fel vid skrivning av %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "fel vid byte av rättigheter på %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "fel vid byte av rättigheter på %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, 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:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: kan inte få tag i information om enheten %s: %s\n"
+
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", avstånd %d"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", storleksgräns %lld"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", kryptering %s (typ %d)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", avstånd %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", krypteringstyp %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, 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:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kan inte öppna enheten %s: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: användaren \"%s\" finns inte.\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: inga rättigheter att granska /dev/loop#"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: kunde inte hitta någon ledig slingenhet"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8551,52 +8696,52 @@ msgstr ""
 "       till slingenheten? (Om det är så bör du kompilera om eller\n"
 "       \"modprobe loop\")."
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Slut på minne vid växande av buffert.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor %d är redan allokerad\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s är skrivskyddad, monterar som endast läsbar"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kunde inte låsa i minne, avslutar.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD misslyckades: %s\n"
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): lyckades\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): lyckades\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: kan inte ta bort enheten %s: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 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:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8605,6 +8750,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8615,7 +8761,7 @@ msgstr ""
 "  %s -f                                                # hitta ledig\n"
 "  %s [-e kryptering] [-o avstånd] {-f|slingenhet} fil  # konfiguration\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8648,22 +8794,22 @@ msgstr ""
 " -v | --verbose           informativt läge\n"
 "\n"
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: kan inte öppna enheten %s: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "mount: stulen loop=%s ...försöker igen\n"
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: enheten är upptagen"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8695,7 +8841,7 @@ msgstr "mount: enligt mtab är %s monterat på %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kan inte öppna %s för skrivning: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fel vid skrivning av %s: %s"
@@ -8715,7 +8861,7 @@ msgstr "mount: kan inte ställa in grupp-id: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: kan inte ställa in användar-id: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kan inte grena: %s"
@@ -8745,88 +8891,88 @@ msgstr "       och det verkar som om detta är växlingsutrymme\n"
 msgid "       I will try type %s\n"
 msgstr "       Jag kommer att försöka med typen %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ser ut som växlingsutrymme - monteras inte"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "montering misslyckades"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: endast root kan montera %s på %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: slingenheten angiven två gånger"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: typen angiven två gånger"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: hoppar över konfigurationen av en slingenhet\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: enligt mtab är %s redan monterat på %s"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: kommer att använda slingenheten %s\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr "mount: stulen loop=%s ...försöker igen\n"
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: stulen loop=%s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: misslyckades konfigurera slingenheten\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: lyckades konfigurera slingenheten\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ingen %s hittades - skapar den...\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kan inte öppna %s: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument till -p eller --pass-fd måste vara ett tal"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, 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:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kan inte ställa in hastighet: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: enligt mtab är %s redan monterat på %s\n"
@@ -9020,22 +9166,27 @@ msgstr "mount: kan inte montera %s%s som endast läsbar"
 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:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: kan inte montera %s%s som endast läsbar"
+
+#: mount/mount.c:1542
 #, 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:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: stulen loop=%s ...försöker igen\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s är redan monterad på %s\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9045,24 +9196,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: ingen typ angavs - jag kommer att anta nfs på grund av kolonet\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: ingen typ angavs - jag kommer att anta cifs på grund //-prefixet\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s är redan monterad på %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9132,19 +9283,19 @@ msgstr ""
 "Andra flaggor: [-nfFrsvw] [-o flaggor] [-p lösenordfd].\n"
 "Ange  man 8 mount  för ytterligare detaljer.\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: endast root kan göra det"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "ingenting monterades"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: ingen sådan partition hittades"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kan inte hitta %s i %s eller %s"
@@ -9325,42 +9476,42 @@ msgstr "Inte superanvändare.\n"
 msgid "%s: swapoff failed"
 msgstr "%s misslyckades.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: kompilerad utan stöd för -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: kan inte ställa in grupp-id: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: kan inte ställa in användar-id: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kan inte grena: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ogiltig blockenhet"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: inte monterad"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kan inte skriva superblock"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9368,110 +9519,120 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s hittades inte"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: måste vara superanvändare för att avmontera"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blockenheter är inte tillåtna på filsystem"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, försöker med umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s är upptagen - monterade om som endast läsbar\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kunde inte montera om %s som endast läsbar\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s avmonterad\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan inte hitta lista med filsystem att avmontera"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Användning: umount [-hV]\n"
 "            umount -a [-f] [-r] [-n] [-v] [-t vfs-typer] [-O alternativ]\n"
 "            umount [-f] [-r] [-n] [-v] special | nod...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektor %d är redan allokerad\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektor %d är redan allokerad\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Kan inte avmontera \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Försöker avmontera %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunde inte hitta %s i mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s är inte monterad (enligt mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: det verkar som om %s är monterad flera gånger"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s är inte i fstab (och du är inte root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montering av %s stämmer inte överens med fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: endast %s kan avmontera %s från %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: endast root kan göra det"
 
@@ -9587,7 +9748,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9598,16 +9759,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "kan inte öppna %s"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "körning misslyckades\n"
@@ -10496,65 +10661,65 @@ msgstr "zräkn"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ogiltigt id: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s från %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "ogiltigt id"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ogiltigt id: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s är ingen blockspecialenhet"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "kan inte hämta storleken på %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "kan inte hämta storleken på %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Kan inte söka på diskenhet"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "kan inte hämta storleken på %s"
@@ -11736,9 +11901,6 @@ msgstr "Slut på minne vid växande av buffert.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "väntar på cr-lf\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "läste %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "läser användarnamn\n"
 
@@ -11769,9 +11931,6 @@ msgstr "Slut på minne vid växande av buffert.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "time-out = %d, tyst = %d, omstart = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Fel vid läsning av %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "kunde inte läsa %s, och kan inte dumpa ioctl\n"
 
@@ -11943,9 +12102,6 @@ msgstr "Slut på minne vid växande av buffert.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: fick felaktig hp->h_length?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "nfs-uttag"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs-bindresvport"
 
@@ -11958,9 +12114,6 @@ msgstr "Slut på minne vid växande av buffert.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "använder port %d för nfs-demonen\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs-anslut"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "okänt nfs-statusreturvärde: %d"
 
diff --git a/po/tr.po b/po/tr.po
index fc278c96..26ed2bd6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2006-03-06 15:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -208,7 +208,7 @@ msgstr "kullanımı: %s [ -n ] AYGIT\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -927,7 +927,7 @@ msgstr "%s aygıtının durum bilgisi alınamıyor"
 msgid "%s is not a block special device"
 msgstr "%s bir blok-özel aygıt değil"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "%s açılamıyor"
@@ -1264,7 +1264,7 @@ msgstr "bloklar denetlenirken erişim başarısız"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check yapılırken tuhaf değerler: yazılım hatası olabilir\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "check_blocks işleminde erişim başarısız"
 
@@ -1336,173 +1336,173 @@ msgstr "'%s' üzerinde dosya sistemi oluşturmaya çalışılmayacak"
 msgid "number of blocks too small"
 msgstr "Sektör sayısı"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "kullanıcı tarafından belirtilen sayfa uzunluğu %d hatalı\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, fuzzy, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Kullanıcı tarafından belirtilen sayfa uzunluğu %d kullanılıyor,\n"
 "(sistem değeri %d/%d yerine)\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Takas başlığı uzunluğu hatalı, bir etiket yazılmamış.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Etiket kısaltıldı.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "bir etiket yok, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "UUID yok\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Kullanımı: %s [-c] [-v0|-v1] [-pSayfaUzunluğu] [-L etiket]\n"
 "                /dev/isim [blokSayısı]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "çok fazla bozuk sayfa var"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Bellek yetersiz"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "1 bozuk sayfa\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu bozuk sayfa\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "takas alanında başa gidilemiyor"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "başlatma sektörü temizlenemiyor"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   BSD disk bölümleme tablosunu gösterir"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   disk etiketinin tamamını gösterir"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: hata: sürüm %d bilinmiyor\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Dosya kapatılırken hata\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: hata: Takas alanını koyacak yer yok mu?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: hata: %lu aygıtın boyutundan büyük (%lu)\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: hata: takas alanı için en az %ldkB gerekiyor\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: uyarı: takas alanı %ldkB ile sınırlanıyor\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "'%s' üzerinde takas aygıtı oluşturulmayacak"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s bağlı; burada bir dosya sistemi yapılmayacak!"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Takas alanı oluşturulamıyor: okunabilir değil"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Takas alanı sürüm %d, uzunluk = %llu kB olarak ayarlanıyor\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "imza sayfası yazılamıyor"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync hata verdi"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "%s durum bilgileri alınamıyor"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "düğümler yazılamıyor"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s %s olarak değiştirilemiyor: %s\n"
@@ -1514,53 +1514,53 @@ msgid ""
 "  %s "
 msgstr "Kullanımı:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "%s aygıtının durum bilgisi alınamıyor"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: bir karakter aygıtı değil"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s bir blok-özel aygıt değil"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "%s kilit dosyası kilitlenemiyor: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Uyarı: %s bir blok aygıtı değil\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "%s aygıtının durum bilgisi alınamıyor"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "%s aygıtının durum bilgisi alınamıyor"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: bir karakter aygıtı değil"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s bir blok-özel aygıt değil"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "servis durdurulurken hata: \"%s\""
@@ -6761,16 +6761,6 @@ msgstr "%s için çekirdek aygıt sürücüsünde RTC_EPOCH_SET ioctl yok.\n"
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) %s için hata verdi"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "%s açılamıyor"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6918,8 +6908,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM hatası, çıkılıyor: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Parola: "
 
@@ -7817,6 +7807,16 @@ msgstr "kullanımı: %s [+biçem] [gün ay yıl]\n"
 msgid "St. Tib's Day"
 msgstr "St. Tib Günü"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "%s açılamıyor"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8332,6 +8332,146 @@ msgstr "%s açılamadı\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM atanmamış.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+"Kullanımı: last [-#] [-f dosya] [-t tty] [-h makinaAdı] [kullanıcı ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ sinyal ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: -l argümanı %s hatalı.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "nfs soketi"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "nfs bağlantısı"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Kaydet"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "%c okundu\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "%s açılamıyor: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "%s açılamıyor: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "%s okunurken hata\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "kimlik geçersiz"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "Numara geçersiz: %s\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "%s için kip değiştirilirken hata: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8402,39 +8542,39 @@ msgstr "uyarı: %s açılamıyor: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s açılamadı - yerine %s kullanılıyor\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, 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:614
+#: mount/fstab.c:615
 #, 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:630
+#: mount/fstab.c:631
 #, 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:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "%s kilit dosyası kilitlenemiyor: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "%s kilit dosyası kilitlenemiyor: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "zaman aşımı"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8443,83 +8583,88 @@ msgstr ""
 "%s bağı oluşturulamıyor\n"
 "Kalmış bir kilit dosyası olabilir mi?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "%s açılamıyor (%s) - mtab güncel değil"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "%s yazılırken hata: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "%s için kip değiştirilirken hata: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "%s için kip değiştirilirken hata: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s %s olarak değiştirilemiyor: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: %s aygıtı hakkında bilgi alınamıyor: %s\n"
+
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", başl %d"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", boysınırı %lld"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", %s şifreleme türü (%d) bilinmiyor"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", başl %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", şifreleme türü %d bilinmiyor\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, 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:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: %s aygıtı açılamıyor: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: \"%s\" yok.\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: /dev/loop# için izinler yetersiz"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: hiç serbest loop aygıtı yok"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8529,52 +8674,52 @@ msgstr ""
 "       bilgiye sahip değil. (`modprobe loop' deneyin, sonuç alamazsanız\n"
 "       çekirdeği yeniden derleyin.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Tampon büyütülürken bellek yetmedi.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s yazma korumalı, salt-okunur olarak bağlanıyor"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Bellek içinde kilitlenemedi, çıkılıyor.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): başarılı\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): başarılı\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: %s aygıtı silinemiyor: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 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:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8583,6 +8728,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8594,7 +8740,7 @@ msgstr ""
 "kullanılmamışlar\n"
 "  %s [ -e şifreleme ] [ -o konum ] {-f|loop_aygıtı} dosya # ayarlama\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8610,22 +8756,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: %s aygıtı açılamıyor: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: aygıt meşgul"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Derleme sırasında loop desteği verilmemiş. Lütfen yeniden derleyin.\n"
@@ -8655,7 +8801,7 @@ msgstr "mount: mtab'a göre, %s %s üzerinde bağlı"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s yazmak için açılamıyor: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: %s yazılırken hata: %s"
@@ -8675,7 +8821,7 @@ msgstr "mount: hız ayarlanamıyor: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ast süreç oluşturulamıyor: %s"
@@ -8705,88 +8851,88 @@ msgstr "       ve bu takas alanı gibi görünüyor\n"
 msgid "       I will try type %s\n"
 msgstr "       %s türü denenecek\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s takas alanı gibi görünüyor - bağlanmadı"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "mount başarısız"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, 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:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: loop aygıtı iki kere belirtilmiş"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: türü iki defa belirtilmiş"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: loop aygıtı ayarları atlanıyor\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: mtab'a göre, %s zaten %s üzerinde bağlı"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, 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:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop aygıtı ayarları yapılamadı\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop aygıtı ayarları tamamlandı\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s yok - oluşturuluyor...\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s açılamıyor: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: -p ve --pass-fd seçeneklerinin argümanı bir sayı olmalıdır"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: hızı ayarlamak için %s açılamıyor"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: mtab'a göre, %s zaten %s üzerinde bağlı"
@@ -8984,22 +9130,27 @@ 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:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: %s%s salt-okunur bağlanamıyor"
+
+#: mount/mount.c:1542
 #, 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:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: %s yok - oluşturuluyor...\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s zaten %s üzerinde bağlı\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9009,22 +9160,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: tür belirtilmemiş - ':' içerdiğinden nfs varsayılıyor\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: tür belirtilmemiş - '//' öneki içerdiğinden cifs varsayılıyor\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s zaten %s üzerinde bağlı\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9087,19 +9238,19 @@ msgstr ""
 "Çeviri hatalarını <gnu-tr@belgeler.org> adresine bildiriniz.\n"
 "Daha fazla bilgi edinmek için 'man 8 mount' yazabilirsiniz.\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: bunu sadece root yapabilir"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "hiçbir şey bağlanmadı"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: böyle bir disk bölümü yok"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s  %s ya da %s içinde bulunamıyor"
@@ -9280,42 +9431,42 @@ msgstr "root değil.\n"
 msgid "%s: swapoff failed"
 msgstr "erişim başarısız"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: -f için destek içermeksizin derlenmiş\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: ast süreç oluşturulamıyor: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: blok aygıtı geçersiz"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: bağlanmadı"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superblok yazılamıyor"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9323,56 +9474,56 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: yok"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: bağı kaldırmak için root gerekli"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: dosya sisteminde blok aygıtlara izin yok"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 yok, umount deneniyor...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s meşgul- salt-okunur olarak yeniden bağlandı\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s salt okunur olarak yeniden bağlanamıyor\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s sistemden ayrıldı\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ayrılacak dosya sistemlerinin listesi bulunamıyor"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Kullanımı: umount [-hV]\n"
 "       umount -a [-f] [-l] [-r] [-n] [-v] [-t ds-türü] [-O seçenekler]\n"
@@ -9393,55 +9544,65 @@ msgstr ""
 "Çeviri hatalarını <gnu-tr@belgeler.org> adresine bildiriniz\n"
 "Daha fazla bilgi edinmek için 'man 8 umount' yazınız.\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Sektör %d zaten kullanımda\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Sektör %d zaten kullanımda\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "\"\" ayrılamaz\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s sistemden ayrılmaya çalışılıyor\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab içinde %s bulunamadı\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s bağlı değil (mtab içinde yok)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s defalarca bağlanmış görünüyor"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s fstab içinde yok (ve siz root değilsiniz)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s bağı fstab ile çelişiyor"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: sadece %1$s %3$s aygıtını %2$s dizininden ayırabilir"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: bu sadece root tarafından yapılabilir"
 
@@ -9557,7 +9718,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9568,16 +9729,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "%s açılamıyor"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "çalıştırma başarısız\n"
@@ -10465,65 +10630,65 @@ msgstr "zsayısı"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "kimlik geçersiz: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%2$s deki %1$s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "kimlik geçersiz"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "kimlik geçersiz: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s bir blok-özel aygıt değil"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "%s uzunluğu alınamıyor"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "%s uzunluğu alınamıyor"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Disk sürücü üzerinde arama yapılamıyor"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "%s uzunluğu alınamıyor"
@@ -11700,9 +11865,6 @@ msgstr "Tampon büyütülürken bellek yetmedi.\n"
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "cr-lf için bekleniyor\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "%c okundu\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "kullanıcı ismi okunuyor\n"
 
@@ -11736,9 +11898,6 @@ msgstr "Tampon büyütülürken bellek yetmedi.\n"
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "zaman aşımı = %d, basit = %d, yeniden = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "%s okunurken hata\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "%s okunamadı ve ioctl dökümlenemiyor\n"
 
@@ -11889,9 +12048,6 @@ msgstr "Tampon büyütülürken bellek yetmedi.\n"
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: yanlış hp->h_length alındı?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "nfs soketi"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -11904,9 +12060,6 @@ msgstr "Tampon büyütülürken bellek yetmedi.\n"
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "nfs artalan süreci için %d portu kullanılıyor\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs bağlantısı"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "bilinmeyen nfs durum sonuç değeri: %d"
 
diff --git a/po/uk.po b/po/uk.po
index d2281fb6..eb13c49e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2006-04-06 10:45+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -202,7 +202,7 @@ msgstr "використання: %s [ -n ] пристрій\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -923,7 +923,7 @@ msgstr "не вдається отримати інформацію про %s"
 msgid "%s is not a block special device"
 msgstr "%s не є спеціальним файлом блочного пристрою"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "не вдається відкрити %s"
@@ -1254,7 +1254,7 @@ msgstr "помилка позиціювання при перевірці бло
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Незрозуміле значення у функції do_check: можливо помилка\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "помилка позиціювання у функції check_blocks"
 
@@ -1326,173 +1326,173 @@ msgstr "файлова система не буде створена на '%s'"
 msgid "number of blocks too small"
 msgstr "Кількість секторів"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Неправильний вказаний користувачем розмір сторінки %d\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, fuzzy, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Використовується вказаний користувачем розмір сторінки %d, замість системних "
 "значень %d/%d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 "Неправильний розмір заголовку розділу підкачки, етикетку не записано.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Етикетку обрізано.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "немає етикетки, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "немає uuid\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Використання: %s [-c] [-v0|-v1] [-pPAGESZ] [-L етикетка] /dev/назва [блоки]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "надто багато пошкоджених сторінок"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Недостатньо пам'яті"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "одна пошкоджена сторінка\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu пошкоджених сторінок\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "помилка встановлення позиції на початок пристрою підкачки"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "не вдається очистити завантажувальний сектор"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   вивести таблицю розділів BSD"
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   показати всю етикетку диску"
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: помилка: невідома версія %d\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Помилка закривання файлу\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: помилка: Не вказано де створити область підкачки?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: помилка: розмір %lu більший ніж розмір пристрою %lu\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: помилка: область підкачки повинна бути принаймні %ldкб\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: попередження: область підкачки відсікається до %ldкб\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "Не буде створено пристрій підкачки на '%s'"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s підключений; тут не можна створювати файлову систему!"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "не вдається встановити простір підкачки: не вдається прочитати"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Встановлюється область підкачки версії %d, розмір = %llu кб\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "не вдається записати сторінку підпису"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "помилка виконання fsync"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "не вдається запустити %s"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "не вдається записати вузли"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "не вдається перейменувати %s у %s: %s\n"
@@ -1504,53 +1504,53 @@ msgid ""
 "  %s "
 msgstr "Використання:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, fuzzy, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "не вдається отримати інформацію про %s"
-
-#: disk-utils/raw.c:136
-#, fuzzy, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: не є символьним пристроєм"
-
-#: disk-utils/raw.c:141
-#, fuzzy, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "%s не є спеціальним файлом блочного пристрою"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "не вдається заблокувати файл блокування %s: %s\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Попередження: %s не є блочним пристроєм\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, fuzzy, c-format
 msgid "Cannot open master raw device '"
 msgstr "не вдається отримати інформацію про %s"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, fuzzy, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "не вдається отримати інформацію про %s"
+
+#: disk-utils/raw.c:211
+#, fuzzy, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "/dev/%s: не є символьним пристроєм"
+
+#: disk-utils/raw.c:216
+#, fuzzy, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "%s не є спеціальним файлом блочного пристрою"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, fuzzy, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "помилка зупинення служби: \"%s\""
@@ -6738,16 +6738,6 @@ msgstr ""
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "помилка у ioctl(RTC_EPOCH_SET) для %s"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "не вдається відкрити %s"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6894,8 +6884,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: помилка PAM, перервано: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Пароль: "
 
@@ -7792,6 +7782,16 @@ msgstr "використання: %s [+формат] [день місяць рі
 msgid "St. Tib's Day"
 msgstr "День святого Tib"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "не вдається відкрити %s"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8308,6 +8308,147 @@ msgstr "не вдається відкрити %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: не визначено $TERM.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+"Використання: last [-#] [-f file] [-t tty] [-h назва_вузла] "
+"[користувач ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ сигнал ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: неправильний -l аргумент %s.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "nfs сокет"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "nfs connect"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Записати"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "прочитано %c\n"
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "не вдається відкрити %s: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "не вдається відкрити %s: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, fuzzy, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr "Помилка читання %s\n"
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "неправильний ідентифікатор"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: неправильне значення\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "помилка зімни режиму доступу до %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Використання: %s [параметри] пристрій ...\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8378,42 +8519,42 @@ msgstr "Попередження: не вдається відкрити %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: не вдається відкрити %s - натомість використовується %s\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "не вдається створити файл блокування %s: %s (для перевизначення "
 "використовуйте -n)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "не вдається створити посилання на файл блокування %s: %s (для перевизначення "
 "використовуйте -n)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "не вдається відкрити файл блокування %s: %s (для перевизначення "
 "використовуйте -n)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "не вдається заблокувати файл блокування %s: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "не вдається заблокувати файл блокування %s: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "вийшов час очікування"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8422,83 +8563,88 @@ msgstr ""
 "не вдається створити посилання %s\n"
 "Можливо є застарілий файл файл блокування?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "не вдається відкрити %s (%s) - mtab не оновлено"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "помилка запису %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "помилка зімни режиму доступу до %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "помилка зімни режиму доступу до %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "не вдається перейменувати %s у %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: не вдається отримати інформацію про пристрій %s: %s\n"
+
+#: mount/lomount.c:388
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", зсув %d"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", обмеження на розмір %lld"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", шифрування %s (тип %d)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", зсув %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", тип шифрування %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: не вдається отримати інформацію про пристрій %s: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: не вдається відкрити пристрій %s: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: користувач \"%s\" не існує.\n"
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: немає прав доступу до /dev/loop#"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: не вдається знайти жодний вільний loop-пристрій"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8508,54 +8654,54 @@ msgstr ""
 "       підтримує роботу з loop-пристроями (Якщо це так - перекомпілюйте\n"
 "       його або виконайте `modprobe loop')."
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Недостатньо пам'яті для збільшення буфера.\n"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Сектор %d вже розподілений\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s захищений від запису, монтується лише для читання"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "не вдається заблокувати у пам'яті, завершення.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): успішно завершено\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): успішно завершено\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: не вдається видалити пристрій %s: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Програма mount була скомпільована без підтримки loop-пристроїв. "
 "Перекомпілюйте її \n"
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8564,6 +8710,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8574,7 +8721,7 @@ msgstr ""
 "  %s -f                                               # знайти вільний\n"
 "  %s [ -e шифрування ] [ -o зсув ] loop_пристрій файл # встановити\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8590,22 +8737,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: не вдається відкрити пристрій %s: %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: пристрій зайнятий"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8636,7 +8783,7 @@ msgstr "mount: згідно mtab, %s підключений у %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: не вдається відкрити %s для запису: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: помилка запису %s: %s"
@@ -8656,7 +8803,7 @@ msgstr "mount: помилка встановлення швидкості: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: помилка створення процесу: %s"
@@ -8686,88 +8833,88 @@ msgstr "       та він схожий розділ підкачки\n"
 msgid "       I will try type %s\n"
 msgstr "       буде випробувано тип %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s схожий на розділ підкачки - не підключатиметься"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "помилка підключення"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: лише адміністратор(root) може підключати %s у %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: loop-пристрій вказано двічі"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: тип вказано двічі"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: пропускається встановлення loop-пристрою\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: згідно mtab, %s вже підключений у %s"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: буде використовуватись loop-пристрій %s\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: помилка встановлення loop-пристрою\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: встановлення loop-пристрою успішно завершено\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: не знайдено %s - створюється..\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: не вдається відкрити %s: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: аргумент для -p або --pass-fd повинен бути числом"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: помилка відкривання %s для встановлення швидкості"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: згідно mtab, %s вже підключений у %s"
@@ -8966,22 +9113,27 @@ msgstr "mount: не вдається підключити %s%s лише для �
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s захищений від запису, але було вказано ключ `-w'"
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: не вдається підключити %s%s лише для читання"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s захищений від запису, монтується лише для читання"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, fuzzy, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: не знайдено %s - створюється..\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s вже підключений у %s\n"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8991,22 +9143,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: не вказано тип - вважається nfs, через наявність двокрапки\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: не вказано тип - вважається cifs, через наявність префіксу //\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s вже підключений у %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9066,19 +9218,19 @@ msgstr ""
 "Інші параметри: [-nfFrsvw] [-o параметри] [-p пароль].\n"
 "Додаткову інформацію дивіться у man 8 mount .\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: це може робити лише адміністратор(root)"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "нічого не було підключено"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: не знайдено такого розділу"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: не вдається знайти %s у %s або %s"
@@ -9259,42 +9411,42 @@ msgstr "Не адміністратор.\n"
 msgid "%s: swapoff failed"
 msgstr "помилка при встановленні позиції"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: зібрано без підтримки -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: не вдається запустити дочірній процес: %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: неправильний блочний пристрій"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: не підключений"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: не вдається записати суперблок"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9302,111 +9454,121 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: не існує"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 "umount: %s: для використання umount необхідно мати права адміністратора"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: блочні пристрої не дозволено на файловій системі"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "немає umount2, пробується umount...\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s зайнятий - перепідключено у режим лише-для-читання\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: не вдається перепідключити %s у режим лише-для-читання\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s відключено\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: не вдається знайти перелік файлових систем для відключення"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Використання: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t тип_фс] [-O параметри]\n"
 "       umount [-f] [-r] [-n] [-v] спец_файл | каталог...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "Сектор %d вже розподілений\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "Сектор %d вже розподілений\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Не вдається відключити \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Спроба відключити %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "не вдається знайти %s у mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s не є підключеним (згідно mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: здається %s підключений декілька разів"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s відсутній у fstab (та ви не адміністратор)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: підключений %s відрізняється від fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: лише %s може відключити %s від %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: це може робити лише адміністратор(root)"
 
@@ -9522,7 +9684,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9533,16 +9695,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "не вдається відкрити %s"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "помилка запуску\n"
@@ -10429,65 +10595,65 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "неправильний ідентифікатор: %s\n"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s з %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 #, fuzzy
 msgid "invalid option"
 msgstr "неправильний ідентифікатор"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "неправильний ідентифікатор: %s\n"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s не є спеціальним файлом блочного пристрою"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "не вдається отримати розмір %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "не вдається отримати розмір %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Помилка позиціювання на дисковому пристрої"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "не вдається отримати розмір %s"
@@ -11672,9 +11838,6 @@ msgstr "Недостатньо пам'яті для збільшення буф�
 #~ msgid "waiting for cr-lf\n"
 #~ msgstr "пошук символу нового рядка\n"
 
-#~ msgid "read %c\n"
-#~ msgstr "прочитано %c\n"
-
 #~ msgid "reading login name\n"
 #~ msgstr "читається реєстраційне ім'я\n"
 
@@ -11708,9 +11871,6 @@ msgstr "Недостатньо пам'яті для збільшення буф�
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#~ msgid "Error reading %s\n"
-#~ msgstr "Помилка читання %s\n"
-
 #~ msgid "couldn't read %s, and cannot ioctl dump\n"
 #~ msgstr "не вдається прочитати %s, або не вдається виконати ioctl дампу\n"
 
@@ -11864,9 +12024,6 @@ msgstr "Недостатньо пам'яті для збільшення буф�
 #~ msgid "mount: got bad hp->h_length?\n"
 #~ msgstr "mount: отримано неправильний hp->h_length?\n"
 
-#~ msgid "nfs socket"
-#~ msgstr "nfs сокет"
-
 #~ msgid "nfs bindresvport"
 #~ msgstr "nfs bindresvport"
 
@@ -11879,9 +12036,6 @@ msgstr "Недостатньо пам'яті для збільшення буф�
 #~ msgid "using port %d for nfs deamon\n"
 #~ msgstr "використовується порт %d служби nfs\n"
 
-#~ msgid "nfs connect"
-#~ msgstr "nfs connect"
-
 #~ msgid "unknown nfs status return value: %d"
 #~ msgstr "повернений невідомий код стану nfs: %d"
 
diff --git a/po/util-linux-ng.pot b/po/util-linux-ng.pot
index d78864b0..b28da904 100644
--- a/po/util-linux-ng.pot
+++ b/po/util-linux-ng.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -198,7 +198,7 @@ msgstr ""
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -881,7 +881,7 @@ msgstr ""
 msgid "%s is not a block special device"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -1187,7 +1187,7 @@ msgstr ""
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr ""
 
@@ -1257,163 +1257,163 @@ msgstr ""
 msgid "number of blocks too small"
 msgstr ""
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr ""
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr ""
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr ""
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr ""
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 msgid "unable to erase bootbits sectors"
 msgstr ""
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr ""
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, c-format
 msgid "        on whole disk. "
 msgstr ""
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr ""
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr ""
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr ""
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr ""
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr ""
@@ -1425,53 +1425,53 @@ msgid ""
 "  %s "
 msgstr ""
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
+#: disk-utils/raw.c:145
 #, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
+msgid "Cannot locate block device '%s' (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:136
+#: disk-utils/raw.c:151
 #, c-format
-msgid "Raw device '%s' is not a character dev\n"
+msgid "Device '%s' is not a block dev\n"
 msgstr ""
 
-#: disk-utils/raw.c:141
+#: disk-utils/raw.c:186
 #, c-format
-msgid "Device '%s' is not a raw dev\n"
+msgid "Cannot open master raw device '"
 msgstr ""
 
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:205
 #, c-format
-msgid "Cannot locate block device '%s' (%s)\n"
+msgid "Cannot locate raw device '%s' (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:211
 #, c-format
-msgid "Device '%s' is not a block dev\n"
+msgid "Raw device '%s' is not a character dev\n"
 msgstr ""
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:216
 #, c-format
-msgid "Cannot open master raw device '"
+msgid "Device '%s' is not a raw dev\n"
 msgstr ""
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr ""
@@ -6188,16 +6188,6 @@ msgstr ""
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr ""
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr ""
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6338,8 +6328,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr ""
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr ""
 
@@ -7208,6 +7198,16 @@ msgstr ""
 msgid "St. Tib's Day"
 msgstr ""
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr ""
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7712,6 +7712,140 @@ msgstr ""
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:46
+#, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, c-format
+msgid "       %s -k\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:152
+msgid "bad arguments"
+msgstr ""
+
+#: misc-utils/uuidd.c:159
+msgid "socket"
+msgstr ""
+
+#: misc-utils/uuidd.c:170
+msgid "connect"
+msgstr ""
+
+#: misc-utils/uuidd.c:189
+msgid "write"
+msgstr ""
+
+#: misc-utils/uuidd.c:197
+msgid "read count"
+msgstr ""
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:313
+#, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:351
+#, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, c-format
+msgid "Invalid operation %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, c-format
+msgid "Bad number: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr ""
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -7782,170 +7916,175 @@ msgstr ""
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr ""
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr ""
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr ""
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr ""
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr ""
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr ""
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -7954,12 +8093,13 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -7975,22 +8115,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr ""
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8020,7 +8160,7 @@ msgstr ""
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
@@ -8040,7 +8180,7 @@ msgstr ""
 msgid "mount: cannot set user id: %s"
 msgstr ""
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
@@ -8070,88 +8210,88 @@ msgstr ""
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr ""
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr ""
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr ""
@@ -8332,22 +8472,27 @@ msgstr ""
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr ""
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr ""
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8357,22 +8502,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8409,19 +8554,19 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -8598,42 +8743,42 @@ msgstr ""
 msgid "%s: swapoff failed"
 msgstr ""
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr ""
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr ""
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -8641,107 +8786,117 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, c-format
+msgid "device %s is associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:472
+#, c-format
+msgid "device %s is not associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8852,7 +9007,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -8863,16 +9018,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr ""
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 msgid "execvp failed"
 msgstr ""
 
@@ -9715,63 +9874,63 @@ msgstr ""
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr ""
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 0d8d45b4..cbc274af 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.15-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2009-05-13 20:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -206,7 +206,7 @@ msgstr "sử dụng: %s [ -n ] thiết bị\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -914,7 +914,7 @@ msgstr "không thể lấy trạng thái về thiết bị %s"
 msgid "%s is not a block special device"
 msgstr "%s không phải là thiết bị khối đặc biệt"
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr "không mở được %s"
@@ -1256,7 +1256,7 @@ msgstr "tìm tới không thành công trong khi thử các khối"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Giá trị kỳ lạ trong do_check (làm kiểm tra): có thể là lỗi\n"
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr "tìm tới không thành công trong check_blocks (kiểm tra khối)"
 
@@ -1326,165 +1326,165 @@ msgstr "sẽ không thử tạo hệ thống tập tin trên '%s'"
 msgid "number of blocks too small"
 msgstr "số khối quá nhỏ"
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Kích cỡ trang do người dùng chỉ ra xấu %d\n"
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Sử dụng kích cỡ trang do người dùng chỉ ra %d, thay cho giá trị hệ thống %d\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Kích cỡ phần đầu xấu cho bộ nhớ trao đổi, không ghi nhãn nào.\n"
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Nhãn bị cắt ngắn.\n"
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr "không nhãn, "
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr "không uuid\n"
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Sử dụng: %s [-c] [-pKÍCH_CỠ_TRANG] [-L nhãn] [-U UUID] /dev/tên [các_khối]\n"
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr "quá nhiều trang xấu"
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr "Không đủ bộ nhớ"
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr "một trang xấu\n"
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu trang xấu\n"
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr "không thể « tua lại » thiết bị trao đổi"
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 msgid "unable to erase bootbits sectors"
 msgstr "không xoá được rãnh ghi bit khởi động"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr "%s: %s: cảnh báo : đừng xoá rãnh ghi bit khởi động\n"
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr "        (%s phát hiện được bảng phân vùng). "
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, c-format
 msgid "        on whole disk. "
 msgstr "        trên toàn đĩa. "
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr "%1$s: cảnh báo : bỏ qua « -U » (UUID không phải được %1$s hỗ trợ)\n"
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: không hỗ trợ vùng trao đổi phiên bản %d.\n"
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr "lỗi: không phân tích được cú pháp của UUID"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: lỗi: không có chỗ nào để thiết lập bộ nhớ trao đổi ?\n"
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: lỗi: kích cỡ %llu KiB lớn hơn kích cỡ thiết bị %llu KiB\n"
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: lỗi: vùng trao đổi cần ít nhất %ld KiB\n"
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: cảnh báo : đang cắt ngắn vùng trao đổi thành %llu KiB\n"
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: lỗi: sẽ không thử tạo thiết bị trao đổi trên '%s'\n"
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: lỗi: %s đã được gắn; sẽ không tạo vùng trao đổi.\n"
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Không thể thiết lập vùng trao đổi: không thể đọc"
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Đang thiết lập vùng trao đổi phiên bản 1, kích cỡ = %llu KiB\n"
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: không thể ghi nhớ trang chữ ký: %s"
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr "fsync bị lỗi"
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: không thể lấy nhãn tập tin SELinux: %s\n"
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr "không thể matchpathcon()"
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr "không thể tạo ngữ cảnh SELinux mới"
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr "không thể tính ngữ cảnh SELinux"
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: không thể đổi nhãn của %s thành %s: %s\n"
@@ -1498,7 +1498,7 @@ msgstr ""
 "Sử dụng:\n"
 "  %s "
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
@@ -1506,47 +1506,47 @@ msgstr ""
 "Thiết bị « %s » là thiết bị thô điều khiển (hãy dùng thô<N> mà <N> lớn hơn số "
 "không)\n"
 
-#: disk-utils/raw.c:130
-#, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "Không tìm thấy thiết bị thô « %s » (%s)\n"
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr "Thiết bị thô « %s » không phải một thiết bị ký tự\n"
-
-#: disk-utils/raw.c:141
-#, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr "Thiết bị « %s » không phải một thiết bị thô\n"
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "Không tìm thấy thiết bị khối « %s » (%s)\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "Thiết bị « %s » không phải một thiết bị khối\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, c-format
 msgid "Cannot open master raw device '"
 msgstr "Không thể mở thiết bị thô chủ '"
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr "Không tìm thấy thiết bị thô « %s » (%s)\n"
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr "Thiết bị thô « %s » không phải một thiết bị ký tự\n"
+
+#: disk-utils/raw.c:216
+#, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr "Thiết bị « %s » không phải một thiết bị thô\n"
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr "Lỗi hỏi thiết bị thô (%s)\n"
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr "thô%d:\tđóng kết với chính %d, phụ %d\n"
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr "Lỗi đặt thiết bị thô (%s)\n"
@@ -6744,16 +6744,6 @@ msgstr ""
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr "ioctl(RTC_EPOCH_SET) tới %s không thành công"
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr "Sử dụng: %s LABEL=<nhãn>|UUID=<uuid>\n"
-
-#: libs/blkid/bin/findfs.c:55
-#, c-format
-msgid "unable to resolve '%s'"
-msgstr "không giải quyết được « %s »"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6900,8 +6890,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM thất bại nên hủy bỏ : %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr "Mật khẩu: "
 
@@ -7799,6 +7789,16 @@ msgstr "sử dụng: %s [+định_dạng] [ngày tháng năm]\n"
 msgid "St. Tib's Day"
 msgstr "Ngày Thánh Tib"
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr "Sử dụng: %s LABEL=<nhãn>|UUID=<uuid>\n"
+
+#: misc-utils/findfs.c:55
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "không giải quyết được « %s »"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8347,6 +8347,147 @@ msgstr "Không đọc được %s\n"
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM (thiết bị cuối) chưa định nghĩa.\n"
 
+#: misc-utils/uuidd.c:46
+#, fuzzy, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+"sử dụng: last [-#] [-f tập_tin] [-t tty] [-h tên_máy] [người_dùng ...]\n"
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, fuzzy, c-format
+msgid "       %s -k\n"
+msgstr "       %s -l [ tín_hiệu ]\n"
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "col: tham số -l xấu %s.\n"
+
+#: misc-utils/uuidd.c:159
+#, fuzzy
+msgid "socket"
+msgstr "ổ cắm: %s.\n"
+
+#: misc-utils/uuidd.c:170
+#, fuzzy
+msgid "connect"
+msgstr "kết nối: %s.\n"
+
+#: misc-utils/uuidd.c:189
+#, fuzzy
+msgid "write"
+msgstr "Ghi"
+
+#: misc-utils/uuidd.c:197
+#, fuzzy
+msgid "read count"
+msgstr "đếm số không tập tin"
+
+#: misc-utils/uuidd.c:203
+#, fuzzy
+msgid "bad response length"
+msgstr "tập tin có tên dài sai"
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, fuzzy, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr "Không mở được %s: %s\n"
+
+#: misc-utils/uuidd.c:313
+#, fuzzy, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr "Không mở được %s: %s\n"
+
+#: misc-utils/uuidd.c:351
+#, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, fuzzy, c-format
+msgid "Invalid operation %d\n"
+msgstr "tùy chọn sai"
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, fuzzy, c-format
+msgid "Bad number: %s\n"
+msgstr "%s: số sai: %s\n"
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr "lỗi thay đổi chế độ của %s: %s\n"
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "Sử dụng: %s [tùy_chọn]\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -8417,36 +8558,36 @@ msgstr "cảnh báo: không mở được %s: %s"
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: không mở được %s - sử dụng %s để thay thế\n"
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr "không tạo được tập tin khóa %s: %s (hãy dùng cờ -n để ghi đè lên)"
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr "không liên kết được tập tin khóa %s: %s (hãy dùng cờ -n để ghi đè lên)"
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr "không mở được tập tin khóa %s: %s (hãy dùng cờ -n để ghi đè lên)"
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Không khóa được tập tin khóa (lock file) %s: %s\n"
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "không khóa được tập tin khóa (lock file) %s: %s"
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr "quá hạn"
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -8455,83 +8596,88 @@ msgstr ""
 "Không tạo được liên kết %s\n"
 "Có thể đây là tập tin khóa bền vững?\n"
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "không mở được %s (%s) - mtab chưa cập nhật"
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr "lỗi ghi nhớ %s: %s"
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "lỗi thay đổi chế độ của %s: %s\n"
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "lỗi thay đổi chủ sở hữu của %s: %s\n"
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "không đổi tên được %s thành %s: %s\n"
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, fuzzy, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr "loop: không lấy được thông tin trên thiết bị %s: %s\n"
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", bù %<PRIu64>"
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", hạn_cỡ %<PRIu64>"
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", mã_hoá %s (kiểu %<PRIu32>)"
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ", bù %d"
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", dạng mã hóa %d\n"
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: không lấy được thông tin trên thiết bị %s: %s\n"
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: không mở được thiết bị %s: %s\n"
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: thư mục « /dev » không tồn tại."
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: không có quyền xem /dev/loop%s<N>"
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: không tìm thấy thiết bị vòng lặp nào còn trống"
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8541,54 +8687,54 @@ msgstr ""
 "       về thiết bị vòng lặp? (Nếu vậy, hãy biên dịch lại hoặc thử `modprobe "
 "loop'.)"
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr "Không đủ bộ nhớ khi đọc cụm từ mật khẩu"
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "cảnh báo : %s đã liên quan đến %s\n"
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "cảnh báo : %s: được bảo vệ chống ghi nên đặt chỉ-đọc.\n"
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Không khóa được vào bộ nhớ, đang thoát.\n"
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD bị lỗi: %s\n"
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): thành công\n"
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): thành công\n"
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: không xóa được thiết bị %s: %s\n"
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Phiên bản mount này được biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch "
 "lại.\n"
 
-#: mount/lomount.c:875
-#, c-format
+#: mount/lomount.c:888
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Usage:\n"
@@ -8596,6 +8742,7 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
@@ -8612,7 +8759,7 @@ msgstr ""
 "\n"
 "TBVL: thiết bị vòng lặp\n"
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8640,22 +8787,22 @@ msgstr ""
 " -v | --verbose          \t\tchế độ chi tiết\n"
 "\n"
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Thiết bị vòng lặp là %s\n"
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "vòng lặp bị ăn cắp=%s... nên thử lại\n"
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: thiết bị đang bận"
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch lại.\n"
@@ -8685,7 +8832,7 @@ msgstr "mount: theo như mtab thì %s đã gắn vào %s"
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: không mở được %s để ghi nhớ: %s"
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: lỗi ghi nhớ %s: %s"
@@ -8705,7 +8852,7 @@ msgstr "mount: không đặt được ID nhóm: %s"
 msgid "mount: cannot set user id: %s"
 msgstr "mount: không đặt được ID người dùng: %s"
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: không thể phân nhánh %s"
@@ -8735,88 +8882,88 @@ msgstr "       và đây có vẻ là vùng trao đổi\n"
 msgid "       I will try type %s\n"
 msgstr "       Sẽ thử loại %s\n"
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s có vẻ là vùng trao đổi - không gắn"
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr "mount (gắn) không thành công"
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: chỉ người chủ có quyền gắn %s vào %s"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr "mount: chỉ ra hai lần thiết bị vòng lặp"
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr "mount: chỉ ra hai lần kiểu hệ thống tập tin"
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: bỏ qua việc cấu hình thiết bị vòng lặp\n"
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: theo như mtab thì %s đã gắn vào %s làm vòng lặp"
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: sẽ sử dụng thiết bị vòng lặp %s\n"
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr "mount: stolen loop=%s (vòng lặp bị ăn cắp) nên thử lại\n"
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: stolen loop=%s (vòng lặp bị ăn cắp)"
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: thiết lập thiết bị vòng lặp không thành công\n"
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: thiết lập thiết bị vòng lặp thành công\n"
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: không tìm thấy %s - đang tạo..\n"
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: không mở được %s: %s"
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: tham số cho -p hoặc --pass-fd phải là một số"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: không mở được %s để đặt tốc độ"
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: không đặt được tốc độ: %s"
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: theo như mtab thì %s đã gắn vào %s\n"
@@ -9016,22 +9163,27 @@ msgstr "mount: không gắn được %s%s với chế độ chỉ đọc"
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s được bảo vệ khỏi ghi nhưng đưa ra cờ `-w' (write, ghi)"
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, fuzzy, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr "mount: không gắn được %s%s với chế độ chỉ đọc"
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s được bảo vệ khỏi ghi, đang gắn chỉ đọc"
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr "mount: không tìm thấy vật chứa trên %s... nên thử lại\n"
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: không tìm thấy vật chứa trên %s"
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9047,26 +9199,26 @@ msgstr ""
 "\tvà không có quyền truy cập đến hệ thống tập tin này.\n"
 "\tĐể tìm chi tiết, xem trang hướng dẫn (man) restorecon(8) và mount(8).\n"
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: không đưa ra kiểu hệ thống tập tin nên coi như nfs vì có dấu hai "
 "chấm\n"
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: không đưa ra kiểu hệ thống tập tin nên giả sử smbfs vì có // đằng "
 "trước\n"
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: đã gắn %s trên %s\n"
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9144,19 +9296,19 @@ msgstr ""
 "Tùy chọn khác: [-nfFrsvw] [-o tùy_chọn] [-p thư_mục_chứa_tập_tin_mật_khẩu].\n"
 "Để xem rất nhiều chi tiết, dùng lệnh « man 8 mount ».\n"
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr "mount: chỉ người chủ (root) có quyền thực hiện"
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr "không gắn gì cả"
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr "mount: không tìm thấy phân vùng như vậy"
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: không tìm thấy %s trong %s hoặc %s"
@@ -9358,42 +9510,42 @@ msgstr "Không phải siêu người dùng.s"
 msgid "%s: swapoff failed"
 msgstr "%s swapoff bị lỗi"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: không biên dịch hỗ trợ -f\n"
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: không đặt được ID nhóm: %s"
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: không đặt được ID người dùng: %s"
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: không thể phân nhánh %s"
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: thiết bị khối không hợp lệ"
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: chưa gắn"
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: không thể ghi siêu khối"
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9405,112 +9557,122 @@ msgstr ""
 "\thàm lsof(8) hoặc fuser(1) có thể tìm\n"
 "\tthông tin có ích về các tiến trình đang dùng thiết bị."
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: không tìm thấy"
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: phải là siêu người dùng (root) để bỏ gắn"
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: thiết bị khối không cho phép trên hệ thống tập tin"
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "không có umount2, đang thử umount..\n"
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s bận - gắn lại chỉ đọc\n"
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: không thể gắn lại %s chỉ đọc\n"
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s đã bỏ gắn\n"
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: không tìm thấy danh sách hệ thống tập tin để bỏ gắn"
 
-#: mount/umount.c:396
-#, c-format
+#: mount/umount.c:397
+#, fuzzy, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 "Sử dụng: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O tùy_chọn]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, fuzzy, c-format
+msgid "device %s is associated with %s\n"
+msgstr "cảnh báo : %s đã liên quan đến %s\n"
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "cảnh báo : %s đã liên quan đến %s\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr "Không bỏ gắn được \"\"\n"
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Đang thử bỏ gắn %s\n"
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr "umount: bị lẫn lộn khi phân tích mtab"
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 "umount: không thể tháo gắn kết %s — %s được gắn kết ở trên nó ở cùng một "
 "điểm."
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Không tìm thấy %s trong mtab\n"
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s chưa gắn (theo mtab)"
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: có vẻ là %s được gắn nhiều lần"
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s không có trong fstab (và người dùng không phải là root)"
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: gắn %s không tương ứng fstab"
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: chỉ có %s có thể bỏ gắn %s từ %s"
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr "umount: chỉ người chủ (root) có quyền thực hiện"
 
@@ -9634,7 +9796,7 @@ msgid "ioprio_set failed"
 msgstr "ioprio_set bị lỗi"
 
 #: schedutils/ionice.c:81
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "ionice - sets or gets process io scheduling class and priority.\n"
@@ -9646,7 +9808,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -9674,16 +9836,21 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "không thể phân tích số « %s »"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+#, fuzzy
+msgid "ignoring given class data for none class"
+msgstr "đang lờ đi dữ liệu hạng đưa ra cho hạng nghỉ"
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr "đang lờ đi dữ liệu hạng đưa ra cho hạng nghỉ"
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr "hạng ưu tiên sai %d"
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 msgid "execvp failed"
 msgstr "execvp bị lỗi"
 
@@ -10580,7 +10747,7 @@ msgstr "zcount"
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
@@ -10589,7 +10756,7 @@ msgstr ""
 "\n"
 "Sử dụng: %s [ -dhV78neo12 ] [ -s <tốc_độ> ] <lđĩa> <thiết_bị>\n"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10597,50 +10764,50 @@ msgstr ""
 "\n"
 "Các tên <lđĩa> đã biết đến:\n"
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr "tốc độ sai: %s"
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach từ %s\n"
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr "tùy chọn sai"
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "kỷ luật dòng sai: %s"
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s không phải là dòng nối tiếp"
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "không thể lấy thuộc tính thiết bị về %s"
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr "tốc độ %d không được hỗ trợ"
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "không thể đặt các thuộc tính thiết bị cho %s"
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr "không thể đặt kỷ luật dòng"
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr "không thể chạy trong nền"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6f924e44..fe47c82e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng-2.14.1-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-05-27 21:39+0200\n"
+"POT-Creation-Date: 2009-07-15 23:23+0200\n"
 "PO-Revision-Date: 2008-08-23 23:20+0800\n"
 "Last-Translator: Ray Wang <wanglei1123@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -205,7 +205,7 @@ msgstr "用法: %s [ -n ] device\n"
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1282
 #: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:115 disk-utils/mkfs.c:52
 #: disk-utils/mkfs.cramfs.c:813 disk-utils/mkfs.minix.c:571
-#: disk-utils/mkswap.c:454 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: disk-utils/mkswap.c:458 misc-utils/ddate.c:179 misc-utils/rename.c:79
 #: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
@@ -903,7 +903,7 @@ msgstr ""
 msgid "%s is not a block special device"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:200
+#: disk-utils/mkfs.bfs.c:172 sys-utils/ldattach.c:205
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -1209,7 +1209,7 @@ msgstr ""
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:306
+#: disk-utils/mkfs.minix.c:507 disk-utils/mkswap.c:310
 msgid "seek failed in check_blocks"
 msgstr ""
 
@@ -1279,164 +1279,164 @@ msgstr ""
 msgid "number of blocks too small"
 msgstr ""
 
-#: disk-utils/mkswap.c:151
+#: disk-utils/mkswap.c:155
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:159
+#: disk-utils/mkswap.c:163
 #, c-format
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:193
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
 #, c-format
 msgid "no label, "
 msgstr ""
 
-#: disk-utils/mkswap.c:207
+#: disk-utils/mkswap.c:211
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:276
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:290
 msgid "too many bad pages"
 msgstr ""
 
-#: disk-utils/mkswap.c:299 misc-utils/look.c:182 misc-utils/setterm.c:1183
+#: disk-utils/mkswap.c:303 misc-utils/look.c:182 misc-utils/setterm.c:1183
 #: text-utils/more.c:1982 text-utils/more.c:1993
 msgid "Out of memory"
 msgstr ""
 
-#: disk-utils/mkswap.c:313
+#: disk-utils/mkswap.c:317
 #, c-format
 msgid "one bad page\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:315
+#: disk-utils/mkswap.c:319
 #, c-format
 msgid "%lu bad pages\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:392 disk-utils/mkswap.c:408 disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:396 disk-utils/mkswap.c:412 disk-utils/mkswap.c:629
 msgid "unable to rewind swap-device"
 msgstr ""
 
-#: disk-utils/mkswap.c:412
+#: disk-utils/mkswap.c:416
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "不能读超级块"
 
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:420
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:423
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr ""
 
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:425
 #, c-format
 msgid "        on whole disk. "
 msgstr ""
 
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:495
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:507
+#: disk-utils/mkswap.c:511
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:519
 msgid "error: UUID parsing failed"
 msgstr ""
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:547
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:556
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:569
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:596
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:598
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:618
 msgid "Unable to set up swap-space: unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:617
+#: disk-utils/mkswap.c:621
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:628
+#: disk-utils/mkswap.c:632
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr ""
 
-#: disk-utils/mkswap.c:639
+#: disk-utils/mkswap.c:643
 msgid "fsync failed"
 msgstr ""
 
-#: disk-utils/mkswap.c:650
+#: disk-utils/mkswap.c:654
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:656
+#: disk-utils/mkswap.c:660
 msgid "unable to matchpathcon()"
 msgstr ""
 
-#: disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:663
 msgid "unable to create new selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:661
+#: disk-utils/mkswap.c:665
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:667
+#: disk-utils/mkswap.c:671
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr ""
@@ -1448,53 +1448,53 @@ msgid ""
 "  %s "
 msgstr "用法:\n"
 
-#: disk-utils/raw.c:122
+#: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
 
-#: disk-utils/raw.c:130
-#, c-format
-msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr ""
-
-#: disk-utils/raw.c:136
-#, c-format
-msgid "Raw device '%s' is not a character dev\n"
-msgstr ""
-
-#: disk-utils/raw.c:141
-#, c-format
-msgid "Device '%s' is not a raw dev\n"
-msgstr ""
-
-#: disk-utils/raw.c:162
+#: disk-utils/raw.c:145
 #, fuzzy, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
 msgstr "%s:不是一个块设备\n"
 
-#: disk-utils/raw.c:168
+#: disk-utils/raw.c:151
 #, fuzzy, c-format
 msgid "Device '%s' is not a block dev\n"
 msgstr "%s:不是一个块设备\n"
 
-#: disk-utils/raw.c:203
+#: disk-utils/raw.c:186
 #, c-format
 msgid "Cannot open master raw device '"
 msgstr ""
 
-#: disk-utils/raw.c:225
+#: disk-utils/raw.c:205
+#, c-format
+msgid "Cannot locate raw device '%s' (%s)\n"
+msgstr ""
+
+#: disk-utils/raw.c:211
+#, c-format
+msgid "Raw device '%s' is not a character dev\n"
+msgstr ""
+
+#: disk-utils/raw.c:216
+#, c-format
+msgid "Device '%s' is not a raw dev\n"
+msgstr ""
+
+#: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
 msgstr ""
 
-#: disk-utils/raw.c:235 disk-utils/raw.c:255
+#: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
 msgstr ""
 
-#: disk-utils/raw.c:251
+#: disk-utils/raw.c:257
 #, c-format
 msgid "Error setting raw device (%s)\n"
 msgstr ""
@@ -6211,16 +6211,6 @@ msgstr ""
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr ""
 
-#: libs/blkid/bin/findfs.c:24
-#, c-format
-msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
-
-#: libs/blkid/bin/findfs.c:55
-#, fuzzy, c-format
-msgid "unable to resolve '%s'"
-msgstr "不能读 inodes"
-
 #: login-utils/agetty.c:361
 #, c-format
 msgid "%s: can't exec %s: %m"
@@ -6361,8 +6351,8 @@ msgid "%s: PAM failure, aborting: %s\n"
 msgstr ""
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
-#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:731
-#: mount/lomount.c:734
+#: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:744
+#: mount/lomount.c:747
 msgid "Password: "
 msgstr ""
 
@@ -7231,6 +7221,16 @@ msgstr ""
 msgid "St. Tib's Day"
 msgstr ""
 
+#: misc-utils/findfs.c:24
+#, c-format
+msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
+msgstr ""
+
+#: misc-utils/findfs.c:55
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "不能读 inodes"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7735,6 +7735,141 @@ msgstr ""
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:46
+#, c-format
+msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:48
+#, c-format
+msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:50
+#, c-format
+msgid "       %s -k\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:152
+#, fuzzy
+msgid "bad arguments"
+msgstr "%s 需要一个参数\n"
+
+#: misc-utils/uuidd.c:159
+msgid "socket"
+msgstr ""
+
+#: misc-utils/uuidd.c:170
+msgid "connect"
+msgstr ""
+
+#: misc-utils/uuidd.c:189
+msgid "write"
+msgstr ""
+
+#: misc-utils/uuidd.c:197
+msgid "read count"
+msgstr ""
+
+#: misc-utils/uuidd.c:203
+msgid "bad response length"
+msgstr ""
+
+#: misc-utils/uuidd.c:268
+#, c-format
+msgid "uuidd daemon already running at pid %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:276
+#, c-format
+msgid "Couldn't create unix stream socket: %s"
+msgstr ""
+
+#: misc-utils/uuidd.c:305
+#, c-format
+msgid "Couldn't bind unix socket %s: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:313
+#, c-format
+msgid "Couldn't listen on unix socket %s: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:351
+#, c-format
+msgid "Error reading from client, len = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:359
+#, c-format
+msgid "operation %d, incoming num = %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:378
+#, c-format
+msgid "Generated time UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:388
+#, c-format
+msgid "Generated random UUID: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:397
+#, c-format
+msgid "Generated time UUID %s and %d following\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:415
+#, c-format
+msgid "Generated %d UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:427
+#, c-format
+msgid "Invalid operation %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
+#, c-format
+msgid "Bad number: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
+#, c-format
+msgid "Error calling uuidd daemon (%s): %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:534
+#, c-format
+msgid "%s and subsequent %d UUID's\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:536
+#, c-format
+msgid "List of UUID's:\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:557
+#, c-format
+msgid "Unexpected reply length from server %d\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:574
+#, c-format
+msgid "Couldn't kill uuidd running at pid %d: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:580
+#, c-format
+msgid "Killed uuidd running at pid %d\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:32
+#, fuzzy, c-format
+msgid "Usage: %s [-r] [-t]\n"
+msgstr "用法: %s [ -n ] device\n"
+
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
@@ -7805,170 +7940,175 @@ msgstr ""
 msgid "mount: could not open %s - using %s instead\n"
 msgstr ""
 
-#: mount/fstab.c:588
+#: mount/fstab.c:589
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:614
+#: mount/fstab.c:615
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:630
+#: mount/fstab.c:631
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:645
+#: mount/fstab.c:646
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:659
+#: mount/fstab.c:660
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr ""
 
-#: mount/fstab.c:661
+#: mount/fstab.c:662
 msgid "timed out"
 msgstr ""
 
-#: mount/fstab.c:668
+#: mount/fstab.c:669
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 
-#: mount/fstab.c:790 mount/fstab.c:845
+#: mount/fstab.c:791 mount/fstab.c:846
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr ""
 
-#: mount/fstab.c:854
+#: mount/fstab.c:855
 #, c-format
 msgid "error writing %s: %s"
 msgstr ""
 
-#: mount/fstab.c:872
+#: mount/fstab.c:873
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:885
+#: mount/fstab.c:886
 #, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:896
+#: mount/fstab.c:897
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:368
+#: mount/lomount.c:364
+#, c-format
+msgid "loop: can't set capacity on device %s: %s\n"
+msgstr ""
+
+#: mount/lomount.c:388
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:371
+#: mount/lomount.c:391
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:379
+#: mount/lomount.c:399
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:392
+#: mount/lomount.c:412
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:395
+#: mount/lomount.c:415
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:403
+#: mount/lomount.c:423
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:414
+#: mount/lomount.c:434
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:430 mount/lomount.c:462 mount/lomount.c:527
-#: mount/lomount.c:576
+#: mount/lomount.c:450 mount/lomount.c:482 mount/lomount.c:544
+#: mount/lomount.c:589
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr ""
 
-#: mount/lomount.c:441 mount/lomount.c:589
+#: mount/lomount.c:461 mount/lomount.c:602
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:592
+#: mount/lomount.c:605
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:595
+#: mount/lomount.c:608
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device? (If so, recompile or `modprobe loop'.)"
 msgstr ""
 
-#: mount/lomount.c:625
+#: mount/lomount.c:638
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:668
+#: mount/lomount.c:681
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:684
+#: mount/lomount.c:697
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:720
+#: mount/lomount.c:733
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:747
+#: mount/lomount.c:760
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:804
+#: mount/lomount.c:817
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:825
+#: mount/lomount.c:838
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:829
+#: mount/lomount.c:842
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:840
+#: mount/lomount.c:853
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:875
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -7977,12 +8117,13 @@ msgid ""
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 " %1$s -f | --find                             find unused\n"
+" %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:884
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -7998,22 +8139,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1014 mount/lomount.c:1052
+#: mount/lomount.c:1036 mount/lomount.c:1076
 #, c-format
 msgid "Loop device is %s\n"
 msgstr ""
 
-#: mount/lomount.c:1039
+#: mount/lomount.c:1063
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1049
+#: mount/lomount.c:1073
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1066
+#: mount/lomount.c:1090
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8043,7 +8184,7 @@ msgstr ""
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:572 mount/mount.c:1193
+#: mount/mount.c:572 mount/mount.c:1190
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
@@ -8063,7 +8204,7 @@ msgstr ""
 msgid "mount: cannot set user id: %s"
 msgstr ""
 
-#: mount/mount.c:705 mount/mount.c:1805
+#: mount/mount.c:705 mount/mount.c:1809
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
@@ -8093,88 +8234,88 @@ msgstr ""
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount.c:905
+#: mount/mount.c:902
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:996
+#: mount/mount.c:993
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:998
+#: mount/mount.c:995
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:1068
+#: mount/mount.c:1065
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:1073
+#: mount/mount.c:1070
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:1085
+#: mount/mount.c:1082
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:1097
+#: mount/mount.c:1094
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 
-#: mount/mount.c:1107
+#: mount/mount.c:1104
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:1116
+#: mount/mount.c:1113
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1118
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr ""
 
-#: mount/mount.c:1126
+#: mount/mount.c:1123
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:1137
+#: mount/mount.c:1134
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:1171
+#: mount/mount.c:1168
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1188
+#: mount/mount.c:1185
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:1209
+#: mount/mount.c:1206
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:1222
+#: mount/mount.c:1219
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr ""
 
-#: mount/mount.c:1225
+#: mount/mount.c:1222
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:1282
+#: mount/mount.c:1279
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr ""
@@ -8355,22 +8496,27 @@ msgstr ""
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1538
+#: mount/mount.c:1527
+#, c-format
+msgid "mount: cannot remount %s%s read-write, is write-protected"
+msgstr ""
+
+#: mount/mount.c:1542
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1548
+#: mount/mount.c:1552
 #, c-format
 msgid "mount: no medium found on %s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1554
+#: mount/mount.c:1558
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr ""
 
-#: mount/mount.c:1572
+#: mount/mount.c:1576
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8380,22 +8526,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1651
+#: mount/mount.c:1655
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1657
+#: mount/mount.c:1661
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 
-#: mount/mount.c:1752
+#: mount/mount.c:1756
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1886
+#: mount/mount.c:1890
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8432,19 +8578,19 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2209
+#: mount/mount.c:2213
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:2219
+#: mount/mount.c:2223
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:2237 mount/mount.c:2263
+#: mount/mount.c:2241 mount/mount.c:2267
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:2240
+#: mount/mount.c:2244
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -8623,42 +8769,42 @@ msgstr ""
 msgid "%s: swapoff failed"
 msgstr "%s 失败.\n"
 
-#: mount/umount.c:40
+#: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:110
+#: mount/umount.c:111
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr ""
 
-#: mount/umount.c:113
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr ""
 
-#: mount/umount.c:138
+#: mount/umount.c:139
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:159
+#: mount/umount.c:160
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:161
+#: mount/umount.c:162
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:163
+#: mount/umount.c:164
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:167
+#: mount/umount.c:168
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -8666,107 +8812,117 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:172
+#: mount/umount.c:173
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:174
+#: mount/umount.c:175
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:176
+#: mount/umount.c:177
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:178
+#: mount/umount.c:179
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:234
+#: mount/umount.c:235
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:251
+#: mount/umount.c:252
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:262
+#: mount/umount.c:263
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:271
+#: mount/umount.c:272
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:366
+#: mount/umount.c:367
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:396
+#: mount/umount.c:397
 #, c-format
 msgid ""
-"Usage: umount [-hV]\n"
-"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
-"       umount [-f] [-r] [-n] [-v] special | node...\n"
+"Usage: umount -h | -V\n"
+"       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
+"       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:446
+#: mount/umount.c:466
+#, c-format
+msgid "device %s is associated with %s\n"
+msgstr ""
+
+#: mount/umount.c:472
+#, fuzzy, c-format
+msgid "device %s is not associated with %s\n"
+msgstr "%s:不是一个块设备\n"
+
+#: mount/umount.c:485
 msgid "Cannot umount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:452
+#: mount/umount.c:491
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:465
+#: mount/umount.c:504
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:470
+#: mount/umount.c:509
 #, c-format
 msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
 msgstr ""
 
-#: mount/umount.c:477
+#: mount/umount.c:516
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:484
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:508
+#: mount/umount.c:547
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:521
+#: mount/umount.c:561
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:567
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:566
+#: mount/umount.c:608
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:653
+#: mount/umount.c:695
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8879,7 +9035,7 @@ msgid ""
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
 "  -c <class>          scheduling class\n"
-"                      1: realtime, 2: best-effort, 3: idle\n"
+"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 "  -t                  ignore failures\n"
 "  -h                  this help\n"
 "\n"
@@ -8890,16 +9046,20 @@ msgstr ""
 msgid "cannot parse number '%s'"
 msgstr "%s: 不能打开 %s\n"
 
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:151
+msgid "ignoring given class data for none class"
+msgstr ""
+
+#: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
 msgstr ""
 
-#: schedutils/ionice.c:161
+#: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
 #, fuzzy
 msgid "execvp failed"
 msgstr "查找失败"
@@ -9746,63 +9906,63 @@ msgstr ""
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:87
+#: sys-utils/ldattach.c:92
 #, c-format
 msgid ""
 "\n"
 "Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:94
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:174
+#: sys-utils/ldattach.c:179
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:177
+#: sys-utils/ldattach.c:182
 #, c-format
 msgid "ldattach from %s\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:182 text-utils/tailf.c:195
+#: sys-utils/ldattach.c:187 text-utils/tailf.c:195
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:194
+#: sys-utils/ldattach.c:199
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:207
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:213
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:216
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:242
+#: sys-utils/ldattach.c:247
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:249
+#: sys-utils/ldattach.c:254
 msgid "cannot set line discipline"
 msgstr ""
 
-#: sys-utils/ldattach.c:255
+#: sys-utils/ldattach.c:260
 msgid "cannot daemonize"
 msgstr ""
 
diff --git a/schedutils/Makefile.am b/schedutils/Makefile.am
index 0c14e51a..88439f2b 100644
--- a/schedutils/Makefile.am
+++ b/schedutils/Makefile.am
@@ -2,18 +2,18 @@ include $(top_srcdir)/config/include-Makefile.am
 
 if BUILD_SCHEDUTILS
 
-usrbinexec_PROGRAMS = chrt
+usrbin_exec_PROGRAMS = chrt
 dist_man_MANS = chrt.1
 
 if HAVE_IOPRIO_GET
 if HAVE_IOPRIO_SET
-usrbinexec_PROGRAMS += ionice
+usrbin_exec_PROGRAMS += ionice
 dist_man_MANS += ionice.1
 endif
 endif
 
 if HAVE_SCHED_GETAFFINITY
-usrbinexec_PROGRAMS += taskset
+usrbin_exec_PROGRAMS += taskset
 dist_man_MANS += taskset.1
 endif
 
diff --git a/schedutils/ionice.1 b/schedutils/ionice.1
index 92712eef..0f75dfdf 100644
--- a/schedutils/ionice.1
+++ b/schedutils/ionice.1
@@ -43,7 +43,8 @@ permitted for an ordinary (i.e., non-root) user.
 
 .SH OPTIONS
 .IP "\fB-c \fIclass\fP"
-The scheduling class. \fI1\fR for real time, \fI2\fR for best-effort, \fI3\fR for idle.
+The scheduling class. \fI0\fR for none, \fI1\fR for real time, \fI2\fR for
+best-effort, \fI3\fR for idle.
 .IP "\fB-n \fIclassdata\fP"
 The scheduling class data. This defines the class data, if the class
 accepts an argument. For real time and best-effort, \fI0-7\fR is valid
diff --git a/schedutils/ionice.c b/schedutils/ionice.c
index 5f1f3489..082b23ba 100644
--- a/schedutils/ionice.c
+++ b/schedutils/ionice.c
@@ -85,7 +85,7 @@ static void usage(int rc)
 	"\nOptions:\n"
 	"  -n <classdata>      class data (0-7, lower being higher prio)\n"
 	"  -c <class>          scheduling class\n"
-	"                      1: realtime, 2: best-effort, 3: idle\n"
+	"                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
 	"  -t                  ignore failures\n"
 	"  -h                  this help\n\n"));
 	exit(rc);
@@ -147,7 +147,9 @@ int main(int argc, char *argv[])
 
 	switch (ioclass) {
 		case IOPRIO_CLASS_NONE:
-			ioclass = IOPRIO_CLASS_BE;
+			if (set & 1)
+				warnx(_("ignoring given class data for none class"));
+			ioprio = 0;
 			break;
 		case IOPRIO_CLASS_RT:
 		case IOPRIO_CLASS_BE:
diff --git a/libs/Makefile.am b/shlibs/Makefile.am
index e09828e6..3e757885 100644
--- a/libs/Makefile.am
+++ b/shlibs/Makefile.am
@@ -1,5 +1,9 @@
 SUBDIRS =
 
+if BUILD_LIBUUID
+SUBDIRS += uuid
+endif
+
 if BUILD_LIBBLKID
 SUBDIRS += blkid
 endif
diff --git a/libs/blkid/.gitignore b/shlibs/blkid/.gitignore
index d6126dea..d6126dea 100644
--- a/libs/blkid/.gitignore
+++ b/shlibs/blkid/.gitignore
diff --git a/libs/blkid/COPYING.libblkid b/shlibs/blkid/COPYING.libblkid
index cf9b6b99..cf9b6b99 100644
--- a/libs/blkid/COPYING.libblkid
+++ b/shlibs/blkid/COPYING.libblkid
diff --git a/libs/blkid/Makefile.am b/shlibs/blkid/Makefile.am
index a27c8524..a76b1fd8 100644
--- a/libs/blkid/Makefile.am
+++ b/shlibs/blkid/Makefile.am
@@ -1,12 +1,12 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-SUBDIRS = src bin
+SUBDIRS = src
 
 # pkg-config stuff
-pkgconfigdir = $(usrlibexecdir)/pkgconfig
+pkgconfigdir = $(usrlib_execdir)/pkgconfig
 pkgconfig_DATA = blkid.pc
 
 dist_man_MANS = libblkid.3
 
-EXTRA_DIST = README.blkid blkid.pc blkid.pc.in libblkid.3
+EXTRA_DIST = README.blkid blkid.pc.in libblkid.3
 
diff --git a/libs/blkid/README.blkid b/shlibs/blkid/README.blkid
index 4fa9be1f..4fa9be1f 100644
--- a/libs/blkid/README.blkid
+++ b/shlibs/blkid/README.blkid
diff --git a/libs/blkid/blkid.pc.in b/shlibs/blkid/blkid.pc.in
index 5d58c3e1..40ec8a9d 100644
--- a/libs/blkid/blkid.pc.in
+++ b/shlibs/blkid/blkid.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@usrlib_execdir@
 includedir=@includedir@
 
 Name: blkid
diff --git a/libs/blkid/libblkid.3 b/shlibs/blkid/libblkid.3
index 46eb868b..46eb868b 100644
--- a/libs/blkid/libblkid.3
+++ b/shlibs/blkid/libblkid.3
diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am
new file mode 100644
index 00000000..bd040ce9
--- /dev/null
+++ b/shlibs/blkid/src/Makefile.am
@@ -0,0 +1,65 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+SUBDIRS = probers .
+
+common_ldadd =
+common_cflags =
+
+if HAVE_UUID
+if BUILD_LIBUUID
+common_ldadd += $(ul_libuuid_la)
+common_cflags += -I$(ul_libuuid_srcdir)
+else
+common_ldadd += $(UUID_LIBS)
+common_cflags += $(UUID_CFLAGS)
+endif
+endif
+
+AM_CPPFLAGS += -I$(ul_libblkid_srcdir) $(common_cflags)
+
+# includes
+blkidincdir = $(includedir)/blkid
+blkidinc_HEADERS = blkid.h
+
+usrlib_exec_LTLIBRARIES = libblkid.la
+libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c  \
+		     probe.c read.c resolve.c save.c tag.c version.c verify.c \
+		     encode.c blkid.h list.h blkidP.h probers/probers.h \
+		     config.c evaluate.c \
+		     $(blkidinc_HEADERS) \
+		     $(top_srcdir)/lib/blkdev.c \
+		     $(top_srcdir)/lib/linux_version.c \
+		     $(top_srcdir)/lib/canonicalize.c \
+		     $(top_srcdir)/lib/md5.c
+
+libblkid_la_LIBADD = probers/libblkid_probers.la $(common_ldadd)
+libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym
+
+libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
+                      -version-info $(LIBBLKID_VERSION_INFO)
+
+tests = test_cache test_config test_dev test_devname test_devno test_getsize \
+	test_read test_resolve test_save test_tag test_verify test_evaluate
+
+EXTRA_DIST = blkid.sym tst_types.c
+CLEANFILES = $(tests)
+
+tests: all $(tests)
+test_%: %.c
+	$(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ $(UUID_LIBS)
+
+
+# move lib from $(usrlib_execdir) to $(libdir) if needed
+install-exec-hook:
+	if test "$(usrlib_execdir)" != "$(libdir)"; then \
+		mkdir -p $(DESTDIR)$(libdir); \
+		mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \
+		so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \
+		so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
+		(cd $(DESTDIR)$(usrlib_execdir) && \
+			rm -f libblkid.so && \
+			$(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libblkid.so); \
+	fi
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(libdir)/libblkid.so*
diff --git a/libs/blkid/src/blkid.h b/shlibs/blkid/src/blkid.h
index 43b2b552..43b2b552 100644
--- a/libs/blkid/src/blkid.h
+++ b/shlibs/blkid/src/blkid.h
diff --git a/libs/blkid/src/blkid.sym b/shlibs/blkid/src/blkid.sym
index 562f44d0..562f44d0 100644
--- a/libs/blkid/src/blkid.sym
+++ b/shlibs/blkid/src/blkid.sym
diff --git a/libs/blkid/src/blkidP.h b/shlibs/blkid/src/blkidP.h
index 4131c5bb..67e7f53a 100644
--- a/libs/blkid/src/blkidP.h
+++ b/shlibs/blkid/src/blkidP.h
@@ -18,6 +18,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
+#include <stdarg.h>
 
 #include "bitops.h"	/* $(top_srcdir)/include/ */
 #include "blkid.h"
diff --git a/libs/blkid/src/cache.c b/shlibs/blkid/src/cache.c
index 01e4be06..01e4be06 100644
--- a/libs/blkid/src/cache.c
+++ b/shlibs/blkid/src/cache.c
diff --git a/libs/blkid/src/config.c b/shlibs/blkid/src/config.c
index 9091736b..9091736b 100644
--- a/libs/blkid/src/config.c
+++ b/shlibs/blkid/src/config.c
diff --git a/libs/blkid/src/dev.c b/shlibs/blkid/src/dev.c
index 31b9fe86..31b9fe86 100644
--- a/libs/blkid/src/dev.c
+++ b/shlibs/blkid/src/dev.c
diff --git a/libs/blkid/src/devname.c b/shlibs/blkid/src/devname.c
index ef686f4b..ef686f4b 100644
--- a/libs/blkid/src/devname.c
+++ b/shlibs/blkid/src/devname.c
diff --git a/libs/blkid/src/devno.c b/shlibs/blkid/src/devno.c
index 8ffdb835..8ffdb835 100644
--- a/libs/blkid/src/devno.c
+++ b/shlibs/blkid/src/devno.c
diff --git a/libs/blkid/src/encode.c b/shlibs/blkid/src/encode.c
index d45a292e..d45a292e 100644
--- a/libs/blkid/src/encode.c
+++ b/shlibs/blkid/src/encode.c
diff --git a/libs/blkid/src/evaluate.c b/shlibs/blkid/src/evaluate.c
index f0ae1266..b8154e47 100644
--- a/libs/blkid/src/evaluate.c
+++ b/shlibs/blkid/src/evaluate.c
@@ -42,6 +42,7 @@ static int verify_tag(const char *devname, const char *name, const char *value)
 	int fd = -1, rc = -1;
 	size_t len;
 	const char *data;
+	int errsv = 0;
 
 	pr = blkid_new_probe();
 	if (!pr)
@@ -50,8 +51,10 @@ static int verify_tag(const char *devname, const char *name, const char *value)
 	blkid_probe_set_request(pr, BLKID_PROBREQ_LABEL | BLKID_PROBREQ_UUID);
 
 	fd = open(devname, O_RDONLY);
-	if (fd < 0)
+	if (fd < 0) {
+		errsv = errno;
 		goto done;
+	}
 	if (blkid_probe_set_device(pr, fd, 0, 0))
 		goto done;
 	rc = blkid_do_safeprobe(pr);
@@ -66,7 +69,9 @@ done:
 	if (fd >= 0)
 		close(fd);
 	blkid_free_probe(pr);
-	return rc;
+
+	/* for non-root users we use unverified udev links */
+	return errsv == EACCES ? 0 : rc;
 }
 
 /**
diff --git a/libs/blkid/src/getsize.c b/shlibs/blkid/src/getsize.c
index 10ba7ecf..10ba7ecf 100644
--- a/libs/blkid/src/getsize.c
+++ b/shlibs/blkid/src/getsize.c
diff --git a/libs/blkid/src/list.h b/shlibs/blkid/src/list.h
index c1cbfec5..c1cbfec5 100644
--- a/libs/blkid/src/list.h
+++ b/shlibs/blkid/src/list.h
diff --git a/libs/blkid/src/llseek.c b/shlibs/blkid/src/llseek.c
index 5bd0e516..5bd0e516 100644
--- a/libs/blkid/src/llseek.c
+++ b/shlibs/blkid/src/llseek.c
diff --git a/libs/blkid/src/probe.c b/shlibs/blkid/src/probe.c
index 38d42762..10fcb003 100644
--- a/libs/blkid/src/probe.c
+++ b/shlibs/blkid/src/probe.c
@@ -24,10 +24,15 @@
 #include <errno.h>
 #endif
 #include <stdint.h>
+#include <stdarg.h>
+
 #ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
+# ifdef HAVE_UUID_UUID_H
+#  include <uuid/uuid.h>
+# else
+#  include <uuid.h>
+# endif
 #endif
-#include <stdarg.h>
 
 #include "blkdev.h"
 #include "blkidP.h"
@@ -50,6 +55,7 @@ static const struct blkid_idinfo *idinfos[] =
 	&jmraid_idinfo,
 	&lvm2_idinfo,
 	&lvm1_idinfo,
+	&snapcow_idinfo,
 	&luks_idinfo,
 
 	/* Filesystems */
diff --git a/libs/blkid/src/probers/Makefile.am b/shlibs/blkid/src/probers/Makefile.am
index d8a98ed2..4591db6a 100644
--- a/libs/blkid/src/probers/Makefile.am
+++ b/shlibs/blkid/src/probers/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-AM_CPPFLAGS += -I$(top_srcdir)/libs/blkid/src
+AM_CPPFLAGS += -I$(ul_libblkid_srcdir)
 
 noinst_LTLIBRARIES = libblkid_probers.la
 libblkid_probers_la_SOURCES = \
diff --git a/libs/blkid/src/probers/adaptec_raid.c b/shlibs/blkid/src/probers/adaptec_raid.c
index 5e8b3a75..5e8b3a75 100644
--- a/libs/blkid/src/probers/adaptec_raid.c
+++ b/shlibs/blkid/src/probers/adaptec_raid.c
diff --git a/libs/blkid/src/probers/btrfs.c b/shlibs/blkid/src/probers/btrfs.c
index 3205e3d9..3205e3d9 100644
--- a/libs/blkid/src/probers/btrfs.c
+++ b/shlibs/blkid/src/probers/btrfs.c
diff --git a/libs/blkid/src/probers/cramfs.c b/shlibs/blkid/src/probers/cramfs.c
index 0ea124b3..0ea124b3 100644
--- a/libs/blkid/src/probers/cramfs.c
+++ b/shlibs/blkid/src/probers/cramfs.c
diff --git a/libs/blkid/src/probers/ddf_raid.c b/shlibs/blkid/src/probers/ddf_raid.c
index 41d6e123..41d6e123 100644
--- a/libs/blkid/src/probers/ddf_raid.c
+++ b/shlibs/blkid/src/probers/ddf_raid.c
diff --git a/libs/blkid/src/probers/ext.c b/shlibs/blkid/src/probers/ext.c
index 671e556c..671e556c 100644
--- a/libs/blkid/src/probers/ext.c
+++ b/shlibs/blkid/src/probers/ext.c
diff --git a/libs/blkid/src/probers/gfs.c b/shlibs/blkid/src/probers/gfs.c
index 584561cf..584561cf 100644
--- a/libs/blkid/src/probers/gfs.c
+++ b/shlibs/blkid/src/probers/gfs.c
diff --git a/libs/blkid/src/probers/hfs.c b/shlibs/blkid/src/probers/hfs.c
index 4cdef0ee..4cdef0ee 100644
--- a/libs/blkid/src/probers/hfs.c
+++ b/shlibs/blkid/src/probers/hfs.c
diff --git a/libs/blkid/src/probers/highpoint_raid.c b/shlibs/blkid/src/probers/highpoint_raid.c
index c7c92db4..c7c92db4 100644
--- a/libs/blkid/src/probers/highpoint_raid.c
+++ b/shlibs/blkid/src/probers/highpoint_raid.c
diff --git a/libs/blkid/src/probers/hpfs.c b/shlibs/blkid/src/probers/hpfs.c
index 2f5f0d19..2f5f0d19 100644
--- a/libs/blkid/src/probers/hpfs.c
+++ b/shlibs/blkid/src/probers/hpfs.c
diff --git a/libs/blkid/src/probers/iso9660.c b/shlibs/blkid/src/probers/iso9660.c
index ca53e3ae..ca53e3ae 100644
--- a/libs/blkid/src/probers/iso9660.c
+++ b/shlibs/blkid/src/probers/iso9660.c
diff --git a/libs/blkid/src/probers/isw_raid.c b/shlibs/blkid/src/probers/isw_raid.c
index f9ae7453..f9ae7453 100644
--- a/libs/blkid/src/probers/isw_raid.c
+++ b/shlibs/blkid/src/probers/isw_raid.c
diff --git a/libs/blkid/src/probers/jfs.c b/shlibs/blkid/src/probers/jfs.c
index 5d9b39ac..5d9b39ac 100644
--- a/libs/blkid/src/probers/jfs.c
+++ b/shlibs/blkid/src/probers/jfs.c
diff --git a/libs/blkid/src/probers/jmicron_raid.c b/shlibs/blkid/src/probers/jmicron_raid.c
index ae852f8f..ae852f8f 100644
--- a/libs/blkid/src/probers/jmicron_raid.c
+++ b/shlibs/blkid/src/probers/jmicron_raid.c
diff --git a/libs/blkid/src/probers/linux_raid.c b/shlibs/blkid/src/probers/linux_raid.c
index a5926561..a5926561 100644
--- a/libs/blkid/src/probers/linux_raid.c
+++ b/shlibs/blkid/src/probers/linux_raid.c
diff --git a/libs/blkid/src/probers/lsi_raid.c b/shlibs/blkid/src/probers/lsi_raid.c
index d9ac4e12..d9ac4e12 100644
--- a/libs/blkid/src/probers/lsi_raid.c
+++ b/shlibs/blkid/src/probers/lsi_raid.c
diff --git a/libs/blkid/src/probers/luks.c b/shlibs/blkid/src/probers/luks.c
index 2fe4ff3b..2fe4ff3b 100644
--- a/libs/blkid/src/probers/luks.c
+++ b/shlibs/blkid/src/probers/luks.c
diff --git a/libs/blkid/src/probers/lvm.c b/shlibs/blkid/src/probers/lvm.c
index 1a4e6bff..d8edc37a 100644
--- a/libs/blkid/src/probers/lvm.c
+++ b/shlibs/blkid/src/probers/lvm.c
@@ -16,6 +16,7 @@
 
 #include "blkidP.h"
 
+#define LVM1_ID_LEN 128
 #define LVM2_ID_LEN 32
 
 struct lvm2_pv_label_header {
@@ -29,6 +30,13 @@ struct lvm2_pv_label_header {
 	uint8_t		pv_uuid[LVM2_ID_LEN];
 } __attribute__ ((packed));
 
+struct lvm1_pv_label_header {
+	uint8_t id[2];			/* HM */
+	uint16_t version;		/* version 1 or 2 */
+	uint32_t _notused[10];		/* lvm1 internals */
+	uint8_t pv_uuid[LVM1_ID_LEN];
+} __attribute__ ((packed));
+
 #define LVM2_LABEL_SIZE 512
 static unsigned int lvm2_calc_crc(const void *buf, unsigned int size)
 {
@@ -49,12 +57,24 @@ static unsigned int lvm2_calc_crc(const void *buf, unsigned int size)
 	return crc;
 }
 
+/* Length of real UUID is always LVM2_ID_LEN */
+static void format_lvm_uuid(char *dst_uuid, char *src_uuid)
+{
+	unsigned int i, b;
+
+	for (i = 0, b = 1; i < LVM2_ID_LEN; i++, b <<= 1) {
+		if (b & 0x4444440)
+			*dst_uuid++ = '-';
+		*dst_uuid++ = *src_uuid++;
+	}
+	*dst_uuid = '\0';
+}
+
 static int probe_lvm2(blkid_probe pr, const struct blkid_idmag *mag)
 {
 	int sector = mag->kboff << 1;
 	struct lvm2_pv_label_header *label;
-	char *p, *q, uuid[40];
-	unsigned int i, b;
+	char uuid[LVM2_ID_LEN + 7];
 	unsigned char *buf;
 
 	buf = blkid_probe_get_buffer(pr,
@@ -85,14 +105,7 @@ static int probe_lvm2(blkid_probe pr, const struct blkid_idmag *mag)
 		return 1;
 	}
 
-	for (i = 0, b = 1, p = uuid, q = (char *) label->pv_uuid; i <= 32;
-	     i++, b <<= 1) {
-		if (b & 0x4444440)
-			*p++ = '-';
-		*p++ = *q++;
-	}
-
-	uuid[LVM2_ID_LEN+6] = '\0';
+	format_lvm_uuid(uuid, (char *) label->pv_uuid);
 	blkid_probe_sprintf_uuid(pr, label->pv_uuid, sizeof(label->pv_uuid),
 			"%s", uuid);
 
@@ -102,6 +115,26 @@ static int probe_lvm2(blkid_probe pr, const struct blkid_idmag *mag)
 	return 0;
 }
 
+static int probe_lvm1(blkid_probe pr, const struct blkid_idmag *mag)
+{
+	struct lvm1_pv_label_header *label;
+	char uuid[LVM2_ID_LEN + 7];
+	unsigned int version;
+
+	label = blkid_probe_get_sb(pr, mag, struct lvm1_pv_label_header);
+	if (!label)
+		return -1;
+
+	version = le16_to_cpu(label->version);
+	if (version != 1 && version != 2)
+		return 1;
+
+	format_lvm_uuid(uuid, (char *) label->pv_uuid);
+	blkid_probe_sprintf_uuid(pr, label->pv_uuid, sizeof(label->pv_uuid),
+			"%s", uuid);
+
+	return 0;
+}
 
 /* NOTE: the original libblkid uses "lvm2pv" as a name */
 const struct blkid_idinfo lvm2_idinfo =
@@ -123,11 +156,21 @@ const struct blkid_idinfo lvm1_idinfo =
 {
 	.name		= "LVM1_member",
 	.usage		= BLKID_USAGE_RAID,
+	.probefunc	= probe_lvm1,
 	.magics		=
 	{
-		{ .magic = "HM", .len = 2, .sboff = 0x400 },
+		{ .magic = "HM", .len = 2 },
 		{ NULL }
 	}
 };
 
-
+const struct blkid_idinfo snapcow_idinfo =
+{
+	.name		= "DM_snapshot_cow",
+	.usage		= BLKID_USAGE_OTHER,
+	.magics		=
+	{
+		{ .magic = "SnAp", .len = 4 },
+		{ NULL }
+	}
+};
diff --git a/libs/blkid/src/probers/minix.c b/shlibs/blkid/src/probers/minix.c
index b29b9a42..b29b9a42 100644
--- a/libs/blkid/src/probers/minix.c
+++ b/shlibs/blkid/src/probers/minix.c
diff --git a/libs/blkid/src/probers/netware.c b/shlibs/blkid/src/probers/netware.c
index 722506f8..722506f8 100644
--- a/libs/blkid/src/probers/netware.c
+++ b/shlibs/blkid/src/probers/netware.c
diff --git a/libs/blkid/src/probers/ntfs.c b/shlibs/blkid/src/probers/ntfs.c
index 55a186a3..55a186a3 100644
--- a/libs/blkid/src/probers/ntfs.c
+++ b/shlibs/blkid/src/probers/ntfs.c
diff --git a/libs/blkid/src/probers/nvidia_raid.c b/shlibs/blkid/src/probers/nvidia_raid.c
index 76361763..76361763 100644
--- a/libs/blkid/src/probers/nvidia_raid.c
+++ b/shlibs/blkid/src/probers/nvidia_raid.c
diff --git a/libs/blkid/src/probers/ocfs.c b/shlibs/blkid/src/probers/ocfs.c
index f9bd11aa..f9bd11aa 100644
--- a/libs/blkid/src/probers/ocfs.c
+++ b/shlibs/blkid/src/probers/ocfs.c
diff --git a/libs/blkid/src/probers/probers.h b/shlibs/blkid/src/probers/probers.h
index c3b22774..78dbd406 100644
--- a/libs/blkid/src/probers/probers.h
+++ b/shlibs/blkid/src/probers/probers.h
@@ -47,6 +47,7 @@ extern const struct blkid_idinfo ufs_idinfo;
 extern const struct blkid_idinfo hpfs_idinfo;
 extern const struct blkid_idinfo lvm2_idinfo;
 extern const struct blkid_idinfo lvm1_idinfo;
+extern const struct blkid_idinfo snapcow_idinfo;
 extern const struct blkid_idinfo luks_idinfo;
 extern const struct blkid_idinfo highpoint37x_idinfo;
 extern const struct blkid_idinfo highpoint45x_idinfo;
diff --git a/libs/blkid/src/probers/promise_raid.c b/shlibs/blkid/src/probers/promise_raid.c
index 29540092..29540092 100644
--- a/libs/blkid/src/probers/promise_raid.c
+++ b/shlibs/blkid/src/probers/promise_raid.c
diff --git a/libs/blkid/src/probers/reiserfs.c b/shlibs/blkid/src/probers/reiserfs.c
index f9a46787..f9a46787 100644
--- a/libs/blkid/src/probers/reiserfs.c
+++ b/shlibs/blkid/src/probers/reiserfs.c
diff --git a/libs/blkid/src/probers/romfs.c b/shlibs/blkid/src/probers/romfs.c
index b5c20ab7..b5c20ab7 100644
--- a/libs/blkid/src/probers/romfs.c
+++ b/shlibs/blkid/src/probers/romfs.c
diff --git a/libs/blkid/src/probers/silicon_raid.c b/shlibs/blkid/src/probers/silicon_raid.c
index a65d79a8..a65d79a8 100644
--- a/libs/blkid/src/probers/silicon_raid.c
+++ b/shlibs/blkid/src/probers/silicon_raid.c
diff --git a/libs/blkid/src/probers/squashfs.c b/shlibs/blkid/src/probers/squashfs.c
index 74f53bfb..74f53bfb 100644
--- a/libs/blkid/src/probers/squashfs.c
+++ b/shlibs/blkid/src/probers/squashfs.c
diff --git a/libs/blkid/src/probers/swap.c b/shlibs/blkid/src/probers/swap.c
index 86eb94c6..86eb94c6 100644
--- a/libs/blkid/src/probers/swap.c
+++ b/shlibs/blkid/src/probers/swap.c
diff --git a/libs/blkid/src/probers/sysv.c b/shlibs/blkid/src/probers/sysv.c
index 933163a2..933163a2 100644
--- a/libs/blkid/src/probers/sysv.c
+++ b/shlibs/blkid/src/probers/sysv.c
diff --git a/libs/blkid/src/probers/udf.c b/shlibs/blkid/src/probers/udf.c
index 5f4046d6..5f4046d6 100644
--- a/libs/blkid/src/probers/udf.c
+++ b/shlibs/blkid/src/probers/udf.c
diff --git a/libs/blkid/src/probers/ufs.c b/shlibs/blkid/src/probers/ufs.c
index fe9870d8..fe9870d8 100644
--- a/libs/blkid/src/probers/ufs.c
+++ b/shlibs/blkid/src/probers/ufs.c
diff --git a/libs/blkid/src/probers/vfat.c b/shlibs/blkid/src/probers/vfat.c
index a83175c0..a83175c0 100644
--- a/libs/blkid/src/probers/vfat.c
+++ b/shlibs/blkid/src/probers/vfat.c
diff --git a/libs/blkid/src/probers/via_raid.c b/shlibs/blkid/src/probers/via_raid.c
index 22022fdd..22022fdd 100644
--- a/libs/blkid/src/probers/via_raid.c
+++ b/shlibs/blkid/src/probers/via_raid.c
diff --git a/libs/blkid/src/probers/vxfs.c b/shlibs/blkid/src/probers/vxfs.c
index 7a27b6c9..7a27b6c9 100644
--- a/libs/blkid/src/probers/vxfs.c
+++ b/shlibs/blkid/src/probers/vxfs.c
diff --git a/libs/blkid/src/probers/xfs.c b/shlibs/blkid/src/probers/xfs.c
index fa7914e2..fa7914e2 100644
--- a/libs/blkid/src/probers/xfs.c
+++ b/shlibs/blkid/src/probers/xfs.c
diff --git a/libs/blkid/src/probers/zfs.c b/shlibs/blkid/src/probers/zfs.c
index 7d39034f..7d39034f 100644
--- a/libs/blkid/src/probers/zfs.c
+++ b/shlibs/blkid/src/probers/zfs.c
diff --git a/libs/blkid/src/read.c b/shlibs/blkid/src/read.c
index b5e9cd02..b5e9cd02 100644
--- a/libs/blkid/src/read.c
+++ b/shlibs/blkid/src/read.c
diff --git a/libs/blkid/src/resolve.c b/shlibs/blkid/src/resolve.c
index bf13b864..bf13b864 100644
--- a/libs/blkid/src/resolve.c
+++ b/shlibs/blkid/src/resolve.c
diff --git a/libs/blkid/src/save.c b/shlibs/blkid/src/save.c
index bbe6f488..bbe6f488 100644
--- a/libs/blkid/src/save.c
+++ b/shlibs/blkid/src/save.c
diff --git a/libs/blkid/src/tag.c b/shlibs/blkid/src/tag.c
index 0dbe1ff5..0dbe1ff5 100644
--- a/libs/blkid/src/tag.c
+++ b/shlibs/blkid/src/tag.c
diff --git a/libs/blkid/src/tst_types.c b/shlibs/blkid/src/tst_types.c
index ecbc0321..ecbc0321 100644
--- a/libs/blkid/src/tst_types.c
+++ b/shlibs/blkid/src/tst_types.c
diff --git a/libs/blkid/src/verify.c b/shlibs/blkid/src/verify.c
index 40ab4c67..40ab4c67 100644
--- a/libs/blkid/src/verify.c
+++ b/shlibs/blkid/src/verify.c
diff --git a/libs/blkid/src/version.c b/shlibs/blkid/src/version.c
index 838af114..838af114 100644
--- a/libs/blkid/src/version.c
+++ b/shlibs/blkid/src/version.c
diff --git a/shlibs/uuid/.gitignore b/shlibs/uuid/.gitignore
new file mode 100644
index 00000000..f85e9721
--- /dev/null
+++ b/shlibs/uuid/.gitignore
@@ -0,0 +1 @@
+tst_*
diff --git a/shlibs/uuid/COPYING.libuuid b/shlibs/uuid/COPYING.libuuid
new file mode 100644
index 00000000..2f170683
--- /dev/null
+++ b/shlibs/uuid/COPYING.libuuid
@@ -0,0 +1,25 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, and the entire permission notice in its entirety,
+   including the disclaimer of warranties.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior
+   written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/shlibs/uuid/Makefile.am b/shlibs/uuid/Makefile.am
new file mode 100644
index 00000000..2bdef334
--- /dev/null
+++ b/shlibs/uuid/Makefile.am
@@ -0,0 +1,10 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+SUBDIRS = src man
+
+# pkg-config stuff
+pkgconfigdir = $(usrlib_execdir)/pkgconfig
+pkgconfig_DATA = uuid.pc
+
+EXTRA_DIST = uuid.pc.in
+
diff --git a/shlibs/uuid/man/.gitignore b/shlibs/uuid/man/.gitignore
new file mode 100644
index 00000000..396a0dcd
--- /dev/null
+++ b/shlibs/uuid/man/.gitignore
@@ -0,0 +1,2 @@
+uuid_generate_random.3
+uuid_generate_time.3
diff --git a/shlibs/uuid/man/Makefile.am b/shlibs/uuid/man/Makefile.am
new file mode 100644
index 00000000..ffaf0241
--- /dev/null
+++ b/shlibs/uuid/man/Makefile.am
@@ -0,0 +1,12 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+dist_man_MANS = uuid.3 uuid_clear.3 uuid_compare.3 uuid_copy.3 uuid_generate.3 \
+		uuid_is_null.3 uuid_parse.3 uuid_time.3 uuid_unparse.3
+
+UUID_GENERATE_LINKS = uuid_generate_random.3 uuid_generate_time.3
+
+man_MANS = $(UUID_GENERATE_LINKS)
+CLEANFILES = $(man_MANS)
+
+$(UUID_GENERATE_LINKS): uuid_generate.3
+	echo ".so man3/uuid_generate.3" > $@
diff --git a/shlibs/uuid/man/uuid.3 b/shlibs/uuid/man/uuid.3
new file mode 100644
index 00000000..caa22851
--- /dev/null
+++ b/shlibs/uuid/man/uuid.3
@@ -0,0 +1,66 @@
+.\" Copyright 1999 Andreas Dilger (adilger@enel.ucalgary.ca)
+.\"
+.\" %Begin-Header%
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, and the entire permission notice in its entirety,
+.\"    including the disclaimer of warranties.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote
+.\"    products derived from this software without specific prior
+.\"    written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+.\" WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+.\" OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+.\" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+.\" USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+.\" DAMAGE.
+.\" %End-Header%
+.\"
+.\" Created  Wed Mar 10 17:42:12 1999, Andreas Dilger
+.TH UUID 3 "May 2009" "util-linux-ng" "Libuuid API"
+.SH NAME
+uuid \- DCE compatible Universally Unique Identifier library
+.SH SYNOPSIS
+.B #include <uuid/uuid.h>
+.SH DESCRIPTION
+The UUID library is used to generate unique identifiers for objects
+that may be accessible beyond the local system.  This library
+generates UUIDs compatible with those created by the Open Software
+Foundation (OSF) Distributed Computing Environment (DCE) utility
+.BR uuidgen .
+.sp
+The UUIDs generated by this library can be reasonably expected to be
+unique within a system, and unique across all systems.  They could
+be used, for instance, to generate unique HTTP cookies across multiple
+web servers without communication between the servers, and without fear
+of a name clash.
+.SH "CONFORMING TO"
+OSF DCE 1.1
+.SH AUTHOR
+Theodore Y. Ts'o
+.SH AVAILABILITY
+.B libuuid
+is part of the util-linux-ng package since version 2.15.1 and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+.UE
+.SH "SEE ALSO"
+.BR uuid_clear (3),
+.BR uuid_compare (3),
+.BR uuid_copy (3),
+.BR uuid_generate (3),
+.BR uuid_is_null (3),
+.BR uuid_parse (3),
+.BR uuid_time (3),
+.BR uuid_unparse (3)
diff --git a/shlibs/uuid/man/uuid_clear.3 b/shlibs/uuid/man/uuid_clear.3
new file mode 100644
index 00000000..d2df1b72
--- /dev/null
+++ b/shlibs/uuid/man/uuid_clear.3
@@ -0,0 +1,61 @@
+.\" Copyright 1999 Andreas Dilger (adilger@enel.ucalgary.ca)
+.\"
+.\" %Begin-Header%
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, and the entire permission notice in its entirety,
+.\"    including the disclaimer of warranties.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote
+.\"    products derived from this software without specific prior
+.\"    written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+.\" WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+.\" OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+.\" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+.\" USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+.\" DAMAGE.
+.\" %End-Header%
+.\"
+.\" Created  Wed Mar 10 17:42:12 1999, Andreas Dilger
+.TH UUID_CLEAR 3 "May 2009" "util-linux-ng" "Libuuid API"
+.SH NAME
+uuid_clear \- reset value of UUID variable to the NULL value
+.SH SYNOPSIS
+.nf
+.B #include <uuid/uuid.h>
+.sp
+.BI "void uuid_clear(uuid_t " uu );
+.fi
+.SH DESCRIPTION
+The
+.B uuid_clear
+function sets the value of the supplied uuid variable
+.I uu
+to the NULL value.
+.SH AUTHOR
+Theodore Y. Ts'o
+.SH AVAILABILITY
+.B libuuid
+is part of the util-linux-ng package since version 2.15.1 and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+.UE
+.SH "SEE ALSO"
+.BR uuid (3),
+.BR uuid_compare (3),
+.BR uuid_copy (3),
+.BR uuid_generate (3),
+.BR uuid_is_null (3),
+.BR uuid_parse (3),
+.BR uuid_unparse (3)
diff --git a/shlibs/uuid/man/uuid_compare.3 b/shlibs/uuid/man/uuid_compare.3
new file mode 100644
index 00000000..3505c0a2
--- /dev/null
+++ b/shlibs/uuid/man/uuid_compare.3
@@ -0,0 +1,67 @@
+.\" Copyright 1999 Andreas Dilger (adilger@enel.ucalgary.ca)
+.\"
+.\" %Begin-Header%
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, and the entire permission notice in its entirety,
+.\"    including the disclaimer of warranties.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote
+.\"    products derived from this software without specific prior
+.\"    written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+.\" WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+.\" OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+.\" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+.\" USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+.\" DAMAGE.
+.\" %End-Header%
+.\"
+.\" Created  Wed Mar 10 17:42:12 1999, Andreas Dilger
+.TH UUID_COMPARE 3 "May 2009" "util-linux-ng" "Libuuid API"
+.SH NAME
+uuid_compare \- compare whether two UUIDs are the same
+.SH SYNOPSIS
+.nf
+.B #include <uuid/uuid.h>
+.sp
+.BI "int uuid_compare(uuid_t " uu1 ", uuid_t " uu2)
+.fi
+.SH DESCRIPTION
+The
+.B uuid_compare
+function compares the two supplied uuid variables
+.IR uu1 " and " uu2
+to each other.
+.SH RETURN VALUE
+Returns an integer less than, equal to, or greater than zero if
+.I uu1
+is found,  respectively, to be lexigraphically less than, equal, or
+greater than
+.IR uu2 .
+.SH AUTHOR
+Theodore Y. Ts'o
+.SH AVAILABILITY
+.B libuuid
+is part of the util-linux-ng package since version 2.15.1 and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+.UE
+.SH "SEE ALSO"
+.BR uuid (3),
+.BR uuid_clear (3),
+.BR uuid_copy (3),
+.BR uuid_generate (3),
+.BR uuid_is_null (3),
+.BR uuid_parse (3),
+.BR uuid_unparse (3)
diff --git a/shlibs/uuid/man/uuid_copy.3 b/shlibs/uuid/man/uuid_copy.3
new file mode 100644
index 00000000..1842a95a
--- /dev/null
+++ b/shlibs/uuid/man/uuid_copy.3
@@ -0,0 +1,63 @@
+.\" Copyright 1999 Andreas Dilger (adilger@enel.ucalgary.ca)
+.\"
+.\" %Begin-Header%
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, and the entire permission notice in its entirety,
+.\"    including the disclaimer of warranties.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote
+.\"    products derived from this software without specific prior
+.\"    written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+.\" WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+.\" OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+.\" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+.\" USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+.\" DAMAGE.
+.\" %End-Header%
+.\"
+.\" Created  Wed Mar 10 17:42:12 1999, Andreas Dilger
+.TH UUID_COPY 3 "May 2009" "util-linux-ng" "Libuuid API"
+.SH NAME
+uuid_copy \- copy a UUID value
+.SH SYNOPSIS
+.nf
+.B #include <uuid/uuid.h>
+.sp
+.BI "void uuid_copy(uuid_t " dst ", uuid_t " src);
+.fi
+.SH DESCRIPTION
+The
+.B uuid_copy
+function copies the UUID variable
+.IR src " to " dst .
+.SH RETURN VALUE
+The copied UUID is returned in the location pointed to by
+.IR dst .
+.SH AUTHOR
+Theodore Y. Ts'o
+.SH AVAILABILITY
+.B libuuid
+is part of the util-linux-ng package since version 2.15.1 and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+.UE
+.SH "SEE ALSO"
+.BR uuid (3),
+.BR uuid_clear (3),
+.BR uuid_compare (3),
+.BR uuid_generate (3),
+.BR uuid_is_null (3),
+.BR uuid_parse (3),
+.BR uuid_unparse (3)
diff --git a/shlibs/uuid/man/uuid_generate.3 b/shlibs/uuid/man/uuid_generate.3
new file mode 100644
index 00000000..79f47e85
--- /dev/null
+++ b/shlibs/uuid/man/uuid_generate.3
@@ -0,0 +1,105 @@
+.\" Copyright 1999 Andreas Dilger (adilger@enel.ucalgary.ca)
+.\"
+.\" %Begin-Header%
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, and the entire permission notice in its entirety,
+.\"    including the disclaimer of warranties.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote
+.\"    products derived from this software without specific prior
+.\"    written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+.\" WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+.\" OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+.\" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+.\" USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+.\" DAMAGE.
+.\" %End-Header%
+.\"
+.\" Created  Wed Mar 10 17:42:12 1999, Andreas Dilger
+.TH UUID_GENERATE 3 "May 2009" "util-linux-ng" "Libuuid API"
+.SH NAME
+uuid_generate, uuid_generate_random, uuid_generate_time \- create a new unique UUID value
+.SH SYNOPSIS
+.nf
+.B #include <uuid/uuid.h>
+.sp
+.BI "void uuid_generate(uuid_t " out );
+.BI "void uuid_generate_random(uuid_t " out );
+.BI "void uuid_generate_time(uuid_t " out );
+.fi
+.SH DESCRIPTION
+The
+.B uuid_generate
+function creates a new universally unique identifier (UUID).  The uuid will
+be generated based on high-quality randomness from
+.IR /dev/urandom ,
+if available.  If it is not available, then
+.B uuid_generate
+will use an alternative algorithm which uses the current time, the
+local ethernet MAC address (if available), and random data generated
+using a pseudo-random generator.
+.sp
+The
+.B uuid_generate_random
+function forces the use of the all-random UUID format, even if
+a high-quality random number generator (i.e.,
+.IR /dev/urandom )
+is not available, in which case a pseudo-random
+generator will be subsituted.  Note that the use of a pseudo-random
+generator may compromise the uniqueness of UUID's
+generated in this fashion.
+.sp
+The
+.B uuid_generate_time
+function forces the use of the alternative algorithm which uses the
+current time and the local ethernet MAC address (if available).
+This algorithm used to be the default one used to generate UUID, but
+because of the use of the ethernet MAC address, it can leak
+information about when and where the UUID was generated.  This can cause
+privacy problems in some applications, so the
+.B uuid_generate
+function only uses this algorithm if a high-quality source of
+randomness is not available.
+.sp
+The UUID is 16 bytes (128 bits) long, which gives approximately 3.4x10^38
+unique values (there are approximately 10^80 elemntary particles in
+the universe according to Carl Sagan's
+.IR Cosmos ).
+The new UUID can reasonably be considered unique among all UUIDs created
+on the local system, and among UUIDs created on other systems in the past
+and in the future.
+.SH RETURN VALUE
+The newly created UUID is returned in the memory location pointed to by
+.IR out .
+.SH "CONFORMING TO"
+OSF DCE 1.1
+.SH AUTHOR
+Theodore Y. Ts'o
+.SH AVAILABILITY
+.B libuuid
+is part of the util-linux-ng package since version 2.15.1 and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+.UE
+.SH "SEE ALSO"
+.BR uuid (3),
+.BR uuidgen (1),
+.BR uuid_clear (3),
+.BR uuid_compare (3),
+.BR uuid_copy (3),
+.BR uuid_is_null (3),
+.BR uuid_parse (3),
+.BR uuid_time (3),
+.BR uuid_unparse (3)
diff --git a/shlibs/uuid/man/uuid_is_null.3 b/shlibs/uuid/man/uuid_is_null.3
new file mode 100644
index 00000000..c05d5401
--- /dev/null
+++ b/shlibs/uuid/man/uuid_is_null.3
@@ -0,0 +1,63 @@
+.\" Copyright 1999 Andreas Dilger (adilger@enel.ucalgary.ca)
+.\"
+.\" %Begin-Header%
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, and the entire permission notice in its entirety,
+.\"    including the disclaimer of warranties.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote
+.\"    products derived from this software without specific prior
+.\"    written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+.\" WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+.\" OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+.\" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+.\" USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+.\" DAMAGE.
+.\" %End-Header%
+.\"
+.\" Created  Wed Mar 10 17:42:12 1999, Andreas Dilger
+.TH UUID_IS_NULL 3 "May 2009" "util-linux-ng" "Libuuid API"
+.SH NAME
+uuid_is_null \- compare the value of the UUID to the NULL value
+.SH SYNOPSIS
+.nf
+.B #include <uuid/uuid.h>
+.sp
+.BI "int uuid_is_null(uuid_t " uu );
+.fi
+.SH DESCRIPTION
+The
+.B uuid_is_null
+function compares the value of the supplied UUID variable
+.I uu
+to the NULL value.  If the value is equal to the NULL UUID, 1 is returned,
+otherwise 0 is returned.
+.SH AUTHOR
+Theodore Y. Ts'o
+.SH AVAILABILITY
+.B libuuid
+is part of the util-linux-ng package since version 2.15.1 and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+.UE
+.SH "SEE ALSO"
+.BR uuid (3),
+.BR uuid_clear (3),
+.BR uuid_compare (3),
+.BR uuid_copy (3),
+.BR uuid_generate (3),
+.BR uuid_time (3),
+.BR uuid_parse (3),
+.BR uuid_unparse (3)
diff --git a/shlibs/uuid/man/uuid_parse.3 b/shlibs/uuid/man/uuid_parse.3
new file mode 100644
index 00000000..2a73f1ce
--- /dev/null
+++ b/shlibs/uuid/man/uuid_parse.3
@@ -0,0 +1,72 @@
+.\" Copyright 1999 Andreas Dilger (adilger@enel.ucalgary.ca)
+.\"
+.\" %Begin-Header%
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, and the entire permission notice in its entirety,
+.\"    including the disclaimer of warranties.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote
+.\"    products derived from this software without specific prior
+.\"    written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+.\" WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+.\" OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+.\" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+.\" USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+.\" DAMAGE.
+.\" %End-Header%
+.\"
+.\" Created  Wed Mar 10 17:42:12 1999, Andreas Dilger
+.TH UUID_PARSE 3 "May 2009" "util-linux-ng" "Libuuid API"
+.SH NAME
+uuid_parse \- convert an input UUID string into binary representation
+.SH SYNOPSIS
+.nf
+.B #include <uuid/uuid.h>
+.sp
+.BI "int uuid_parse( char *" in ", uuid_t " uu );
+.fi
+.SH DESCRIPTION
+The
+.B uuid_parse
+function converts the UUID string given by
+.I in
+into the binary representation.  The input UUID is a string of the form
+1b4e28ba\-2fa1\-11d2\-883f\-b9a761bde3fb (in
+.BR printf (3)
+format "%08x\-%04x\-%04x\-%04x\-%012x", 36 bytes plus the trailing '\\0').
+.SH RETURN VALUE
+Upon successfully parsing the input string, 0 is returned, and the UUID is
+stored in the location pointed to by
+.IR uu ,
+otherwise \-1 is returned.
+.SH "CONFORMING TO"
+OSF DCE 1.1
+.SH AUTHOR
+Theodore Y. Ts'o
+.SH AVAILABILITY
+.B libuuid
+is part of the util-linux-ng package since version 2.15.1 and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+.UE
+.SH "SEE ALSO"
+.BR uuid (3),
+.BR uuid_clear (3),
+.BR uuid_compare (3),
+.BR uuid_copy (3),
+.BR uuid_generate (3),
+.BR uuid_is_null (3),
+.BR uuid_time (3),
+.BR uuid_unparse (3)
diff --git a/shlibs/uuid/man/uuid_time.3 b/shlibs/uuid/man/uuid_time.3
new file mode 100644
index 00000000..6b1f1cb3
--- /dev/null
+++ b/shlibs/uuid/man/uuid_time.3
@@ -0,0 +1,75 @@
+.\" Copyright 1999 Andreas Dilger (adilger@enel.ucalgary.ca)
+.\"
+.\" %Begin-Header%
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, and the entire permission notice in its entirety,
+.\"    including the disclaimer of warranties.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote
+.\"    products derived from this software without specific prior
+.\"    written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+.\" WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+.\" OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+.\" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+.\" USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+.\" DAMAGE.
+.\" %End-Header%
+.\"
+.\" Created  Wed Mar 10 17:42:12 1999, Andreas Dilger
+.TH UUID_TIME 3 "May 2009" "util-linux-ng" "Libuuid API"
+.SH NAME
+uuid_time \- extract the time at which the UUID was created
+.SH SYNOPSIS
+.nf
+.B #include <uuid/uuid.h>
+.sp
+.BI "time_t uuid_time(uuid_t " uu ", struct timeval *" ret_tv )
+.fi
+.SH DESCRIPTION
+The
+.B uuid_time
+function extracts the time at which the supplied time-based UUID
+.I uu
+was created.  Note that the UUID creation time is only encoded within
+certain types of UUIDs.  This function can only reasonably expect to
+extract the creation time for UUIDs created with the
+.BR uuid_generate_time (3)
+function.  It may or may not work with UUIDs created by other mechanisms.
+.SH "RETURN VALUES"
+The time at which the UUID was created, in seconds since January 1, 1970 GMT
+(the epoch), is returned (see
+.BR time "(2))."
+The time at which the UUID was created, in seconds and microseconds since
+the epoch, is also stored in the location pointed to by
+.I ret_tv
+(see
+.BR gettimeofday "(2))."
+.SH AUTHOR
+Theodore Y. Ts'o
+.SH AVAILABILITY
+.B libuuid
+is part of the util-linux-ng package since version 2.15.1 and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+.UE
+.SH "SEE ALSO"
+.BR uuid (3),
+.BR uuid_clear (3),
+.BR uuid_compare (3),
+.BR uuid_copy (3),
+.BR uuid_generate (3),
+.BR uuid_is_null (3),
+.BR uuid_parse (3),
+.BR uuid_unparse (3)
diff --git a/shlibs/uuid/man/uuid_unparse.3 b/shlibs/uuid/man/uuid_unparse.3
new file mode 100644
index 00000000..dbbd22d0
--- /dev/null
+++ b/shlibs/uuid/man/uuid_unparse.3
@@ -0,0 +1,80 @@
+.\" Copyright 1999 Andreas Dilger (adilger@enel.ucalgary.ca)
+.\"
+.\" %Begin-Header%
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, and the entire permission notice in its entirety,
+.\"    including the disclaimer of warranties.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote
+.\"    products derived from this software without specific prior
+.\"    written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+.\" WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+.\" OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+.\" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+.\" USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+.\" DAMAGE.
+.\" %End-Header%
+.\"
+.\" Created  Wed Mar 10 17:42:12 1999, Andreas Dilger
+.TH UUID_UNPARSE 3 "May 2009" "util-linux-ng" "Libuuid API"
+.SH NAME
+uuid_unparse \- convert an UUID from binary representation to a string
+.SH SYNOPSIS
+.nf
+.B #include <uuid/uuid.h>
+.sp
+.BI "void uuid_unparse(uuid_t " uu ", char *" out );
+.BI "void uuid_unparse_upper(uuid_t " uu ", char *" out );
+.BI "void uuid_unparse_lower(uuid_t " uu ", char *" out );
+.fi
+.SH DESCRIPTION
+The
+.B uuid_unparse
+function converts the supplied UUID
+.I uu
+from the binary representation into a 36\-byte string (plus tailing '\\0')
+of the form 1b4e28ba\-2fa1\-11d2\-883f\-0016d3cca427 and stores this
+value in the character string pointed to by
+.IR out .
+The case of the hex digits returned by
+.B uuid_unparse
+may be upper or lower case, and is
+dependent on the system-dependent local default.
+.PP
+If the case of the
+hex digits is important then the functions
+.B uuid_unparse_upper
+and
+.B uuid_unparse_lower
+may be used.
+.SH "CONFORMING TO"
+OSF DCE 1.1
+.SH AUTHOR
+Theodore Y. Ts'o
+.SH AVAILABILITY
+.B libuuid
+is part of the util-linux-ng package since version 2.15.1 and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+.UE
+.SH "SEE ALSO"
+.BR uuid (3),
+.BR uuid_clear (3),
+.BR uuid_compare (3),
+.BR uuid_copy (3),
+.BR uuid_generate (3),
+.BR uuid_time (3),
+.BR uuid_is_null (3),
+.BR uuid_parse (3)
diff --git a/shlibs/uuid/src/Makefile.am b/shlibs/uuid/src/Makefile.am
new file mode 100644
index 00000000..9af1979e
--- /dev/null
+++ b/shlibs/uuid/src/Makefile.am
@@ -0,0 +1,38 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+AM_CPPFLAGS += -I$(ul_libuuid_srcdir)
+
+noinst_PROGRAMS = tst_uuid
+tst_uuid_LDADD = libuuid.la #$(ul_libuuid_la)
+
+# includes
+uuidincdir = $(includedir)/uuid
+uuidinc_HEADERS = uuid.h
+
+usrlib_exec_LTLIBRARIES = libuuid.la
+libuuid_la_SOURCES = clear.c compare.c copy.c gen_uuid.c \
+           isnull.c pack.c parse.c unpack.c unparse.c uuidd.h \
+           uuidd.h uuidP.h uuid_time.c $(uuidinc_HEADERS)
+
+libuuid_la_DEPENDENCIES = uuid.sym
+
+libuuid_la_LDFLAGS = -Wl,--version-script=$(ul_libuuid_srcdir)/uuid.sym \
+                     -version-info $(LIBUUID_VERSION_INFO)
+
+EXTRA_DIST = uuid.sym gen_uuid_nt.c
+
+# move lib from $(usrlib_execdir) to $(libdir) if needed
+install-exec-hook:
+	if test "$(usrlib_execdir)" != "$(libdir)"; then \
+		mkdir -p $(DESTDIR)$(libdir); \
+		mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* $(DESTDIR)$(libdir); \
+		so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libuuid.so); \
+		so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
+		(cd $(DESTDIR)$(usrlib_execdir) && \
+			rm -f libuuid.so && \
+			$(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libuuid.so); \
+	fi
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(libdir)/libuuid.so*
+
diff --git a/shlibs/uuid/src/clear.c b/shlibs/uuid/src/clear.c
new file mode 100644
index 00000000..2d91fee9
--- /dev/null
+++ b/shlibs/uuid/src/clear.c
@@ -0,0 +1,43 @@
+/*
+ * clear.c -- Clear a UUID
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include "string.h"
+
+#include "uuidP.h"
+
+void uuid_clear(uuid_t uu)
+{
+	memset(uu, 0, 16);
+}
+
diff --git a/shlibs/uuid/src/compare.c b/shlibs/uuid/src/compare.c
new file mode 100644
index 00000000..f28a7267
--- /dev/null
+++ b/shlibs/uuid/src/compare.c
@@ -0,0 +1,55 @@
+/*
+ * compare.c --- compare whether or not two UUID's are the same
+ *
+ * Returns 0 if the two UUID's are different, and 1 if they are the same.
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include "uuidP.h"
+#include <string.h>
+
+#define UUCMP(u1,u2) if (u1 != u2) return((u1 < u2) ? -1 : 1);
+
+int uuid_compare(const uuid_t uu1, const uuid_t uu2)
+{
+	struct uuid	uuid1, uuid2;
+
+	uuid_unpack(uu1, &uuid1);
+	uuid_unpack(uu2, &uuid2);
+
+	UUCMP(uuid1.time_low, uuid2.time_low);
+	UUCMP(uuid1.time_mid, uuid2.time_mid);
+	UUCMP(uuid1.time_hi_and_version, uuid2.time_hi_and_version);
+	UUCMP(uuid1.clock_seq, uuid2.clock_seq);
+	return memcmp(uuid1.node, uuid2.node, 6);
+}
+
diff --git a/shlibs/uuid/src/copy.c b/shlibs/uuid/src/copy.c
new file mode 100644
index 00000000..ead33aa2
--- /dev/null
+++ b/shlibs/uuid/src/copy.c
@@ -0,0 +1,45 @@
+/*
+ * copy.c --- copy UUIDs
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include "uuidP.h"
+
+void uuid_copy(uuid_t dst, const uuid_t src)
+{
+	unsigned char		*cp1;
+	const unsigned char	*cp2;
+	int			i;
+
+	for (i=0, cp1 = dst, cp2 = src; i < 16; i++)
+		*cp1++ = *cp2++;
+}
diff --git a/shlibs/uuid/src/gen_uuid.c b/shlibs/uuid/src/gen_uuid.c
new file mode 100644
index 00000000..8bb29f38
--- /dev/null
+++ b/shlibs/uuid/src/gen_uuid.c
@@ -0,0 +1,678 @@
+/*
+ * gen_uuid.c --- generate a DCE-compatible uuid
+ *
+ * Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+/*
+ * Force inclusion of SVID stuff since we need it if we're compiling in
+ * gcc-wall wall mode
+ */
+#define _SVID_SOURCE
+
+#ifdef _WIN32
+#define _WIN32_WINNT 0x0500
+#include <windows.h>
+#define UUID MYUUID
+#endif
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/wait.h>
+#include <sys/stat.h>
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NET_IF_DL_H
+#include <net/if_dl.h>
+#endif
+#if defined(__linux__) && defined(HAVE_SYS_SYSCALL_H)
+#include <sys/syscall.h>
+#endif
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
+#include "uuidP.h"
+#include "uuidd.h"
+
+#ifdef HAVE_SRANDOM
+#define srand(x)	srandom(x)
+#define rand()		random()
+#endif
+
+#ifdef TLS
+#define THREAD_LOCAL static TLS
+#else
+#define THREAD_LOCAL static
+#endif
+
+#if defined(__linux__) && defined(__NR_gettid) && defined(HAVE_JRAND48)
+#define DO_JRAND_MIX
+THREAD_LOCAL unsigned short jrand_seed[3];
+#endif
+
+#ifdef _WIN32
+static void gettimeofday (struct timeval *tv, void *dummy)
+{
+	FILETIME	ftime;
+	uint64_t	n;
+
+	GetSystemTimeAsFileTime (&ftime);
+	n = (((uint64_t) ftime.dwHighDateTime << 32)
+	     + (uint64_t) ftime.dwLowDateTime);
+	if (n) {
+		n /= 10;
+		n -= ((369 * 365 + 89) * (uint64_t) 86400) * 1000000;
+	}
+
+	tv->tv_sec = n / 1000000;
+	tv->tv_usec = n % 1000000;
+}
+
+static int getuid (void)
+{
+	return 1;
+}
+#endif
+
+static int get_random_fd(void)
+{
+	struct timeval	tv;
+	static int	fd = -2;
+	int		i;
+
+	if (fd == -2) {
+		gettimeofday(&tv, 0);
+#ifndef _WIN32
+		fd = open("/dev/urandom", O_RDONLY);
+		if (fd == -1)
+			fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
+		if (fd >= 0) {
+			i = fcntl(fd, F_GETFD);
+			if (i >= 0)
+				fcntl(fd, F_SETFD, i | FD_CLOEXEC);
+		}
+#endif
+		srand((getpid() << 16) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec);
+#ifdef DO_JRAND_MIX
+		jrand_seed[0] = getpid() ^ (tv.tv_sec & 0xFFFF);
+		jrand_seed[1] = getppid() ^ (tv.tv_usec & 0xFFFF);
+		jrand_seed[2] = (tv.tv_sec ^ tv.tv_usec) >> 16;
+#endif
+	}
+	/* Crank the random number generator a few times */
+	gettimeofday(&tv, 0);
+	for (i = (tv.tv_sec ^ tv.tv_usec) & 0x1F; i > 0; i--)
+		rand();
+	return fd;
+}
+
+
+/*
+ * Generate a series of random bytes.  Use /dev/urandom if possible,
+ * and if not, use srandom/random.
+ */
+static void get_random_bytes(void *buf, int nbytes)
+{
+	int i, n = nbytes, fd = get_random_fd();
+	int lose_counter = 0;
+	unsigned char *cp = (unsigned char *) buf;
+
+	if (fd >= 0) {
+		while (n > 0) {
+			i = read(fd, cp, n);
+			if (i <= 0) {
+				if (lose_counter++ > 16)
+					break;
+				continue;
+			}
+			n -= i;
+			cp += i;
+			lose_counter = 0;
+		}
+	}
+
+	/*
+	 * We do this all the time, but this is the only source of
+	 * randomness if /dev/random/urandom is out to lunch.
+	 */
+	for (cp = buf, i = 0; i < nbytes; i++)
+		*cp++ ^= (rand() >> 7) & 0xFF;
+
+#ifdef DO_JRAND_MIX
+	{
+		unsigned short tmp_seed[3];
+
+		memcpy(tmp_seed, jrand_seed, sizeof(tmp_seed));
+		jrand_seed[2] = jrand_seed[2] ^ syscall(__NR_gettid);
+		for (cp = buf, i = 0; i < nbytes; i++)
+			*cp++ ^= (jrand48(tmp_seed) >> 7) & 0xFF;
+		memcpy(jrand_seed, tmp_seed,
+		       sizeof(jrand_seed)-sizeof(unsigned short));
+	}
+#endif
+
+	return;
+}
+
+/*
+ * Get the ethernet hardware address, if we can find it...
+ *
+ * XXX for a windows version, probably should use GetAdaptersInfo:
+ * http://www.codeguru.com/cpp/i-n/network/networkinformation/article.php/c5451
+ * commenting out get_node_id just to get gen_uuid to compile under windows
+ * is not the right way to go!
+ */
+static int get_node_id(unsigned char *node_id)
+{
+#ifdef HAVE_NET_IF_H
+	int		sd;
+	struct ifreq	ifr, *ifrp;
+	struct ifconf	ifc;
+	char buf[1024];
+	int		n, i;
+	unsigned char	*a;
+#ifdef HAVE_NET_IF_DL_H
+	struct sockaddr_dl *sdlp;
+#endif
+
+/*
+ * BSD 4.4 defines the size of an ifreq to be
+ * max(sizeof(ifreq), sizeof(ifreq.ifr_name)+ifreq.ifr_addr.sa_len
+ * However, under earlier systems, sa_len isn't present, so the size is
+ * just sizeof(struct ifreq)
+ */
+#ifdef HAVE_SA_LEN
+#ifndef max
+#define max(a,b) ((a) > (b) ? (a) : (b))
+#endif
+#define ifreq_size(i) max(sizeof(struct ifreq),\
+     sizeof((i).ifr_name)+(i).ifr_addr.sa_len)
+#else
+#define ifreq_size(i) sizeof(struct ifreq)
+#endif /* HAVE_SA_LEN*/
+
+	sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+	if (sd < 0) {
+		return -1;
+	}
+	memset(buf, 0, sizeof(buf));
+	ifc.ifc_len = sizeof(buf);
+	ifc.ifc_buf = buf;
+	if (ioctl (sd, SIOCGIFCONF, (char *)&ifc) < 0) {
+		close(sd);
+		return -1;
+	}
+	n = ifc.ifc_len;
+	for (i = 0; i < n; i+= ifreq_size(*ifrp) ) {
+		ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
+		strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
+#ifdef SIOCGIFHWADDR
+		if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
+			continue;
+		a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
+#else
+#ifdef SIOCGENADDR
+		if (ioctl(sd, SIOCGENADDR, &ifr) < 0)
+			continue;
+		a = (unsigned char *) ifr.ifr_enaddr;
+#else
+#ifdef HAVE_NET_IF_DL_H
+		sdlp = (struct sockaddr_dl *) &ifrp->ifr_addr;
+		if ((sdlp->sdl_family != AF_LINK) || (sdlp->sdl_alen != 6))
+			continue;
+		a = (unsigned char *) &sdlp->sdl_data[sdlp->sdl_nlen];
+#else
+		/*
+		 * XXX we don't have a way of getting the hardware
+		 * address
+		 */
+		close(sd);
+		return 0;
+#endif /* HAVE_NET_IF_DL_H */
+#endif /* SIOCGENADDR */
+#endif /* SIOCGIFHWADDR */
+		if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])
+			continue;
+		if (node_id) {
+			memcpy(node_id, a, 6);
+			close(sd);
+			return 1;
+		}
+	}
+	close(sd);
+#endif
+	return 0;
+}
+
+/* Assume that the gettimeofday() has microsecond granularity */
+#define MAX_ADJUSTMENT 10
+
+static int get_clock(uint32_t *clock_high, uint32_t *clock_low,
+		     uint16_t *ret_clock_seq, int *num)
+{
+	THREAD_LOCAL int		adjustment = 0;
+	THREAD_LOCAL struct timeval	last = {0, 0};
+	THREAD_LOCAL int		state_fd = -2;
+	THREAD_LOCAL FILE		*state_f;
+	THREAD_LOCAL uint16_t		clock_seq;
+	struct timeval			tv;
+	struct flock			fl;
+	uint64_t			clock_reg;
+	mode_t				save_umask;
+	int				len;
+
+	if (state_fd == -2) {
+		save_umask = umask(0);
+		state_fd = open("/var/lib/libuuid/clock.txt",
+				O_RDWR|O_CREAT, 0660);
+		(void) umask(save_umask);
+		state_f = fdopen(state_fd, "r+");
+		if (!state_f) {
+			close(state_fd);
+			state_fd = -1;
+		}
+	}
+	fl.l_type = F_WRLCK;
+	fl.l_whence = SEEK_SET;
+	fl.l_start = 0;
+	fl.l_len = 0;
+	fl.l_pid = 0;
+	if (state_fd >= 0) {
+		rewind(state_f);
+		while (fcntl(state_fd, F_SETLKW, &fl) < 0) {
+			if ((errno == EAGAIN) || (errno == EINTR))
+				continue;
+			fclose(state_f);
+			close(state_fd);
+			state_fd = -1;
+			break;
+		}
+	}
+	if (state_fd >= 0) {
+		unsigned int cl;
+		unsigned long tv1, tv2;
+		int a;
+
+		if (fscanf(state_f, "clock: %04x tv: %lu %lu adj: %d\n",
+			   &cl, &tv1, &tv2, &a) == 4) {
+			clock_seq = cl & 0x3FFF;
+			last.tv_sec = tv1;
+			last.tv_usec = tv2;
+			adjustment = a;
+		}
+	}
+
+	if ((last.tv_sec == 0) && (last.tv_usec == 0)) {
+		get_random_bytes(&clock_seq, sizeof(clock_seq));
+		clock_seq &= 0x3FFF;
+		gettimeofday(&last, 0);
+		last.tv_sec--;
+	}
+
+try_again:
+	gettimeofday(&tv, 0);
+	if ((tv.tv_sec < last.tv_sec) ||
+	    ((tv.tv_sec == last.tv_sec) &&
+	     (tv.tv_usec < last.tv_usec))) {
+		clock_seq = (clock_seq+1) & 0x3FFF;
+		adjustment = 0;
+		last = tv;
+	} else if ((tv.tv_sec == last.tv_sec) &&
+	    (tv.tv_usec == last.tv_usec)) {
+		if (adjustment >= MAX_ADJUSTMENT)
+			goto try_again;
+		adjustment++;
+	} else {
+		adjustment = 0;
+		last = tv;
+	}
+
+	clock_reg = tv.tv_usec*10 + adjustment;
+	clock_reg += ((uint64_t) tv.tv_sec)*10000000;
+	clock_reg += (((uint64_t) 0x01B21DD2) << 32) + 0x13814000;
+
+	if (num && (*num > 1)) {
+		adjustment += *num - 1;
+		last.tv_usec += adjustment / 10;
+		adjustment = adjustment % 10;
+		last.tv_sec += last.tv_usec / 1000000;
+		last.tv_usec = last.tv_usec % 1000000;
+	}
+
+	if (state_fd > 0) {
+		rewind(state_f);
+		len = fprintf(state_f,
+			      "clock: %04x tv: %016lu %08lu adj: %08d\n",
+			      clock_seq, last.tv_sec, last.tv_usec, adjustment);
+		fflush(state_f);
+		if (ftruncate(state_fd, len) < 0) {
+			fprintf(state_f, "                   \n");
+			fflush(state_f);
+		}
+		rewind(state_f);
+		fl.l_type = F_UNLCK;
+		fcntl(state_fd, F_SETLK, &fl);
+	}
+
+	*clock_high = clock_reg >> 32;
+	*clock_low = clock_reg;
+	*ret_clock_seq = clock_seq;
+	return 0;
+}
+
+#if defined(HAVE_UUIDD) && defined(HAVE_SYS_UN_H)
+/* used in get_uuid_via_daemon() only */
+static ssize_t read_all(int fd, char *buf, size_t count)
+{
+	ssize_t ret;
+	ssize_t c = 0;
+	int tries = 0;
+
+	memset(buf, 0, count);
+	while (count > 0) {
+		ret = read(fd, buf, count);
+		if (ret <= 0) {
+			if ((errno == EAGAIN || errno == EINTR || ret == 0) &&
+			    (tries++ < 5))
+				continue;
+			return c ? c : -1;
+		}
+		if (ret > 0)
+			tries = 0;
+		count -= ret;
+		buf += ret;
+		c += ret;
+	}
+	return c;
+}
+
+/*
+ * Close all file descriptors
+ */
+static void close_all_fds(void)
+{
+	int i, max;
+
+#if defined(HAVE_SYSCONF) && defined(_SC_OPEN_MAX)
+	max = sysconf(_SC_OPEN_MAX);
+#elif defined(HAVE_GETDTABLESIZE)
+	max = getdtablesize();
+#elif defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE)
+	struct rlimit rl;
+
+	getrlimit(RLIMIT_NOFILE, &rl);
+	max = rl.rlim_cur;
+#else
+	max = OPEN_MAX;
+#endif
+
+	for (i=0; i < max; i++) {
+		close(i);
+		if (i <= 2)
+			open("/dev/null", O_RDWR);
+	}
+}
+
+/*
+ * Try using the uuidd daemon to generate the UUID
+ *
+ * Returns 0 on success, non-zero on failure.
+ */
+static int get_uuid_via_daemon(int op, uuid_t out, int *num)
+{
+	char op_buf[64];
+	int op_len;
+	int s;
+	ssize_t ret;
+	int32_t reply_len = 0, expected = 16;
+	struct sockaddr_un srv_addr;
+	struct stat st;
+	pid_t pid;
+	static const char *uuidd_path = UUIDD_PATH;
+	static int access_ret = -2;
+	static int start_attempts = 0;
+
+	if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
+		return -1;
+
+	srv_addr.sun_family = AF_UNIX;
+	strcpy(srv_addr.sun_path, UUIDD_SOCKET_PATH);
+
+	if (connect(s, (const struct sockaddr *) &srv_addr,
+		    sizeof(struct sockaddr_un)) < 0) {
+		if (access_ret == -2)
+			access_ret = access(uuidd_path, X_OK);
+		if (access_ret == 0)
+			access_ret = stat(uuidd_path, &st);
+		if (access_ret == 0 && (st.st_mode & (S_ISUID | S_ISGID)) == 0)
+			access_ret = access(UUIDD_DIR, W_OK);
+		if (access_ret == 0 && start_attempts++ < 5) {
+			if ((pid = fork()) == 0) {
+				close_all_fds();
+				execl(uuidd_path, "uuidd", "-qT", "300",
+				      (char *) NULL);
+				exit(1);
+			}
+			(void) waitpid(pid, 0, 0);
+			if (connect(s, (const struct sockaddr *) &srv_addr,
+				    sizeof(struct sockaddr_un)) < 0)
+				goto fail;
+		} else
+			goto fail;
+	}
+	op_buf[0] = op;
+	op_len = 1;
+	if (op == UUIDD_OP_BULK_TIME_UUID) {
+		memcpy(op_buf+1, num, sizeof(*num));
+		op_len += sizeof(*num);
+		expected += sizeof(*num);
+	}
+
+	ret = write(s, op_buf, op_len);
+	if (ret < 1)
+		goto fail;
+
+	ret = read_all(s, (char *) &reply_len, sizeof(reply_len));
+	if (ret < 0)
+		goto fail;
+
+	if (reply_len != expected)
+		goto fail;
+
+	ret = read_all(s, op_buf, reply_len);
+
+	if (op == UUIDD_OP_BULK_TIME_UUID)
+		memcpy(op_buf+16, num, sizeof(int));
+
+	memcpy(out, op_buf, 16);
+
+	close(s);
+	return ((ret == expected) ? 0 : -1);
+
+fail:
+	close(s);
+	return -1;
+}
+
+#else /* !defined(HAVE_UUIDD) && defined(HAVE_SYS_UN_H) */
+static int get_uuid_via_daemon(int op, uuid_t out, int *num)
+{
+	return -1;
+}
+#endif
+
+void uuid__generate_time(uuid_t out, int *num)
+{
+	static unsigned char node_id[6];
+	static int has_init = 0;
+	struct uuid uu;
+	uint32_t	clock_mid;
+
+	if (!has_init) {
+		if (get_node_id(node_id) <= 0) {
+			get_random_bytes(node_id, 6);
+			/*
+			 * Set multicast bit, to prevent conflicts
+			 * with IEEE 802 addresses obtained from
+			 * network cards
+			 */
+			node_id[0] |= 0x01;
+		}
+		has_init = 1;
+	}
+	get_clock(&clock_mid, &uu.time_low, &uu.clock_seq, num);
+	uu.clock_seq |= 0x8000;
+	uu.time_mid = (uint16_t) clock_mid;
+	uu.time_hi_and_version = ((clock_mid >> 16) & 0x0FFF) | 0x1000;
+	memcpy(uu.node, node_id, 6);
+	uuid_pack(&uu, out);
+}
+
+void uuid_generate_time(uuid_t out)
+{
+#ifdef TLS
+	THREAD_LOCAL int		num = 0;
+	THREAD_LOCAL struct uuid	uu;
+	THREAD_LOCAL time_t		last_time = 0;
+	time_t				now;
+
+	if (num > 0) {
+		now = time(0);
+		if (now > last_time+1)
+			num = 0;
+	}
+	if (num <= 0) {
+		num = 1000;
+		if (get_uuid_via_daemon(UUIDD_OP_BULK_TIME_UUID,
+					out, &num) == 0) {
+			last_time = time(0);
+			uuid_unpack(out, &uu);
+			num--;
+			return;
+		}
+		num = 0;
+	}
+	if (num > 0) {
+		uu.time_low++;
+		if (uu.time_low == 0) {
+			uu.time_mid++;
+			if (uu.time_mid == 0)
+				uu.time_hi_and_version++;
+		}
+		num--;
+		uuid_pack(&uu, out);
+		return;
+	}
+#else
+	if (get_uuid_via_daemon(UUIDD_OP_TIME_UUID, out, 0) == 0)
+		return;
+#endif
+
+	uuid__generate_time(out, 0);
+}
+
+
+void uuid__generate_random(uuid_t out, int *num)
+{
+	uuid_t	buf;
+	struct uuid uu;
+	int i, n;
+
+	if (!num || !*num)
+		n = 1;
+	else
+		n = *num;
+
+	for (i = 0; i < n; i++) {
+		get_random_bytes(buf, sizeof(buf));
+		uuid_unpack(buf, &uu);
+
+		uu.clock_seq = (uu.clock_seq & 0x3FFF) | 0x8000;
+		uu.time_hi_and_version = (uu.time_hi_and_version & 0x0FFF)
+			| 0x4000;
+		uuid_pack(&uu, out);
+		out += sizeof(uuid_t);
+	}
+}
+
+void uuid_generate_random(uuid_t out)
+{
+	int	num = 1;
+	/* No real reason to use the daemon for random uuid's -- yet */
+
+	uuid__generate_random(out, &num);
+}
+
+
+/*
+ * This is the generic front-end to uuid_generate_random and
+ * uuid_generate_time.  It uses uuid_generate_random only if
+ * /dev/urandom is available, since otherwise we won't have
+ * high-quality randomness.
+ */
+void uuid_generate(uuid_t out)
+{
+	if (get_random_fd() >= 0)
+		uuid_generate_random(out);
+	else
+		uuid_generate_time(out);
+}
diff --git a/shlibs/uuid/src/gen_uuid_nt.c b/shlibs/uuid/src/gen_uuid_nt.c
new file mode 100644
index 00000000..aa44bfd3
--- /dev/null
+++ b/shlibs/uuid/src/gen_uuid_nt.c
@@ -0,0 +1,92 @@
+/*
+ * gen_uuid_nt.c -- Use NT api to generate uuid
+ *
+ * Written by Andrey Shedel (andreys@ns.cr.cyco.com)
+ */
+
+
+#include "uuidP.h"
+
+#pragma warning(push,4)
+
+#pragma comment(lib, "ntdll.lib")
+
+//
+// Here is a nice example why it's not a good idea
+// to use native API in ordinary applications.
+// Number of parameters in function below was changed from 3 to 4
+// for NT5.
+//
+//
+// NTSYSAPI
+// NTSTATUS
+// NTAPI
+// NtAllocateUuids(
+//     OUT PULONG p1,
+//     OUT PULONG p2,
+//     OUT PULONG p3,
+//     OUT PUCHAR Seed // 6 bytes
+//   );
+//
+//
+
+unsigned long
+__stdcall
+NtAllocateUuids(
+   void* p1,  // 8 bytes
+   void* p2,  // 4 bytes
+   void* p3   // 4 bytes
+   );
+
+typedef
+unsigned long
+(__stdcall*
+NtAllocateUuids_2000)(
+   void* p1,  // 8 bytes
+   void* p2,  // 4 bytes
+   void* p3,  // 4 bytes
+   void* seed // 6 bytes
+   );
+
+
+
+//
+// Nice, but instead of including ntddk.h ot winnt.h
+// I should define it here because they MISSED __stdcall in those headers.
+//
+
+__declspec(dllimport)
+struct _TEB*
+__stdcall
+NtCurrentTeb(void);
+
+
+//
+// The only way to get version information from the system is to examine
+// one stored in PEB. But it's pretty dangerouse because this value could
+// be altered in image header.
+//
+
+static
+int
+Nt5(void)
+{
+	//return NtCuttentTeb()->Peb->OSMajorVersion >= 5;
+	return (int)*(int*)((char*)(int)(*(int*)((char*)NtCurrentTeb() + 0x30)) + 0xA4) >= 5;
+}
+
+
+
+
+void uuid_generate(uuid_t out)
+{
+	if(Nt5())
+	{
+		unsigned char seed[6];
+		((NtAllocateUuids_2000)NtAllocateUuids)(out, ((char*)out)+8, ((char*)out)+12, &seed[0] );
+	}
+	else
+	{
+		NtAllocateUuids(out, ((char*)out)+8, ((char*)out)+12);
+	}
+}
diff --git a/shlibs/uuid/src/isnull.c b/shlibs/uuid/src/isnull.c
new file mode 100644
index 00000000..931e7e7d
--- /dev/null
+++ b/shlibs/uuid/src/isnull.c
@@ -0,0 +1,48 @@
+/*
+ * isnull.c --- Check whether or not the UUID is null
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include "uuidP.h"
+
+/* Returns 1 if the uuid is the NULL uuid */
+int uuid_is_null(const uuid_t uu)
+{
+	const unsigned char 	*cp;
+	int			i;
+
+	for (i=0, cp = uu; i < 16; i++)
+		if (*cp++)
+			return 0;
+	return 1;
+}
+
diff --git a/shlibs/uuid/src/pack.c b/shlibs/uuid/src/pack.c
new file mode 100644
index 00000000..097516d2
--- /dev/null
+++ b/shlibs/uuid/src/pack.c
@@ -0,0 +1,69 @@
+/*
+ * Internal routine for packing UUID's
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include <string.h>
+#include "uuidP.h"
+
+void uuid_pack(const struct uuid *uu, uuid_t ptr)
+{
+	uint32_t	tmp;
+	unsigned char	*out = ptr;
+
+	tmp = uu->time_low;
+	out[3] = (unsigned char) tmp;
+	tmp >>= 8;
+	out[2] = (unsigned char) tmp;
+	tmp >>= 8;
+	out[1] = (unsigned char) tmp;
+	tmp >>= 8;
+	out[0] = (unsigned char) tmp;
+
+	tmp = uu->time_mid;
+	out[5] = (unsigned char) tmp;
+	tmp >>= 8;
+	out[4] = (unsigned char) tmp;
+
+	tmp = uu->time_hi_and_version;
+	out[7] = (unsigned char) tmp;
+	tmp >>= 8;
+	out[6] = (unsigned char) tmp;
+
+	tmp = uu->clock_seq;
+	out[9] = (unsigned char) tmp;
+	tmp >>= 8;
+	out[8] = (unsigned char) tmp;
+
+	memcpy(out+10, uu->node, 6);
+}
+
diff --git a/shlibs/uuid/src/parse.c b/shlibs/uuid/src/parse.c
new file mode 100644
index 00000000..074383ef
--- /dev/null
+++ b/shlibs/uuid/src/parse.c
@@ -0,0 +1,79 @@
+/*
+ * parse.c --- UUID parsing
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "uuidP.h"
+
+int uuid_parse(const char *in, uuid_t uu)
+{
+	struct uuid	uuid;
+	int 		i;
+	const char	*cp;
+	char		buf[3];
+
+	if (strlen(in) != 36)
+		return -1;
+	for (i=0, cp = in; i <= 36; i++,cp++) {
+		if ((i == 8) || (i == 13) || (i == 18) ||
+		    (i == 23)) {
+			if (*cp == '-')
+				continue;
+			else
+				return -1;
+		}
+		if (i== 36)
+			if (*cp == 0)
+				continue;
+		if (!isxdigit(*cp))
+			return -1;
+	}
+	uuid.time_low = strtoul(in, NULL, 16);
+	uuid.time_mid = strtoul(in+9, NULL, 16);
+	uuid.time_hi_and_version = strtoul(in+14, NULL, 16);
+	uuid.clock_seq = strtoul(in+19, NULL, 16);
+	cp = in+24;
+	buf[2] = 0;
+	for (i=0; i < 6; i++) {
+		buf[0] = *cp++;
+		buf[1] = *cp++;
+		uuid.node[i] = strtoul(buf, NULL, 16);
+	}
+
+	uuid_pack(&uuid, uu);
+	return 0;
+}
diff --git a/shlibs/uuid/src/tst_uuid.c b/shlibs/uuid/src/tst_uuid.c
new file mode 100644
index 00000000..e03138f7
--- /dev/null
+++ b/shlibs/uuid/src/tst_uuid.c
@@ -0,0 +1,180 @@
+/*
+ * tst_uuid.c --- test program from the UUID library
+ *
+ * Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#ifdef _WIN32
+#define _WIN32_WINNT 0x0500
+#include <windows.h>
+#define UUID MYUUID
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "uuid.h"
+
+static int test_uuid(const char * uuid, int isValid)
+{
+	static const char * validStr[2] = {"invalid", "valid"};
+	uuid_t uuidBits;
+	int parsedOk;
+
+	parsedOk = uuid_parse(uuid, uuidBits) == 0;
+
+	printf("%s is %s", uuid, validStr[isValid]);
+	if (parsedOk != isValid) {
+		printf(" but uuid_parse says %s\n", validStr[parsedOk]);
+		return 1;
+	}
+	printf(", OK\n");
+	return 0;
+}
+
+#ifdef __GNUC__
+#define ATTR(x) __attribute__(x)
+#else
+#define ATTR(x)
+#endif
+
+int
+main(int argc ATTR((unused)) , char **argv ATTR((unused)))
+{
+	uuid_t		buf, tst;
+	char		str[100];
+	struct timeval	tv;
+	time_t		time_reg;
+	unsigned char	*cp;
+	int i;
+	int failed = 0;
+	int type, variant;
+
+	uuid_generate(buf);
+	uuid_unparse(buf, str);
+	printf("UUID generate = %s\n", str);
+	printf("UUID: ");
+	for (i=0, cp = (unsigned char *) &buf; i < 16; i++) {
+		printf("%02x", *cp++);
+	}
+	printf("\n");
+	type = uuid_type(buf); 	variant = uuid_variant(buf);
+	printf("UUID type = %d, UUID variant = %d\n", type, variant);
+	if (variant != UUID_VARIANT_DCE) {
+		printf("Incorrect UUID Variant; was expecting DCE!\n");
+		failed++;
+	}
+	printf("\n");
+
+	uuid_generate_random(buf);
+	uuid_unparse(buf, str);
+	printf("UUID random string = %s\n", str);
+	printf("UUID: ");
+	for (i=0, cp = (unsigned char *) &buf; i < 16; i++) {
+		printf("%02x", *cp++);
+	}
+	printf("\n");
+	type = uuid_type(buf); 	variant = uuid_variant(buf);
+	printf("UUID type = %d, UUID variant = %d\n", type, variant);
+	if (variant != UUID_VARIANT_DCE) {
+		printf("Incorrect UUID Variant; was expecting DCE!\n");
+		failed++;
+	}
+	if (type != 4) {
+		printf("Incorrect UUID type; was expecting "
+		       "4 (random type)!\n");
+		failed++;
+	}
+	printf("\n");
+
+	uuid_generate_time(buf);
+	uuid_unparse(buf, str);
+	printf("UUID string = %s\n", str);
+	printf("UUID time: ");
+	for (i=0, cp = (unsigned char *) &buf; i < 16; i++) {
+		printf("%02x", *cp++);
+	}
+	printf("\n");
+	type = uuid_type(buf); 	variant = uuid_variant(buf);
+	printf("UUID type = %d, UUID variant = %d\n", type, variant);
+	if (variant != UUID_VARIANT_DCE) {
+		printf("Incorrect UUID Variant; was expecting DCE!\n");
+		failed++;
+	}
+	if (type != 1) {
+		printf("Incorrect UUID type; was expecting "
+		       "1 (time-based type)!\\n");
+		failed++;
+	}
+	tv.tv_sec = 0;
+	tv.tv_usec = 0;
+	time_reg = uuid_time(buf, &tv);
+	printf("UUID time is: (%ld, %ld): %s\n", tv.tv_sec, tv.tv_usec,
+	       ctime(&time_reg));
+	uuid_parse(str, tst);
+	if (!uuid_compare(buf, tst))
+		printf("UUID parse and compare succeeded.\n");
+	else {
+		printf("UUID parse and compare failed!\n");
+		failed++;
+	}
+	uuid_clear(tst);
+	if (uuid_is_null(tst))
+		printf("UUID clear and is null succeeded.\n");
+	else {
+		printf("UUID clear and is null failed!\n");
+		failed++;
+	}
+	uuid_copy(buf, tst);
+	if (!uuid_compare(buf, tst))
+		printf("UUID copy and compare succeeded.\n");
+	else {
+		printf("UUID copy and compare failed!\n");
+		failed++;
+	}
+	failed += test_uuid("84949cc5-4701-4a84-895b-354c584a981b", 1);
+	failed += test_uuid("84949CC5-4701-4A84-895B-354C584A981B", 1);
+	failed += test_uuid("84949cc5-4701-4a84-895b-354c584a981bc", 0);
+	failed += test_uuid("84949cc5-4701-4a84-895b-354c584a981", 0);
+	failed += test_uuid("84949cc5x4701-4a84-895b-354c584a981b", 0);
+	failed += test_uuid("84949cc504701-4a84-895b-354c584a981b", 0);
+	failed += test_uuid("84949cc5-470104a84-895b-354c584a981b", 0);
+	failed += test_uuid("84949cc5-4701-4a840895b-354c584a981b", 0);
+	failed += test_uuid("84949cc5-4701-4a84-895b0354c584a981b", 0);
+	failed += test_uuid("g4949cc5-4701-4a84-895b-354c584a981b", 0);
+	failed += test_uuid("84949cc5-4701-4a84-895b-354c584a981g", 0);
+
+	if (failed) {
+		printf("%d failures.\n", failed);
+		exit(1);
+	}
+	return 0;
+}
diff --git a/shlibs/uuid/src/unpack.c b/shlibs/uuid/src/unpack.c
new file mode 100644
index 00000000..beaaff3c
--- /dev/null
+++ b/shlibs/uuid/src/unpack.c
@@ -0,0 +1,63 @@
+/*
+ * Internal routine for unpacking UUID
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include <string.h>
+#include "uuidP.h"
+
+void uuid_unpack(const uuid_t in, struct uuid *uu)
+{
+	const uint8_t	*ptr = in;
+	uint32_t		tmp;
+
+	tmp = *ptr++;
+	tmp = (tmp << 8) | *ptr++;
+	tmp = (tmp << 8) | *ptr++;
+	tmp = (tmp << 8) | *ptr++;
+	uu->time_low = tmp;
+
+	tmp = *ptr++;
+	tmp = (tmp << 8) | *ptr++;
+	uu->time_mid = tmp;
+
+	tmp = *ptr++;
+	tmp = (tmp << 8) | *ptr++;
+	uu->time_hi_and_version = tmp;
+
+	tmp = *ptr++;
+	tmp = (tmp << 8) | *ptr++;
+	uu->clock_seq = tmp;
+
+	memcpy(uu->node, ptr, 6);
+}
+
diff --git a/shlibs/uuid/src/unparse.c b/shlibs/uuid/src/unparse.c
new file mode 100644
index 00000000..a95bbb04
--- /dev/null
+++ b/shlibs/uuid/src/unparse.c
@@ -0,0 +1,76 @@
+/*
+ * unparse.c -- convert a UUID to string
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include <stdio.h>
+
+#include "uuidP.h"
+
+static const char *fmt_lower =
+	"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x";
+
+static const char *fmt_upper =
+	"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X";
+
+#ifdef UUID_UNPARSE_DEFAULT_UPPER
+#define FMT_DEFAULT fmt_upper
+#else
+#define FMT_DEFAULT fmt_lower
+#endif
+
+static void uuid_unparse_x(const uuid_t uu, char *out, const char *fmt)
+{
+	struct uuid uuid;
+
+	uuid_unpack(uu, &uuid);
+	sprintf(out, fmt,
+		uuid.time_low, uuid.time_mid, uuid.time_hi_and_version,
+		uuid.clock_seq >> 8, uuid.clock_seq & 0xFF,
+		uuid.node[0], uuid.node[1], uuid.node[2],
+		uuid.node[3], uuid.node[4], uuid.node[5]);
+}
+
+void uuid_unparse_lower(const uuid_t uu, char *out)
+{
+	uuid_unparse_x(uu, out,	fmt_lower);
+}
+
+void uuid_unparse_upper(const uuid_t uu, char *out)
+{
+	uuid_unparse_x(uu, out,	fmt_upper);
+}
+
+void uuid_unparse(const uuid_t uu, char *out)
+{
+	uuid_unparse_x(uu, out, FMT_DEFAULT);
+}
diff --git a/shlibs/uuid/src/uuid.h b/shlibs/uuid/src/uuid.h
new file mode 100644
index 00000000..e329bf7a
--- /dev/null
+++ b/shlibs/uuid/src/uuid.h
@@ -0,0 +1,103 @@
+/*
+ * Public include file for the UUID library
+ *
+ * Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#ifndef _UUID_UUID_H
+#define _UUID_UUID_H
+
+#include <sys/types.h>
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
+#include <time.h>
+
+typedef unsigned char uuid_t[16];
+
+/* UUID Variant definitions */
+#define UUID_VARIANT_NCS	0
+#define UUID_VARIANT_DCE	1
+#define UUID_VARIANT_MICROSOFT	2
+#define UUID_VARIANT_OTHER	3
+
+/* UUID Type definitions */
+#define UUID_TYPE_DCE_TIME   1
+#define UUID_TYPE_DCE_RANDOM 4
+
+/* Allow UUID constants to be defined */
+#ifdef __GNUC__
+#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
+	static const uuid_t name __attribute__ ((unused)) = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
+#else
+#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
+	static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* clear.c */
+void uuid_clear(uuid_t uu);
+
+/* compare.c */
+int uuid_compare(const uuid_t uu1, const uuid_t uu2);
+
+/* copy.c */
+void uuid_copy(uuid_t dst, const uuid_t src);
+
+/* gen_uuid.c */
+void uuid_generate(uuid_t out);
+void uuid_generate_random(uuid_t out);
+void uuid_generate_time(uuid_t out);
+
+/* isnull.c */
+int uuid_is_null(const uuid_t uu);
+
+/* parse.c */
+int uuid_parse(const char *in, uuid_t uu);
+
+/* unparse.c */
+void uuid_unparse(const uuid_t uu, char *out);
+void uuid_unparse_lower(const uuid_t uu, char *out);
+void uuid_unparse_upper(const uuid_t uu, char *out);
+
+/* uuid_time.c */
+time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
+int uuid_type(const uuid_t uu);
+int uuid_variant(const uuid_t uu);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UUID_UUID_H */
diff --git a/shlibs/uuid/src/uuid.sym b/shlibs/uuid/src/uuid.sym
new file mode 100644
index 00000000..05d9f393
--- /dev/null
+++ b/shlibs/uuid/src/uuid.sym
@@ -0,0 +1,33 @@
+/*
+ * The symbol versioning ensures that a new application requiring symbol foo()
+ * can't run with old libblkid.so not providing foo() - the global SONAME
+ * version info can't enforce this since we never change the SONAME.
+ *
+ * The original libuuid from e2fsprogs (<=1.41.5) does not to use
+ * symbol versioning -- all the original symbols are in UUID_1.0 now.
+ */
+UUID_1.0 {
+global:
+	uuid_clear;
+	uuid_compare;
+	uuid_copy;
+	uuid_generate;
+	uuid_generate_random;
+	uuid_generate_time;
+	uuid_is_null;
+	uuid_parse;
+	uuid_unparse;
+	uuid_unparse_lower;
+	uuid_unparse_upper;
+	uuid_time;
+	uuid_type;
+	uuid_variant;
+
+	/* uuid__* this is not part of the official API, this is
+	 * uuidd (uuid daemon) specific stuff. Hell.
+	 */
+	uuid__generate_time;
+	uuid__generate_random;
+local:
+	*;
+};
diff --git a/shlibs/uuid/src/uuidP.h b/shlibs/uuid/src/uuidP.h
new file mode 100644
index 00000000..9d30ce2f
--- /dev/null
+++ b/shlibs/uuid/src/uuidP.h
@@ -0,0 +1,59 @@
+/*
+ * uuid.h -- private header file for uuids
+ *
+ * Copyright (C) 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#include <inttypes.h>
+#include <sys/types.h>
+
+#include "uuid.h"
+
+/*
+ * Offset between 15-Oct-1582 and 1-Jan-70
+ */
+#define TIME_OFFSET_HIGH 0x01B21DD2
+#define TIME_OFFSET_LOW  0x13814000
+
+struct uuid {
+	uint32_t	time_low;
+	uint16_t	time_mid;
+	uint16_t	time_hi_and_version;
+	uint16_t	clock_seq;
+	uint8_t	node[6];
+};
+
+
+/*
+ * prototypes
+ */
+void uuid_pack(const struct uuid *uu, uuid_t ptr);
+void uuid_unpack(const uuid_t in, struct uuid *uu);
diff --git a/shlibs/uuid/src/uuid_time.c b/shlibs/uuid/src/uuid_time.c
new file mode 100644
index 00000000..f25f5c90
--- /dev/null
+++ b/shlibs/uuid/src/uuid_time.c
@@ -0,0 +1,171 @@
+/*
+ * uuid_time.c --- Interpret the time field from a uuid.  This program
+ * 	violates the UUID abstraction barrier by reaching into the guts
+ *	of a UUID and interpreting it.
+ *
+ * Copyright (C) 1998, 1999 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#ifdef _WIN32
+#define _WIN32_WINNT 0x0500
+#include <windows.h>
+#define UUID MYUUID
+#endif
+
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <time.h>
+
+#include "uuidP.h"
+
+time_t uuid_time(const uuid_t uu, struct timeval *ret_tv)
+{
+	struct timeval		tv;
+	struct uuid		uuid;
+	uint32_t		high;
+	uint64_t		clock_reg;
+
+	uuid_unpack(uu, &uuid);
+
+	high = uuid.time_mid | ((uuid.time_hi_and_version & 0xFFF) << 16);
+	clock_reg = uuid.time_low | ((uint64_t) high << 32);
+
+	clock_reg -= (((uint64_t) 0x01B21DD2) << 32) + 0x13814000;
+	tv.tv_sec = clock_reg / 10000000;
+	tv.tv_usec = (clock_reg % 10000000) / 10;
+
+	if (ret_tv)
+		*ret_tv = tv;
+
+	return tv.tv_sec;
+}
+
+int uuid_type(const uuid_t uu)
+{
+	struct uuid		uuid;
+
+	uuid_unpack(uu, &uuid);
+	return ((uuid.time_hi_and_version >> 12) & 0xF);
+}
+
+int uuid_variant(const uuid_t uu)
+{
+	struct uuid		uuid;
+	int			var;
+
+	uuid_unpack(uu, &uuid);
+	var = uuid.clock_seq;
+
+	if ((var & 0x8000) == 0)
+		return UUID_VARIANT_NCS;
+	if ((var & 0x4000) == 0)
+		return UUID_VARIANT_DCE;
+	if ((var & 0x2000) == 0)
+		return UUID_VARIANT_MICROSOFT;
+	return UUID_VARIANT_OTHER;
+}
+
+#ifdef DEBUG
+static const char *variant_string(int variant)
+{
+	switch (variant) {
+	case UUID_VARIANT_NCS:
+		return "NCS";
+	case UUID_VARIANT_DCE:
+		return "DCE";
+	case UUID_VARIANT_MICROSOFT:
+		return "Microsoft";
+	default:
+		return "Other";
+	}
+}
+
+
+int
+main(int argc, char **argv)
+{
+	uuid_t		buf;
+	time_t		time_reg;
+	struct timeval	tv;
+	int		type, variant;
+
+	if (argc != 2) {
+		fprintf(stderr, "Usage: %s uuid\n", argv[0]);
+		exit(1);
+	}
+	if (uuid_parse(argv[1], buf)) {
+		fprintf(stderr, "Invalid UUID: %s\n", argv[1]);
+		exit(1);
+	}
+	variant = uuid_variant(buf);
+	type = uuid_type(buf);
+	time_reg = uuid_time(buf, &tv);
+
+	printf("UUID variant is %d (%s)\n", variant, variant_string(variant));
+	if (variant != UUID_VARIANT_DCE) {
+		printf("Warning: This program only knows how to interpret "
+		       "DCE UUIDs.\n\tThe rest of the output is likely "
+		       "to be incorrect!!\n");
+	}
+	printf("UUID type is %d", type);
+	switch (type) {
+	case 1:
+		printf(" (time based)\n");
+		break;
+	case 2:
+		printf(" (DCE)\n");
+		break;
+	case 3:
+		printf(" (name-based)\n");
+		break;
+	case 4:
+		printf(" (random)\n");
+		break;
+	default:
+		printf("\n");
+	}
+	if (type != 1) {
+		printf("Warning: not a time-based UUID, so UUID time "
+		       "decoding will likely not work!\n");
+	}
+	printf("UUID time is: (%ld, %ld): %s\n", tv.tv_sec, tv.tv_usec,
+	       ctime(&time_reg));
+
+	return 0;
+}
+#endif
diff --git a/shlibs/uuid/src/uuidd.h b/shlibs/uuid/src/uuidd.h
new file mode 100644
index 00000000..68ee0e5c
--- /dev/null
+++ b/shlibs/uuid/src/uuidd.h
@@ -0,0 +1,54 @@
+/*
+ * Definitions used by the uuidd daemon
+ *
+ * Copyright (C) 2007 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ * %End-Header%
+ */
+
+#ifndef _UUID_UUIDD_H
+#define _UUID_UUIDD_H
+
+#define UUIDD_DIR		"/var/run/uuidd"
+#define UUIDD_SOCKET_PATH	UUIDD_DIR "/request"
+#define UUIDD_PIDFILE_PATH	UUIDD_DIR "/uuidd.pid"
+#define UUIDD_PATH		"/usr/sbin/uuidd"
+
+#define UUIDD_OP_GETPID			0
+#define UUIDD_OP_GET_MAXOP		1
+#define UUIDD_OP_TIME_UUID		2
+#define UUIDD_OP_RANDOM_UUID		3
+#define UUIDD_OP_BULK_TIME_UUID		4
+#define UUIDD_OP_BULK_RANDOM_UUID	5
+#define UUIDD_MAX_OP			UUIDD_OP_BULK_RANDOM_UUID
+
+extern void uuid__generate_time(uuid_t out, int *num);
+extern void uuid__generate_random(uuid_t out, int *num);
+
+#endif /* _UUID_UUID_H */
diff --git a/shlibs/uuid/uuid.pc.in b/shlibs/uuid/uuid.pc.in
new file mode 100644
index 00000000..875de19b
--- /dev/null
+++ b/shlibs/uuid/uuid.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@usrlib_execdir@
+includedir=@includedir@
+
+Name: uuid
+Description: Universally unique id library
+Version: @LIBUUID_VERSION@
+Requires:
+Cflags: -I${includedir}/uuid
+Libs: -L${libdir} -luuid
diff --git a/sys-utils/.gitignore b/sys-utils/.gitignore
index c47cd077..6f0be710 100644
--- a/sys-utils/.gitignore
+++ b/sys-utils/.gitignore
@@ -36,6 +36,7 @@ sparc32.8
 sparc32bash.8
 sparc64.8
 sparc.8
+switch_root
 tunelp
 vidmode.8
 x86_64.8
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
index b4c6ac60..19ecccca 100644
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@ -2,8 +2,8 @@ include $(top_srcdir)/config/include-Makefile.am
 
 bin_PROGRAMS =
 sbin_PROGRAMS =
-usrbinexec_PROGRAMS = flock ipcrm ipcs ipcmk renice setsid
-usrsbinexec_PROGRAMS = readprofile
+usrbin_exec_PROGRAMS = flock ipcrm ipcs ipcmk renice setsid
+usrsbin_exec_PROGRAMS = readprofile
 
 dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \
 		readprofile.1
@@ -11,8 +11,8 @@ dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \
 if LINUX
 bin_PROGRAMS += dmesg
 sbin_PROGRAMS += ctrlaltdel
-usrbinexec_PROGRAMS += cytune setarch lscpu
-usrsbinexec_PROGRAMS += ldattach tunelp rtcwake
+usrbin_exec_PROGRAMS += cytune setarch lscpu
+usrsbin_exec_PROGRAMS += ldattach tunelp rtcwake
 
 dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
 		ldattach.8 lscpu.1 tunelp.8 rtcwake.8
@@ -28,6 +28,11 @@ sbin_PROGRAMS += pivot_root
 dist_man_MANS += pivot_root.8
 endif
 
+if BUILD_SWITCH_ROOT
+sbin_PROGRAMS += switch_root
+dist_man_MANS += switch_root.8
+endif
+
 if BUILD_ARCH
 bin_PROGRAMS += arch
 dist_man_MANS += arch.1
@@ -35,7 +40,7 @@ endif
 
 RDEV_LINKS =
 if BUILD_RDEV
-usrsbinexec_PROGRAMS += rdev
+usrsbin_exec_PROGRAMS += rdev
 RDEV_LINKS += ramsize vidmode rootflags
 dist_man_MANS += rdev.8
 endif
@@ -80,17 +85,17 @@ $(SETARCH_MAN_LINKS): setarch.8
 
 install-exec-hook:
 	for I in $(RDEV_LINKS); do \
-		cd $(DESTDIR)$(usrsbinexecdir) && ln -sf rdev $$I ; \
+		cd $(DESTDIR)$(usrsbin_execdir) && ln -sf rdev $$I ; \
 	done
 	for I in $(SETARCH_LINKS); do \
-		cd $(DESTDIR)$(usrbinexecdir) && ln -sf setarch $$I ; \
+		cd $(DESTDIR)$(usrbin_execdir) && ln -sf setarch $$I ; \
 	done
 
 uninstall-hook:
 	for I in $(RDEV_LINKS); do \
-		rm -f $(DESTDIR)$(usrbinexecdir)/$$I ; \
+		rm -f $(DESTDIR)$(usrbin_execdir)/$$I ; \
 	done
 	for I in $(SETARCH_LINKS); do \
-		rm -f $(DESTDIR)$(usrbinexecdir)/$$I ; \
+		rm -f $(DESTDIR)$(usrbin_execdir)/$$I ; \
 	done
 
diff --git a/sys-utils/ldattach.8 b/sys-utils/ldattach.8
index 4ee62293..7afe51dd 100644
--- a/sys-utils/ldattach.8
+++ b/sys-utils/ldattach.8
@@ -35,7 +35,7 @@ With no arguments,
 .B ldattach
 prints usage information.
 .SH LINE DISCIPLINES
-As of kernel release 2.6.21, the following line disciplines are supported:
+Depending on the kernel release, the following line disciplines are supported:
 .TP
 .BR TTY ( 0 )
 The default line discipline,
@@ -80,6 +80,9 @@ Bluetooth HCI UART driver.
 .TP
 .BR GIGASET_M101 ( 16 )
 Driver for Siemens Gigaset M101 serial DECT adapter.
+.TP
+.BR PPS ( 18 )
+Driver for serial line Pulse Per Second (PPS) source.
 .SH OPTIONS
 .TP
 \fB-d\fP | \fB--debug\fP
diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index 801dd1cb..19f70fe6 100644
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -34,6 +34,10 @@
 # define N_GIGASET_M101 16
 #endif
 
+#ifndef N_PPS
+# define N_PPS 18
+#endif
+
 #ifndef ARRAY_SIZE
 # define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 #endif
@@ -65,7 +69,8 @@ ld_table[] = {
 	{ "HCI",	N_HCI },
 	{ "GIGASET_M101",	N_GIGASET_M101 },
 	{ "GIGASET",	N_GIGASET_M101 },
-	{ "M101",	N_GIGASET_M101 }
+	{ "M101",	N_GIGASET_M101 },
+	{ "PPS",	N_PPS },
 };
 
 /* look up line discipline code */
diff --git a/sys-utils/switch_root.8 b/sys-utils/switch_root.8
new file mode 100644
index 00000000..ea175b00
--- /dev/null
+++ b/sys-utils/switch_root.8
@@ -0,0 +1,49 @@
+.\" Karel Zak <kzak@redhat.com>
+.TH SWITCH_ROOT 8 "June 2009" "Linux"
+.SH NAME
+switch_root \- switch to another filesystem as the root of the mount tree.
+.SH SYNOPSIS
+.B switch_root
+.RB [\-hV]
+.LP
+.B switch_root
+.I newroot
+.I init
+.RB [ \fIarg\fP
+.RB ...]
+.SH DESCRIPTION
+.B switch_root
+moves already mounted /proc, /dev and /sys to
+.I newroot
+and makes
+.I newroot
+the new root filesystem and starts
+.I init
+process.
+
+.B WARNING: switch_root removes recursively all files and directories on the current root filesystem.
+
+.SH OPTIONS
+.IP "\fB\-h, \-\-help\fP"
+show help and exit
+.IP "\fB\-V, \-\-version\fP"
+show version number and exit
+
+.SH RETURN VALUE
+.B switch_root
+returns 0 on success and 1 on failure.
+
+.SH "SEE ALSO"
+.BR mount (8)
+.BR chroot (2)
+.BR init (8)
+.BR mkinitrd (8)
+.SH AUTHORS
+.nf
+Peter Jones <pjones@redhat.com>
+Jeremy Katz <katzj@redhat.com>
+Karel Zak <kzak@redhat.com>
+.fi
+.SH AVAILABILITY
+The switch_root command is part of the util-linux-ng package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c
new file mode 100644
index 00000000..b192a08e
--- /dev/null
+++ b/sys-utils/switch_root.c
@@ -0,0 +1,280 @@
+/*
+ * switchroot.c - switch to new root directory and start init.
+ *
+ * Copyright 2002-2009 Red Hat, Inc.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *	Peter Jones <pjones@redhat.com>
+ *	Jeremy Katz <katzj@redhat.com>
+ */
+#include <sys/mount.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <err.h>
+#include <libgen.h>
+
+#ifndef MS_MOVE
+#define MS_MOVE 8192
+#endif
+
+/* remove all files/directories below dirName -- don't cross mountpoints */
+static int recursiveRemove(int fd)
+{
+	struct stat rb;
+	DIR *dir;
+	int rc = -1;
+	int dfd;
+
+	if (!(dir = fdopendir(fd))) {
+		warn("failed to open directory");
+		goto done;
+	}
+
+	/* fdopendir() precludes us from continuing to use the input fd */
+	dfd = dirfd(dir);
+
+	if (fstat(dfd, &rb)) {
+		warn("failed to stat directory");
+		goto done;
+	}
+
+	while(1) {
+		struct dirent *d;
+
+		errno = 0;
+		if (!(d = readdir(dir))) {
+			if (errno) {
+				warn("failed to read directory");
+				goto done;
+			}
+			break;	/* end of directory */
+		}
+
+		if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
+			continue;
+
+		if (d->d_type == DT_DIR) {
+			struct stat sb;
+
+			if (fstatat(dfd, d->d_name, &sb, AT_SYMLINK_NOFOLLOW)) {
+				warn("failed to stat %s", d->d_name);
+				continue;
+			}
+
+			/* remove subdirectories if device is same as dir */
+			if (sb.st_dev == rb.st_dev) {
+				int cfd;
+
+				cfd = openat(dfd, d->d_name, O_RDONLY);
+				if (cfd >= 0) {
+					recursiveRemove(cfd);
+					close(cfd);
+				}
+			} else
+				continue;
+		}
+
+		if (unlinkat(dfd, d->d_name,
+			     d->d_type == DT_DIR ? AT_REMOVEDIR : 0))
+			warn("failed to unlink %s", d->d_name);
+	}
+
+	rc = 0;	/* success */
+
+done:
+	if (dir)
+		closedir(dir);
+	return rc;
+}
+
+/* find the enclosing mount point of a path, by examining the backing device
+ * of parent directories until we reach / or find a parent with a differing
+ * device. Result must be freed.
+ */
+static char *get_parent_mount(const char *path)
+{
+	struct stat sb;
+	char *dir;
+	char tmp[PATH_MAX];
+	dev_t inner_dev;
+
+	if (stat(path, &sb) != 0) {
+		warn("failed to stat %s", path);
+		return NULL;
+	}
+
+	inner_dev = sb.st_dev;
+	dir = strdup(path);
+
+	while (dir) {
+		char *parent;
+
+		strncpy(tmp, dir, PATH_MAX);
+		tmp[PATH_MAX - 1] = '\0';
+		parent = dirname(tmp);
+
+		if (stat(parent, &sb) != 0) {
+			warn("failed to stat %s", parent);
+			return NULL;
+		}
+		if (sb.st_dev != inner_dev)
+			return dir;
+
+		strncpy(dir, parent, PATH_MAX);
+		dir[PATH_MAX - 1] = '\0';
+
+		/* maybe we've reached / */
+		if (*dir == '/' && !*(dir + 1))
+			return dir;
+	}
+	return NULL;
+}
+
+static int switchroot(const char *newroot)
+{
+	/*  Don't try to unmount the old "/", there's no way to do it. */
+	const char *umounts[] = { "/dev", "/proc", "/sys", NULL };
+	int i;
+	int cfd, rc = -1;
+	pid_t pid;
+	const char *chroot_path = NULL;
+	char *newroot_mnt;
+
+	for (i = 0; umounts[i] != NULL; i++) {
+		char newmount[PATH_MAX];
+
+		snprintf(newmount, sizeof(newmount), "%s%s", newroot, umounts[i]);
+
+		if (mount(umounts[i], newmount, NULL, MS_MOVE, NULL) < 0) {
+			warn("failed to mount moving %s to %s",
+				umounts[i], newmount);
+			warnx("forcing unmount of %s", umounts[i]);
+			umount2(umounts[i], MNT_FORCE);
+		}
+	}
+
+	newroot_mnt = get_parent_mount(newroot);
+	if (newroot_mnt && strcmp(newroot, newroot_mnt)) {
+		/* newroot is not a mount point, so we have to MS_MOVE the
+		 * parent mount point and then chroot in to the "subroot"
+		 */
+		chroot_path = newroot + strlen(newroot_mnt);
+		newroot = newroot_mnt;
+	}
+
+	if (chdir(newroot)) {
+		warn("failed to change directory to %s", newroot);
+		goto done;
+	}
+
+	cfd = open("/", O_RDONLY);
+
+	if (mount(newroot, "/", NULL, MS_MOVE, NULL) < 0) {
+		warn("failed to mount moving %s to /", newroot);
+		goto done;
+	}
+
+	/* move to the real root of the device */
+	if (chroot(".")) {
+		warn("failed to change root");
+		goto done;
+	}
+
+	/* move to the subdirectory on the root device (subroot) */
+	if (chroot_path) {
+		if (chdir(chroot_path)) {
+			warn("failed to chdir to subroot %s", chroot_path);
+			goto done;
+		}
+		if (chroot(".")) {
+			warn("failed to change root to subroot %s", chroot_path);
+			goto done;
+		}
+	}
+
+	if (cfd >= 0) {
+		pid = fork();
+		if (pid <= 0) {
+			recursiveRemove(cfd);
+			if (pid == 0)
+				exit(EXIT_SUCCESS);
+		}
+		close(cfd);
+	}
+	rc = 0;
+done:
+	free(newroot_mnt);
+	return rc;
+}
+
+static void usage(FILE *output)
+{
+	fprintf(output, "usage: %s <newrootdir> <init> <args to init>\n",
+			program_invocation_short_name);
+	exit(output == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
+static void version(void)
+{
+	fprintf(stdout,  "%s from %s\n", program_invocation_short_name,
+			PACKAGE_STRING);
+	exit(EXIT_SUCCESS);
+}
+
+int main(int argc, char *argv[])
+{
+	char *newroot, *init, **initargs;
+
+	if (argv[1] && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")))
+		usage(stdout);
+	if (argv[1] && (!strcmp(argv[1], "--version") || !strcmp(argv[1], "-V")))
+		version();
+	if (argc < 3)
+		usage(stderr);
+
+	newroot = argv[1];
+	init = argv[2];
+	initargs = &argv[2];
+
+	if (!*newroot || !*init)
+		usage(stderr);
+
+	if (switchroot(newroot))
+		errx(EXIT_FAILURE, "failed. Sorry.");
+
+	if (access(init, X_OK))
+		warn("cannot access %s", init);
+
+	/* get session leader */
+	setsid();
+
+	/* set controlling terminal */
+	if (ioctl (0, TIOCSCTTY, 1))
+		warn("failed to TIOCSCTTY");
+
+	execv(init, initargs);
+	err(EXIT_FAILURE, "failed to execute %s", init);
+}
+
diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index 232ae630..f9eeec14 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -45,6 +45,6 @@ TS_CMD_ISLOCAL=${TS_CMD_ISLOCAL-"$TOPDIR/login-utils/islocal_test"}
 TS_CMD_HWCLOCK=${TS_CMD_HWCLOCK-"$TOPDIR/hwclock/hwclock"}
 TS_CMD_LSCPU=${TS_CMD_LSCPU-"$TOPDIR/sys-utils/lscpu"}
 
-TS_CMD_BLKID=${TS_CMD_BLKID-"$TOPDIR/libs/blkid/bin/blkid"}
-
+TS_CMD_BLKID=${TS_CMD_BLKID-"$TOPDIR/misc-utils/blkid"}
 
+TS_CMD_FDISK=${TS_CMD_FDISK-"$TOPDIR/fdisk/fdisk"}
diff --git a/tests/expected/fdisk/doslabel b/tests/expected/fdisk/doslabel
new file mode 100644
index 00000000..1d987f6d
--- /dev/null
+++ b/tests/expected/fdisk/doslabel
@@ -0,0 +1,18 @@
+Initialize empty image
+f1c9645dbc14efddc7d8a322685f26eb doslabel.img
+Create new DOS partition table
+57e721e38d1266c2df055067c18f2cf9 doslabel.img
+Create primary partition
+ae4f9b12f4a768849f72ea36938c30c7 doslabel.img
+Create extended partition
+76987a00b353687cd1dba3ddea9d66f9 doslabel.img
+Create logical partitions
+a1cd6708e4a6d2e5f6bc9d5c0da0cf3b doslabel.img
+Delete logical partitions
+4c6937d529ace5661fb82efb9394154a doslabel.img
+Create another logical partition
+9589eaaed698d2402945ab3e513c1eb4 doslabel.img
+Delete primary partition
+1e6d646e5df66a2664cfbbb13fa9a08a doslabel.img
+Delete extended partition
+fc3cdb12326656d7996b09b6f76973e7 doslabel.img
diff --git a/tests/expected/paths/built-in b/tests/expected/paths/built-in
index 318f44e5..51372de3 100644
--- a/tests/expected/paths/built-in
+++ b/tests/expected/paths/built-in
@@ -1,6 +1,7 @@
        _PATH_DEFPATH /usr/local/bin:/bin:/usr/bin
   _PATH_DEFPATH_ROOT /usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-           _PATH_TTY /dev/tty
+       _PATH_DEV_TTY /dev/tty
+      _PATH_DEV_LOOP /dev/loop
      _PATH_SECURETTY /etc/securetty
       _PATH_WTMPLOCK /etc/wtmplock
      _PATH_HUSHLOGIN .hushlogin
diff --git a/tests/functions.sh b/tests/functions.sh
index d07b7e31..50ef12d8 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -246,13 +246,23 @@ function ts_die {
 	ts_finalize
 }
 
-function ts_device_init {
-	local img="$TS_OUTDIR/${TS_TESTNAME}.img"
-	local dev=""
+function ts_image_md5sum {
+	local img=${1:-"$TS_OUTDIR/${TS_TESTNAME}.img"}
+	echo $(md5sum "$img" | awk '{printf $1}') $(basename "$img")
+}
 
-	dd if=/dev/zero of="$img" bs=1M count=5 &> /dev/null
+function ts_image_init {
+	local mib=${1:-"5"}	# size in MiBs
+	local img=${2:-"$TS_OUTDIR/${TS_TESTNAME}.img"}
+	
+	dd if=/dev/zero of="$img" bs=1M count=$mib &> /dev/null
+	echo "$img"
+	return 0
+}
 
-	dev=$($TS_CMD_LOSETUP -s -f "$img")
+function ts_device_init {
+	local img=$(ts_image_init)
+	local dev=$($TS_CMD_LOSETUP -s -f "$img")
 
 	if [ -z "$dev" ]; then
 		ts_device_deinit $dev
diff --git a/tests/helpers/test_pathnames.c b/tests/helpers/test_pathnames.c
index 1accedec..5cc6efd7 100644
--- a/tests/helpers/test_pathnames.c
+++ b/tests/helpers/test_pathnames.c
@@ -33,7 +33,8 @@ struct hlpPath paths[] =
 {
 	DEF_HLPPATH(_PATH_DEFPATH),
 	DEF_HLPPATH(_PATH_DEFPATH_ROOT),
-	DEF_HLPPATH(_PATH_TTY),
+	DEF_HLPPATH(_PATH_DEV_TTY),
+	DEF_HLPPATH(_PATH_DEV_LOOP),
 	DEF_HLPPATH(_PATH_SECURETTY),
 	DEF_HLPPATH(_PATH_WTMPLOCK),
 	DEF_HLPPATH(_PATH_HUSHLOGIN),
diff --git a/tests/ts/fdisk/doslabel b/tests/ts/fdisk/doslabel
new file mode 100755
index 00000000..a7ea576d
--- /dev/null
+++ b/tests/ts/fdisk/doslabel
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+#
+# This file is part of util-linux-ng.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+
+TS_TOPDIR="$(dirname $0)/../.."
+TS_DESC="doslabel tests"
+
+. $TS_TOPDIR/functions.sh
+ts_init "$*"
+
+# cmd to change number of cylinders to 1024 and changes system id to 0x1
+FDISK_CMD_INIT='x\nc\n1024\ni\n0x1\nr\n'
+FDISK_CMD_WRITE_CLOSE='w\nq\n'
+FDISK_CMD_CREATE_DOSLABEL='o\n' #create dos label
+FDISK_CMD_CREATE_PRIMARY='n\np\n1\n\n+1M\n' # create primary partition 1 of size 1MB
+FDISK_CMD_CREATE_EXTENDED='n\ne\n2\n\n+10\n' # create extended partition 2 of size 11 cylinders
+FDISK_CMD_CREATE_LOGICAL='n\nl\n\n+1\n' # create next logical partition of size 2 cyl
+FDISK_CMD_DELETE_LOGICALS='d\n6\nd\n5\nd\n6\d5\n' # delete middle, head, tail, last partitions
+FDISK_CMD_DELETE_PRIMARY='d\n1\n' # delete first primary
+FDISK_CMD_DELETE_EXTENDED='d\n2\n' # delete second primary
+
+#set -x 
+
+ts_log "Initialize empty image"
+TEST_IMAGE_NAME=$(ts_image_init 10)
+ts_image_md5sum 2>&1 >> $TS_OUTPUT
+
+# need to run init twice, to change system ID after new label, otherwise system
+# ID will be random and will screw up md5's
+ts_log "Create new DOS partition table"
+echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
+	 | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+ts_image_md5sum 2>&1 >> $TS_OUTPUT
+
+ts_log "Create primary partition"
+echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
+	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+ts_image_md5sum 2>&1 >> $TS_OUTPUT
+
+ts_log "Create extended partition"
+echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" | \
+	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+ts_image_md5sum 2>&1 >> $TS_OUTPUT
+
+ts_log "Create logical partitions"
+echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
+	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+ts_image_md5sum 2>&1 >> $TS_OUTPUT
+
+ts_log "Delete logical partitions"
+echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_LOGICALS}${FDISK_CMD_WRITE_CLOSE}" \
+	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+ts_image_md5sum 2>&1 >> $TS_OUTPUT
+
+ts_log "Create another logical partition"
+echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
+	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+ts_image_md5sum  2>&1 >> $TS_OUTPUT
+
+ts_log "Delete primary partition"
+echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \
+	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+ts_image_md5sum 2>&1 >> $TS_OUTPUT
+
+ts_log "Delete extended partition"
+echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" \
+	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+ts_image_md5sum 2>&1 >> $TS_OUTPUT
+
+ts_finalize
diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am
index 7c724aeb..dec895b4 100644
--- a/text-utils/Makefile.am
+++ b/text-utils/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/include-Makefile.am
 
 EXTRA_DIST = README.clear README.col
 
-usrbinexec_PROGRAMS = col colcrt colrm column hexdump rev line tailf
+usrbin_exec_PROGRAMS = col colcrt colrm column hexdump rev line tailf
 
 hexdump_SOURCES = hexdump.c conv.c display.c hexsyntax.c odsyntax.c parse.c \
 		  hexdump.h
@@ -11,7 +11,7 @@ dist_man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1
 
 if HAVE_NCURSES
 bin_PROGRAMS = more
-usrbinexec_PROGRAMS += ul pg
+usrbin_exec_PROGRAMS += ul pg
 if HAVE_TINFO
 more_LDADD = -ltinfo
 pg_LDADD = -ltinfo @NCURSES_LIBS@
diff --git a/text-utils/pg.c b/text-utils/pg.c
index 30c67009..b2c4d873 100644
--- a/text-utils/pg.c
+++ b/text-utils/pg.c
@@ -220,7 +220,7 @@ smalloc(size_t s)
 {
         char *m = (char *)malloc(s);
         if (m == NULL) {
-		char *p = _("Out of memory\n");
+		const char *p = _("Out of memory\n");
                 write(2, p, strlen(p));
                 quit(++exitstatus);
         }
@@ -1507,7 +1507,7 @@ found_bw:
 				/*
 				 * Help!
 				 */
-				char *help = _(helpscreen);
+				const char *help = _(helpscreen);
 				write(1, copyright + 4, strlen(copyright + 4));
 				write(1, help, strlen(help));
 				goto newcmd;
author	LaMont Jones <lamont@debian.org>	2009-07-21 15:45:04 -0600
committer	LaMont Jones <lamont@debian.org>	2009-07-21 15:45:04 -0600
commit	7a22bb9abcb56d1010cefd204709e3888f95f735 (patch)
tree	5c38b4485f79ee8f6a9d5f9537e973f1f663f027
parent	4e13a18f57a5b427c559f3b466b9655db14d28f8 (diff)
parent	741064af10ec81635d708e9fb8373f96341246eb (diff)
download	util-linux-old-7a22bb9abcb56d1010cefd204709e3888f95f735.tar.gz